diff po/nn.po @ 20263:15ad77c653ad

I ran stats.pl to get updated po files. This was necessary to pull some old strings back into use, now that we've gone back in time.
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 18:19:24 +0000
parents 60485bc8ff7f
children e4719768af06
line wrap: on
line diff
--- a/po/nn.po	Fri Sep 28 17:11:39 2007 +0000
+++ b/po/nn.po	Fri Sep 28 18:19:24 2007 +0000
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-25 01:15-0700\n"
+"POT-Creation-Date: 2007-09-28 13:16-0500\n"
 "PO-Revision-Date: 2007-09-06 23:00+0100\n"
 "Last-Translator: Y S Landro <nynorsk@strilen.net>\n"
 "Language-Team: \n"
@@ -43,7 +43,7 @@
 "  -n, --nologin       loggar ikkje på automatisk\n"
 "  -v, --version       vis noverande versjon og avslutt\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -59,7 +59,7 @@
 #: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2032
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1515
@@ -94,8 +94,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Du har truleg gløymt å kjøra 'make install')"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
 msgid "Modify Account"
 msgstr "Endra konto"
 
@@ -125,7 +125,7 @@
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntcertmgr.c:91
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
 #: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
 #: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
 #: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
@@ -135,8 +135,8 @@
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2416
-#: ../libpurple/protocols/jabber/buddy.c:2452
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2449
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
@@ -145,10 +145,10 @@
 #: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/msn/msn.c:362
-#: ../libpurple/protocols/oscar/oscar.c:6092
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6094
 #: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -183,16 +183,16 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:767
-#: ../pidgin/gtkdialogs.c:906 ../pidgin/gtkdialogs.c:998
-#: ../pidgin/gtkdialogs.c:1018 ../pidgin/gtkdialogs.c:1042
-#: ../pidgin/gtkdialogs.c:1064 ../pidgin/gtkdialogs.c:1112
-#: ../pidgin/gtkdialogs.c:1153 ../pidgin/gtkdialogs.c:1209
-#: ../pidgin/gtkdialogs.c:1248 ../pidgin/gtkdialogs.c:1275
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:769
+#: ../pidgin/gtkdialogs.c:908 ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1044
+#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1155 ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1250 ../pidgin/gtkdialogs.c:1277
 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
 #: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
@@ -233,7 +233,7 @@
 msgid "Delete"
 msgstr "Slett"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
 #: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Kontoar"
@@ -244,16 +244,15 @@
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2305
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:383 ../finch/gntpounce.c:713
-#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
-#: ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
+#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712
+#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Legg til"
@@ -313,19 +312,19 @@
 msgid "Error adding buddy"
 msgstr "Klarte ikkje å leggja til venn"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2884
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
 #: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Brukarnamn"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1507
+#: ../libpurple/protocols/msn/msn.c:1395
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1017
-#: ../pidgin/gtkdialogs.c:1041 ../pidgin/gtkdialogs.c:1063
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1043 ../pidgin/gtkdialogs.c:1065
 #: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Alias"
@@ -337,7 +336,7 @@
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
 #: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3206 ../pidgin/gtknotify.c:503
+#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
 #: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
@@ -351,7 +350,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3342 ../pidgin/gtkblist.c:5772
+#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Legg til venn"
@@ -360,15 +359,15 @@
 msgid "Please enter buddy information."
 msgstr "Skriv inn venneinformasjonen."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
 msgid "Chats"
 msgstr "Prat"
 
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1694 ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -380,7 +379,7 @@
 msgid "Auto-join"
 msgstr "Automatisk tilkopling"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6154
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
 msgid "Add Chat"
 msgstr "Legg til praterom"
 
@@ -402,7 +401,7 @@
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
 msgid "Add Group"
 msgstr "Legg til gruppe"
 
@@ -434,7 +433,7 @@
 msgid "Retrieving..."
 msgstr "Hentar…"
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -445,10 +444,10 @@
 msgstr "Legg til vennevarsling"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1607
 msgid "Send File"
 msgstr "Send fil"
 
@@ -492,14 +491,14 @@
 msgstr "Stadfest fjerninga"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "_Fjern"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2355 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4566
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Venneliste"
@@ -518,15 +517,15 @@
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/jabber/buddy.c:2214
+#: ../libpurple/protocols/jabber/buddy.c:2396
 #: ../libpurple/protocols/jabber/jabber.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1544
 #: ../libpurple/protocols/jabber/jabber.c:1567
 #: ../libpurple/protocols/jabber/jabber.c:1590
 #: ../libpurple/protocols/jabber/jabber.c:1613
 #: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1697
+#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -536,7 +535,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
 msgid "Nickname"
 msgstr "Kallenamn"
 
@@ -545,12 +544,12 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2830
-#: ../libpurple/protocols/oscar/oscar.c:2908
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
-#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
+#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
 msgid "Idle"
 msgstr "Uverksam"
 
@@ -581,36 +580,36 @@
 "\n"
 "Sist sett: %s ago"
 
-#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Ny…"
 
-#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Lagra…"
 
-#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Tilleggsprogram"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:748
-#: ../pidgin/gtkdialogs.c:887 ../pidgin/gtkdialogs.c:968
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:750
+#: ../pidgin/gtkdialogs.c:889 ../pidgin/gtkdialogs.c:970
 msgid "_Name"
 msgstr "_Namn"
 
-#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:753
-#: ../pidgin/gtkdialogs.c:892 ../pidgin/gtkdialogs.c:973
+#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:755
+#: ../pidgin/gtkdialogs.c:894 ../pidgin/gtkdialogs.c:975
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:761
+#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:763
 msgid "New Instant Message"
 msgstr "Ny lynmelding"
 
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:763
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:765
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
@@ -619,15 +618,15 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
 #: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
 #: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
 #: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
 #: ../libpurple/protocols/jabber/jabber.c:1736
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306
-#: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6093
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -644,57 +643,45 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
-#: ../libpurple/protocols/yahoo/yahoo.c:3507 ../pidgin/gtkblist.c:4321
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:766
-#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:768
+#: ../pidgin/gtkdialogs.c:907 ../pidgin/gtkdialogs.c:999
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2261 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr "Val"
 
-#: ../finch/gntblist.c:2267
+#: ../finch/gntblist.c:2247
 msgid "Send IM..."
 msgstr "Send lynmelding…"
 
+#: ../finch/gntblist.c:2251
+#, fuzzy
+msgid "Show empty groups"
+msgstr "Vis tomme grupper"
+
+#: ../finch/gntblist.c:2257
+#, fuzzy
+msgid "Show offline buddies"
+msgstr "Vis fråkopla vennar"
+
+#: ../finch/gntblist.c:2263
+msgid "Sort by status"
+msgstr "Sorter etter tilstand"
+
+#: ../finch/gntblist.c:2267
+msgid "Sort alphabetically"
+msgstr "Sorter alfabetisk "
+
 #: ../finch/gntblist.c:2271
-#, fuzzy
-msgid "Show"
-msgstr "Vis alt"
-
-#: ../finch/gntblist.c:2276
-#, fuzzy
-msgid "Empty groups"
-msgstr "Vis tomme grupper"
-
-#: ../finch/gntblist.c:2282
-#, fuzzy
-msgid "Offline buddies"
-msgstr "Vis fråkopla vennar"
-
-#: ../finch/gntblist.c:2288
-#, fuzzy
-msgid "Sort"
-msgstr "Port"
-
-#: ../finch/gntblist.c:2293
-#, fuzzy
-msgid "By Status"
-msgstr "Etter status"
-
-#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106
-msgid "Alphabetically"
-msgstr "Alfabetisk "
-
-#: ../finch/gntblist.c:2301
-#, fuzzy
-msgid "By Log Size"
-msgstr "Etter loggstorleiken"
+msgid "Sort by log size"
+msgstr "Sorter etter loggstorleiken"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
 #, fuzzy
@@ -793,7 +780,7 @@
 msgid "Hostname"
 msgstr "Vertsnamn"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1688
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Informasjon"
@@ -801,24 +788,24 @@
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
 #: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
 #: ../libpurple/protocols/silc/util.c:382
 #: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Lukk"
 
-#: ../finch/gntconn.c:125
+#: ../finch/gntconn.c:124
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:127
 #, c-format
 msgid "%s disconnected."
 msgstr "%s fråkopla."
 
-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:128
 #, c-format
 msgid ""
 "%s\n"
@@ -831,7 +818,7 @@
 "Finch vil ikkje prøva å kople til kontoen på nytt før feilen er retta og "
 "kontoen er teken i bruk att."
 
-#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323
+#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
 msgid "Re-enable Account"
 msgstr "Ta kontoen i bruk att "
 
@@ -839,23 +826,23 @@
 msgid "No such command."
 msgstr "Kommandoen finst ikkje."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:530
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Syntaksfeil:  du skreiv ikkje rett tal argument til kommandoen"
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:536
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
 msgid "Your command failed for an unknown reason."
 msgstr "Kommandoen din feila av ukjend årsak."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
 msgid "That command only works in chats, not IMs."
 msgstr "Den kommandoen verkar berre i praterom, ikkje i lynmeldingar."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
 msgid "That command only works in IMs, not chats."
 msgstr "Den kommandoen verkar berre i lynmeldingar, ikkje i praterom."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:551
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "Den kommandoen verkar ikkje i denne protokollen."
 
@@ -873,7 +860,7 @@
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
 #, c-format
 msgid ""
 "\n"
@@ -886,63 +873,63 @@
 msgid "You have left this chat."
 msgstr "Du har forlate dette praterommet."
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415
+#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Logginga er starta. Framtidige meldingar i denne samtala vil bli logga."
 
-#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423
+#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Logginga er stoppa. Framtidige meldingar i denne samtala vil ikkje bli logga."
 
-#: ../finch/gntconv.c:469
+#: ../finch/gntconv.c:442
 msgid "Send To"
 msgstr "Send til"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:486
 msgid "Conversation"
 msgstr "Prat"
 
-#: ../finch/gntconv.c:519
+#: ../finch/gntconv.c:492
 msgid "Clear Scrollback"
 msgstr "Tøm skjerm"
 
-#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Vis tidsstempel"
 
-#: ../finch/gntconv.c:539
+#: ../finch/gntconv.c:512
 msgid "Add Buddy Pounce..."
 msgstr "Legg til vennevarsling…"
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:527
 msgid "Enable Logging"
 msgstr "Bruk logging"
 
-#: ../finch/gntconv.c:560
+#: ../finch/gntconv.c:533
 msgid "Enable Sounds"
 msgstr "Bruk lydar"
 
-#: ../finch/gntconv.c:766
+#: ../finch/gntconv.c:739
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:889
+#: ../finch/gntconv.c:861
 msgid "List of users:\n"
 msgstr "Brukarliste:\n"
 
-#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370
+#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
 msgid "Supported debug options are:  version"
 msgstr "Støtta feilsøkingsval er:  versjon"
 
-#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422
+#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr "Kommandoen finst ikkje (i denne samanhengen)."
 
-#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -950,7 +937,7 @@
 "Bruk \"/help &lt;kommando&gt;\" for å få hjelp med ein kommando.\n"
 "Dei følgjande kommandoane er tilgjengelege i denne samanhengen:\n"
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7642
+#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -958,13 +945,13 @@
 "say &lt;message&gt;: Sender ei melding på normal måte, som om du ikkje nytta "
 "ein kommando."
 
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7645
+#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
 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:1154 ../pidgin/gtkconv.c:7648
+#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -972,39 +959,39 @@
 "debug &lt;option&gt;: Send forskjellig feilsøkingsinformasjon til samtala du "
 "er i."
 
-#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651
+#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tømmer skjermen."
 
-#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;: Hjelp til ein spesifikk kommando."
 
-#: ../finch/gntconv.c:1163
+#: ../finch/gntconv.c:1135
 msgid "users:  Show the list of users in the chat."
 msgstr "users: viser lista over brukarar i praterommet."
 
-#: ../finch/gntconv.c:1168
+#: ../finch/gntconv.c:1140
 msgid "plugins: Show the plugins window."
 msgstr "plugins: viser programtilleggsvindauget."
 
-#: ../finch/gntconv.c:1171
+#: ../finch/gntconv.c:1143
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: viser vennelista."
 
-#: ../finch/gntconv.c:1174
+#: ../finch/gntconv.c:1146
 msgid "accounts: Show the accounts window."
 msgstr "accounts: viser kontovindauget."
 
-#: ../finch/gntconv.c:1177
+#: ../finch/gntconv.c:1149
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: viser feilsøkingsvindauget."
 
-#: ../finch/gntconv.c:1180
+#: ../finch/gntconv.c:1152
 msgid "prefs: Show the preference window."
 msgstr "prefs: viser innstillingsvindauget."
 
-#: ../finch/gntconv.c:1183
+#: ../finch/gntconv.c:1155
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: viser lagra status-vindauget."
 
@@ -1068,17 +1055,17 @@
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
 #: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:596 ../libpurple/protocols/msn/msn.c:603
-#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/msn/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2696
-#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:2700
+#: ../libpurple/protocols/oscar/oscar.c:3780
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3247 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
+#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
 #: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Status"
@@ -1122,7 +1109,7 @@
 msgid "Finished"
 msgstr "Ferdig"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Overfører"
 
@@ -1134,11 +1121,11 @@
 msgid "You have mail!"
 msgstr "Du har fått e-post."
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:510
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
 msgid "Sender"
 msgstr "Sendar"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:517
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
 msgid "Subject"
 msgstr "Emne"
 
@@ -1163,23 +1150,23 @@
 msgid "Buddy Information"
 msgstr "Venneinformasjon"
 
-#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Hald fram"
 
-#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649
+#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
 msgstr "Lynmeldingar"
 
-#: ../finch/gntnotify.c:392
+#: ../finch/gntnotify.c:389
 msgid "Join"
 msgstr "Bli med"
 
-#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../finch/gntnotify.c:398
+#: ../finch/gntnotify.c:395
 msgid "(none)"
 msgstr "(ingen)"
 
@@ -1234,7 +1221,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2069
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
 msgid "Preferences"
 msgstr "Innstillingar "
 
@@ -1413,6 +1400,7 @@
 msgstr "%s har sendt deg ei melding. (%s)"
 
 #: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukjend varselhending. Rapportér feilen."
 
@@ -1420,12 +1408,12 @@
 msgid "Based on keyboard use"
 msgstr "Basert på tastaturbruk"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
 msgid "From last sent message"
 msgstr "Frå sist sendte melding"
 
 #: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Aldri"
@@ -1475,12 +1463,12 @@
 msgstr "Endra tilstand til"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Samtaler"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
 msgid "Logging"
 msgstr "Loggføring"
 
@@ -1546,8 +1534,8 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer klarte ikkje å starta."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
-#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
+#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1563,7 +1551,7 @@
 msgid "Profiles"
 msgstr "Profilar"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -1571,7 +1559,7 @@
 msgid "Console Beep"
 msgstr "Konsollyd"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
 msgid "Command"
 msgstr "Kommando"
 
@@ -1579,7 +1567,7 @@
 msgid "No Sound"
 msgstr "Ingen lyd"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
 msgid "Sound Method"
 msgstr "Lydmetode"
 
@@ -1597,7 +1585,7 @@
 "(%s for filnamn)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
 msgid "Sound Options"
 msgstr "Lydinnstillingar"
 
@@ -1606,17 +1594,17 @@
 msgstr "Lydar når samtalevindauget har fokus"
 
 #: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Alltid"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when available"
 msgstr "Berre når tilgjengeleg"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
 msgid "Only when not available"
 msgstr "Berre når ikkje tilgjengeleg"
 
@@ -1625,11 +1613,11 @@
 msgstr "Volum (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
 msgid "Sound Events"
 msgstr "Lydhendingar"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
 msgid "Event"
 msgstr "Hending"
 
@@ -1637,15 +1625,15 @@
 msgid "File"
 msgstr "Fil"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
 msgid "Test"
 msgstr "Test"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
 msgid "Reset"
 msgstr "Nullstill"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
 msgid "Choose..."
 msgstr "Vel…"
 
@@ -1665,7 +1653,7 @@
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Tittel"
@@ -1696,20 +1684,17 @@
 #: ../libpurple/protocols/jabber/jabber.c:1601
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/msn/msn.c:634 ../libpurple/protocols/msn/msn.c:641
-#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/msn.c:655
-#: ../libpurple/protocols/msn/msn.c:661 ../libpurple/protocols/msn/msn.c:667
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/novell/novell.c:2946
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/oscar/oscar.c:5552
-#: ../libpurple/protocols/oscar/oscar.c:5770
-#: ../libpurple/protocols/oscar/oscar.c:5784
-#: ../libpurple/protocols/oscar/oscar.c:5800
-#: ../libpurple/protocols/oscar/oscar.c:5807
-#: ../libpurple/protocols/oscar/oscar.c:5814
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5554
+#: ../libpurple/protocols/oscar/oscar.c:5772
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5802
+#: ../libpurple/protocols/oscar/oscar.c:5809
+#: ../libpurple/protocols/oscar/oscar.c:5816
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1717,8 +1702,8 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3750
-#: ../libpurple/protocols/yahoo/yahoo.c:3756
+#: ../libpurple/protocols/yahoo/yahoo.c:3751
+#: ../libpurple/protocols/yahoo/yahoo.c:3757
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
@@ -1774,7 +1759,7 @@
 msgid "Certificates"
 msgstr "Sertifikat"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
 msgid "Sounds"
 msgstr "Lydar"
 
@@ -1878,16 +1863,16 @@
 msgid "Toaster plugin"
 msgstr "Programtillegg for sprettoppvindauge"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Samtale med %s på %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:150
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Historikktillegget krev loggføring"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:151
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1903,11 +1888,11 @@
 msgid "GntHistory"
 msgstr "Historikk"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:194
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Viser nyleg logga samtaler i nye samtaler."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1919,15 +1904,16 @@
 msgid "Lastlog"
 msgstr "Lastlog"
 
-#: ../finch/plugins/lastlog.c:99
+#. Translator Note: The "backlog" is the conversation buffer/history.
+#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: leiter etter understrengar i loggen."
 
-#: ../finch/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Lastlog-programtillegg."
 
@@ -1959,7 +1945,7 @@
 msgstr "Manglar protokolltillegg til %s"
 
 #: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4318
+#: ../pidgin/gtkblist.c:4036
 msgid "Connection Error"
 msgstr "Tilkoplingsfeil"
 
@@ -2004,16 +1990,16 @@
 
 #: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2030
-#: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/jabber/buddy.c:2027
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3242 ../pidgin/gtkblist.c:5662
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
+#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2154,7 +2140,7 @@
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1882
+#: ../libpurple/certificate.c:1881
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2166,7 +2152,7 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1891
+#: ../libpurple/certificate.c:1890
 #, fuzzy
 msgid "Certificate Information"
 msgstr "Tenarinformasjon"
@@ -2191,9 +2177,9 @@
 msgstr "+++ %s logga av"
 
 #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2337
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:361
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -2310,6 +2296,7 @@
 "%s"
 
 #: ../libpurple/dnsquery.c:578
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF under lesing frå oppslagsprosessen"
 
@@ -2418,6 +2405,7 @@
 msgstr "Overføringa av fila %s er ferdig"
 
 #: ../libpurple/ft.c:685
+#, c-format
 msgid "File transfer complete"
 msgstr "Filoverføringa er ferdig"
 
@@ -2427,6 +2415,7 @@
 msgstr "Du avbraut overføringa av %s"
 
 #: ../libpurple/ft.c:1108
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Filoverføringa blei avbroten"
 
@@ -2684,6 +2673,7 @@
 msgstr "Du nyttar %s, men dette tillegget krev %s."
 
 #: ../libpurple/plugin.c:380
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Dette tillegget har ikkje definert ein ID."
 
@@ -2765,13 +2755,13 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2229
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5884
-#: ../libpurple/protocols/oscar/oscar.c:5939
-#: ../libpurple/protocols/oscar/oscar.c:6165
-#: ../libpurple/protocols/oscar/oscar.c:6235 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
+#: ../libpurple/protocols/oscar/oscar.c:2233
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:5941
+#: ../libpurple/protocols/oscar/oscar.c:6167
+#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -2813,8 +2803,8 @@
 "ferdig\n"
 "(berre når det ikkje foregår ei samtale med sendaren)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Notes"
 msgstr "Notat"
 
@@ -3248,9 +3238,9 @@
 msgstr "Du kan endra/sletta varselet frå vennevarsel-vindauget"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:622
-#: ../libpurple/protocols/novell/novell.c:1919
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
@@ -3260,9 +3250,9 @@
 msgstr "Ja"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:622
-#: ../libpurple/protocols/novell/novell.c:1920
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
@@ -3370,7 +3360,7 @@
 msgstr "Testar om dei fleste tinga verkar som dei skal."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
 #: ../libpurple/plugins/ssl/ssl-nss.c:725
 msgid "X.509 Certificates"
 msgstr "X.509-sertifikat"
@@ -3381,7 +3371,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3389,8 +3379,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tilbyr SSL-støtte gjennom GNUTLS."
 
@@ -3495,15 +3485,15 @@
 "Varslar i samtalevindauget når ein venn går vekk/blir uverksam eller kjem "
 "tilbake."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-tilleggslastar"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tilbyr støtte for lasting av Tcl-tillegg"
 
-#: ../libpurple/plugins/tcl/tcl.c:509
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3540,7 +3530,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/jabber/buddy.c:2216
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3722,8 +3712,8 @@
 #: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
 #: ../libpurple/protocols/gg/gg.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3785
-#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3802
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "By"
@@ -3732,9 +3722,9 @@
 msgid "Year of birth"
 msgstr "Fødselsår"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1699
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3747,14 +3737,14 @@
 msgstr "Mann eller kvinne"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Mann"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3814,25 +3804,25 @@
 msgstr "Legg til praterom…"
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/jabber/buddy.c:2031
+#: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5604
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Fråkopla"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/jabber/buddy.c:2033
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2821
+#: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3100 ../libpurple/status.c:155
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Tilgjengeleg"
@@ -3842,31 +3832,32 @@
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2824
+#: ../libpurple/protocols/jabber/buddy.c:2037
+#: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4543
-#: ../libpurple/protocols/oscar/oscar.c:5630
+#: ../libpurple/protocols/oscar/oscar.c:4547
+#: ../libpurple/protocols/oscar/oscar.c:5632
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3652
-#: ../libpurple/protocols/yahoo/yahoo.c:3726 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1941
+#: ../libpurple/protocols/yahoo/yahoo.c:3653
+#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
 #: ../pidgin/gtkstatusbox.c:1058
+#, c-format
 msgid "Away"
 msgstr "Vekke"
 
 #: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2695
-#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/oscar/oscar.c:2699
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2389
-#: ../libpurple/protocols/oscar/oscar.c:3706
+#: ../libpurple/protocols/jabber/buddy.c:2210
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3877,7 +3868,7 @@
 msgstr "Fødselsår"
 
 #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3907
+#: ../libpurple/protocols/oscar/oscar.c:3911
 msgid "Unable to display the search results."
 msgstr "Klarer ikkje å visa søkjeresultata."
 
@@ -3921,7 +3912,7 @@
 msgid "Connection failed."
 msgstr "Tilkoplinga feila."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "Blokkert"
 
@@ -4059,7 +4050,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2354
+#: ../libpurple/protocols/myspace/myspace.c:2356
 msgid "Server has disconnected"
 msgstr "Tenaren har kopla frå"
 
@@ -4085,14 +4076,14 @@
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:384
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
+#: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1287
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1718
-#: ../libpurple/protocols/yahoo/yahoo.c:2938
+#: ../libpurple/protocols/simple/simple.c:1716
+#: ../libpurple/protocols/yahoo/yahoo.c:2939
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Koplar til"
@@ -4106,20 +4097,20 @@
 #. TODO: try other ports if in auto mode, then save
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:318
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1633
+#: ../libpurple/protocols/simple/simple.c:1631
 msgid "Couldn't create socket"
 msgstr "Klarte ikkje å laga endepunkt"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2467
+#: ../libpurple/protocols/myspace/myspace.c:2469
 #: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "Klarte ikkje å kopla til verten"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2350
+#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr "Lesefeil"
 
@@ -4159,22 +4150,22 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:6669
+#: ../libpurple/protocols/msn/msn.c:2185
+#: ../libpurple/protocols/oscar/oscar.c:6671
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/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:1898
+#: ../libpurple/protocols/simple/simple.c:1896
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Tenar"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302
-#: ../libpurple/protocols/oscar/oscar.c:6672
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
+#: ../libpurple/protocols/oscar/oscar.c:6674
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4246,7 +4237,7 @@
 msgstr " <i>(identifisert)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3696
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4527,7 +4518,7 @@
 msgstr "names [kanal]:  listar brukarane i kanalen."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2299
+#: ../libpurple/protocols/jabber/jabber.c:2261
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nytt kallenamn&gt;:  endra kallenamnet ditt."
 
@@ -4670,7 +4661,7 @@
 msgid "Ad-Hoc Command Failed"
 msgstr "'blocklist'-kommandoen feila"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:176
+#: ../libpurple/protocols/jabber/adhoccommands.c:173
 #, fuzzy
 msgid "execute"
 msgstr "Uventa"
@@ -4816,15 +4807,15 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1768
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/oscar/oscar.c:3749
 msgid "Birthday"
 msgstr "Fødselsdag"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3314
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Skildring"
@@ -5138,7 +5129,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2902
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Capabilities"
 msgstr "Evner"
 
@@ -5165,8 +5156,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
 #: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3784
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/oscar/oscar.c:3801
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5185,73 +5176,74 @@
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr "Ikkje vekke frå"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr "Mellombels vekke frå"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr "Avbryt nærværsvarsling"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr "Send autoriseringsførespurnaden (ein gong til)"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
+#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Unsubscribe"
 msgstr "Avbryt tinging"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
+#: ../libpurple/protocols/jabber/buddy.c:1985
 #, fuzzy
 msgid "Log In"
 msgstr "Pålogga"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:1989
 #, fuzzy
 msgid "Log Out"
 msgstr "Loggfør alle praterom"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/buddy.c:2035
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Snakkesaleg"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr "Utvida vekke"
 
-#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/buddy.c:2041
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5806
+#: ../libpurple/protocols/oscar/oscar.c:5808
 #: ../libpurple/protocols/sametime/sametime.c:3297
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Ikkje forstyrr meg"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/protocols/jabber/buddy.c:2208
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2394
-#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/jabber/buddy.c:2212
+#: ../libpurple/protocols/jabber/buddy.c:2391
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "Last Name"
 msgstr "Etternamn"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr "Her er resultatet frå søket ditt"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2322
+#: ../libpurple/protocols/jabber/buddy.c:2319
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5259,40 +5251,40 @@
 "Finn ein kontakt ved å skriva inn søkjekriteria i dei gjevne felta. Merk: "
 "ein kan nytta jokerteikn (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2342
+#: ../libpurple/protocols/jabber/buddy.c:2339
 msgid "Directory Query Failed"
 msgstr "Katalogsøk feila"
 
-#: ../libpurple/protocols/jabber/buddy.c:2343
+#: ../libpurple/protocols/jabber/buddy.c:2340
 msgid "Could not query the directory server."
 msgstr "Klarte ikkje å spørja katalogtenaren."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2377
+#: ../libpurple/protocols/jabber/buddy.c:2374
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Tenarinstruksjonar: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2384
+#: ../libpurple/protocols/jabber/buddy.c:2381
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Fyll ut eitt eller fleire felt for å søkja etter samsvarande XMPP-brukarar."
 
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/novell/novell.c:1490
-#: ../libpurple/protocols/oscar/oscar.c:3710
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/jabber/buddy.c:2401
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3723
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/jabber/buddy.c:2410
+#: ../libpurple/protocols/jabber/buddy.c:2411
 msgid "Search for XMPP users"
 msgstr "Søk etter XMPP-brukarar"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2415
+#: ../libpurple/protocols/jabber/buddy.c:2412
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5304,24 +5296,24 @@
 msgid "Search"
 msgstr "Søk"
 
-#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2427
 msgid "Invalid Directory"
 msgstr "Ugyldig katalog"
 
-#: ../libpurple/protocols/jabber/buddy.c:2447
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Enter a User Directory"
 msgstr "Før opp ein brukarkatalog"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Select a user directory to search"
 msgstr "Vel ein brukarkatalog å søkja i"
 
-#: ../libpurple/protocols/jabber/buddy.c:2451
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Search Directory"
 msgstr "Søk katalog"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5290
+#: ../libpurple/protocols/oscar/oscar.c:5294
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Rom:"
@@ -5432,9 +5424,9 @@
 msgstr "Lesefeil"
 
 #: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2557
-#: ../libpurple/protocols/yahoo/yahoo.c:2589
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2558
+#: ../libpurple/protocols/yahoo/yahoo.c:2590
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5499,8 +5491,8 @@
 msgstr "Allereie registrert"
 
 #: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3786
-#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "State"
 msgstr "Fylke/Region/Stat"
 
@@ -5584,7 +5576,7 @@
 msgstr "Begynner datastraum"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:390
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autentiserer"
 
@@ -5597,7 +5589,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5600
+#: ../libpurple/protocols/oscar/oscar.c:5602
 msgid "Not Authorized"
 msgstr "Ikkje autorisert"
 
@@ -5766,7 +5758,7 @@
 msgstr "Skriv inn det nye passordet ditt"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6388
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -5774,7 +5766,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/oscar/oscar.c:6399
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -6036,50 +6028,31 @@
 msgstr ""
 "Klarte ikkje å senda fila til %s fordi brukaren ikkje støttar filoverføringar"
 
-#: ../libpurple/protocols/jabber/jabber.c:2250
-#: ../libpurple/protocols/yahoo/yahoo.c:4118
-#, fuzzy
-msgid "Buzz"
-msgstr "alarm"
-
-#: ../libpurple/protocols/jabber/jabber.c:2251
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s har logga på."
-
-#: ../libpurple/protocols/jabber/jabber.c:2252
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "Buzzing %s..."
-msgstr "Alarmerer"
-
-#: ../libpurple/protocols/jabber/jabber.c:2291
+#: ../libpurple/protocols/jabber/jabber.c:2253
 msgid "config:  Configure a chat room."
 msgstr "config:  Endra prateromsinnstillingane."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2257
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Endra prateromsinnstillingane."
 
-#: ../libpurple/protocols/jabber/jabber.c:2304
+#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
 msgstr "part [rom]:  Forlata praterommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrera seg i eit praterom."
 
-#: ../libpurple/protocols/jabber/jabber.c:2315
+#: ../libpurple/protocols/jabber/jabber.c:2277
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nytt emne]:  Visa eller endra emnet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2321
+#: ../libpurple/protocols/jabber/jabber.c:2283
 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:2327
+#: ../libpurple/protocols/jabber/jabber.c:2289
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6087,7 +6060,7 @@
 "affiliate &lt;brukar&gt; &lt;owner|admin|member|outcast|none&gt;: vel kva "
 "tilknyting brukaren har til rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2333
+#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6095,31 +6068,31 @@
 "role &lt;brukar&gt; &lt;moderator|participant|visitor|none&gt;: vel kva "
 "rolle brukaren har i rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2339
+#: ../libpurple/protocols/jabber/jabber.c:2301
 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:2345
+#: ../libpurple/protocols/jabber/jabber.c:2307
 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:2351
+#: ../libpurple/protocols/jabber/jabber.c:2313
 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:2356
+#: ../libpurple/protocols/jabber/jabber.c:2318
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;brukar&gt; &lt;melding&gt;:  Send ei privat melding til ein annan "
 "brukar."
 
-#: ../libpurple/protocols/jabber/jabber.c:2362
+#: ../libpurple/protocols/jabber/jabber.c:2324
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2367
-#: ../libpurple/protocols/yahoo/yahoo.c:4144
+#: ../libpurple/protocols/jabber/jabber.c:2329
+#: ../libpurple/protocols/yahoo/yahoo.c:4145
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: send ein alarm til ein brukar for å merksemda hans"
 
@@ -6156,8 +6129,8 @@
 msgstr "Tillat _autentisering i klartekst over ukrypterte samband"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3275
-#: ../libpurple/protocols/simple/simple.c:1904
+#: ../libpurple/protocols/myspace/myspace.c:3277
+#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Connect port"
 msgstr "Tilkoplingsport"
 
@@ -6165,7 +6138,7 @@
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3272
+#: ../libpurple/protocols/myspace/myspace.c:3274
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -6200,6 +6173,12 @@
 msgid "XMPP Message Error"
 msgstr "Jabber meldingsfeil"
 
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s har logga på."
+
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6209,16 +6188,16 @@
 msgid "XML Parse error"
 msgstr "Feil i XML-tolkinga"
 
-#: ../libpurple/protocols/jabber/presence.c:422
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Ukjend feil til stades"
 
-#: ../libpurple/protocols/jabber/presence.c:503
-#: ../libpurple/protocols/jabber/presence.c:504
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Lag eit nytt rom"
 
-#: ../libpurple/protocols/jabber/presence.c:505
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6226,20 +6205,20 @@
 "Du er i ferd med å laga eit nytt praterom. Ønskjer du å endra innstillingane "
 "til det, eller vil nytta standardinnstillingane?"
 
-#: ../libpurple/protocols/jabber/presence.c:511
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "Endra rom_innstillingane"
 
-#: ../libpurple/protocols/jabber/presence.c:512
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "_Godta standardinnstillingane"
 
-#: ../libpurple/protocols/jabber/presence.c:554
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "Feil i praterommet %s"
 
-#: ../libpurple/protocols/jabber/presence.c:558
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Klarte ikkje å kopla til praterommet %s"
@@ -6317,7 +6296,7 @@
 "something appropriate."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:100
+#: ../libpurple/protocols/jabber/usernick.c:99
 #, fuzzy
 msgid "Set Nickname..."
 msgstr "Kallenamn"
@@ -6332,22 +6311,12 @@
 msgid "Select an action"
 msgstr "Vel ei fil"
 
-#: ../libpurple/protocols/msn/contact.c:207
-#, fuzzy
-msgid "Unable to connect to contact server"
-msgstr "Klarer ikkje å kopla til tenaren."
-
-#: ../libpurple/protocols/msn/contact.c:954
-#, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Vel Notes adressebok"
-
-#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problem med synkroniseringa av vennelista i %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6356,7 +6325,7 @@
 "%s på den lokale lista er med i gruppa \"%s\", men ikkje på tenarlista. "
 "Ønskjer du å leggja ho/han til?"
 
-#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6366,194 +6335,241 @@
 "han til?"
 
 #: ../libpurple/protocols/msn/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "Klarte ikkje å tyda meldinga"
 
 #: ../libpurple/protocols/msn/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksfeil (truleg feil i klienten)"
 
 #: ../libpurple/protocols/msn/error.c:46
+#, c-format
 msgid "Invalid e-mail address"
 msgstr "Ugyldig e-postadresse"
 
 #: ../libpurple/protocols/msn/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "Brukaren finst ikkje"
 
 #: ../libpurple/protocols/msn/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Manglar fullstendig domenenamn"
 
 #: ../libpurple/protocols/msn/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "Allereie logga inn"
 
 #: ../libpurple/protocols/msn/error.c:59
+#, c-format
 msgid "Invalid screen name"
 msgstr "Ugyldig brukarnamn"
 
 #: ../libpurple/protocols/msn/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Ugyldig visingsnamn"
 
 #: ../libpurple/protocols/msn/error.c:65
+#, c-format
 msgid "List full"
 msgstr "Lista er full"
 
 #: ../libpurple/protocols/msn/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Allereie der"
 
 #: ../libpurple/protocols/msn/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "Ikkje på lista"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "Brukaren er fråkopla"
 
 #: ../libpurple/protocols/msn/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Allereie i den tilstanden"
 
 #: ../libpurple/protocols/msn/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Allereie i motsett liste"
 
 #: ../libpurple/protocols/msn/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "For mange grupper"
 
 #: ../libpurple/protocols/msn/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Ugyldig gruppe"
 
 #: ../libpurple/protocols/msn/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "Brukaren er ikkje med i gruppa"
 
 #: ../libpurple/protocols/msn/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Gruppenamnet er for langt"
 
 #: ../libpurple/protocols/msn/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kan ikkje fjerna gruppe null"
 
 #: ../libpurple/protocols/msn/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Prøvde å leggja ein kontakt til ei gruppe som ikkje finst"
 
 #: ../libpurple/protocols/msn/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Sentralbordet feila"
 
 #: ../libpurple/protocols/msn/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Varselsoverføringa feila"
 
 #: ../libpurple/protocols/msn/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Manglar påkravde felt"
 
 #: ../libpurple/protocols/msn/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Alt for mange treff på ein FND"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
+#, c-format
 msgid "Not logged in"
 msgstr "Ikkje innlogga"
 
 #: ../libpurple/protocols/msn/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Tenesta er mellombels utilgjengeleg"
 
 #: ../libpurple/protocols/msn/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Databasetenarfeil"
 
 #: ../libpurple/protocols/msn/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Kommandoen er ikkje i bruk"
 
 #: ../libpurple/protocols/msn/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Filhandteringsfeil"
 
 #: ../libpurple/protocols/msn/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Minnetildelingsfeil"
 
 #: ../libpurple/protocols/msn/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Feil CHL-verdi sende til tenaren"
 
 #: ../libpurple/protocols/msn/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Tenaren er oppteken"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Tenaren er utilgjengeleg"
 
 #: ../libpurple/protocols/msn/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "Varslingstenaren er nede"
 
 #: ../libpurple/protocols/msn/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Tilkoplinga til databasen feila"
 
 #: ../libpurple/protocols/msn/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Tenaren er på veg ned (forlat skipet)"
 
 #: ../libpurple/protocols/msn/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Tilkoplingsfeil"
 
 #: ../libpurple/protocols/msn/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrane er anten ukjende eller ikkje tilletne"
 
 #: ../libpurple/protocols/msn/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Klarte ikkje å skriva"
 
 #: ../libpurple/protocols/msn/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Øktoverbelastning"
 
 #: ../libpurple/protocols/msn/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "Brukaren er for aktiv"
 
 #: ../libpurple/protocols/msn/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "For mange økter"
 
 #: ../libpurple/protocols/msn/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Passport-kontoen er ikkje stadfesta"
 
 #: ../libpurple/protocols/msn/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Ugyldig vennefil"
 
 #: ../libpurple/protocols/msn/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Uventa"
 
 #: ../libpurple/protocols/msn/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Endrar visingsnamnet for ofte"
 
 #: ../libpurple/protocols/msn/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Tenaren er for oppteken"
 
@@ -6562,26 +6578,32 @@
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#, c-format
 msgid "Authentication failed"
 msgstr "Autentiseringa feila"
 
 #: ../libpurple/protocols/msn/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Ikkje tillate når du er fråkopla"
 
 #: ../libpurple/protocols/msn/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Tek ikkje i mot nye brukarar"
 
 #: ../libpurple/protocols/msn/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport for barn utan foreldregodkjennig"
 
 #: ../libpurple/protocols/msn/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-kontoen er enno ikkje stadfesta"
 
 #: ../libpurple/protocols/msn/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Ugyldig autentiseringsmelding"
 
@@ -6614,31 +6636,31 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "Det nye MSN-visingsnamnet ditt er for langt."
 
-#: ../libpurple/protocols/msn/msn.c:285
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Skriv inn visingsnamnet ditt."
 
-#: ../libpurple/protocols/msn/msn.c:286
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Dette er namnet som vil synast hos andre MSN-vennar."
 
-#: ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Skriv inn heimetelefonnummeret ditt."
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Skriv inn arbeidstelefonnummeret ditt."
 
-#: ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Skriv inn mobiltelefonnummeret ditt."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillèt du MSN Mobile-sider?"
 
-#: ../libpurple/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6646,325 +6668,321 @@
 "Vil du tillata eller nekta personar i vennelista di å senda deg MSN Mobile-"
 "sider til mobiltelefonen din eller annan mobileining?"
 
-#: ../libpurple/protocols/msn/msn.c:360
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Tillat"
 
-#: ../libpurple/protocols/msn/msn.c:361
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Nekt"
 
-#: ../libpurple/protocols/msn/msn.c:377
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Denne Hotmail-kontoen er kanskje ikkje i bruk."
 
-#: ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Send ei mobilmelding."
 
-#: ../libpurple/protocols/msn/msn.c:405
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Side"
 
-#: ../libpurple/protocols/msn/msn.c:610 ../libpurple/protocols/msn/msn.c:635
-#: ../libpurple/protocols/msn/msn.c:642 ../libpurple/protocols/msn/msn.c:649
-#: ../libpurple/protocols/msn/msn.c:656 ../libpurple/protocols/msn/msn.c:662
-#: ../libpurple/protocols/msn/msn.c:668
-#, fuzzy
-msgid "Current media"
-msgstr "Noverande markør"
-
-#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3076
-#: ../libpurple/protocols/yahoo/yahoo.c:3760
+#: ../libpurple/protocols/msn/msn.c:549
+msgid "Has you"
+msgstr "Har deg"
+
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3077
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Be Right Back"
 msgstr "Kjem straks tilbake"
 
-#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2827
-#: ../libpurple/protocols/novell/novell.c:2957
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3078
-#: ../libpurple/protocols/yahoo/yahoo.c:3763
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Busy"
 msgstr "Oppteken"
 
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/yahoo/yahoo.c:3086
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On the Phone"
 msgstr "Taler i  telefonen"
 
-#: ../libpurple/protocols/msn/msn.c:666
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Out to Lunch"
 msgstr "Er ute til lunsj"
 
-#: ../libpurple/protocols/msn/msn.c:697
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Skriv inn visingsnamn…"
 
-#: ../libpurple/protocols/msn/msn.c:702
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Skriv inn heimetelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:706
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Skriv inn jobbtelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:710
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Skriv inn mobiltelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:716
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ta i bruk/ta vekk mobile einingar…"
 
-#: ../libpurple/protocols/msn/msn.c:721
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Tillat/avslå mobilsider…"
 
-#: ../libpurple/protocols/msn/msn.c:732
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Opna Hotmail-innkorga"
 
-#: ../libpurple/protocols/msn/msn.c:756
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Send til mobil"
 
-#: ../libpurple/protocols/msn/msn.c:766
-#: ../libpurple/protocols/novell/novell.c:3413
+#: ../libpurple/protocols/msn/msn.c:688
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Start ein _prat"
 
-#: ../libpurple/protocols/msn/msn.c:804
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN krev bruk av SSL. Last ned eit støtta SSL-bibliotek. "
 
-#: ../libpurple/protocols/msn/msn.c:832
+#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr "Klarte ikkje å kopla til tenaren."
 
-#: ../libpurple/protocols/msn/msn.c:1620 ../libpurple/protocols/msn/msn.c:1968
+#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Klarte ikkje å henta profilen"
 
-#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
+#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Generelt"
 
-#: ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1588
 #: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3755
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Alder"
 
-#: ../libpurple/protocols/msn/msn.c:1700
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Yrke"
 
-#: ../libpurple/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/msn/msn.c:1591
 #: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Stad"
 
-#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1898
-#: ../libpurple/protocols/msn/msn.c:1904 ../libpurple/protocols/msn/msn.c:1911
+#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
 msgid "Hobbies and Interests"
 msgstr "Fritidssysler og interesser"
 
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msn/msn.c:1838 ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msn/msn.c:1853 ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
 msgid "A Little About Me"
 msgstr "Litt om meg sjølv"
 
-#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Social"
 msgstr "Sosial"
 
-#: ../libpurple/protocols/msn/msn.c:1731
+#: ../libpurple/protocols/msn/msn.c:1621
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Sivilstand"
 
-#: ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Interests"
 msgstr "Interesser"
 
-#: ../libpurple/protocols/msn/msn.c:1733
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Pets"
 msgstr "Kjæledyr"
 
-#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Hometown"
 msgstr "Heimstad/by"
 
-#: ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
 msgstr "Tidlegare bustader"
 
-#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
 msgstr "Mote"
 
-#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
 msgstr "Musikk"
 
-#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msn/msn.c:1926
+#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1816
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Favorittsitat"
 
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1646
 msgid "Contact Info"
 msgstr "Kontaktinfo"
 
-#: ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Personal"
 msgstr "Personleg"
 
-#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Significant Other"
 msgstr "Annan viktig"
 
-#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Home Phone"
 msgstr "Heimetelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Phone 2"
 msgstr "Heimetelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1763
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Home Address"
 msgstr "Heimeadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal Mobile"
 msgstr "Personleg mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Home Fax"
 msgstr "Heimefaks"
 
-#: ../libpurple/protocols/msn/msn.c:1766
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Personal E-Mail"
 msgstr "Personleg e-postadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Personal IM"
 msgstr "Personleg pratenett"
 
-#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr "Jubileum"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1787
+#: ../libpurple/protocols/msn/msn.c:1677
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/msn/msn.c:1678
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1789
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1680
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Phone"
 msgstr "Arbeidstelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1793
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Work Address"
 msgstr "Arbeidsadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work Mobile"
 msgstr "Jobbmobil"
 
-#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work Pager"
 msgstr "Personsøkar arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
 msgstr "Telefaks arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work E-Mail"
 msgstr "E-postadresse jobb"
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
 msgstr "Pratenett arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msn/msn.c:1689
 msgid "Start Date"
 msgstr "Startdato"
 
-#: ../libpurple/protocols/msn/msn.c:1869 ../libpurple/protocols/msn/msn.c:1875
-#: ../libpurple/protocols/msn/msn.c:1882 ../libpurple/protocols/msn/msn.c:1889
+#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
 msgid "Favorite Things"
 msgstr "Favorittsakene mine"
 
-#: ../libpurple/protocols/msn/msn.c:1934
+#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr "Sist oppdatert"
 
-#: ../libpurple/protocols/msn/msn.c:1945
+#: ../libpurple/protocols/msn/msn.c:1835
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Heimeside"
 
-#: ../libpurple/protocols/msn/msn.c:1969
+#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr "Brukaren har ikkje laga ein offentleg profil."
 
-#: ../libpurple/protocols/msn/msn.c:1970
+#: ../libpurple/protocols/msn/msn.c:1860
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6974,14 +6992,14 @@
 "seia at brukaren anten ikkje finst, eller at ho/han ikkje har laga ein "
 "offentleg profil enno."
 
-#: ../libpurple/protocols/msn/msn.c:1974
+#: ../libpurple/protocols/msn/msn.c:1864
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "Fann ingen informasjon i brukarprofilen. Brukaren finst mest truleg ikkje."
 
-#: ../libpurple/protocols/msn/msn.c:1982
+#: ../libpurple/protocols/msn/msn.c:1872
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiladresse"
@@ -6996,106 +7014,101 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271
-#, fuzzy
-msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Novell GroupWise Messenger-protokolltillegg"
-
-#: ../libpurple/protocols/msn/msn.c:2306
+#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
+msgid "MSN Protocol Plugin"
+msgstr "MSN-protokolltillegg"
+
+#: ../libpurple/protocols/msn/msn.c:2194
 msgid "Use HTTP Method"
 msgstr "Bruk HTTP-metode"
 
-#: ../libpurple/protocols/msn/msn.c:2311
+#: ../libpurple/protocols/msn/msn.c:2199
 #, fuzzy
 msgid "HTTP Method Server"
 msgstr "IPC-testtenar"
 
-#: ../libpurple/protocols/msn/msn.c:2316
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "Show custom smileys"
 msgstr "Vis eigne smilefjes"
 
-#: ../libpurple/protocols/msn/msn.c:2324
+#: ../libpurple/protocols/msn/msn.c:2212
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: dytta til ein brukar for å få merksemda hans/hennar"
 
-#: ../libpurple/protocols/msn/nexus.c:137
-msgid "Windows Live ID authentication:Unable to connect"
-msgstr ""
-
-#: ../libpurple/protocols/msn/nexus.c:275
-#, fuzzy
-msgid "Windows Live ID authentication Failed"
-msgstr "Feil: autentiseringa feila"
-
-#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Klarte ikkje å kopla til"
+
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s er ikkje ei gyldig gruppe."
 
-#: ../libpurple/protocols/msn/notification.c:197
-#: ../libpurple/protocols/msn/notification.c:938
-#: ../libpurple/protocols/msn/session.c:369
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Ukjend feil."
 
-#: ../libpurple/protocols/msn/notification.c:200
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:518
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s sende deg nettopp ein dytt (\"nudge\")."
-
-#: ../libpurple/protocols/msn/notification.c:843
-#, fuzzy, c-format
-msgid "Unknown error (%d)"
-msgstr "Ukjend feil"
-
-#: ../libpurple/protocols/msn/notification.c:844
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Klarte ikkje å leggja til brukar"
-
-#: ../libpurple/protocols/msn/notification.c:904
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Klarte ikkje å leggja til brukaren på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:908
+#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Klarte ikkje å blokkera brukaren på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:912
+#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Klarte ikkje å tillata brukaren på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:920
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Klarte ikkje å leggja til %s fordi vennelista di er full."
 
-#: ../libpurple/protocols/msn/notification.c:929
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s er ikkje ein gyldig Passport-konto."
 
-#: ../libpurple/protocols/msn/notification.c:934
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Tenesta er mellombels utilgjengeleg."
 
-#: ../libpurple/protocols/msn/notification.c:1272
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Klarte ikkje å endra namnet til gruppa"
 
-#: ../libpurple/protocols/msn/notification.c:1327
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Klarer ikkje å sletta gruppa"
 
-#: ../libpurple/protocols/msn/notification.c:1943
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7122,30 +7135,6 @@
 "\n"
 "Du vil kunna logga på att straks vedlikehaldsarbeidet er ferdig."
 
-#: ../libpurple/protocols/msn/oim.c:141
-#, fuzzy
-msgid "Unable to connect to OIM server"
-msgstr "Klarer ikkje å kopla til tenaren."
-
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "Klarte ikkje å kopla til"
-
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "Skrivefeil"
@@ -7163,58 +7152,58 @@
 "Tilkoplingsfeil frå %s-tenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:336
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Protokollen vår er ikkje støtta av tenaren."
 
-#: ../libpurple/protocols/msn/session.c:340
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Feil i HTTP-tolkinga."
 
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/msn/session.c:307
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:207
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "Du har logga på frå ein annan stad."
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tenarane er mellombels utilgjengelege. Vent ei stund og prøv igjen."
 
-#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-tenarane vil vera mellombels nede."
 
-#: ../libpurple/protocols/msn/session.c:359
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Klarte ikkje å autentisera: %s"
 
-#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-vennelista di er mellombels utilgjengeleg. Vent ei stund og prøv igjen."
 
-#: ../libpurple/protocols/msn/session.c:385
-#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Protokollsjekk"
 
-#: ../libpurple/protocols/msn/session.c:388
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Startar autentisering"
 
-#: ../libpurple/protocols/msn/session.c:389
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Hentar informasjonskapsel"
 
-#: ../libpurple/protocols/msn/session.c:391
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Sender informasjonskapsel"
 
-#: ../libpurple/protocols/msn/session.c:392
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Hentar vennelista"
 
@@ -7267,25 +7256,22 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Det kan vera at meldinga ikkje blei sendt sia ein ukjend feil oppstod:"
 
-#: ../libpurple/protocols/msn/userlist.c:243
+#: ../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:312
+#: ../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."
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Klarte ikkje å leggja til \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "Det oppgjevne brukarnamnet er ikkje gyldig."
 
@@ -7316,7 +7302,7 @@
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1798
+#: ../libpurple/protocols/myspace/myspace.c:1801
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-feil"
 
@@ -7332,50 +7318,50 @@
 msgid "Logging in"
 msgstr "Loggar på"
 
-#: ../libpurple/protocols/myspace/myspace.c:1278
+#: ../libpurple/protocols/myspace/myspace.c:1286
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "Mista sambandet til tenaren (ingen data er mottekne på %d sekund)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1321
+#: ../libpurple/protocols/myspace/myspace.c:1328
 msgid "New mail messages"
 msgstr "Nye e-postmeldingar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1322
+#: ../libpurple/protocols/myspace/myspace.c:1329
 msgid "New blog comments"
 msgstr "Ny blogg-kommentarar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1323
+#: ../libpurple/protocols/myspace/myspace.c:1330
 msgid "New profile comments"
 msgstr "Ny profilkommentarar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1324
+#: ../libpurple/protocols/myspace/myspace.c:1331
 msgid "New friend requests!"
 msgstr "Nye venneførespurnader"
 
-#: ../libpurple/protocols/myspace/myspace.c:1325
+#: ../libpurple/protocols/myspace/myspace.c:1332
 msgid "New picture comments"
 msgstr "Nytt bilete-kommentarar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1355
+#: ../libpurple/protocols/myspace/myspace.c:1360
 msgid "MySpace"
 msgstr "MySpace"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1538
+#: ../libpurple/protocols/myspace/myspace.c:1543
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Tilkopla"
 
-#: ../libpurple/protocols/myspace/myspace.c:1549
-#: ../libpurple/protocols/myspace/myspace.c:1551
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/myspace/myspace.c:1556
 msgid "No username set"
 msgstr "Ikkje noko brukarnamn er skriven inn"
 
-#: ../libpurple/protocols/myspace/myspace.c:1550
+#: ../libpurple/protocols/myspace/myspace.c:1555
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
@@ -7383,72 +7369,72 @@
 "Gå til http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "og vel eit brukarnamn. Prøv deretter å logga på igjen."
 
-#: ../libpurple/protocols/myspace/myspace.c:1777
+#: ../libpurple/protocols/myspace/myspace.c:1782
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfeil, kode %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1970
-#: ../libpurple/protocols/myspace/myspace.c:2004
+#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:2006
 msgid "Failed to add buddy"
 msgstr "Klarte ikkje å leggja til venn"
 
-#: ../libpurple/protocols/myspace/myspace.c:1970
+#: ../libpurple/protocols/myspace/myspace.c:1972
 msgid "'addbuddy' command failed."
 msgstr "'addbuddy'-kommandoen feila."
 
-#: ../libpurple/protocols/myspace/myspace.c:2004
-#: ../libpurple/protocols/myspace/myspace.c:2245
+#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:2247
 msgid "persist command failed"
 msgstr "'persist'-kommandoen feila"
 
-#: ../libpurple/protocols/myspace/myspace.c:2113
+#: ../libpurple/protocols/myspace/myspace.c:2115
 #, c-format
 msgid "No such user: %s"
 msgstr "Brukaren %s finst ikkje"
 
-#: ../libpurple/protocols/myspace/myspace.c:2114
+#: ../libpurple/protocols/myspace/myspace.c:2116
 msgid "User lookup"
 msgstr "Slår opp brukaren"
 
-#: ../libpurple/protocols/myspace/myspace.c:2226
-#: ../libpurple/protocols/myspace/myspace.c:2245
-#: ../libpurple/protocols/myspace/myspace.c:2267
+#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2269
 msgid "Failed to remove buddy"
 msgstr "Klarte ikkje å fjerna vennen"
 
-#: ../libpurple/protocols/myspace/myspace.c:2226
+#: ../libpurple/protocols/myspace/myspace.c:2228
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy'-kommandoen feila"
 
-#: ../libpurple/protocols/myspace/myspace.c:2267
+#: ../libpurple/protocols/myspace/myspace.c:2269
 msgid "blocklist command failed"
 msgstr "'blocklist'-kommandoen feila"
 
-#: ../libpurple/protocols/myspace/myspace.c:2313
+#: ../libpurple/protocols/myspace/myspace.c:2315
 msgid "Invalid input condition"
 msgstr "Ugyldig inndatavilkår"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2331
-#: ../libpurple/protocols/myspace/myspace.c:2362
+#: ../libpurple/protocols/myspace/myspace.c:2333
+#: ../libpurple/protocols/myspace/myspace.c:2364
 msgid "Read buffer full"
 msgstr "Leselageret er fullt"
 
-#: ../libpurple/protocols/myspace/myspace.c:2400
+#: ../libpurple/protocols/myspace/myspace.c:2402
 msgid "Unparseable message"
 msgstr "Meldinga kan ikkje tolkast"
 
-#: ../libpurple/protocols/myspace/myspace.c:2469
+#: ../libpurple/protocols/myspace/myspace.c:2471
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Klarte ikkje å kopla til verten: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2640
+#: ../libpurple/protocols/myspace/myspace.c:2642
 msgid "IM Friends"
 msgstr "Lynmeldingsvennar"
 
-#: ../libpurple/protocols/myspace/myspace.c:2739
+#: ../libpurple/protocols/myspace/myspace.c:2741
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -7457,57 +7443,57 @@
 "%d vennar blei lagde til eller oppdaterte frå tenaren (inkludert vennar som "
 "allereie var på tenarsidelista)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2740
+#: ../libpurple/protocols/myspace/myspace.c:2742
 msgid "Add contacts from server"
 msgstr "Legg til kontaktar frå tenaren"
 
-#: ../libpurple/protocols/myspace/myspace.c:2792
-#: ../libpurple/protocols/myspace/myspace.c:2857
+#: ../libpurple/protocols/myspace/myspace.c:2794
+#: ../libpurple/protocols/myspace/myspace.c:2859
 msgid "Add friends from MySpace.com"
 msgstr "Legg til vennar frå MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2793
+#: ../libpurple/protocols/myspace/myspace.c:2795
 msgid "Importing friends failed"
 msgstr "klarte ikkje å importera vennane"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2849
+#: ../libpurple/protocols/myspace/myspace.c:2851
 msgid "Find people..."
 msgstr "Søk etter personar…"
 
-#: ../libpurple/protocols/myspace/myspace.c:2852
+#: ../libpurple/protocols/myspace/myspace.c:2854
 msgid "Change IM name..."
 msgstr "Endra lynmeldingsnamn…"
 
-#: ../libpurple/protocols/myspace/myspace.c:3154
+#: ../libpurple/protocols/myspace/myspace.c:3156
 msgid "myim URL handler"
 msgstr "myim adressehandterar"
 
-#: ../libpurple/protocols/myspace/myspace.c:3155
+#: ../libpurple/protocols/myspace/myspace.c:3157
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr "Fann ingen passande MySpaceIM-konto til å opna denne myim-adressa."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3158
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Ta i bruk den rette MySpaceIM-kontoen og prøv igjen."
 
-#: ../libpurple/protocols/myspace/myspace.c:3279
+#: ../libpurple/protocols/myspace/myspace.c:3281
 msgid "Show display name in status text"
 msgstr "Vis visingsnamnet i statusteksten"
 
-#: ../libpurple/protocols/myspace/myspace.c:3282
+#: ../libpurple/protocols/myspace/myspace.c:3284
 msgid "Show headline in status text"
 msgstr "Vis overskrift i statusteksten"
 
-#: ../libpurple/protocols/myspace/myspace.c:3287
+#: ../libpurple/protocols/myspace/myspace.c:3289
 msgid "Send emoticons"
 msgstr "Send emotikon"
 
-#: ../libpurple/protocols/myspace/myspace.c:3292
+#: ../libpurple/protocols/myspace/myspace.c:3294
 msgid "Screen resolution (dots per inch)"
 msgstr "Skjermoppløysing (punkt per tomme)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3295
+#: ../libpurple/protocols/myspace/myspace.c:3297
 msgid "Base font size (points)"
 msgstr "Grunnskriftstorleik (punkt)"
 
@@ -7519,7 +7505,7 @@
 
 #. TODO: link to username, if available
 #: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2960
+#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Profile"
 msgstr "Profil"
 
@@ -7821,39 +7807,39 @@
 msgid "Login failed (%s)."
 msgstr "Pålogginga feila (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:249
+#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Klarer ikkje å senda meldinga. Fekk ikkje brukardetaljar (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:398
+#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Klarer ikkje å leggja %s til vennelsita di (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:424
+#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Klarer ikkje å senda melding (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:495
-#: ../libpurple/protocols/novell/novell.c:987
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Klarer ikkje å invitera brukaren (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:534
+#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Klarer ikkje å senda melding til %s. Kan ikkje laga konferansen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:539
+#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Klarer ikkje å senda melding. Kan ikkje laga konferansen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:586
+#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7862,7 +7848,7 @@
 "Klarer ikkje å flytta brukar %s til mappa %s  på tenarsidelista. Feil under "
 "laginga av mappe (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:634
+#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7871,61 +7857,61 @@
 "Klarer ikkje å leggja %s til vennelista di. Får ikkje laga mappe på "
 "tenarsidelista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:707
+#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Får ikkje henta detaljar for brukar %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:753
-#: ../libpurple/protocols/novell/novell.c:899
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Klarer ikkje å leggja brukar til personvernlista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:800
+#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Klarer ikkje å leggja til %s  på blokkeringslista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:853
+#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Klarer ikkje å leggja til %s på tilgangslista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:921
+#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Umogleg å fjerna %s frå personvernlista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:944
-#: ../libpurple/protocols/novell/novell.c:1649
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Umogleg å endra personverninnstillingar (%s) på tenarsida."
 
-#: ../libpurple/protocols/novell/novell.c:1014
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Umogleg å laga konferanse (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1123
-#: ../libpurple/protocols/novell/novell.c:1694
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "Feil i tilkoplinga mot tenar. Lukkar sambandet."
 
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Privat tittel"
 
-#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "E-postkontor"
 
-#: ../libpurple/protocols/novell/novell.c:1504
+#: ../libpurple/protocols/novell/novell.c:1502
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Brukar-ID"
@@ -7936,41 +7922,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1517
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Fullt namn"
 
-#: ../libpurple/protocols/novell/novell.c:1639
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferanse %d"
 
-#: ../libpurple/protocols/novell/novell.c:1670
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "Klarer ikkje å laga eit SSL-samband med tenaren."
 
-#: ../libpurple/protocols/novell/novell.c:1722
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Autentiserer…"
 
-#: ../libpurple/protocols/novell/novell.c:1734
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "Klarer ikkje å kopla til tenaren."
 
-#: ../libpurple/protocols/novell/novell.c:1737
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "Venatr på svar…"
 
-#: ../libpurple/protocols/novell/novell.c:1872
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s er blitt invitert til denne praten."
 
-#: ../libpurple/protocols/novell/novell.c:1900
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Prateinvitasjon"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7981,15 +7967,16 @@
 "\n"
 "Sendt: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1903
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Vil du bli med i praten?"
 
-#: ../libpurple/protocols/novell/novell.c:2017
+#. we don't want to reconnect in this case
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Du er blitt logga ut fordi du logga deg på frå ei anna maskin."
 
-#: ../libpurple/protocols/novell/novell.c:2074
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7999,7 +7986,7 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2172
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8007,11 +7994,12 @@
 "Klarer ikkje å kopla til tenaren. Skriv inn adressa til tenaren du vil kopla "
 "deg til."
 
-#: ../libpurple/protocols/novell/novell.c:2200
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Feil. SSL-støtte er ikkje installert."
 
-#: ../libpurple/protocols/novell/novell.c:2509
+#: ../libpurple/protocols/novell/novell.c:2504
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Denne konferanse er blitt lukka. Kan ikkje senda fleire meldingar."
 
@@ -8025,31 +8013,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3523
-#: ../libpurple/protocols/novell/novell.c:3525
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger-protokolltillegg"
 
-#: ../libpurple/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Tenaradresse"
 
-#: ../libpurple/protocols/novell/novell.c:3554
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Tenarport"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
-#: ../libpurple/protocols/yahoo/yahoo.c:2635
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2469
+#: ../libpurple/protocols/yahoo/yahoo.c:2636
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
 #: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
 #: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
 msgid "Server closed the connection."
 msgstr "Tenaren lukka tilkoplinga."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2462
-#: ../libpurple/protocols/yahoo/yahoo.c:2629 ../libpurple/proxy.c:593
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2463
+#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
 #: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, c-format
@@ -8060,7 +8048,7 @@
 "Mista sambandet med tenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
 #: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
 #: ../libpurple/proxy.c:1478
@@ -8098,7 +8086,7 @@
 msgstr "ICQ-protokolltillegg"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Teiknkoding"
@@ -8273,7 +8261,7 @@
 msgstr "Prat"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6008
+#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr "Hent fil"
 
@@ -8346,43 +8334,49 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5778
+#: ../libpurple/protocols/oscar/oscar.c:5780
+#, c-format
 msgid "Free For Chat"
 msgstr "Ledig for prat"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5813
+#: ../libpurple/protocols/oscar/oscar.c:5815
+#, c-format
 msgid "Not Available"
 msgstr "Ikkje tilgjengeleg"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5799
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#, c-format
 msgid "Occupied"
 msgstr "Oppteken"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
+#, c-format
 msgid "Web Aware"
 msgstr "Nettmedviten"
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3094 ../libpurple/status.c:157
+#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr "Usynleg"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
+#, c-format
 msgid "Online"
 msgstr "Tilkopla"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3703
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
 msgid "IP Address"
 msgstr "IP-adresse"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Warning Level"
 msgstr "Åtvaringsnivå"
 
@@ -8434,14 +8428,14 @@
 "innehalda tal."
 
 #: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2104
+#: ../libpurple/protocols/yahoo/yahoo.c:2105
 msgid "Invalid screen name."
 msgstr "Ugyldig brukarnamn."
 
 #: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1047
-#: ../libpurple/protocols/yahoo/yahoo.c:2125
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1045
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Incorrect password."
 msgstr "Feil passord."
 
@@ -8492,10 +8486,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2228
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5883
-#: ../libpurple/protocols/oscar/oscar.c:6164 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2281
+#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_OK"
 
@@ -8531,31 +8525,31 @@
 msgid "Unable to initialize connection"
 msgstr "Klarte ikkje å setja i gang sambandet"
 
-#: ../libpurple/protocols/oscar/oscar.c:2198
+#: ../libpurple/protocols/oscar/oscar.c:2202
 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:2226
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr "Godtakingførespurnad:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2227
+#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr "Gjer vel og godta meg."
 
-#: ../libpurple/protocols/oscar/oscar.c:2268
-#: ../libpurple/protocols/oscar/oscar.c:2276
-#: ../libpurple/protocols/oscar/oscar.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:5259
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:2272
+#: ../libpurple/protocols/oscar/oscar.c:2280
+#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/yahoo/yahoo.c:1030
 msgid "No reason given."
 msgstr "Ingen årsak oppgjeven."
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2279
 msgid "Authorization Denied Message:"
 msgstr "Avvist godtaking:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8566,17 +8560,17 @@
 "Årsak:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2408
 msgid "ICQ authorization denied."
 msgstr "ICQ-godtaking avvist."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2415
 #, 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:2419
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8589,7 +8583,7 @@
 "Frå:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8602,7 +8596,7 @@
 "Frå:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8615,38 +8609,38 @@
 "Meldinga er:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2460
 #, 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:2462
+#: ../libpurple/protocols/oscar/oscar.c:2466
 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:2467 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "L_egg til"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2472
 msgid "_Decline"
 msgstr "_Avvis"
 
-#: ../libpurple/protocols/oscar/oscar.c:2592
+#: ../libpurple/protocols/oscar/oscar.c:2596
 #, 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:2601
+#: ../libpurple/protocols/oscar/oscar.c:2605
 #, 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:2610
+#: ../libpurple/protocols/oscar/oscar.c:2614
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8655,21 +8649,21 @@
 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:2619
+#: ../libpurple/protocols/oscar/oscar.c:2623
 #, 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:2628
+#: ../libpurple/protocols/oscar/oscar.c:2632
 #, 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:2637
+#: ../libpurple/protocols/oscar/oscar.c:2641
 #, 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."
@@ -8677,47 +8671,47 @@
 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:2792
+#: ../libpurple/protocols/oscar/oscar.c:2796
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Klarer ikkje å senda melding: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2792
-#: ../libpurple/protocols/oscar/oscar.c:2797
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2801
+#: ../libpurple/protocols/oscar/oscar.c:2865
 msgid "Unknown reason."
 msgstr "Ukjend årsak."
 
-#: ../libpurple/protocols/oscar/oscar.c:2795
+#: ../libpurple/protocols/oscar/oscar.c:2799
 #: ../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:2861
+#: ../libpurple/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "User information not available: %s"
 msgstr "Brukarinformasjon er ikkje tilgjengeleg: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2892
+#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Online Since"
 msgstr "Tilkopla sia"
 
-#: ../libpurple/protocols/oscar/oscar.c:2897
+#: ../libpurple/protocols/oscar/oscar.c:2901
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Medlem sia"
 
-#: ../libpurple/protocols/oscar/oscar.c:2932
+#: ../libpurple/protocols/oscar/oscar.c:2936
 msgid "Available Message"
 msgstr "Tilgjengeleg melding"
 
-#: ../libpurple/protocols/oscar/oscar.c:3040
+#: ../libpurple/protocols/oscar/oscar.c:3044
 msgid "Your AIM connection may be lost."
 msgstr "AIM-sambandet kan vera tapt."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3228
+#: ../libpurple/protocols/oscar/oscar.c:3232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8725,7 +8719,7 @@
 "Klarer ikkje visa ei melding frå denne brukaren: ho inneheldt ulovlege "
 "teikn.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3392
+#: ../libpurple/protocols/oscar/oscar.c:3396
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8733,82 +8727,83 @@
 "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:3475
+#: ../libpurple/protocols/oscar/oscar.c:3479
 #: ../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:3725
+#: ../libpurple/protocols/oscar/oscar.c:3729
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Personal Web Page"
 msgstr "Personelg nettside"
 
-#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3783
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3787
-#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/oscar/oscar.c:3815
 msgid "Division"
 msgstr "Avdeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3812
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Position"
 msgstr "Stilling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Web Page"
 msgstr "Nettside"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Information"
 msgstr "Arbeidsinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3873
+#: ../libpurple/protocols/oscar/oscar.c:3877
 msgid "Pop-Up Message"
 msgstr "Sprettoppmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/oscar/oscar.c:3917
 #, 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:3918
+#: ../libpurple/protocols/oscar/oscar.c:3922
 msgid "Screen name"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ingen resultat funnen for e-postadressa %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3965
+#: ../libpurple/protocols/oscar/oscar.c:3969
 #, 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:3967
+#: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
 msgstr "Bede om kontostadfesting"
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4002
+#, c-format
 msgid "Error Changing Account Info"
 msgstr "Feil ved endring av kontoinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8817,12 +8812,12 @@
 "Feil 0x%04x: kan ikkje formatera brukarnamnet sia det førespurde namnet "
 "ikkje samsvarer med originalen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, 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:4007
+#: ../libpurple/protocols/oscar/oscar.c:4011
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8831,7 +8826,7 @@
 "Feil 0x%04x: kan ikkje formatera brukarnamnet sia det førespurde namnet er "
 "for langt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8840,7 +8835,7 @@
 "Feil 0x%04x: kan ikkje endra e-postadressa sia det allereie finst ein "
 "førespurnad for dette brukarnamnet."
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8849,7 +8844,7 @@
 "Feil 0x%04x: kan ikkje endra e-postadressa sia den oppgjevne adressa har for "
 "mange brukarnamn knytte til seg."
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8858,32 +8853,32 @@
 "Feil 0x%04x: kan ikkje endra e-postadressa sia den oppgjevne adressa er "
 "ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: ukjent feil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4029
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "E-postadressa til %s er %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4031
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr "Konto-info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4214
+#: ../libpurple/protocols/oscar/oscar.c:4218
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Lynmeldingsbiletet blei ikkje sendt. Du må vera direkte tilkopla for å kunna "
 "senda lynmeldingsbilete."
 
-#: ../libpurple/protocols/oscar/oscar.c:4485
+#: ../libpurple/protocols/oscar/oscar.c:4489
 msgid "Unable to set AIM profile."
 msgstr "Klarer ikkje å lagra AIM-profilen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4486
+#: ../libpurple/protocols/oscar/oscar.c:4490
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -8892,7 +8887,7 @@
 "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:4500
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8907,11 +8902,11 @@
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 
-#: ../libpurple/protocols/oscar/oscar.c:4505
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Profile too long."
 msgstr "Profilen er for lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4550
+#: ../libpurple/protocols/oscar/oscar.c:4554
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8926,11 +8921,11 @@
 "Du har overskride maksimum lengd (%d bytar) på fråværsmeldinga. Meldinga er "
 "blitt forkorta."
 
-#: ../libpurple/protocols/oscar/oscar.c:4555
+#: ../libpurple/protocols/oscar/oscar.c:4559
 msgid "Away message too long."
 msgstr "Fråværsmeldinga er for lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4624
+#: ../libpurple/protocols/oscar/oscar.c:4628
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8941,17 +8936,17 @@
 "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:4626
-#: ../libpurple/protocols/oscar/oscar.c:5056
-#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:4630
+#: ../libpurple/protocols/oscar/oscar.c:5060
+#: ../libpurple/protocols/oscar/oscar.c:5075
 msgid "Unable To Add"
 msgstr "Klarer ikkje å leggja til"
 
-#: ../libpurple/protocols/oscar/oscar.c:4735
+#: ../libpurple/protocols/oscar/oscar.c:4739
 msgid "Unable To Retrieve Buddy List"
 msgstr "Klarer ikkje å henta vennelista"
 
-#: ../libpurple/protocols/oscar/oscar.c:4736
+#: ../libpurple/protocols/oscar/oscar.c:4740
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -8959,15 +8954,15 @@
 "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:4918
-#: ../libpurple/protocols/oscar/oscar.c:4920
-#: ../libpurple/protocols/oscar/oscar.c:5136
-#: ../libpurple/protocols/oscar/oscar.c:5137
-#: ../libpurple/protocols/oscar/oscar.c:5142
+#: ../libpurple/protocols/oscar/oscar.c:4922
+#: ../libpurple/protocols/oscar/oscar.c:4924
+#: ../libpurple/protocols/oscar/oscar.c:5140
+#: ../libpurple/protocols/oscar/oscar.c:5141
+#: ../libpurple/protocols/oscar/oscar.c:5146
 msgid "Orphans"
 msgstr "Foreldrelause"
 
-#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8976,17 +8971,17 @@
 "Kan ikkje leggja til vennen %s sia vennelista er full. Slett ein venn frå "
 "lista og prøv igjen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5054
-#: ../libpurple/protocols/oscar/oscar.c:5069
+#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5073
 msgid "(no name)"
 msgstr "(ikkje noko namn)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5068
+#: ../libpurple/protocols/oscar/oscar.c:5072
 #, 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:5174
+#: ../libpurple/protocols/oscar/oscar.c:5178
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8995,22 +8990,22 @@
 "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:5182
+#: ../libpurple/protocols/oscar/oscar.c:5186
 msgid "Authorization Given"
 msgstr "Godkjent"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5255
+#: ../libpurple/protocols/oscar/oscar.c:5259
 #, 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:5256
+#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Granted"
 msgstr "Godkjent"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5263
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9021,53 +9016,53 @@
 "di. Årsaka er: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5264
 msgid "Authorization Denied"
 msgstr "Godkjenning avvist"
 
-#: ../libpurple/protocols/oscar/oscar.c:5296
+#: ../libpurple/protocols/oscar/oscar.c:5300
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5336
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Invalid chat name specified."
 msgstr "Det oppgjevne pratenamnet er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:5405
+#: ../libpurple/protocols/oscar/oscar.c:5409
 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:5567
-#: ../libpurple/protocols/oscar/oscar.c:5572
+#: ../libpurple/protocols/oscar/oscar.c:5569
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "Away Message"
 msgstr "Fråværsmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:5572
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(hentar)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5772
+#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "iTunes Music Store Link"
 msgstr "Lenkje til iTunes Music Store"
 
-#: ../libpurple/protocols/oscar/oscar.c:5880
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Vennenotat for %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr "Vennemerknad:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5928
+#: ../libpurple/protocols/oscar/oscar.c:5930
 #, 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:5932
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9075,66 +9070,66 @@
 "Handlinga kan medføra ein tryggleiksrisikio fordi ho avslører IP-adressa di. "
 "Vil du fortsetja?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5940
 #: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "_Koplar til"
 
-#: ../libpurple/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:5975
 msgid "Get AIM Info"
 msgstr "Hent _AIM-informasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:5979
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
 msgstr "Endra vennemerknad"
 
-#: ../libpurple/protocols/oscar/oscar.c:5987
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr "Hent statusmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
 msgstr "Direktelynmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:6022
+#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr "Spør om ny godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6081
+#: ../libpurple/protocols/oscar/oscar.c:6083
 msgid "Require authorization"
 msgstr "Krev autorisasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:6084
+#: ../libpurple/protocols/oscar/oscar.c:6086
 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:6089
+#: ../libpurple/protocols/oscar/oscar.c:6091
 msgid "ICQ Privacy Options"
 msgstr "ICQ personvernval"
 
-#: ../libpurple/protocols/oscar/oscar.c:6108
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
 msgstr "Den nye formateringa er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6109
+#: ../libpurple/protocols/oscar/oscar.c:6111
 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:6162
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "Change Address To:"
 msgstr "Endra adressa til:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6208
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du ventar ikkje på godkjenning</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "You are awaiting authorization from the following buddies"
 msgstr "De ventar på godkjenning frå desse vennane"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9142,73 +9137,73 @@
 "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:6229
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by E-Mail"
 msgstr "Finn venn utfrå e-postadessa"
 
-#: ../libpurple/protocols/oscar/oscar.c:6230
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by e-mail address"
 msgstr "Bruk e-postadressa til å søkja etter ein venn"
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6233
 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:6234
+#: ../libpurple/protocols/oscar/oscar.c:6236
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../libpurple/protocols/oscar/oscar.c:6392
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Set User Info (URL)..."
 msgstr "Skriv inn brukarinfo (URL)…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Change Password (URL)"
 msgstr "Endra passord (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6407
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Configure IM Forwarding (URL)"
 msgstr "Innstillingar for vidaresending (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6417
+#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "Set Privacy Options..."
 msgstr "Personvernval…"
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6424
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr "Stadfest konto"
 
-#: ../libpurple/protocols/oscar/oscar.c:6428
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Vis noverande registrerte e-postadresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6434
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Endra noverande registrerte e-postadresse…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6439
+#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis vennar som ventar på godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6445
+#: ../libpurple/protocols/oscar/oscar.c:6447
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Bruk e-postadressa til å søkja etter ein venn…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6450
+#: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
 msgstr "Søk etter venn utfrå opplysningar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6518
+#: ../libpurple/protocols/oscar/oscar.c:6520
 msgid "Use recent buddies group"
 msgstr "Bruk seinaste vennegruppe"
 
-#: ../libpurple/protocols/oscar/oscar.c:6521
+#: ../libpurple/protocols/oscar/oscar.c:6523
 msgid "Show how long you have been idle"
 msgstr "Vis kor lenge du har vore uverksam"
 
-#: ../libpurple/protocols/oscar/oscar.c:6676
+#: ../libpurple/protocols/oscar/oscar.c:6678
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9227,6 +9222,7 @@
 msgstr "Prøver å kopla til %s:%hu."
 
 #: ../libpurple/protocols/oscar/peer.c:856
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Prøver å kopla til via mellomtenar."
 
@@ -9690,7 +9686,7 @@
 msgid "Error requesting login token"
 msgstr "Feil ved førespurnad om påloggingsmarkør"
 
-#: ../libpurple/protocols/qq/login_logout.c:488
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "Får ikkje logga på - sjekk feilsøkingsloggen."
 
@@ -10066,7 +10062,7 @@
 msgid "Send TEST Announcement"
 msgstr "Send TEST-melding"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr "Emne:"
 
@@ -10091,7 +10087,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Ingen Sametime felleskapstenar spesifisert"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
 msgid "Connect"
 msgstr "Kopla til"
 
@@ -10144,6 +10140,10 @@
 "Identifikatoren '%s' samsvarte ikkje med nokon brukar i Sametime-"
 "fellesskapet ditt. Oppføringa er fjerna frå vennelista di."
 
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Klarte ikkje å leggja til brukar"
+
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -10265,7 +10265,7 @@
 "leggja desse brukarane til i vennelista di, eller senda dei meldingar ved "
 "hjelp av knappane nedanfor."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:755
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
 msgid "Search Results"
 msgstr "Søkjeresultat"
 
@@ -10842,6 +10842,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanaltilstandar:</b> "
 
@@ -10880,6 +10881,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11500,6 +11502,7 @@
 msgstr "Koplar til SILC-tenar"
 
 #: ../libpurple/protocols/silc/silc.c:352
+#, c-format
 msgid "Could not load SILC key pair"
 msgstr "Klarte ikkje å lasta SILC nøkkelpar"
 
@@ -11528,7 +11531,8 @@
 msgstr "Stemninga di no"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
@@ -11928,7 +11932,7 @@
 msgstr "Secure Internet Live Conferencing-protokollen (SILC) "
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
 msgid "Network"
 msgstr "Nettverk"
 
@@ -12124,50 +12128,60 @@
 msgstr "Ingen tilgjengelege tenarstatistikkar"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Feil: versjonsfeil - oppgrader klienten din"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Feil: den andre sida stoler ikkje på/støttar ikkje den offentlege nøkkelen "
 "din"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 "Feil: den andre sida støttar ikkje den føreslegne nøkkelutvekslingsgruppa"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Feil: den andre sida støttar ikkje den føreslegne krypteringsmetoden"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr ""
 "Feil: den andre sida støttar ikkje den føreslegne krypteringsstandarden for "
 "den offentlege nøkkelen (PKCS)"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 "Feil: den andre sida støttar ikkje den føreslegne nøkkelfunksjonen (hash)"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr ""
 "Feil: den andre sida støttar ikkje den føreslegne meldingsstadfestingskoden "
 "(HMAC)"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Feil: ugyldig signatur"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Feil: ugyldig informasjonskapsel"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Feil: autentiseringa feila"
 
@@ -12194,31 +12208,31 @@
 msgstr "Klarte ikkje å lagra"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1531
+#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr "Klarte ikkje å kopla til"
 
-#: ../libpurple/protocols/simple/simple.c:1061
+#: ../libpurple/protocols/simple/simple.c:1059
 #, fuzzy
 msgid "Unknown server response."
 msgstr "Ukjend årsak."
 
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1607
-#: ../libpurple/protocols/simple/simple.c:1620
-#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/simple/simple.c:1563
+#: ../libpurple/protocols/simple/simple.c:1605
+#: ../libpurple/protocols/simple/simple.c:1618
+#: ../libpurple/protocols/simple/simple.c:1669
 msgid "Could not create listen socket"
 msgstr "Klarte ikkje å laga lytte-endepunkt"
 
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't resolve host"
 msgstr "Vertsoppslaget feila"
 
-#: ../libpurple/protocols/simple/simple.c:1679
+#: ../libpurple/protocols/simple/simple.c:1677
 msgid "Could not resolve hostname"
 msgstr "Vertsnamnoppslaget feila"
 
-#: ../libpurple/protocols/simple/simple.c:1696
+#: ../libpurple/protocols/simple/simple.c:1694
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "IRC-brukarnamn kan ikkje innehalda mellomrom eller @-teikn"
 
@@ -12230,36 +12244,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-protokolltillegg"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1873
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-protokolltillegget"
 
-#: ../libpurple/protocols/simple/simple.c:1901
+#: ../libpurple/protocols/simple/simple.c:1899
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Offentleggjer tilstand (merk: kven som helst kan sjå deg)"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1905
 msgid "Use UDP"
 msgstr "Bruk UDP"
 
+#: ../libpurple/protocols/simple/simple.c:1907
+msgid "Use proxy"
+msgstr "Bruk mellomlager"
+
 #: ../libpurple/protocols/simple/simple.c:1909
-msgid "Use proxy"
-msgstr "Bruk mellomlager"
-
-#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Proxy"
 msgstr "Mellomlager"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Auth User"
 msgstr "Autentiser brukar"
 
-#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth Domain"
 msgstr "Autentiseringsdomene"
 
@@ -12304,6 +12318,7 @@
 msgstr "Det er ikkje tillate å åtvara mot %s."
 
 #: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Ei melding er blitt vraka - du går ut over tenaren si fartsgrense."
 
@@ -12328,38 +12343,47 @@
 msgstr "%s sendte deg ei melding som ikkje kom fram: ho var sendt for fort."
 
 #: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Svikt."
 
 #: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "For mange treff."
 
 #: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Treng fleire parametrar."
 
 #: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogtenesta er mellombels utilgjengeleg."
 
 #: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "E-mail lookup restricted."
 msgstr "E-postoppslag er avgrensa."
 
 #: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Nøkkelord er ignorert."
 
 #: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "Ingen nøkkelord."
 
 #: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "Brukaren har ingen katalogopplysningar."
 
 #: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "Land er ikkje støtta."
 
@@ -12369,18 +12393,22 @@
 msgstr "Ukjent svikt: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Ugyldig brukarnamn eller passord."
 
 #: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Tenesta er mellombels utilgjengeleg."
 
 #: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Åtvaringsnivået ditt er for tida for høgt til at du kan logga på."
 
 #: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -12418,8 +12446,8 @@
 msgid "Password Change Successful"
 msgstr "Passordet er endra"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5871
-#: ../pidgin/gtkblist.c:6227
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
+#: ../pidgin/gtkblist.c:5932
 msgid "_Group:"
 msgstr "_Gruppe:"
 
@@ -12479,27 +12507,27 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolltillegg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
+#: ../libpurple/protocols/yahoo/yahoo.c:782
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 "%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje "
 "støtta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:840
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-meldinga di blei ikkje sendt."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:959
+#: ../libpurple/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! systemmelding for %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "Authorization denied message:"
 msgstr "Melding om avvist autentisering:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1046
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12508,18 +12536,18 @@
 "%s har (i ettertid) avslått førespurnaden din om å få leggja dei til i lista "
 "di grunna: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#: ../libpurple/protocols/yahoo/yahoo.c:1050
 #, 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:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr "Er blitt nekta å leggja til venn"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1993
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12530,11 +12558,11 @@
 "vil truleg ikkje vera i stand til å logga deg på Yahoo. Sjå hos %s etter "
 "oppdateringar."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!-autentiseringa feila"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2062
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12543,51 +12571,51 @@
 "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:2065
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
 msgstr "Ignorera vennen?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2128
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 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:2131
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, 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:2185
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 #, 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:2188
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr "Klarte ikkje å leggja til vennen i tenarlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
+#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørleg %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2650
+#: ../libpurple/protocols/yahoo/yahoo.c:2651
 msgid "Received unexpected HTTP response from server."
 msgstr "Fekk uventa HTTP-svar frå tenar."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2674
-#: ../libpurple/protocols/yahoo/yahoo.c:2860
-#: ../libpurple/protocols/yahoo/yahoo.c:2963
-#: ../libpurple/protocols/yahoo/yahoo.c:2973
+#: ../libpurple/protocols/yahoo/yahoo.c:2675
+#: ../libpurple/protocols/yahoo/yahoo.c:2861
+#: ../libpurple/protocols/yahoo/yahoo.c:2964
+#: ../libpurple/protocols/yahoo/yahoo.c:2974
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Tilkoplingsproblem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2700
+#: ../libpurple/protocols/yahoo/yahoo.c:2701
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12596,7 +12624,7 @@
 "Mista sambandet med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2725
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12605,104 +12633,114 @@
 "Klaret ikkje å få til samband med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3080
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Home"
 msgstr "Ikkje heime"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3082
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not at Desk"
 msgstr "Ikkje ved pulten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3084
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "Not in Office"
 msgstr "Ikkje på kontoret"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3088
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "On Vacation"
 msgstr "På ferie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3785
 msgid "Stepped Out"
 msgstr "Ute eit bel"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3185
-#: ../libpurple/protocols/yahoo/yahoo.c:3215
+#: ../libpurple/protocols/yahoo/yahoo.c:3186
+#: ../libpurple/protocols/yahoo/yahoo.c:3216
 msgid "Not on server list"
 msgstr "Ikkje på tenarlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
-#: ../libpurple/protocols/yahoo/yahoo.c:3290
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Appear Online"
 msgstr "Framstå som tilkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3311
+#: ../libpurple/protocols/yahoo/yahoo.c:3236
+#: ../libpurple/protocols/yahoo/yahoo.c:3312
 msgid "Appear Permanently Offline"
 msgstr "Verkar alltid vera fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
+#: ../libpurple/protocols/yahoo/yahoo.c:3254
 msgid "Presence"
 msgstr "Nærvær"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3296
+#: ../libpurple/protocols/yahoo/yahoo.c:3297
 msgid "Appear Offline"
 msgstr "Verkar vera fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3305
+#: ../libpurple/protocols/yahoo/yahoo.c:3306
 msgid "Don't Appear Permanently Offline"
 msgstr "Ikkje verka vera alltid fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3353
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr "Bli med i praterom"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3359
+#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr "Lag konferanse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3387
+#: ../libpurple/protocols/yahoo/yahoo.c:3388
 msgid "Presence Settings"
 msgstr "Nærværsinnstillingar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3393
+#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
 msgstr "Laga krusedullar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 msgid "Activate which ID?"
 msgstr "Kva ID skal takast i bruk?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 #, fuzzy
 msgid "Join whom in chat?"
 msgstr "Kven skal bli med i praterommet?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3517
+#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr "Ta i bruk ID…"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3521
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "Join User in Chat..."
 msgstr "Bli med brukaren i praterommet…"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3526
+#: ../libpurple/protocols/yahoo/yahoo.c:3527
 msgid "Open Inbox"
 msgstr "Opna innkorga"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4135
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#, fuzzy
+msgid "Buzz"
+msgstr "alarm"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+#, fuzzy, c-format
+msgid "Buzzing %s..."
+msgstr "Alarmerer"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4136
 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:4140
+#: ../libpurple/protocols/yahoo/yahoo.c:4141
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: list romma på Yahoo-nettverket"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4148
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: spør ein brukar om å starta ei teikneøkt"
 
@@ -12716,56 +12754,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4357
-#: ../libpurple/protocols/yahoo/yahoo.c:4359
+#: ../libpurple/protocols/yahoo/yahoo.c:4358
+#: ../libpurple/protocols/yahoo/yahoo.c:4360
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokolltillegg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4382
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4385
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Pager server"
 msgstr "Søkjetenestetenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4388
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Japan Pager server"
 msgstr "Søkjetenestetenar (_Japan)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4391
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr "S_økjeport"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "File transfer server"
 msgstr "Filoverføringstenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "Japan file transfer server"
 msgstr "Filoverføringstenar (Japa_n)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr "Filoverførings_port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Chat room locale"
 msgstr "Pratero_mslokalitet"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
 msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4414
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room list URL"
 msgstr "Prateromslisteadresse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat server"
 msgstr "Yahoo pratetenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 msgid "Yahoo Chat port"
 msgstr "Yahoo prateport"
 
@@ -13206,7 +13244,7 @@
 msgid "%s has requested your attention!"
 msgstr ""
 
-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:796
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13215,12 +13253,12 @@
 "%s har invitert %s til praterommet %s:\n"
 "%s"
 
-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:801
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s har invitert %s til praterommet %s\n"
 
-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
 msgstr "Tek du i mot invitasjonen?"
 
@@ -13264,62 +13302,47 @@
 msgid "%s changed status from %s to %s"
 msgstr "%s endra status frå %s til %s"
 
-#: ../libpurple/status.c:612
-#, fuzzy, c-format
-msgid "%s (%s) changed status from %s to %s"
-msgstr "%s endra status frå %s til %s"
-
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:619
 #, c-format
 msgid "%s is now %s"
 msgstr "%s er no %s"
 
-#: ../libpurple/status.c:625
-#, fuzzy, c-format
-msgid "%s (%s) is now %s"
-msgstr "%s er no %s"
-
-#: ../libpurple/status.c:631
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s er ikkje lenger %s"
 
-#: ../libpurple/status.c:633
-#, fuzzy, c-format
-msgid "%s (%s) is no longer %s"
-msgstr "%s er ikkje lenger %s"
-
-#: ../libpurple/status.c:1244
+#: ../libpurple/status.c:1234
 #, c-format
 msgid "%s became idle"
 msgstr "%s blei uverksam"
 
-#: ../libpurple/status.c:1261
+#: ../libpurple/status.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s blei aktiv igjen"
 
-#: ../libpurple/status.c:1324
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s blei uverksam"
 
-#: ../libpurple/status.c:1326
+#: ../libpurple/status.c:1316
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "%s vart verksam igjen"
 
-#: ../libpurple/util.c:701
+#: ../libpurple/util.c:718
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2705
+#: ../libpurple/util.c:2722
 #, c-format
 msgid "Error Reading %s"
 msgstr "Klarte ikkje å lesa %s"
 
-#: ../libpurple/util.c:2706
+#: ../libpurple/util.c:2723
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13328,67 +13351,67 @@
 "Ein feil oppstod under lesinga av %s. Dei er ikkje blitt lasta, og den gamle "
 "fila har fått namnet %s~."
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3223
 msgid "Calculating..."
 msgstr "Reknar…"
 
-#: ../libpurple/util.c:3209
+#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr "Ukjend."
 
-#: ../libpurple/util.c:3235
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekund"
 
-#: ../libpurple/util.c:3247
+#: ../libpurple/util.c:3264
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagar"
 
-#: ../libpurple/util.c:3255
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d time"
 msgstr[1] "%s, %d timar"
 
-#: ../libpurple/util.c:3261
+#: ../libpurple/util.c:3278
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timar"
 
-#: ../libpurple/util.c:3269
+#: ../libpurple/util.c:3286
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutt"
 
-#: ../libpurple/util.c:3275
+#: ../libpurple/util.c:3292
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutt"
 msgstr[1] "%d minutt"
 
-#: ../libpurple/util.c:3535
+#: ../libpurple/util.c:3552
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Klarte ikkje å opna %s: vidaresendt for mange gonger"
 
-#: ../libpurple/util.c:3572 ../libpurple/util.c:3868
+#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Klarte ikkje å kopla til %s"
 
-#: ../libpurple/util.c:3695
+#: ../libpurple/util.c:3712
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13397,17 +13420,17 @@
 "Klarer ikkje å tildela nok minne til å halda på innhaldet frå %s. Nettenaren "
 "prøver kanskje å gjera noko vondskapsfullt."
 
-#: ../libpurple/util.c:3730
+#: ../libpurple/util.c:3747
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Klarte ikkje å lesa frå %s: %s"
 
-#: ../libpurple/util.c:3761
+#: ../libpurple/util.c:3778
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Klarte ikkje å skriva frå %s: %s"
 
-#: ../libpurple/util.c:3786
+#: ../libpurple/util.c:3803
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Klarte ikkje å kopla til %s: %s"
@@ -13497,7 +13520,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
 msgid "Use Environmental Settings"
 msgstr "Bruk miljøinnstillingar"
 
@@ -13519,15 +13542,15 @@
 msgid "Proxy Options"
 msgstr "Mellomtenarval"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
 msgstr "_Mellomtenartype:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -13535,7 +13558,7 @@
 msgid "_Username:"
 msgstr "Brukar_namn:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
 msgstr "P_assord:"
 
@@ -13595,284 +13618,243 @@
 "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:524
-#, c-format
-msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural ""
-"You currently have %d contacts named %s. Would you like to merge them?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../pidgin/gtkblist.c:525
-msgid ""
-"Merging these contacts will cause them to share a single entry on the buddy "
-"list and use a single conversation window. You can separate them again by "
-"choosing 'Expand' from the contact's context menu"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:527
-#, fuzzy
-msgid "_Merge"
-msgstr "_Melding:"
-
-#: ../pidgin/gtkblist.c:924
+#: ../pidgin/gtkblist.c:767
 msgid "Join a Chat"
 msgstr "Gå inn i eit praterom"
 
-#: ../pidgin/gtkblist.c:945
+#: ../pidgin/gtkblist.c:788
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 "Skriv inn nødvendig informasjon om praterommet du ønskjer å gå inn i.\n"
 
-#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188
-#: ../pidgin/gtkpounce.c:539 ../pidgin/gtkroomlist.c:396
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
+#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Blokker"
 
-#: ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1088
 msgid "Un_block"
 msgstr "A_vblokker"
 
-#: ../pidgin/gtkblist.c:1288
-msgid "Move to"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:1328
+#: ../pidgin/gtkblist.c:1139
 msgid "Get _Info"
 msgstr "Hent _info"
 
-#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Lynmelding"
 
-#: ../pidgin/gtkblist.c:1337
-#, fuzzy
-msgid "_Send File..."
-msgstr "_Send fil"
-
-#: ../pidgin/gtkblist.c:1344
-#, fuzzy
-msgid "Add Buddy _Pounce..."
-msgstr "Legg til vennevarsling…"
-
-#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
-#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
+#: ../pidgin/gtkblist.c:1148
+#, fuzzy
+msgid "_Send File"
+msgstr "Send fil"
+
+#: ../pidgin/gtkblist.c:1155
+msgid "Add Buddy _Pounce"
+msgstr "Legg til venne_varsling"
+
+#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
+#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
 msgid "View _Log"
 msgstr "Vis l_ogg"
 
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Hide when offline"
-msgstr "Ikkje tillate når du er fråkopla"
-
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Show when offline"
-msgstr "Ikkje tillate når du er fråkopla"
-
-#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
-#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
+#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Alias..."
 msgstr "A_lias…"
 
-#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
-#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
+#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
+#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../pidgin/gtkblist.c:1434
-#, fuzzy
-msgid "Add _Buddy..."
-msgstr "Legg til venn"
-
-#: ../pidgin/gtkblist.c:1437
-#, fuzzy
-msgid "Add C_hat..."
-msgstr "Legg til praterom"
-
-#: ../pidgin/gtkblist.c:1440
+#: ../pidgin/gtkblist.c:1238
+msgid "Add a _Buddy"
+msgstr "Legg til ein _venn"
+
+#: ../pidgin/gtkblist.c:1241
+msgid "Add a C_hat"
+msgstr "Legg til eit samtale_rom"
+
+#: ../pidgin/gtkblist.c:1244
 msgid "_Delete Group"
 msgstr "_Slett gruppe"
 
-#: ../pidgin/gtkblist.c:1442
+#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
 #. join button
-#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../pidgin/gtkblist.c:1464
+#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
 msgstr "Automatisk pålogging"
 
-#: ../pidgin/gtkblist.c:1466
-#, fuzzy
-msgid "Persistent"
-msgstr "Persisk"
-
-#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
+#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
 msgid "_Collapse"
 msgstr "_Slå saman"
 
-#: ../pidgin/gtkblist.c:1532
+#: ../pidgin/gtkblist.c:1334
 msgid "_Expand"
 msgstr "_Utvid"
 
-#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
-#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898
+#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
+#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
 msgid "/Tools/Mute Sounds"
 msgstr "/Verktøy/Demp lydar"
 
-#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903
+#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
 #: ../pidgin/gtkpounce.c:430
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "Du kan ikkje leggja til vennen med den kontoen du nyttar no."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3067
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr "/_Vennar"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Vennar/_Ny lynmelding…"
 
-#: ../pidgin/gtkblist.c:3069
+#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Vennar/Gå inn i eit prater_om…"
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:2872
 msgid "/Buddies/Get User _Info..."
 msgstr "/Vennar/Hent brukar_info…"
 
-#: ../pidgin/gtkblist.c:3071
+#: ../pidgin/gtkblist.c:2873
 msgid "/Buddies/View User _Log..."
 msgstr "/Vennar/Vis brukar_logg…"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:2875
 msgid "/Buddies/Show"
 msgstr "/Vennar/Vis"
 
-#: ../pidgin/gtkblist.c:3074
+#: ../pidgin/gtkblist.c:2876
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Vennar/Vis/_Fråkopla vennar"
 
-#: ../pidgin/gtkblist.c:3075
+#: ../pidgin/gtkblist.c:2877
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Vennar/Vis/_Tomme grupper"
 
-#: ../pidgin/gtkblist.c:3076
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Vennar/Vis/Venne_detaljar"
 
-#: ../pidgin/gtkblist.c:3077
+#: ../pidgin/gtkblist.c:2879
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Vennar/Vis/Fr_åkoplingstid"
 
-#: ../pidgin/gtkblist.c:3078
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Vennar/Vis/_Protokollikon"
 
-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Vennar/Sort_er vennane"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Vennar/Legg til _venn…"
 
-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr "/Vennar/Legg til _praterom…"
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr "/Vennar/Legg til _gruppe…"
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr "/Vennar/Avsl_utt"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:2890
 msgid "/_Accounts"
 msgstr "/K_ontoar"
 
-#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889
-#, fuzzy
-msgid "/Accounts/Manage"
-msgstr "/Kontoar"
+#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Kontoar/Legg til\\/endra"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr "/V_erktøy"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Verktøy/Venne_varsling"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/_Certificates"
 msgstr "/Verktøy/_Sertifikat"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:2897
 msgid "/Tools/Plu_gins"
 msgstr "/Verktøy/Program_tillegg"
 
-#: ../pidgin/gtkblist.c:3096
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr "/Verktøy/_Innstillingar"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Personvern"
 
-#: ../pidgin/gtkblist.c:3099
+#: ../pidgin/gtkblist.c:2901
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringar"
 
-#: ../pidgin/gtkblist.c:3100
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/R_oom List"
 msgstr "/Verktøy/_Romliste"
 
-#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:2903
 msgid "/Tools/System _Log"
 msgstr "/Verktøy/System_logg"
 
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:2905
 msgid "/Tools/Mute _Sounds"
 msgstr "/Verktøy/_Demp lydar"
 
 #. Help
-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:2907
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:2908
 msgid "/Help/Online _Help"
 msgstr "/Hjelp/_Hjelp på nettet"
 
-#: ../pidgin/gtkblist.c:3107
+#: ../pidgin/gtkblist.c:2909
 msgid "/Help/_Debug Window"
 msgstr "/Hjelp/_Feilsøkingsvindauge"
 
-#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
+#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
 
-#: ../pidgin/gtkblist.c:3140
+#: ../pidgin/gtkblist.c:2942
 #, c-format
 msgid ""
 "\n"
@@ -13881,131 +13863,135 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:3218
+#: ../pidgin/gtkblist.c:3020
 msgid "Buddy Alias"
 msgstr "Venne-alias"
 
-#: ../pidgin/gtkblist.c:3247
+#: ../pidgin/gtkblist.c:3049
 msgid "Logged In"
 msgstr "Pålogga"
 
-#: ../pidgin/gtkblist.c:3293
+#: ../pidgin/gtkblist.c:3095
 msgid "Last Seen"
 msgstr "Sist sett"
 
-#: ../pidgin/gtkblist.c:3314
+#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
 msgstr "Skummelt"
 
-#: ../pidgin/gtkblist.c:3316
+#: ../pidgin/gtkblist.c:3118
 msgid "Awesome"
 msgstr "Storarta"
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3120
 msgid "Rockin'"
 msgstr "Glimrande"
 
-#: ../pidgin/gtkblist.c:3657
+#: ../pidgin/gtkblist.c:3453
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "UVerksam %dd  %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3659
+#: ../pidgin/gtkblist.c:3455
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "UVerksam %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3661
+#: ../pidgin/gtkblist.c:3457
 #, c-format
 msgid "Idle %dm"
 msgstr "Uverksam %dm"
 
-#: ../pidgin/gtkblist.c:3806
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/New Instant Message..."
 msgstr "/Vennar/_Ny lynmelding…"
 
-#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Join a Chat..."
 msgstr "/Vennar/Gå inn i eit prater_om…"
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Get User Info..."
 msgstr "/Vennar/Hent brukar_informasjon…"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3605
 msgid "/Buddies/Add Buddy..."
 msgstr "/Vennar/Legg til venn…"
 
-#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843
+#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
 msgid "/Buddies/Add Chat..."
 msgstr "/Vennar/Legg til _praterom…"
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3607
 msgid "/Buddies/Add Group..."
 msgstr "/Vennar/Legg til gruppe…"
 
-#: ../pidgin/gtkblist.c:3846
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Privacy"
 msgstr "/Verktøy/Personvern"
 
-#: ../pidgin/gtkblist.c:3849
+#: ../pidgin/gtkblist.c:3645
 msgid "/Tools/Room List"
 msgstr "/Verktøy/Romliste"
 
 #
-#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d unread message from %s\n"
 msgstr[1] "%d ulesne meldingar frå %s\n"
 
-#: ../pidgin/gtkblist.c:4104
+#: ../pidgin/gtkblist.c:3822
 msgid "Manually"
 msgstr "Manuelt"
 
-#: ../pidgin/gtkblist.c:4107
+#: ../pidgin/gtkblist.c:3824
+msgid "Alphabetically"
+msgstr "Alfabetisk "
+
+#: ../pidgin/gtkblist.c:3825
 msgid "By status"
 msgstr "Etter status"
 
-#: ../pidgin/gtkblist.c:4108
+#: ../pidgin/gtkblist.c:3826
 msgid "By log size"
 msgstr "Etter loggstorleiken"
 
-#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
 #, c-format
 msgid "%s disconnected"
 msgstr "%s fråkopla"
 
-#: ../pidgin/gtkblist.c:4349
+#: ../pidgin/gtkblist.c:4067
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s fråkopla: %s</span>"
 
-#: ../pidgin/gtkblist.c:4501
+#: ../pidgin/gtkblist.c:4219
 msgid "<b>Username:</b>"
 msgstr "<b>Brukarnamn:</b>"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4226
 msgid "<b>Password:</b>"
 msgstr "<b>Passord:</b>"
 
-#: ../pidgin/gtkblist.c:4519
+#: ../pidgin/gtkblist.c:4237
 msgid "_Login"
 msgstr "_Innlogging"
 
-#: ../pidgin/gtkblist.c:4602
+#: ../pidgin/gtkblist.c:4320
 msgid "/Accounts"
 msgstr "/Kontoar"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:4334
 #, fuzzy, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Velkomen til %s!</span>\n"
@@ -14018,27 +14004,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4879
+#: ../pidgin/gtkblist.c:4597
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Vennar/Vis/Fråkopla vennar"
 
-#: ../pidgin/gtkblist.c:4882
+#: ../pidgin/gtkblist.c:4600
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Vennar/Vis/Tomme grupper"
 
-#: ../pidgin/gtkblist.c:4888
+#: ../pidgin/gtkblist.c:4606
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Vennar/Vis/Vennedetaljar"
 
-#: ../pidgin/gtkblist.c:4891
+#: ../pidgin/gtkblist.c:4609
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Vennar/Vis/Uverksam tid"
 
-#: ../pidgin/gtkblist.c:4894
+#: ../pidgin/gtkblist.c:4612
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Vennar/Vis/Protokollikon"
 
-#: ../pidgin/gtkblist.c:5796
+#: ../pidgin/gtkblist.c:5507
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -14049,32 +14035,26 @@
 "Kallenamnet/aliaset blir då nytta i staden for brukarnamnet der det er "
 "mogleg.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:5819
-#, fuzzy
-msgid "A_ccount:"
-msgstr "Konto:"
-
 #. End of account box
-#: ../pidgin/gtkblist.c:5831
+#: ../pidgin/gtkblist.c:5542
 msgid "_Screen name:"
 msgstr "Brukar_namn:"
 
-#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209
+#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
 msgid "A_lias:"
 msgstr "Al_ias:"
 
-#: ../pidgin/gtkblist.c:6121
+#: ../pidgin/gtkblist.c:5826
 msgid "This protocol does not support chat rooms."
 msgstr "Protokollen støttar ikkje praterom."
 
-#: ../pidgin/gtkblist.c:6137
+#: ../pidgin/gtkblist.c:5842
 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:6178
+#: ../pidgin/gtkblist.c:5883
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14082,47 +14062,39 @@
 "Skriv inn eit kallenamn og høveleg informasjon om praterommet du ønskjer å "
 "leggja til i vennelista.\n"
 
-#: ../pidgin/gtkblist.c:6237
-msgid "Autojoin when account becomes online."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6238
-msgid "Hide chat when the window is closed."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6264
+#: ../pidgin/gtkblist.c:5964
 msgid "Please enter the name of the group to be added."
 msgstr "Skriv inn namnet på gruppa du ønskjer å leggja til."
 
-#: ../pidgin/gtkblist.c:6909
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Kontoar/"
 
-#: ../pidgin/gtkblist.c:6933
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Endra konto"
 
-#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
 msgid "No actions available"
 msgstr "Ingen tilgjengelege handlingar"
 
-#: ../pidgin/gtkblist.c:6954
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Slå av"
 
-#: ../pidgin/gtkblist.c:6966
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Ta konto i bruk"
 
-#: ../pidgin/gtkblist.c:6972
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Kontoar/Ta i bruk konto"
 
-#: ../pidgin/gtkblist.c:7021
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/V_erktøy"
 
-#: ../pidgin/gtkblist.c:7091
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Vennar/Sorter vennar"
 
@@ -14132,7 +14104,7 @@
 msgid "SSL Servers"
 msgstr "Tenar"
 
-#: ../pidgin/gtkconn.c:181
+#: ../pidgin/gtkconn.c:180
 #, c-format
 msgid ""
 "%s\n"
@@ -14145,26 +14117,26 @@
 "%s vil ikkje prøva å kopla kontoen til att før du rettar feilen og slår på "
 "kontoen."
 
-#: ../pidgin/gtkconv.c:523
+#: ../pidgin/gtkconv.c:482
 msgid "Unknown command."
 msgstr "Ukjend kommando."
 
-#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821
+#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
 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:815
+#: ../pidgin/gtkconv.c:774
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Du kan ikkje nytta nokon av dei aktive kontoane til å invitera denne vennen."
 
-#: ../pidgin/gtkconv.c:868
+#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter venn til praterommet"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:898
+#: ../pidgin/gtkconv.c:857
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14172,188 +14144,188 @@
 "Skriv inn namnet på brukaren du ønskjer å invitera. Du kan ta med ei valfri "
 "velkomstmelding."
 
-#: ../pidgin/gtkconv.c:919
+#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
 msgstr "_Venn:"
 
-#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Melding:"
 
-#: ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657 ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
 #: ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Klarte ikkje å opna fila."
 
-#: ../pidgin/gtkconv.c:994
+#: ../pidgin/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Samtale med %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1032
+#: ../pidgin/gtkconv.c:991
 msgid "Save Conversation"
 msgstr "Lagra samtale"
 
-#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Finn"
 
-#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "S_øk etter:"
 
-#: ../pidgin/gtkconv.c:1675
+#: ../pidgin/gtkconv.c:1622
 msgid "Un-Ignore"
 msgstr "Avblokker"
 
-#: ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr "Blokker"
 
-#: ../pidgin/gtkconv.c:1698
+#: ../pidgin/gtkconv.c:1645
 msgid "Get Away Message"
 msgstr "Hent fråværsmelding"
 
-#: ../pidgin/gtkconv.c:1721
+#: ../pidgin/gtkconv.c:1668
 msgid "Last said"
 msgstr "Sist sagt"
 
-#: ../pidgin/gtkconv.c:2665
+#: ../pidgin/gtkconv.c:2606
 msgid "Unable to save icon file to disk."
 msgstr "Klarte ikkje å lagra ikonet."
 
-#: ../pidgin/gtkconv.c:2716
+#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr "Lagra ikon"
 
-#: ../pidgin/gtkconv.c:2768
+#: ../pidgin/gtkconv.c:2709
 msgid "Animate"
 msgstr "Animer"
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2714
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2717
 msgid "Save Icon As..."
 msgstr "Lagra ikon som…"
 
-#: ../pidgin/gtkconv.c:2780
+#: ../pidgin/gtkconv.c:2721
 msgid "Set Custom Icon..."
 msgstr "Bruk eige ikon…"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2734
 msgid "Remove Custom Icon"
 msgstr "Fjern eige ikon"
 
-#: ../pidgin/gtkconv.c:2924
+#: ../pidgin/gtkconv.c:2861
 msgid "Show All"
 msgstr "Vis alt"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2943
+#: ../pidgin/gtkconv.c:2880
 msgid "/_Conversation"
 msgstr "/_Samtale"
 
-#: ../pidgin/gtkconv.c:2945
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Samtale/_Ny lynmelding…"
 
-#: ../pidgin/gtkconv.c:2950
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Find..."
 msgstr "/Samtale/_Finn…"
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/View _Log"
 msgstr "/Samtale/Vis l_ogg"
 
-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr "/Samtale/Lagra _som…"
 
-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Samtale/T_øm skjermen"
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/S_end fil…"
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Legg til _vennevarsling…"
 
-#: ../pidgin/gtkconv.c:2962
+#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr "/Samtale/Hent info_rmasjon"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/Samtale/_Inviter…"
 
-#: ../pidgin/gtkconv.c:2966
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/M_ore"
 msgstr "/Samtale/_Meir"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2907
 msgid "/Conversation/Al_ias..."
 msgstr "/Samtale/_Kallenamn…"
 
-#: ../pidgin/gtkconv.c:2972
+#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/Samtale/_Blokker…"
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Unblock..."
 msgstr "/Samtale/_Avblokker…"
 
-#: ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Add..."
 msgstr "/Samtale/Legg _til…"
 
-#: ../pidgin/gtkconv.c:2978
+#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Remove..."
 msgstr "/Samtale/F_jern…"
 
-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Samtale/Set inn _lenkje…"
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Samtale/Set inn _bilete…"
 
-#: ../pidgin/gtkconv.c:2991
+#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/_Close"
 msgstr "/Samtale/L_ukk"
 
 #. Options
-#: ../pidgin/gtkconv.c:2995
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Options"
 msgstr "/_Val"
 
-#: ../pidgin/gtkconv.c:2996
+#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr "/Val/Bruk l_ogging"
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr "/Val/Bruk _lydar"
 
-#: ../pidgin/gtkconv.c:2999
+#: ../pidgin/gtkconv.c:2936
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Val/Vis _formateringsverktøya"
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:2937
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Val/Vis _tidsstempel"
 
-#: ../pidgin/gtkconv.c:3124
+#: ../pidgin/gtkconv.c:3061
 msgid "/Conversation/More"
 msgstr "/Samtale/Meir"
 
-#: ../pidgin/gtkconv.c:3180
+#: ../pidgin/gtkconv.c:3117
 msgid "/Options"
 msgstr "/Val"
 
@@ -14362,173 +14334,172 @@
 #. 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:3215 ../pidgin/gtkconv.c:3247
+#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
 msgid "/Conversation"
 msgstr "/Samtale"
 
-#: ../pidgin/gtkconv.c:3255
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis logg"
 
-#: ../pidgin/gtkconv.c:3261
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil…"
 
-#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Legg til vennevarsling…"
 
-#: ../pidgin/gtkconv.c:3271
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Get Info"
 msgstr "/Samtale/Hent info"
 
-#: ../pidgin/gtkconv.c:3275
+#: ../pidgin/gtkconv.c:3212
 msgid "/Conversation/Invite..."
 msgstr "/Samtale/Inviter…"
 
-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Alias..."
 msgstr "/Samtale/Kallenamn…"
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr "/Samtale/Blokker…"
 
-#: ../pidgin/gtkconv.c:3289
+#: ../pidgin/gtkconv.c:3226
 msgid "/Conversation/Unblock..."
 msgstr "/Samtale/Avblokker…"
 
-#: ../pidgin/gtkconv.c:3293
+#: ../pidgin/gtkconv.c:3230
 msgid "/Conversation/Add..."
 msgstr "/Samtale/Legg til…"
 
-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Remove..."
 msgstr "/Samtale/Fjern…"
 
-#: ../pidgin/gtkconv.c:3303
+#: ../pidgin/gtkconv.c:3240
 msgid "/Conversation/Insert Link..."
 msgstr "/Samtale/Set inn lenkje…"
 
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Insert Image..."
 msgstr "/Samtale/Set inn _bilete…"
 
-#: ../pidgin/gtkconv.c:3313
+#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr "/Val/Skru på logging"
 
-#: ../pidgin/gtkconv.c:3316
+#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr "/Vis/Skru på lyd"
 
-#: ../pidgin/gtkconv.c:3329
+#: ../pidgin/gtkconv.c:3266
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Val/Vis formateringsverktøya"
 
-#: ../pidgin/gtkconv.c:3332
+#: ../pidgin/gtkconv.c:3269
 msgid "/Options/Show Timestamps"
 msgstr "/Val/Vis tidsstempel"
 
-#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451
+#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
 msgstr "Brukaren skriv…"
 
-#: ../pidgin/gtkconv.c:3454
+#: ../pidgin/gtkconv.c:3391
 msgid "User has typed something and stopped"
 msgstr "Brukaren har skrive noko og stoppa"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8103
-#, fuzzy
-msgid "S_end To"
-msgstr "Send til"
-
-#: ../pidgin/gtkconv.c:4349
+#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
+msgid "_Send To"
+msgstr "Sen_d som"
+
+#: ../pidgin/gtkconv.c:4286
 msgid "_Send"
 msgstr "_Send"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4453
+#: ../pidgin/gtkconv.c:4390
 msgid "0 people in room"
 msgstr "0 personar i rommet"
 
-#: ../pidgin/gtkconv.c:5823 ../pidgin/gtkconv.c:5944
+#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
 #, 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:6550 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Skriv"
 
-#: ../pidgin/gtkconv.c:6554
+#: ../pidgin/gtkconv.c:6490
 msgid "Stopped Typing"
 msgstr "Stoppa å skriva"
 
-#: ../pidgin/gtkconv.c:6557
+#: ../pidgin/gtkconv.c:6493
 msgid "Nick Said"
 msgstr "Kallenamnet sa"
 
-#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Ulesne meldingar"
 
-#: ../pidgin/gtkconv.c:6563
+#: ../pidgin/gtkconv.c:6499
 msgid "New Event"
 msgstr "Ny hending"
 
-#: ../pidgin/gtkconv.c:7654
+#: ../pidgin/gtkconv.c:7572
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Tømmer skjermen."
 
-#: ../pidgin/gtkconv.c:7817
+#: ../pidgin/gtkconv.c:7736
 msgid "Confirm close"
 msgstr "Stadfest lukking"
 
-#: ../pidgin/gtkconv.c:7849
+#: ../pidgin/gtkconv.c:7768
 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:8436
+#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
 msgstr "Lukk andre faner"
 
-#: ../pidgin/gtkconv.c:8442
+#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
 msgstr "Lukk alle fanene"
 
-#: ../pidgin/gtkconv.c:8450
+#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
 msgstr "Kopla frå denne fana"
 
-#: ../pidgin/gtkconv.c:8456
+#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
 msgstr "Lukk denne fana"
 
-#: ../pidgin/gtkconv.c:8951
+#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr "Lukk samtala"
 
-#: ../pidgin/gtkconv.c:9553
+#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
 msgstr "Siste opna vindauge"
 
-#: ../pidgin/gtkconv.c:9555
+#: ../pidgin/gtkconv.c:9479
 msgid "Separate IM and Chat windows"
 msgstr "Skilde lynmeldings- og samtalevindauge"
 
-#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417
+#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr "Nytt vindauge"
 
-#: ../pidgin/gtkconv.c:9559
+#: ../pidgin/gtkconv.c:9483
 msgid "By group"
 msgstr "Etter gruppe"
 
-#: ../pidgin/gtkconv.c:9561
+#: ../pidgin/gtkconv.c:9485
 msgid "By account"
 msgstr "Etter konto"
 
@@ -14884,11 +14855,12 @@
 msgstr "Albansk"
 
 #: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:260
-#: ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:263
 msgid "Swedish"
 msgstr "Svensk"
 
@@ -14904,7 +14876,7 @@
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:264
 msgid "Turkish"
 msgstr "Tyrkisk"
 
@@ -14916,7 +14888,7 @@
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T. M. Thanh og Gnome-Vi-laget"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:265
 msgid "Simplified Chinese"
 msgstr "Forenkla kinesisk"
 
@@ -14926,7 +14898,7 @@
 msgstr "Hong Kong-kinesisk"
 
 #: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:217
-#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:266
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
@@ -14934,12 +14906,12 @@
 msgid "Amharic"
 msgstr "Amharisk"
 
-#: ../pidgin/gtkdialogs.c:351
+#: ../pidgin/gtkdialogs.c:353
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: ../pidgin/gtkdialogs.c:394
+#: ../pidgin/gtkdialogs.c:396
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -14962,58 +14934,59 @@
 "fullstendig liste over bidragsytarar. Programmet kjem utan nokon som helst "
 "form for garanti.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:414
+#, c-format
 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:417
+#: ../pidgin/gtkdialogs.c:419
 msgid "Current Developers"
 msgstr "Noverande utviklarar"
 
-#: ../pidgin/gtkdialogs.c:432
+#: ../pidgin/gtkdialogs.c:434
 msgid "Crazy Patch Writers"
 msgstr "Rettarar"
 
-#: ../pidgin/gtkdialogs.c:447
+#: ../pidgin/gtkdialogs.c:449
 msgid "Retired Developers"
 msgstr "Tidlegare utviklarar"
 
-#: ../pidgin/gtkdialogs.c:462
+#: ../pidgin/gtkdialogs.c:464
 msgid "Retired Crazy Patch Writers"
 msgstr "Pensjonerte, pasjonerte lappeskrivarar"
 
-#: ../pidgin/gtkdialogs.c:477
+#: ../pidgin/gtkdialogs.c:479
 msgid "Artists"
 msgstr "Kunstnarar"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:494
 msgid "Current Translators"
 msgstr "Noverande omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:512
+#: ../pidgin/gtkdialogs.c:514
 msgid "Past Translators"
 msgstr "Tidlegare omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:530
+#: ../pidgin/gtkdialogs.c:532
 msgid "Debugging Information"
 msgstr "Feilsøkingsinformasjon "
 
-#: ../pidgin/gtkdialogs.c:900
+#: ../pidgin/gtkdialogs.c:902
 msgid "Get User Info"
 msgstr "Hent brukarinfo"
 
-#: ../pidgin/gtkdialogs.c:902
+#: ../pidgin/gtkdialogs.c:904
 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:992
+#: ../pidgin/gtkdialogs.c:994
 msgid "View User Log"
 msgstr "Les brukarlogg"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:996
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -15021,32 +14994,32 @@
 "Skriv inn brukar- eller kallenamnet til personen du ønskjer å lesa loggen "
 "til."
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1016
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Enter an alias for this contact."
 msgstr "Før opp eit kallenamn (alias) for denne kontakten."
 
-#: ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1039
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Før opp eit kallenamn (alias) for %s."
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1041
 msgid "Alias Buddy"
 msgstr "Vennealias"
 
-#: ../pidgin/gtkdialogs.c:1060
+#: ../pidgin/gtkdialogs.c:1062
 msgid "Alias Chat"
 msgstr "Kallenamn praterom"
 
-#: ../pidgin/gtkdialogs.c:1061
+#: ../pidgin/gtkdialogs.c:1063
 msgid "Enter an alias for this chat."
 msgstr "Før opp eit kallenamn for dette praterommet."
 
-#: ../pidgin/gtkdialogs.c:1100
+#: ../pidgin/gtkdialogs.c:1102
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15061,15 +15034,15 @@
 "Du er i ferd med å fjerna kontakten som inneheld %s og %d andre vennar frå "
 "vennelista di. Ønskjer du å halda fram?"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1110
 msgid "Remove Contact"
 msgstr "Fjern kontakt"
 
-#: ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1113
 msgid "_Remove Contact"
 msgstr "_Fjern kontakt"
 
-#: ../pidgin/gtkdialogs.c:1142
+#: ../pidgin/gtkdialogs.c:1144
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15078,15 +15051,15 @@
 "Du er i ferd med å slå gruppa med namnet %s saman med gruppa %s. Vil du "
 "halda fram?"
 
-#: ../pidgin/gtkdialogs.c:1149
+#: ../pidgin/gtkdialogs.c:1151
 msgid "Merge Groups"
 msgstr "Slå saman grupper"
 
-#: ../pidgin/gtkdialogs.c:1152
+#: ../pidgin/gtkdialogs.c:1154
 msgid "_Merge Groups"
 msgstr "_Slå saman grupper"
 
-#: ../pidgin/gtkdialogs.c:1202
+#: ../pidgin/gtkdialogs.c:1204
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15095,29 +15068,29 @@
 "Er du sikker på at du ønskjer å fjerna gruppa %s og alle medlemmene i ho frå "
 "vennelista di?"
 
-#: ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1207
 msgid "Remove Group"
 msgstr "Fjern gruppa"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1210
 msgid "_Remove Group"
 msgstr "_Fjern gruppe"
 
-#: ../pidgin/gtkdialogs.c:1241
+#: ../pidgin/gtkdialogs.c:1243
 #, 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:1244
+#: ../pidgin/gtkdialogs.c:1246
 msgid "Remove Buddy"
 msgstr "Fjern venn"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1249
 msgid "_Remove Buddy"
 msgstr "_Fjern venn"
 
-#: ../pidgin/gtkdialogs.c:1268
+#: ../pidgin/gtkdialogs.c:1270
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15125,11 +15098,11 @@
 msgstr ""
 "Er du sikker på at du ønskjer å fjerna praterommet %s frå vennelista di?"
 
-#: ../pidgin/gtkdialogs.c:1271
+#: ../pidgin/gtkdialogs.c:1273
 msgid "Remove Chat"
 msgstr "Fjern praterom"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1276
 msgid "_Remove Chat"
 msgstr "_Fjern praterom"
 
@@ -15155,7 +15128,7 @@
 
 #: ../pidgin/gtkdocklet.c:535
 #, fuzzy
-msgid "Blink on New Message"
+msgid "Blink on new message"
 msgstr "Blink ved ny melding"
 
 #: ../pidgin/gtkdocklet.c:542
@@ -15252,7 +15225,7 @@
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Reset formatting"
 msgstr "_Ta vekk formatering"
 
@@ -15331,6 +15304,7 @@
 msgstr "Lagra bilete"
 
 #: ../pidgin/gtkimhtml.c:3522
+#, c-format
 msgid "_Save Image..."
 msgstr "_Lagra bilete…"
 
@@ -15366,11 +15340,11 @@
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Skriv inn nettadressa du ønskjer å leggja til."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1099
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "Legg til lenkje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1260
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr "_Set inn"
 
@@ -15392,126 +15366,125 @@
 msgid "Smile!"
 msgstr "Smil!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:843 ../pidgin/gtkimhtmltoolbar.c:1217
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
 msgid "_Font"
 msgstr "Skriftt_ype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1051
+#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Group Items"
 msgstr "Grupper element"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1051
+#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
 msgstr "Avgrupper element"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Feit"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1087 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Understreka"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088
+#: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
 msgstr "Gjennomstreking"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090
+#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Increase Font Size"
 msgstr "Auk skriftstorleiken"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Decrease Font Size"
 msgstr "Minsk skriftstorleiken"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
+#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Font Face"
 msgstr "Skrifttype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Background Color"
 msgstr "Bakgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Foreground Color"
 msgstr "Forgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
-msgid "Reset Formatting"
-msgstr "Nullstill formateringa"
-
 #: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Reset Formatting"
+msgstr "Nullstill formateringa"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Insert IM Image"
 msgstr "Legg til lynmeldingsbilete"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Smiley"
 msgstr "Legg til smilefjes"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1177
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<b>_Bold</b>"
 msgstr "<b>_Feit</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1178
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursiv</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<u>_Underline</u>"
 msgstr "<u>_Understrek</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Gjennomstreking</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Større</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 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:1189
+#: ../pidgin/gtkimhtmltoolbar.c:1191
 msgid "_Font face"
 msgstr "Skriftt_ype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1190
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "Foreground _color"
 msgstr "_Forgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Bac_kground color"
 msgstr "_Bakgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1268
+#: ../pidgin/gtkimhtmltoolbar.c:1270
+msgid "_Smiley"
+msgstr "_Smilefjes"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1276
 msgid "_Image"
 msgstr "_Bilete"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1274
+#: ../pidgin/gtkimhtmltoolbar.c:1282
 msgid "_Link"
 msgstr "_Lenkje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1280
+#: ../pidgin/gtkimhtmltoolbar.c:1288
 msgid "_Horizontal rule"
 msgstr "_Horisontal strek"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1302
-#, fuzzy
-msgid "_Smile!"
-msgstr "Smil!"
-
 #: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
@@ -15620,7 +15593,6 @@
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
-"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -15636,10 +15608,10 @@
 "                      konto(ar) å bruka, skilde med komma)\n"
 "  -v, --version       vis noverande versjon og avslutt\n"
 
-#: ../pidgin/gtkmain.c:516
+#: ../pidgin/gtkmain.c:512
 #, fuzzy, c-format
 msgid ""
-"%s %s has segfaulted and attempted to dump a core file.\n"
+"%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15677,7 +15649,7 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -15690,17 +15662,17 @@
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Du har fått e-postmeldingar</span>"
 
-#: ../pidgin/gtknotify.c:537
+#: ../pidgin/gtknotify.c:540
 #, 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:562
+#: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+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>"
 
@@ -15908,7 +15880,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Skjul  nye lynmeldingssamtaler:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 msgid "When away"
 msgstr "Når vekke"
 
@@ -15961,59 +15933,55 @@
 msgid "Show _formatting on incoming messages"
 msgstr "Vis _formatering i innkomne meldingar"
 
-#: ../pidgin/gtkprefs.c:997
-msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+#: ../pidgin/gtkprefs.c:998
+msgid "Show _detailed information"
+msgstr "Vis _detaljar"
 
 #: ../pidgin/gtkprefs.c:1000
-msgid "Show _detailed information"
-msgstr "Vis _detaljar"
-
-#: ../pidgin/gtkprefs.c:1002
 msgid "Enable buddy ic_on animation"
 msgstr "Bruk _animerte venneikon"
 
-#: ../pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1007
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Varslar vennar at du skriv til dei"
 
-#: ../pidgin/gtkprefs.c:1012
+#: ../pidgin/gtkprefs.c:1010
 msgid "Highlight _misspelled words"
 msgstr "_Merk feilstava ord"
 
-#: ../pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
 msgstr "Bruk jamn rulling"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1017
 msgid "F_lash window when IMs are received"
 msgstr "La vindauget _blinka når nye lynmmeldingar kjem"
 
-#: ../pidgin/gtkprefs.c:1021
+#: ../pidgin/gtkprefs.c:1019
 msgid "Minimi_ze new conversation windows"
 msgstr "Mi_nimer nye pratevindauge"
 
+#: ../pidgin/gtkprefs.c:1023
+msgid "Font"
+msgstr "Skrifftype"
+
 #: ../pidgin/gtkprefs.c:1025
-msgid "Font"
-msgstr "Skrifftype"
+msgid "Use document font from _theme"
+msgstr "Bruk dokumentskrifttype frå _tema"
 
 #: ../pidgin/gtkprefs.c:1027
-msgid "Use document font from _theme"
-msgstr "Bruk dokumentskrifttype frå _tema"
+msgid "Use font from _theme"
+msgstr "Bruk skrifttype frå _tema"
 
 #: ../pidgin/gtkprefs.c:1029
-msgid "Use font from _theme"
-msgstr "Bruk skrifttype frå _tema"
-
-#: ../pidgin/gtkprefs.c:1031
 msgid "Conversation _font:"
 msgstr "Samtaleskrift:"
 
-#: ../pidgin/gtkprefs.c:1045
+#: ../pidgin/gtkprefs.c:1043
 msgid "Default Formatting"
 msgstr "Standardformatering"
 
-#: ../pidgin/gtkprefs.c:1064
+#: ../pidgin/gtkprefs.c:1062
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16021,119 +15989,119 @@
 "Slik vil dei utgåande meldingane dine sjå ut når du nyttar protokollar som "
 "støttar formatering."
 
-#: ../pidgin/gtkprefs.c:1130
+#: ../pidgin/gtkprefs.c:1128
 msgid "ST_UN server:"
 msgstr "ST_UN-tenar:"
 
-#: ../pidgin/gtkprefs.c:1142
+#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Døme: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1146
+#: ../pidgin/gtkprefs.c:1144
 msgid "_Autodetect IP address"
 msgstr "Finn IP-adressa _automatisk"
 
-#: ../pidgin/gtkprefs.c:1155
+#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
 msgstr "Offentleg _IP:"
 
-#: ../pidgin/gtkprefs.c:1184
+#: ../pidgin/gtkprefs.c:1182
 msgid "Ports"
 msgstr "Portar"
 
-#: ../pidgin/gtkprefs.c:1187
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Manually specify range of ports to listen on"
 msgstr "Før opp _portrekkje det skal lyttast til"
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1188
 msgid "_Start port:"
 msgstr "_Startport:"
 
-#: ../pidgin/gtkprefs.c:1197
+#: ../pidgin/gtkprefs.c:1195
 msgid "_End port:"
 msgstr "Sluttp_ort:"
 
-#: ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkprefs.c:1203
 msgid "Proxy Server"
 msgstr "Mellomtenar"
 
-#: ../pidgin/gtkprefs.c:1209
+#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr "Inga mellomlagring"
 
-#: ../pidgin/gtkprefs.c:1265
+#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr "Br_ukar:"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1328
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1329
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1330
 msgid "Netscape"
 msgstr "Netscape"
 
+#: ../pidgin/gtkprefs.c:1331
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../pidgin/gtkprefs.c:1332
+msgid "Konqueror"
+msgstr "Konqueror"
+
 #: ../pidgin/gtkprefs.c:1333
-msgid "Mozilla"
-msgstr "Mozilla"
+msgid "GNOME Default"
+msgstr "GNOME-standard"
 
 #: ../pidgin/gtkprefs.c:1334
-msgid "Konqueror"
-msgstr "Konqueror"
+msgid "Galeon"
+msgstr "Galeon"
 
 #: ../pidgin/gtkprefs.c:1335
-msgid "GNOME Default"
-msgstr "GNOME-standard"
+msgid "Firefox"
+msgstr "Firefox"
 
 #: ../pidgin/gtkprefs.c:1336
-msgid "Galeon"
-msgstr "Galeon"
+msgid "Firebird"
+msgstr "Firebird"
 
 #: ../pidgin/gtkprefs.c:1337
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../pidgin/gtkprefs.c:1338
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1348
+#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr "Sjølvvald"
 
-#: ../pidgin/gtkprefs.c:1401
+#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr "Nettlesarval"
 
-#: ../pidgin/gtkprefs.c:1405
+#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr "_Nettlesar:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1411
 msgid "_Open link in:"
 msgstr "Opna _lenkje i:"
 
-#: ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkprefs.c:1413
 msgid "Browser default"
 msgstr "Nettlesarstandard"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1414
 msgid "Existing window"
 msgstr "Eksisterande vindauge"
 
-#: ../pidgin/gtkprefs.c:1418
+#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr "Ny fane"
 
-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16142,63 +16110,69 @@
 "_Sjølvvald:\n"
 "(%s for adresse)"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log _format:"
 msgstr "Logg_format:"
 
+#: ../pidgin/gtkprefs.c:1475
+msgid "Log all _instant messages"
+msgstr "L_oggfør alle lynmeldingar"
+
 #: ../pidgin/gtkprefs.c:1477
-msgid "Log all _instant messages"
-msgstr "L_oggfør alle lynmeldingar"
-
-#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "Loggfør alle sa_mtaler"
 
-#: ../pidgin/gtkprefs.c:1481
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
 msgstr "Loggfør alle _statusendringar i systemloggen"
 
-#: ../pidgin/gtkprefs.c:1627
+#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr "Lydval"
 
-#: ../pidgin/gtkprefs.c:1637
+#: ../pidgin/gtkprefs.c:1635
+#, c-format
 msgid "Quietest"
 msgstr "Stillaste"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1637
+#, c-format
 msgid "Quieter"
 msgstr "Stillare"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1639
+#, c-format
 msgid "Quiet"
 msgstr "Stille"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1643
+#, c-format
 msgid "Loud"
 msgstr "Høg"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1645
+#, c-format
 msgid "Louder"
 msgstr "Høgare"
 
-#: ../pidgin/gtkprefs.c:1649
+#: ../pidgin/gtkprefs.c:1647
+#, c-format
 msgid "Loudest"
 msgstr "Høgast"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
 msgstr "Konsollyd"
 
-#: ../pidgin/gtkprefs.c:1724
+#: ../pidgin/gtkprefs.c:1722
 msgid "No sounds"
 msgstr "Ingen lydar"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16207,81 +16181,81 @@
 "Lyd_kommando:\n"
 "(%s for filnamn)"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1757
 msgid "Sounds when conversation has _focus"
 msgstr "Lydar medan samtalevindauget har _fokus"
 
-#: ../pidgin/gtkprefs.c:1761
+#: ../pidgin/gtkprefs.c:1759
 msgid "Enable sounds:"
 msgstr "Bruk lydar:"
 
-#: ../pidgin/gtkprefs.c:1772
+#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1852
+#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr "Spel"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1927
 msgid "_Report idle time:"
 msgstr "Vis kor lenge _uverksam:"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr "Basert på tastatur- eller musebruk"
 
-#: ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1941
 msgid "_Auto-reply:"
 msgstr "_Automatisk svar:"
 
-#: ../pidgin/gtkprefs.c:1947
+#: ../pidgin/gtkprefs.c:1945
 msgid "When both away and idle"
 msgstr "Både når vekke og uverksam"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
 msgstr "Automatisk vekke"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:1953
 msgid "Change status when _idle"
 msgstr "_Endra tilstand når uverksam"
 
-#: ../pidgin/gtkprefs.c:1959
+#: ../pidgin/gtkprefs.c:1957
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutt før ein blir uverksam:"
 
-#: ../pidgin/gtkprefs.c:1967
+#: ../pidgin/gtkprefs.c:1965
 msgid "Change _status to:"
 msgstr "Endra _tilstand til:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1986
 msgid "Status at Startup"
 msgstr "Tilstand ved oppstart"
 
-#: ../pidgin/gtkprefs.c:1990
+#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
 msgstr "Bruk tilstanden frå _siste avslutning ved oppstart"
 
-#: ../pidgin/gtkprefs.c:1996
+#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
 msgstr "Tilstand å _bruka ved oppstart:"
 
+#: ../pidgin/gtkprefs.c:2032
+msgid "Interface"
+msgstr "Grensesnitt"
+
 #: ../pidgin/gtkprefs.c:2034
-msgid "Interface"
-msgstr "Grensesnitt"
-
-#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "Smilefjestema"
 
-#: ../pidgin/gtkprefs.c:2043
+#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr "Nettlesar"
 
-#: ../pidgin/gtkprefs.c:2047
+#: ../pidgin/gtkprefs.c:2045
 msgid "Status / Idle"
 msgstr "Tilstand/uverksam"
 
@@ -16776,7 +16750,7 @@
 msgid "Received Messages"
 msgstr "Mottekne meldingar"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Vel farge for %s"
@@ -17047,7 +17021,7 @@
 "\n"
 "<b>Vennenotat</b>: %s"
 
-#: ../pidgin/plugins/history.c:192
+#: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Historikk"
 
@@ -17299,37 +17273,46 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Horisontal deling GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:69
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Samtale"
 
+#: ../pidgin/plugins/pidginrc.c:74
+msgid "Conversation History"
+msgstr "Samtalehistorikk"
+
+#: ../pidgin/plugins/pidginrc.c:75
+msgid "Log Viewer"
+msgstr "Logglesar"
+
 # Vindauge eller meldingsvindauge?
-#: ../pidgin/plugins/pidginrc.c:70
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Førespurnadsvindauge"
 
-#: ../pidgin/plugins/pidginrc.c:71
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Varslingsvindauge"
 
-#: ../pidgin/plugins/pidginrc.c:247
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Vel farge"
 
-#: ../pidgin/plugins/pidginrc.c:294
+#: ../pidgin/plugins/pidginrc.c:300
+#, c-format
 msgid "Select Interface Font"
 msgstr "Vel grensesnittskrift"
 
-#: ../pidgin/plugins/pidginrc.c:297
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Vel skrifttype for %s"
 
-#: ../pidgin/plugins/pidginrc.c:365
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+ grensesnittskrift"
 
-#: ../pidgin/plugins/pidginrc.c:385
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ snarvegstema tekst"
 
@@ -17353,36 +17336,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Grensesnittfargar"
 
-#: ../pidgin/plugins/pidginrc.c:446
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Grafiske element-storleikar"
 
-#: ../pidgin/plugins/pidginrc.c:467
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Skrifttypar"
 
-#: ../pidgin/plugins/pidginrc.c:491
+#: ../pidgin/plugins/pidginrc.c:497
 msgid "Gtkrc File Tools"
 msgstr "Filverktøy Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:496
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Skriva innstillingane til %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:505
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Les gtkrc-filene på nytt"
 
-#: ../pidgin/plugins/pidginrc.c:538
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ temabehandling"
 
-#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Gjev tilgang til ofte brukte gtkrc-innstillingar."
 
@@ -17561,6 +17544,7 @@
 msgstr "Formateringsval for tidsstempel"
 
 #: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Tving 24h tidsformat"
 
@@ -17778,14 +17762,116 @@
 msgstr ""
 "Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
 
-#~ msgid "Sort by status"
-#~ msgstr "Sorter etter tilstand"
-
-#~ msgid "Sort alphabetically"
-#~ msgstr "Sorter alfabetisk "
-
-#~ msgid "Sort by log size"
-#~ msgstr "Sorter etter loggstorleiken"
+#, fuzzy
+#~ msgid "Show"
+#~ msgstr "Vis alt"
+
+#, fuzzy
+#~ msgid "Offline buddies"
+#~ msgstr "Vis fråkopla vennar"
+
+#, fuzzy
+#~ msgid "Sort"
+#~ msgstr "Port"
+
+#, fuzzy
+#~ msgid "By Status"
+#~ msgstr "Etter status"
+
+#, fuzzy
+#~ msgid "By Log Size"
+#~ msgstr "Etter loggstorleiken"
+
+#, fuzzy
+#~ msgid "Unable to connect to contact server"
+#~ msgstr "Klarer ikkje å kopla til tenaren."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Vel Notes adressebok"
+
+#, fuzzy
+#~ msgid "Current media"
+#~ msgstr "Noverande markør"
+
+#, fuzzy
+#~ msgid "Windows Live Messenger Protocol Plugin"
+#~ msgstr "Novell GroupWise Messenger-protokolltillegg"
+
+#, fuzzy
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Feil: autentiseringa feila"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s sende deg nettopp ein dytt (\"nudge\")."
+
+#, fuzzy
+#~ msgid "Unknown error (%d)"
+#~ msgstr "Ukjend feil"
+
+#, fuzzy
+#~ msgid "Unable to connect to OIM server"
+#~ msgstr "Klarer ikkje å kopla til tenaren."
+
+#, fuzzy
+#~ msgid "%s (%s) changed status from %s to %s"
+#~ msgstr "%s endra status frå %s til %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is now %s"
+#~ msgstr "%s er no %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is no longer %s"
+#~ msgstr "%s er ikkje lenger %s"
+
+#, fuzzy
+#~ msgid "_Merge"
+#~ msgstr "_Melding:"
+
+#, fuzzy
+#~ msgid "_Send File..."
+#~ msgstr "_Send fil"
+
+#, fuzzy
+#~ msgid "Add Buddy _Pounce..."
+#~ msgstr "Legg til vennevarsling…"
+
+#, fuzzy
+#~ msgid "Hide when offline"
+#~ msgstr "Ikkje tillate når du er fråkopla"
+
+#, fuzzy
+#~ msgid "Show when offline"
+#~ msgstr "Ikkje tillate når du er fråkopla"
+
+#, fuzzy
+#~ msgid "Add _Buddy..."
+#~ msgstr "Legg til venn"
+
+#, fuzzy
+#~ msgid "Add C_hat..."
+#~ msgstr "Legg til praterom"
+
+#, fuzzy
+#~ msgid "Persistent"
+#~ msgstr "Persisk"
+
+#, fuzzy
+#~ msgid "/Accounts/Manage"
+#~ msgstr "/Kontoar"
+
+#, fuzzy
+#~ msgid "A_ccount:"
+#~ msgstr "Konto:"
+
+#, fuzzy
+#~ msgid "S_end To"
+#~ msgstr "Send til"
+
+#, fuzzy
+#~ msgid "_Smile!"
+#~ msgstr "Smil!"
 
 #~ msgid "nudged"
 #~ msgstr "dytta"
@@ -17793,12 +17879,6 @@
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Du har nettopp sendt ein dytt (\"nudge\")"
 
-#~ msgid "Has you"
-#~ msgstr "Har deg"
-
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN-protokolltillegg"
-
 #~ msgid "%s just sent you a Buzz!"
 #~ msgstr "%s sendte deg nettopp ein alarm"
 
@@ -17817,29 +17897,5 @@
 #~ msgid "Attention! You have been %s."
 #~ msgstr "NB! Du er blitt %s."
 
-#~ msgid "Add Buddy _Pounce"
-#~ msgstr "Legg til venne_varsling"
-
-#~ msgid "Add a _Buddy"
-#~ msgstr "Legg til ein _venn"
-
-#~ msgid "Add a C_hat"
-#~ msgstr "Legg til eit samtale_rom"
-
-#~ msgid "/Accounts/Add\\/Edit"
-#~ msgstr "/Kontoar/Legg til\\/endra"
-
 #~ msgid "/Conversation/_Hide"
 #~ msgstr "/Samtale/Skj_ul"
-
-#~ msgid "_Send To"
-#~ msgstr "Sen_d som"
-
-#~ msgid "_Smiley"
-#~ msgstr "_Smilefjes"
-
-#~ msgid "Conversation History"
-#~ msgstr "Samtalehistorikk"
-
-#~ msgid "Log Viewer"
-#~ msgstr "Logglesar"