im.pidgin.pidgin: 6c6941c4bd9b2f2ba63426af7e60fdc6da5e7e4a

lschiere at pidgin.im lschiere at pidgin.im
Tue Nov 13 16:52:36 EST 2007


-----------------------------------------------------------------
Revision: 6c6941c4bd9b2f2ba63426af7e60fdc6da5e7e4a
Ancestor: 7857eaa0edf6a2d71cf85fde1c5a83fc489f6a7e
Author: lschiere at pidgin.im
Date: 2007-11-13T21:46:58
Branch: im.pidgin.pidgin

Modified files:
        po/ChangeLog po/be at latin.po po/ko.po po/nb.po po/ru.po
        po/sv.po

ChangeLog: 

applied changes from 1ae7bab2d86d4fb77e82e0c2fd0e7f44329604ab
             through 411a5a191f207125458c876b7c79548a1adfe5a1

applied changes from 411a5a191f207125458c876b7c79548a1adfe5a1
             through 0b96bb2ecc89729c68d8d075c24c4888e167af0c

applied changes from 0b96bb2ecc89729c68d8d075c24c4888e167af0c
             through 9b5d2a139552c771181a94d9b250b7598bb9a0cd

applied changes from 9b5d2a139552c771181a94d9b250b7598bb9a0cd
             through 635653c66433c9d827d4f0aa1b8de827682bcf91

applied changes from 635653c66433c9d827d4f0aa1b8de827682bcf91
             through c9910b4879ed0099fe645a4e65b73380955abe40

applied changes from c9910b4879ed0099fe645a4e65b73380955abe40
             through 0dc5edb3f0a938a69a58ebe98f8303f96fed05b7

-------------- next part --------------
============================================================
--- po/ChangeLog	f37ae778e896dfbb7a02c8a040b98e59ba097bf7
+++ po/ChangeLog	1762cc73b178e482f0c2e79f4d043aaf31fd174e
@@ -1,5 +1,12 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.2.3
+	* Belarusian Latin translation updated (Ihar Hrachyshka)
+	* Korean translation updated (Sushizang)
+	* Norwegian Bokmål translation updated (Hallvard Glad)
+	* Russian translation updated (Dmitry Beloglazov)
+	* Swedish translation updated (Peter Hjalmarsson)
+
 version 2.2.2
 	* Catalan translation updated (Josep Puigdemont)
 	* Chinese (Simplified) translation updated (Funda Wang)
============================================================
--- po/be at latin.po	f3415d449ea052f05b2674450d95b8642cf69de8
+++ po/be at latin.po	f306aecb2a5416f77cbed3eaac3f43508b948b92
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
+"POT-Creation-Date: 2007-10-24 03:22-0400\n"
 "PO-Revision-Date: 2007-08-24 16:50+0300\n"
 "Last-Translator: YOUR NAME <E-MAIL at ADDRESS>\n"
 "Language-Team: Belarusian Latin <be-latin.open-tran.eu>\n"
@@ -49,7 +49,7 @@ msgstr ""
 "  -n, --nologin       nie ŭvachodź aŭtamatyčna\n"
 "  -v, --version       pakažy dziejnuju versiju j vyjdzi\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -61,11 +61,11 @@ msgstr ""
 "pamyłcy na http://developer.pidgin.im"
 
 #: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:235 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1515
@@ -100,8 +100,8 @@ msgstr "(Ty mabyć zabyŭsia vykanać 'm
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Ty mabyć zabyŭsia vykanać 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1474 ../pidgin/gtkblist.c:4367
 msgid "Modify Account"
 msgstr "Madyfikuj kont"
 
@@ -131,32 +131,32 @@ msgstr "Alias:"
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:472 ../finch/gntpounce.c:459
+#: ../finch/gntpounce.c:667 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
 #: ../libpurple/account.c:1013 ../libpurple/account.c:1263
 #: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2416
+#: ../libpurple/protocols/jabber/buddy.c:2452
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
 #: ../libpurple/protocols/jabber/jabber.c:1737
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
+#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
+#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/oscar/oscar.c:6148
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -189,29 +189,29 @@ msgstr "Alias:"
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1909
+#: ../pidgin/gtkaccount.c:2496 ../pidgin/gtkblist.c:6321
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:772
+#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
+#: ../pidgin/gtkdialogs.c:1023 ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1158 ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1253 ../pidgin/gtkdialogs.c:1280
 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1108
 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
 #: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
 #: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:472 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
 #: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
 #: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
@@ -219,8 +219,8 @@ msgstr "Zapišy"
 msgid "Save"
 msgstr "Zapišy"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1901
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ty sapraŭdy chočaš vydalić %s?"
@@ -233,14 +233,14 @@ msgstr "Vydal kont"
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
 #: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1107 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Vydal"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2326 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Konty"
 
@@ -250,15 +250,16 @@ msgstr "Ty možaš uklučyć/adklučyć 
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2372
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:713
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2495
+#: ../pidgin/gtkblist.c:6320 ../pidgin/gtkconv.c:1713
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Dadaj"
@@ -268,33 +269,33 @@ msgstr "Madyfikuj"
 msgid "Modify"
 msgstr "Madyfikuj"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2442
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s zrabiÅ­ %s svaim siabram%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2494
 msgid "Add buddy to your list?"
 msgstr "Dadać siabra ŭ tvoj śpis?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2552
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s choča dadać %s u svoj śpis siabroŭ%s%s"
 
 #: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize buddy?"
 msgstr "Aŭtaryzavać siabra?"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Authorize"
 msgstr "AÅ­taryzuj"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
 msgid "Deny"
 msgstr "AdmoÅ­"
 
@@ -318,19 +319,19 @@ msgstr "Pamyłka pry dadańni siabra"
 msgid "Error adding buddy"
 msgstr "Pamyłka pry dadańni siabra"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2903
+#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Bačnaja nazva"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
+#: ../libpurple/protocols/msn/msn.c:1509
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1022
+#: ../pidgin/gtkdialogs.c:1046 ../pidgin/gtkdialogs.c:1068
 #: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Alias"
@@ -340,10 +341,11 @@ msgstr "Hrupa"
 msgstr "Hrupa"
 
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../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:511 ../pidgin/gtkpounce.c:1275
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Kont"
 
@@ -356,7 +358,7 @@ msgstr "Kont"
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5826
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Dadaj siabra"
@@ -365,15 +367,16 @@ msgstr "Kali łaska, uviadzi źviestki a
 msgid "Please enter buddy information."
 msgstr "Kali łaska, uviadzi źviestki ab siabry."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Hutarki"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
+#: ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1690 ../libpurple/protocols/msn/msn.c:1755
+#: ../libpurple/protocols/msn/msn.c:1782
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -385,7 +388,7 @@ msgstr "Aŭtamatyčna dałučajsia"
 msgid "Auto-join"
 msgstr "Aŭtamatyčna dałučajsia"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6208
 msgid "Add Chat"
 msgstr "Dadaj hutarku"
 
@@ -407,7 +410,7 @@ msgstr "Hrupa z takoj nazvaj užo isnuje
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6317
 msgid "Add Group"
 msgstr "Dadaj hrupu"
 
@@ -431,15 +434,15 @@ msgstr "Redahuj nałady"
 msgid "Edit Settings"
 msgstr "Redahuj nałady"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Źviestki"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Atrymańnie..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -450,10 +453,10 @@ msgstr "Dadaj siabroŭskuju začepku"
 msgstr "Dadaj siabroŭskuju začepku"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "Dašli fajł"
 
@@ -497,14 +500,14 @@ msgstr "Paćvierdź vydaleńnie"
 msgstr "Paćvierdź vydaleńnie"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Vydal"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2422 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4610
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Åšpis siabroÅ­"
@@ -523,15 +526,15 @@ msgstr "Pieraklučy paznaku"
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2399
 #: ../libpurple/protocols/jabber/jabber.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1544
 #: ../libpurple/protocols/jabber/jabber.c:1567
 #: ../libpurple/protocols/jabber/jabber.c:1590
 #: ../libpurple/protocols/jabber/jabber.c:1613
 #: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1517 ../libpurple/protocols/msn/msn.c:1693
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -541,21 +544,21 @@ msgstr "Pieraklučy paznaku"
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
 msgid "Nickname"
 msgstr "Mianuška"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/bonjour/bonjour.c:354
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2927
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
+#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
 msgid "Idle"
 msgstr "Biaździejańnie"
 
@@ -586,36 +589,26 @@ msgstr ""
 "\n"
 "Apošni raz bačyŭ: %s tamu"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Novy..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Zapisany..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:343 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Pluginy"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Nazva"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Kont"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:766
 msgid "New Instant Message"
 msgstr "Novaje chutkaje paviedamleńnie"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:768
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Uviadzi bačnuju nazvu albo alias asoby, ź jakoj chočaš skantaktavacca."
@@ -623,15 +616,15 @@ msgstr "Uviadzi bačnuju nazvu albo alia
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
+#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
 #: ../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:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/oscar/oscar.c:6147
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -648,58 +641,83 @@ msgstr "Uviadzi bačnuju nazvu albo alia
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4366
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:771
+#: ../pidgin/gtkdialogs.c:910 ../pidgin/gtkdialogs.c:1002
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "OK"
 
+#: ../finch/gntblist.c:2270
+msgid "Channel"
+msgstr "Kanał"
+
+#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:924
+msgid "Join a Chat"
+msgstr "Dałučysia da hutarki"
+
+#: ../finch/gntblist.c:2284
+msgid "Please enter the name of the chat you want to join."
+msgstr "Akreśl nazvu hutarki, da jakoj chočaš dałučycca."
+
+#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "Dałučysia"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:797
 msgid "Options"
 msgstr "Opcyi"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "Dašli paviedamleńnie..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "Pakažy pustyja hrupy"
+#: ../finch/gntblist.c:2334
+msgid "Join Chat..."
+msgstr "Dałučysia da hutarki..."
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Pakažy adłučanych siabroŭ"
+#: ../finch/gntblist.c:2338
+msgid "Show"
+msgstr "Pakažy"
 
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Paradkuj pa statusie"
+#: ../finch/gntblist.c:2343
+msgid "Empty groups"
+msgstr "Pustyja hrupy"
 
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Paradkuj pa alfabecie"
+#: ../finch/gntblist.c:2349
+msgid "Offline buddies"
+msgstr "Adłučanyja siabry"
 
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Paradkuj pa pamiery časopisaŭ"
+#: ../finch/gntblist.c:2355
+msgid "Sort"
+msgstr "Sartuj"
 
+#: ../finch/gntblist.c:2360
+msgid "By Status"
+msgstr "Pa statusie"
+
+#: ../finch/gntblist.c:2364 ../pidgin/gtkblist.c:4151
+msgid "Alphabetically"
+msgstr "Pa alfabecie"
+
+#: ../finch/gntblist.c:2368
+msgid "By Log Size"
+msgstr "Pa pamiery časopisu"
+
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
 msgid "Certificate Import"
-msgstr "Spałučysia z partom"
+msgstr "Impartavańnie sertyfikatu"
 
 #: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr ""
+msgstr "Akreśl nazvu kamputara"
 
 #: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "Uviadzi nazvu kamputara, dla jakoha pryznačany hety sertyfikat."
 
 #: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
@@ -707,19 +725,20 @@ msgstr ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"Niemahčyma zimpartavać fajł %s.\n"
+"Upeŭnisia, što fajł čytelny i ŭ farmacie PEM.\n"
 
 #: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "Pamyłka impartavańnia sertyfikatu"
 
 #: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "Pamyłka impartavańnia sertyfikatu X.509"
 
 #: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "Abiary fajł"
+msgstr "Abiary sertyfikat PEM"
 
 #: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
 #, c-format
@@ -727,23 +746,25 @@ msgstr ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"Pamyłka ekspartavańnia fajłu %s.\n"
+"Upeŭnisia, što maješ dazvoł na zapis u metavaj ściežcy\n"
 
 #: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "Pamyłka ekspartavańnia sertyfikatu"
 
 #: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "Pamyłka ekspartavańnia sertyfikatu X.509"
 
 #: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "Ekspartavańnie sertyfikatu PEM X.509"
 
 #: ../finch/gntcertmgr.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate for %s"
-msgstr "Status dla %s"
+msgstr "Sertyfikat dla %s"
 
 #: ../finch/gntcertmgr.c:195
 #, c-format
@@ -753,57 +774,61 @@ msgstr ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"Ahulnaja nazva: %s\n"
+"\n"
+"Adbitak palcaÅ­ SHA1:\n"
+"%s"
 
 #: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "Sertyfikat hostu SSL"
 
 #: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "Sapraŭdy vydalić sertyfikat dla %s?"
 
 #: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "Paćvierdź vydaleńnie sertyfikatu"
 
 #: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
 msgid "Certificate Manager"
-msgstr ""
+msgstr "KiraÅ­nik sertyfikataÅ­"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:666
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Nazva hostu"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Źviestki"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
+#: ../finch/gntplugin.c:211 ../finch/gntplugin.c:403 ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
 #: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2469
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Začyni"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s adłučajecca."
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -816,7 +841,7 @@ msgstr ""
 "Finch nia budzie paŭtarać sproby spałučeńnia z kontam, pakul ty nia vypraviš "
 "pamyłku j znoŭ nie zadziejničaješ kont."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4368
 msgid "Re-enable Account"
 msgstr "PieraÅ­ruchom kont"
 
@@ -824,32 +849,31 @@ msgstr "Niama takoha zahadu."
 msgid "No such command."
 msgstr "Niama takoha zahadu."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksyčnaja pamyłka: Ty ŭvioŭ niapravilnuju kolkaść arhumentaŭ dla hetaha "
 "zahadu."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "Zahad vykanany pamyłkova ź nieviadomaj pryčyny."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "Toj zahad pracuje tolki Å­ hutarkach, ale nie Å­ pryvatnych razmovach."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "Toj zahad pracuje tolki Å­ pryvatnych razmovach, ale nia Å­ hutarkach."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "Toj zahad nie racuje dla hetaha pratakołu."
 
 #: ../finch/gntconv.c:168
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "Niemahčyma dasłać paviedamleńnie, bo my dasyłajem nadta chutka:"
+msgstr "Paviedamleńnie nie było dasłanaje, bo ty nie aŭtaryzavany."
 
 #: ../finch/gntconv.c:251
 #, c-format
@@ -861,7 +885,7 @@ msgstr "%s [%s]"
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
 #, c-format
 msgid ""
 "\n"
@@ -874,66 +898,64 @@ msgstr "Ty pakidaješ hetuju hutarku."
 msgid "You have left this chat."
 msgstr "Ty pakidaješ hetuju hutarku."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Uvachod pačaty. Nastupnyja paviedamleńni ŭ hetaj razmovie buduć zapisvacca."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Uvachod spynieny. Nastupnyja paviedamleńni ŭ hetaj razmovie nia buduć "
 "zapisvacca."
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:469
 msgid "Send To"
 msgstr "Dašli da"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:513
 msgid "Conversation"
 msgstr "Razmova"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:519
 msgid "Clear Scrollback"
 msgstr "Ačyść bufer prakrutki"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Pakažy časavyja adbitki"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:539
 msgid "Add Buddy Pounce..."
 msgstr "Dadaj siabroŭskuju začepku..."
 
-#: ../finch/gntconv.c:527
-#, fuzzy
+#: ../finch/gntconv.c:554
 msgid "Enable Logging"
-msgstr "/Opcyi/Uklučy viadzieńnie časopisaŭ"
+msgstr "Uklučy viadzieńnie časopisaŭ"
 
-#: ../finch/gntconv.c:533
-#, fuzzy
+#: ../finch/gntconv.c:560
 msgid "Enable Sounds"
-msgstr "Uklučy huki:"
+msgstr "Uklučy huki"
 
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:766
 msgid "<AUTO-REPLY> "
 msgstr "<AŬTA-ADKAZ> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:889
 msgid "List of users:\n"
 msgstr "Åšpis karystalnikaÅ­:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "Padtrymanyja debugavyja opcyi: version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "Niama takoha zahadu (u hetym kantekście)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -941,7 +963,7 @@ msgstr ""
 "Užyj \"/help &lt;zahad&gt;\" dziela dapamohi pa akreślenym zahadzie.\n"
 "U hetym kantekście dastupnyja nastupnyja zahady:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7688
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -949,13 +971,13 @@ msgstr ""
 "say &lt;paviedamleńnie&gt;:  Dasyłaje paviedamleńnie, jak by ty nie "
 "karystaÅ­sia zahadam."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7691
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;dziejańnie&gt;:  Dasyłaje dziejańnie ŭ styli IRC siabru albo ŭ "
 "hutarku."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7694
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -963,43 +985,48 @@ msgstr ""
 "debug &lt;opcyja&gt;:  Dasyłaje raznastajnuju debugavuju infarmacyju da "
 "dziejnaje razmovy."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7697
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Ačyščaje bufer prakrutki razmovy."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7703
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;zahad&gt;:  Dapamoha pa akreślenym zahadzie."
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1163
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Pakazvaje śpis karystalnikaŭ dla hetaje hutarki."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1168
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Pakazvaje vakno pluginaÅ­."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1171
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Pakazvaje śpis siabroŭ."
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1174
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Pakazvaje vakno kontaÅ­."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1177
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Pakazvaje vakno debugavańnia."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1180
 msgid "prefs: Show the preference window."
 msgstr "prefs: Pakazvaje vakno naładaŭ."
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Pakazvaje vakno zachavanych statusaÅ­."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "Niemahčyma adčynić fajł."
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Vakno debugavańnia"
 
@@ -1007,15 +1034,15 @@ msgstr "Vakno debugavańnia"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Ačyść"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
-msgstr "Filter: "
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
+msgstr "Filter:"
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Prypyni"
 
@@ -1052,24 +1079,24 @@ msgstr "Zastałosia"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/bonjour/bonjour.c:358
 #: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
 #: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/msn/msn.c:597 ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/novell/novell.c:2840
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:2715
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
+#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
 #: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Stan"
@@ -1106,14 +1133,14 @@ msgid "The file was saved as %s."
 #: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "Fajł byŭ zapisany jak %s."
 
 #: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
 #: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "Skončanaja"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:388
 msgid "Transferring"
 msgstr "Pieradajecca"
 
@@ -1121,19 +1148,19 @@ msgstr "Listy"
 msgid "Emails"
 msgstr "Listy"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Novaja pošta!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:518
 msgid "Sender"
 msgstr "AdpraÅ­nik"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:525
 msgid "Subject"
 msgstr "Tema"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
@@ -1141,53 +1168,49 @@ msgstr[2] "%s (%s) z %d novymi paviedaml
 msgstr[1] "%s (%s) z %d novymi paviedamleńniami."
 msgstr[2] "%s (%s) z %d novymi paviedamleńniami."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "Novaja pošta"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:948
 #, c-format
 msgid "Info for %s"
 msgstr "Źviestki ab %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:949
 msgid "Buddy Information"
 msgstr "Źviestki ab siabry"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Praciahvaj"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "Razmova"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "Dałučysia"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Zaprasi"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(niama)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:76 ../finch/gntplugin.c:85
 msgid "ERROR"
 msgstr "PAMYŁKA"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:76
 msgid "loading plugin failed"
 msgstr "pamyłka zahruzki plugina"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:85
 msgid "unloading plugin failed"
 msgstr "pamyłka vyhruzki plugina"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:130
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1204,19 +1227,42 @@ msgstr ""
 "Web-sajt: %s\n"
 "Nazva fajłu: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:188
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Treba zahruzić plugin, kab jaho skanfihuravać."
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:236
 msgid "No configuration options for this plugin."
 msgstr "Hety plugin nia maje opcyj kanfihuracyi."
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:257
+msgid "Error loading plugin"
+msgstr "U časie zahruzki plugina adbyłasia pamyłka"
+
+#: ../finch/gntplugin.c:258
+msgid "The selected file is not a valid plugin."
+msgstr "Abrany fajł nie źjaŭlajecca sapraŭdnym pluginam."
+
+#: ../finch/gntplugin.c:259
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Adčyni debugavaje vakno i paŭtary znoŭ, kab ubačyć dakładnaje paviedamleńnie "
+"ab pamyłcy."
+
+#: ../finch/gntplugin.c:322
+msgid "Select plugin to install"
+msgstr "Abiary plugin, kab zainstalavać"
+
+#: ../finch/gntplugin.c:348
 msgid "You can (un)load plugins from the following list."
 msgstr "Ty možaš zahruzić/vyhruzić pluginy z hetaha śpisu."
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:399
+msgid "Install Plugin..."
+msgstr "Zainstaluj plugin..."
+
+#: ../finch/gntplugin.c:408
 msgid "Configure Plugin"
 msgstr "Skanfihuruj plugin"
 
@@ -1225,8 +1271,8 @@ msgstr "Skanfihuruj plugin"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:464 ../finch/gntplugin.c:471 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2069
 msgid "Preferences"
 msgstr "Nałady"
 
@@ -1234,11 +1280,11 @@ msgstr "Abiary siabra dziela začepki."
 msgid "Please enter a buddy to pounce."
 msgstr "Abiary siabra dziela začepki."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Novaja siabroŭskaja začepka"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Redahuj siabroŭskuju začepku"
 
@@ -1256,7 +1302,7 @@ msgstr "Nazva siabra:"
 msgstr "Nazva siabra:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "ÄŒaplaj, kali siabra..."
 
@@ -1301,7 +1347,7 @@ msgstr "Dasyłaje paviedamleńnie"
 msgstr "Dasyłaje paviedamleńnie"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Dziejańnie"
 
@@ -1329,85 +1375,82 @@ msgstr "ÄŒaplaj, tolki kali moj status n
 msgid "Pounce only when my status is not available"
 msgstr "ÄŒaplaj, tolki kali moj status niedastupny"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1288
 msgid "Recurring"
 msgstr "PaÅ­tarajecca"
 
 #: ../finch/gntpounce.c:618
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "Niemahčyma źmianić mianušku"
+msgstr "Niemahčyma stvaryć začepku"
 
 #: ../finch/gntpounce.c:619
-#, fuzzy
 msgid "You do not have any accounts."
-msgstr "Ty musiš abrać kont."
+msgstr "Ty nia maješ kontaŭ."
 
 #: ../finch/gntpounce.c:620
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "Kab stvaryć začepku, treba najpierš stvaryć kont."
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1103
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Ty sapraŭdy chočaš vydalić začepku na %s dla %s?"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1332
 msgid "Buddy Pounces"
 msgstr "Siabroŭskija začepki"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s pačaŭ pisać tabie (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s prypyniŭsia pisać tabie (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s uvajšoŭ (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s viarnuŭsia ź biaździejańnia (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s viarnuÅ­sia (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s spyniŭsia pisać tabie (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1471
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s vyjšaŭ (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1473
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s staŭ biaździejnym (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1475
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s adyjšoŭ. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1477
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s dasłaŭ tabie paviedamleńnie. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1478
 msgid "Unknown pounce event. Please report this!"
 msgstr "Nieviadomaja padzieja dla začepki. Kali łaska, adrapartuj ab hetym!"
 
@@ -1415,12 +1458,12 @@ msgstr "Zasnavana na vykarystańni klavi
 msgid "Based on keyboard use"
 msgstr "Zasnavana na vykarystańni klavijatury"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
 msgid "From last sent message"
 msgstr "Ad apošniaha dasłanaha paviedamleńnia"
 
 #: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nikoli"
@@ -1470,25 +1513,25 @@ msgstr "Źmiani status na"
 msgstr "Źmiani status na"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Razmovy"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
 msgid "Logging"
 msgstr "ÄŒasopisy"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "Jašče nie pracuje."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1555
 #: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Zapišy fajł..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556
 #: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Adčyni fajł..."
@@ -1533,16 +1576,16 @@ msgstr "Chtości pramaŭlaje tvaju bačn
 msgid "Someone says your screen name in chat"
 msgstr "Chtości pramaŭlaje tvaju bačnuju nazvu ŭ hutarcy"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:308
 msgid "GStreamer Failure"
 msgstr "Pamyłka GStreamera"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:309
 msgid "GStreamer failed to initialize."
 msgstr "Pamyłka inicyjalizacyi GStreamera."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
+#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
 msgid "(default)"
 msgstr "(zmoŭčany)"
 
@@ -1558,7 +1601,7 @@ msgstr "Profili"
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
 msgid "Automatic"
 msgstr "Aŭtamatyčny"
 
@@ -1566,7 +1609,7 @@ msgstr "Syhnał kansoli"
 msgid "Console Beep"
 msgstr "Syhnał kansoli"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
 msgid "Command"
 msgstr "Zahad"
 
@@ -1574,7 +1617,7 @@ msgstr "Biaz huku"
 msgid "No Sound"
 msgstr "Biaz huku"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
 msgid "Sound Method"
 msgstr "Hukavy metad"
 
@@ -1592,7 +1635,7 @@ msgstr ""
 "(%s dziela nazvy fajłu)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
 msgid "Sound Options"
 msgstr "Opcyi huku"
 
@@ -1601,17 +1644,17 @@ msgstr "Huki, kali razmova sfakusavanaja
 msgstr "Huki, kali razmova sfakusavanaja"
 
 #: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "ZaÅ­siody"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
 msgid "Only when available"
 msgstr "Tolki kali jość"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
 msgid "Only when not available"
 msgstr "Tolki kali niama"
 
@@ -1620,11 +1663,11 @@ msgstr "Hučnaść (0-100):"
 msgstr "Hučnaść (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
 msgid "Sound Events"
 msgstr "Hukavyja padziei"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
 msgid "Event"
 msgstr "Padzieja"
 
@@ -1632,15 +1675,15 @@ msgstr "Fajł"
 msgid "File"
 msgstr "Fajł"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
 msgid "Test"
 msgstr "Testuj"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
 msgid "Reset"
 msgstr "Viarni"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
 msgid "Choose..."
 msgstr "Abiary..."
 
@@ -1660,7 +1703,7 @@ msgstr "Zachavanyja statusy"
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1486
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Nazva"
@@ -1678,9 +1721,9 @@ msgstr "Typ"
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/bonjour/bonjour.c:270
+#: ../libpurple/protocols/bonjour/bonjour.c:277
+#: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
 #: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
@@ -1691,26 +1734,29 @@ msgstr "Typ"
 #: ../libpurple/protocols/jabber/jabber.c:1601
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../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
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../libpurple/protocols/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:5608
+#: ../libpurple/protocols/oscar/oscar.c:5826
+#: ../libpurple/protocols/oscar/oscar.c:5840
+#: ../libpurple/protocols/oscar/oscar.c:5856
+#: ../libpurple/protocols/oscar/oscar.c:5863
+#: ../libpurple/protocols/oscar/oscar.c:5870
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
@@ -1764,9 +1810,9 @@ msgid "Certificates"
 
 #: ../finch/gntui.c:85
 msgid "Certificates"
-msgstr ""
+msgstr "Sertyfikaty"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
 msgid "Sounds"
 msgstr "Huki"
 
@@ -1776,23 +1822,20 @@ msgstr "Statusy"
 
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "U časie vyhružeńnia plugina adbylisia pamyłki."
+msgstr "U časie zahruzki plugina adbyłasia pamyłka."
 
 #: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "Niemahčyma adčynić fajł"
+msgstr "Niemahčyma znajści dyspłej X"
 
 #: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "Niemahčyma adčynić fajł"
+msgstr "Niemahčyma znajści vakno"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "Niemahčyma zahruzić hety plugin, bo jon skampilavany biez padtrymki X11."
 
 #: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
@@ -1871,16 +1914,16 @@ msgstr "Plugin tostera"
 msgid "Toaster plugin"
 msgstr "Plugin tostera"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Razmova z %s na %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Plugin historyi vymahaje viadzieńnia časopisaŭ"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1896,11 +1939,11 @@ msgstr "GntHistory"
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Pakazvaje niadaÅ­na zapisanyja razmovy dla novych razmovaÅ­."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1953,7 +1996,7 @@ msgstr "Nie staje plugina pratakołu dla
 msgstr "Nie staje plugina pratakołu dla %s"
 
 #: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkblist.c:4363
 msgid "Connection Error"
 msgstr "Pamyłka spałučeńnia"
 
@@ -1998,16 +2041,16 @@ msgstr "Akreśl źviestki karystalnika"
 
 #: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Nieviadomy"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3250 ../pidgin/gtkblist.c:5716
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2017,58 +2060,59 @@ msgstr "śpis siabroŭ"
 msgid "buddy list"
 msgstr "śpis siabroŭ"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(NIE ADPAVIADAJE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s vydaje nastupnyja sertyfikaty dla adnarazovaha vykarystańnia:"
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"Ahulnaja nazva: %s %s\n"
+"Adbitak palcaÅ­ (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Pravierka adnarazovaha sertyfikatu"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:885
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "UÅ‚ady sertyfikacyi"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1053
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "Keš roŭniaŭ SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
+#: ../libpurple/certificate.c:1184
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "Pryjmi zaprašeńnie na hutarku?"
+msgstr "Pryniać sertyfikat dla %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1190
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "Pravierka sertyfikatu SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
-#, fuzzy
+#: ../libpurple/certificate.c:1199
 msgid "Accept"
-msgstr "_Pryjmi"
+msgstr "Pryjmi"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1200 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:90
@@ -2076,77 +2120,84 @@ msgstr "AdmoÅ­"
 msgid "Reject"
 msgstr "AdmoÅ­"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1201
 msgid "_View Certificate..."
-msgstr ""
+msgstr "_Prahladaj sertyfikat..."
 
 #. Prompt the user to authenticate the certificate
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1301
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
 "could mean that you are not connecting to the service you believe you are."
 msgstr ""
+"Sertyfikat, vydadzieny \"%s\", naležyć \"%s\". Heta moža značyć, što ty "
+"spałučajeśsia nia z toj pasłuhaj, ź jakoj dumaješ."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1326
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
+"Sertyfikat, vydadzieny \"%s\", samapadpisany. Jaho niemahčyma aŭtamatyčna "
+"pravieryć."
 
-#: ../libpurple/certificate.c:1331
+#: ../libpurple/certificate.c:1344
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "Łancuh sertyfikataŭ, vydadzieny dla %s, niapravilny."
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
-#, fuzzy
+#: ../libpurple/certificate.c:1352 ../libpurple/certificate.c:1421
 msgid "SSL Certificate Error"
-msgstr "Pamyłka zapisu"
+msgstr "Pamyłka sertyfikatu SSL"
 
-#: ../libpurple/certificate.c:1340
-#, fuzzy
+#: ../libpurple/certificate.c:1353
 msgid "Invalid certificate chain"
-msgstr "Niapravilnaja nazva"
+msgstr "Niapravilny Å‚ancuh sertyfikataÅ­"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1373
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"U ciabie niama bazy źviestak ab karaniovych sertyfikatach, tamu niemahčyma "
+"spraŭdzić hety sertyfikat."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
+#: ../libpurple/certificate.c:1396
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
+"Abvieščany karaniovy sertyfikat nieviadomy dla Pidgina."
 
-#: ../libpurple/certificate.c:1408
+#: ../libpurple/certificate.c:1413
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
 msgstr ""
+"Łancuh sertyfikataŭ, vydadzieny %s, nia maje pravilnaha libčavaha podpisu ad "
+"Uładaŭ sertyfikacyi, choć abvieščana, što jon jość."
 
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1422
 msgid "Invalid certificate authority signature"
-msgstr ""
+msgstr "Niapravilny podpis ad UÅ‚adaÅ­ sertyfikacyi"
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1886
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2156,21 +2207,25 @@ msgstr ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Ahulnaja nazva: %s\n"
+"\n"
+"Adbitak palcaÅ­ (SHA1): %s\n"
+"\n"
+"Data aktyvizacyi: %s\n"
+"Data zakančeńnia dziejańnia: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-#, fuzzy
+#: ../libpurple/certificate.c:1895
 msgid "Certificate Information"
-msgstr "Źviestki ab servery"
+msgstr "Źviestki ab sertyfikacie"
 
 #: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Pamyłka rehistracyi"
 
 #: ../libpurple/connection.c:180
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "Pamyłka rehistracyi"
+msgstr "Pamyłka vydaleńnia rehistracyi"
 
 #: ../libpurple/connection.c:350
 #, c-format
@@ -2183,9 +2238,9 @@ msgstr "+++ %s vychodzić"
 msgstr "+++ %s vychodzić"
 
 #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/protocols/jabber/buddy.c:2340
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:363
 msgid "Unknown error"
 msgstr "Nieviadomaja pamyłka"
 
@@ -2260,7 +2315,7 @@ msgstr "Pamyłka atrymańnia serv-nazvy:
 msgid "Failed to get serv name: %s"
 msgstr "Pamyłka atrymańnia serv-nazvy: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "D-BUS server Purple'a nie pracuje z nastupnaje pryčyny"
 
@@ -2276,7 +2331,7 @@ msgstr "Niemahčyma dasłać zapyt da pr
 msgid "Unable to send request to resolver process\n"
 msgstr "Niemahčyma dasłać zapyt da pracesu vyjaśnieńnia\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2285,8 +2340,8 @@ msgstr ""
 "Pamyłka vyjaśnieńnia %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Pamyłka vyjaśnieńnia %s: %d"
@@ -2301,16 +2356,15 @@ msgstr ""
 "%s"
 
 #: ../libpurple/dnsquery.c:578
-#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "Sustrety znak EOF u časie čytańnia z pracesu vyjaśnieńnia"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Pamyłka stvareńnia nici: %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Nieviadomaja pryčyna"
 
@@ -2412,7 +2466,6 @@ msgstr "Pieradača fajłu %s skončanaja
 msgstr "Pieradača fajłu %s skončanaja"
 
 #: ../libpurple/ft.c:685
-#, c-format
 msgid "File transfer complete"
 msgstr "Pieradača fajłu skončanaja"
 
@@ -2422,7 +2475,6 @@ msgstr "Ty anulavaŭ pieradaču %s"
 msgstr "Ty anulavaŭ pieradaču %s"
 
 #: ../libpurple/ft.c:1108
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Pieradača fajłu anulavanaja"
 
@@ -2681,7 +2733,6 @@ msgstr "Ty karystajeśsia %s, ale hety p
 msgstr "Ty karystajeśsia %s, ale hety plugin vymahaje %s."
 
 #: ../libpurple/plugin.c:380
-#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Hety plugin nie akreśliŭ ID."
 
@@ -2762,14 +2813,14 @@ msgstr "_Zapišy"
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:1456
+#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:6221
+#: ../libpurple/protocols/oscar/oscar.c:6291 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
 msgid "_Cancel"
 msgstr "_Anuluj"
 
@@ -2811,8 +2862,8 @@ msgstr ""
 "fajłu\n"
 "(tolki kali niama adčynienaje razmovy z adpraŭnikom)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1766
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "Notes"
 msgstr "Natatki"
 
@@ -3036,34 +3087,34 @@ msgstr ""
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Karystalnik adłučany."
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Dasłany aŭtamatyčny adkaz:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s vychodzić."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Adno ci niekalki paviedamleńniaŭ mohuć być niedastaŭlenymi."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Ty adłučyŭsia/adłučyłasia ad servera."
 
-#: ../libpurple/plugins/log_reader.c:1628
+#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -3071,79 +3122,87 @@ msgstr ""
 "Ty ciapier adłučany/adłučanaja. Paviedamleńni nia buduć atrymvacca, pakul ty "
 "nia ŭvojdzieš."
 
-#: ../libpurple/plugins/log_reader.c:1643
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "Niemahčyma dasłać paviedamleńnie, bo jaho daŭžynia pieravyšaje maksymalnuju "
 "daŭžyniu."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Niemahčyma dasłać paviedamleńnie."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "Ahulnaja kanfihuracyja čytańnia časopisaŭ"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Chutki padlik pamieru"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Užyj heŭrystyku nazvaŭ"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Kataloh časopisaŭ"
 
@@ -3153,21 +3212,21 @@ msgstr "Kataloh časopisaŭ"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Hartač časopisaŭ"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Ułučaje časopisy ad inšych klijentaŭ chutkich paviedamleńniaŭ u ahlad "
 "časopisaŭ."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3256,9 +3315,9 @@ msgstr ""
 "začepki'"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/novell/novell.c:1919
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
@@ -3268,9 +3327,9 @@ msgstr "Tak"
 msgstr "Tak"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/novell/novell.c:1920
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
@@ -3378,10 +3437,10 @@ msgstr "Testy, kab pravieryć pracu bolÅ
 msgstr "Testy, kab pravieryć pracu bolšaści rečaŭ."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "Sertyfikaty X.509"
 
 #. *< type
 #. *< ui_requirement
@@ -3389,7 +3448,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3397,8 +3456,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "Padtrymvaje SSL praz GNUTLS."
 
@@ -3408,7 +3467,7 @@ msgstr "Padtrymvaje SSL praz GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3416,8 +3475,8 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Padtrymvaje SSL praz Mozilla NSS."
 
@@ -3478,7 +3537,7 @@ msgid "Buddy _Signs On/Off"
 
 #: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
-msgstr "Siabra _uvachodić/vychodzić"
+msgstr "Siabra _ŭvachodić/vychodzić"
 
 #. *< type
 #. *< ui_requirement
@@ -3503,15 +3562,15 @@ msgstr ""
 "Paviedamlaje ŭ vaknie razmovy ab tym, što siabra adychodzić/viartajecca ci "
 "stanovicca dziejnym/biaździejnym."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Zahruzčyk pluginaŭ na Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Padtrymvaje zahruzku pluginaÅ­ na Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3519,36 +3578,46 @@ msgstr ""
 "Niemahčyma znajści instalacyju ActiveTCL. Kali chočaš karystacca pluginami "
 "na TCL, zainstaluj ActiveTCL z http://www.activestate.com\n"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:107
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr ""
+"Nabor pryładaŭ Apple Bonjour dla Windows nia znojdzieny, hladzi FAQ na: "
+"http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging dla padrabiaźniejšych źviestak."
+
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:124
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Niemahčyma słuchać uvachodnyja spałučeńni\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:149
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Niemahčyma spałučycca z lakalnym serveram mDNS. Ci jon pracuje?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/bonjour/bonjour.c:670
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Imia"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/bonjour/bonjour.c:367
+#: ../libpurple/protocols/bonjour/bonjour.c:673
 #: ../libpurple/protocols/gg/gg.c:627
 #: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Proźvišča"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:371
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3557,13 +3626,13 @@ msgstr "E-mail"
 msgid "E-Mail"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:374
+#: ../libpurple/protocols/bonjour/bonjour.c:679
 msgid "AIM Account"
 msgstr "Kont AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:377
+#: ../libpurple/protocols/bonjour/bonjour.c:682
 msgid "XMPP Account"
 msgstr "Kont XMPP"
 
@@ -3577,16 +3646,16 @@ msgstr "Kont XMPP"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:481
+#: ../libpurple/protocols/bonjour/bonjour.c:483
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin pratakołu Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:624
 msgid "Purple Person"
 msgstr "Asoba Purple"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/bonjour/bonjour.c:676
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/jabber/jabber.c:932
 #: ../libpurple/protocols/silc/silc.c:770
@@ -3606,32 +3675,32 @@ msgstr "%s začyniaje razmovu."
 msgstr "%s začyniaje razmovu."
 
 #: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:662
+#: ../libpurple/protocols/bonjour/jabber.c:680
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Niemahčyma dasłać paviedamleńnie, niemahčyma pačać razmovu."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:585
 msgid "Cannot open socket"
 msgstr "Niemahčyma adčynić sokiet"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:593
 msgid "Error setting socket options"
 msgstr "Pamyłka akreśleńnia opcyj sokieta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:617
 msgid "Could not bind socket to port"
 msgstr "Niemahčyma pryviazać sokiet da portu"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:625
 msgid "Could not listen on socket"
 msgstr "Niemahčyma słuchać sokiet"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "Niapravilnyja nałady proxy"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3731,8 +3800,8 @@ msgstr "ZapoÅ­ni nastupnyja pali"
 #: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
 #: ../libpurple/protocols/gg/gg.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Horad"
@@ -3741,9 +3810,9 @@ msgstr "Hod naradžeńnia"
 msgid "Year of birth"
 msgstr "Hod naradžeńnia"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1695
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../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
@@ -3756,14 +3825,14 @@ msgstr "Mužčynski albo žanočy"
 msgstr "Mužčynski albo žanočy"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Mužčynski"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3823,26 +3892,26 @@ msgstr "Dadaj u hutarku..."
 msgstr "Dadaj u hutarku..."
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5658
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Adłučany"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/novell/novell.c:2821
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Dastupny"
 
@@ -3851,32 +3920,31 @@ msgstr "Dastupny"
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
+#: ../libpurple/protocols/oscar/oscar.c:4562
+#: ../libpurple/protocols/oscar/oscar.c:5686
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1941
 #: ../pidgin/gtkstatusbox.c:1058
-#, c-format
 msgid "Away"
 msgstr "Adyjšoŭ"
 
 #: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/oscar/oscar.c:2714
+#: ../libpurple/protocols/oscar/oscar.c:3714
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3887,7 +3955,7 @@ msgstr "Hod naradžeńnia"
 msgstr "Hod naradžeńnia"
 
 #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/oscar/oscar.c:3926
 msgid "Unable to display the search results."
 msgstr "Niemahčyma pakazać vyniki pošuku."
 
@@ -3931,7 +3999,7 @@ msgstr "Pamyłka spałučeńnia."
 msgid "Connection failed."
 msgstr "Pamyłka spałučeńnia."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:622
 msgid "Blocked"
 msgstr "Zablakavany"
 
@@ -4069,7 +4137,7 @@ msgstr "MOTD dla %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/myspace/myspace.c:2361
 msgid "Server has disconnected"
 msgstr "Server adłučyŭsia"
 
@@ -4095,14 +4163,14 @@ msgstr "Mianuški IRC nia mohuć utrymva
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/msn/session.c:386
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/simple/simple.c:1732
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Spałučeńnie"
@@ -4116,20 +4184,20 @@ msgstr "Niama padtrymki SSL"
 #. TODO: try other ports if in auto mode, then save
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/myspace/myspace.c:318
+#: ../libpurple/protocols/simple/simple.c:465
+#: ../libpurple/protocols/simple/simple.c:1647
 msgid "Couldn't create socket"
 msgstr "Niemahčyma stvaryć sokiet"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/myspace/myspace.c:2474
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "Niemahčyma spałučycca z hostam"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "Read error"
 msgstr "Pamyłka čytańnia"
 
@@ -4169,22 +4237,22 @@ msgstr "Nia samy fihovy plugin pratakoł
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../libpurple/protocols/msn/msn.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:6725
 #: ../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:1896
+#: ../libpurple/protocols/simple/simple.c:1919
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:6728
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4256,7 +4324,7 @@ msgstr " <i>(identyfikavany)</i>"
 msgstr " <i>(identyfikavany)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3715
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4355,28 +4423,28 @@ msgstr "Tolki zaprašeńnie"
 msgid "Invitation only"
 msgstr "Tolki zaprašeńnie"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Ciabie kiknuli z %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s kiknuŭ/kiknuła (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "režym (%s %s) ad %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "Niapravilnaja mianuška"
 
-#: ../libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:913
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4384,7 +4452,7 @@ msgstr ""
 "Abranaja taboju mianuška nie pryjmalnaja dla servera. Mabyć, jana ŭtrymvaje "
 "niedazvolenyja znaki."
 
-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:918
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4392,44 +4460,44 @@ msgstr ""
 "Abranaja taboju nazva kontu nie pryjmalnaja dla servera. Mabyć, jana "
 "Å­trymvaje niedazvolenyja znaki."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "Niemahčyma źmianić mianušku"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "Niemahčyma źmianić mianušku"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Ty ŭvachodziš na kanał%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "Pamyłka: niapravilny PONG ad servera"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Adkaz na PING -- adstavańnir: %lu sekundaŭ"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Niemahčyma dałučycca da %s: patrebnaja rehistracyja."
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Niemahčyma dałučycca da kanału"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Mianuška albo kanał časova niedastupnyja."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "Udary ad %s"
@@ -4537,7 +4605,7 @@ msgstr "names [kanał]:  Pakažy dziejny
 msgstr "names [kanał]:  Pakažy dziejny śpis karystalnikaŭ hetaha kanału."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novaja mianuška&gt;:  Źmiani svaju mianušku."
 
@@ -4648,21 +4716,21 @@ msgstr ""
 msgstr ""
 "whowas &lt;mianuška&gt;: Atrymaj źviestki ab karystalniku, jaki vyjšaŭ."
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "ÄŒas adkazu ad %s: %lu sekundaÅ­"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "Adkaz na CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:632
+#: ../libpurple/protocols/irc/parse.c:636 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -4677,14 +4745,12 @@ msgstr "Nieviadomaja pamyłka"
 
 #: ../libpurple/protocols/jabber/adhoccommands.c:139
 #: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "Zahad adklučany"
+msgstr "Pamyłka zahadu Ad-Hoc"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
-#, fuzzy
+#: ../libpurple/protocols/jabber/adhoccommands.c:176
 msgid "execute"
-msgstr "Niečakany"
+msgstr "vykanaj"
 
 #: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
@@ -4827,15 +4893,15 @@ msgstr "Rola"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/oscar/oscar.c:3764
 msgid "Birthday"
 msgstr "Dzień naradžeńnia"
 
 #: ../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:3116
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3314
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Apisańnie"
@@ -4866,104 +4932,92 @@ msgid "Last Activity"
 #: ../libpurple/protocols/jabber/buddy.c:815
 #: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
-msgstr ""
+msgstr "Apošniaja dziejnaść"
 
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
 msgid "Service Discovery Info"
-msgstr "Akreśl źviestki dla katalohu"
+msgstr "Infarmacyja ab vynajdzienych pasłuhach"
 
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
-msgstr ""
+msgstr "Elementy vynajdzienych pasłuh"
 
 #: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
 msgid "Extended Stanza Addressing"
-msgstr "Pašyrany adras"
+msgstr "Pašyranaje adrasavańnie strafy"
 
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
 msgid "Multi-User Chat"
-msgstr "Stvary alias dla hutarki"
+msgstr "Hutarka mnohich karystalnikaÅ­"
 
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
-#, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "Karystalnik nia maje źviestak z katalohu."
+msgstr "Pašyranaja infarmacyja ab prysutnaści ŭ hutarcy mnohich karystalnikaŭ"
 
 #: ../libpurple/protocols/jabber/buddy.c:827
 #: ../libpurple/protocols/jabber/buddy.c:987
 msgid "In-Band Bytestreams"
-msgstr ""
+msgstr "PÅ‚yni bajtaÅ­ In-Band"
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
 msgid "Ad-Hoc Commands"
-msgstr "Zahad"
+msgstr "Zahady Ad-Hoc"
 
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
-msgstr ""
+msgstr "Pasłuha PubSub"
 
 #: ../libpurple/protocols/jabber/buddy.c:833
 #: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
-msgstr ""
+msgstr "PÅ‚yni bajtaÅ­ SOCKS5"
 
 #: ../libpurple/protocols/jabber/buddy.c:835
 #: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Out of Band Data"
-msgstr ""
+msgstr "Źviestki Out of Band"
 
 #: ../libpurple/protocols/jabber/buddy.c:837
 #: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
 msgid "XHTML-IM"
-msgstr "HTML"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
 msgid "In-Band Registration"
-msgstr "Pamyłka rehistracyi"
+msgstr "Rehistracyja In-Band"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
 msgid "User Location"
-msgstr "Raźmiaščeńnie"
+msgstr "Pałažeńnie karystalnika"
 
 #: ../libpurple/protocols/jabber/buddy.c:843
 #: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
 msgid "User Avatar"
-msgstr "Pošuk karystalnika"
+msgstr "Avatar karystalnika"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "Infarmavańnie ab statusie siabra"
+msgstr "Infarmavańni hutarki ab stanie"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
 msgid "Software Version"
-msgstr "Niepadtrymanaja versija"
+msgstr "Versija prahramy"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
 msgid "Stream Initiation"
-msgstr "Aryjentacyja"
+msgstr "Inicyjacyja płyni"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
@@ -4973,129 +5027,113 @@ msgstr "Pieradača fajłu"
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
 msgid "User Mood"
-msgstr "Režymy karystalnika"
+msgstr "Nastroj karystalnika"
 
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
 msgid "User Activity"
-msgstr "Limit karystalnikaÅ­"
+msgstr "Aktyŭnaść karystalnika"
 
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
 msgid "Entity Capabilities"
-msgstr "Mahčymaści"
+msgstr "Mahčymaści isnaści"
 
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
-msgstr ""
+msgstr "Pieramovy praz Å¡yfravanuju sesiju"
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
 msgid "User Tune"
-msgstr "Nazva karystalnika"
+msgstr "Melodyja karystalnika"
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-#, fuzzy
 msgid "Roster Item Exchange"
-msgstr "Razmova z abmienam klučami"
+msgstr "Abmien elementami śpisu siabroŭ"
 
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-#, fuzzy
 msgid "Reachability Address"
-msgstr "Adras e-mail"
+msgstr "Adras dasiahalnaści"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
 msgid "User Profile"
-msgstr "Profil"
+msgstr "Profil karystalnika"
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-#, fuzzy
 msgid "Jingle"
-msgstr "Dałučysia"
+msgstr "Jingle"
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
-msgstr ""
+msgstr "Jingle AÅ­dyjo"
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
 msgid "User Nickname"
-msgstr "Nazva karystalnika"
+msgstr "Mianuška karystalnika"
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
-msgstr ""
+msgstr "Jingle ICE UDP"
 
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
-msgstr ""
+msgstr "Jingle ICE TCP"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle Raw UDP"
-msgstr ""
+msgstr "Jingle Raw UDP"
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
 msgid "Jingle Video"
-msgstr "Žyvoje videa"
+msgstr "Jingle Videa"
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
-msgstr ""
+msgstr "Jingle DTMF"
 
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
 msgid "Message Receipts"
-msgstr "Atrymanaje paviedamleńnie"
+msgstr "Atrymańni paviedamleńniaŭ"
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
-#, fuzzy
 msgid "Public Key Publishing"
-msgstr "Adbitak lepietu dla publičnaha kluča"
+msgstr "Publikacyja publičnaha kluča"
 
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
 msgid "User Chatting"
-msgstr "Opcyi karystalnika"
+msgstr "Karystalnik hutaryć"
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-#, fuzzy
 msgid "User Browsing"
-msgstr "Režymy karystalnika"
+msgstr "Karystalnik hartaje sieciva"
 
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-#, fuzzy
 msgid "User Gaming"
-msgstr "Nazva karystalnika"
+msgstr "Karystalnik hulajecca"
 
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-#, fuzzy
 msgid "User Viewing"
-msgstr "Limit karystalnikaÅ­"
+msgstr "Karystalnik prahladaje"
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
@@ -5108,48 +5146,47 @@ msgstr "Ping"
 
 #: ../libpurple/protocols/jabber/buddy.c:899
 #: ../libpurple/protocols/jabber/buddy.c:1059
-#, fuzzy
 msgid "Stanza Encryption"
-msgstr "Šyfravańnie Trillian"
+msgstr "Šyfravańnie strofaŭ"
 
 #: ../libpurple/protocols/jabber/buddy.c:901
 #: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
-msgstr ""
+msgstr "Čas isnaści"
 
 #: ../libpurple/protocols/jabber/buddy.c:903
 #: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
-msgstr ""
+msgstr "Zatrymanaja dastaÅ­ka"
 
 #: ../libpurple/protocols/jabber/buddy.c:905
 #: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Collaborative Data Objects"
-msgstr ""
+msgstr "Supolnyja abjekty źviestak"
 
 #: ../libpurple/protocols/jabber/buddy.c:907
 #: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "File Repository and Sharing"
-msgstr ""
+msgstr "Schovišča fajłaŭ i supolny dostup"
 
 #: ../libpurple/protocols/jabber/buddy.c:909
 #: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
-msgstr ""
+msgstr "Pošuk pasłuh STUN dla Jingle"
 
 #: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgstr "Sproščanyja pieramovy praz šyfravanuju sesiju"
 
 #: ../libpurple/protocols/jabber/buddy.c:913
 #: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
-msgstr ""
+msgstr "Pravierka Hop"
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Capabilities"
 msgstr "Mahčymaści"
 
@@ -5176,8 +5213,8 @@ msgstr "Siaredniaje imia"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
 #: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5196,74 +5233,71 @@ msgstr "Lahatyp"
 msgid "Logo"
 msgstr "Lahatyp"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Zdymi schovanku ad"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "ÄŒasova schavajsia ad"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Anuluj infarmavańnie ab prysutnaści"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "(Piera-)Zapytaj aÅ­taryzacyi"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "Adpišysia"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
-msgstr "Uvajšoŭ/Uvajšła"
+msgstr "Uvajdzi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
-msgstr "Zachoŭvaj časopisy hutarak"
+msgstr "Vyjdzi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/buddy.c:2038
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Chaču pahavaryć"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Pašyrany adychod"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
+#: ../libpurple/protocols/jabber/buddy.c:2044
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../libpurple/protocols/oscar/oscar.c:5862
 #: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
 msgid "Do Not Disturb"
 msgstr "Nie turbuj mianie"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/oscar/oscar.c:3726
 msgid "Last Name"
 msgstr "Proźvišča"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "Voś vyniki tvajho pošuku"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2322
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5271,40 +5305,40 @@ msgstr ""
 "Šukaj kantakt, akreśliŭšy kryter pošuku ŭ nastupnych paloch. Zaŭvaha: pali "
 "padtrymvajuć pošuk pa šablonach (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2342
 msgid "Directory Query Failed"
 msgstr "Pamyłka zapytu da katalohu"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2343
 msgid "Could not query the directory server."
 msgstr "Niemahčyma zapytacca ŭ servera katalohu."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrukcyi servera: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2384
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Zapoŭni adno ci niekalki paloŭ, kab šukać adpaviednych karystalnikaŭ XMPP."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "E-Mail Address"
 msgstr "Adras e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2414
 msgid "Search for XMPP users"
 msgstr "Å ukaj karystalnikaÅ­ XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2415
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5316,24 +5350,24 @@ msgstr "Å ukaj"
 msgid "Search"
 msgstr "Å ukaj"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2430
 msgid "Invalid Directory"
 msgstr "Niapravilny kataloh"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2447
 msgid "Enter a User Directory"
 msgstr "Akreśl kataloh karystalnikaŭ"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Select a user directory to search"
 msgstr "Abiary kataloh karystalnikaŭ dziela pošuku"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2451
 msgid "Search Directory"
 msgstr "Å ukaj u katalohu"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5346
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Pakoj:"
@@ -5430,7 +5464,7 @@ msgid "You require encryption, but it is
 
 #: ../libpurple/protocols/jabber/jabber.c:145
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "Ty vymahaješ šyfravańnia, ale jano niedastupnaje na hetym servery."
 
 #: ../libpurple/protocols/jabber/jabber.c:259
 #: ../libpurple/protocols/jabber/jabber.c:312
@@ -5444,9 +5478,9 @@ msgstr "Pamyłka čytańnia"
 msgstr "Pamyłka čytańnia"
 
 #: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5474,9 +5508,9 @@ msgstr "Paśpiachovaja rehistracyja %s@%
 msgstr "Paśpiachovaja rehistracyja %s@%s"
 
 #: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "Paśpiachovaja rehistracyja %s@%s"
+msgstr "Paśpiachovaja rehistracyja na %s"
 
 #: ../libpurple/protocols/jabber/jabber.c:664
 #: ../libpurple/protocols/jabber/jabber.c:665
@@ -5489,21 +5523,19 @@ msgstr "Pamyłka rehistracyi"
 msgstr "Pamyłka rehistracyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "Paśpiachovaja rehistracyja %s@%s"
+msgstr "Paśpiachovaje vydaleńnie rehistracyi z %s"
 
 #: ../libpurple/protocols/jabber/jabber.c:694
 #: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
 msgid "Unregistration Successful"
-msgstr "Paśpiachovaja rehistracyja"
+msgstr "Paśpiachovaje vydaleńnie rehistracyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:703
 #: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
 msgid "Unregistration Failed"
-msgstr "Pamyłka rehistracyi"
+msgstr "Pamyłka vydaleńnia rehistracyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:864
 #: ../libpurple/protocols/jabber/jabber.c:865
@@ -5511,8 +5543,8 @@ msgstr "Užo zarehistravany"
 msgstr "Užo zarehistravany"
 
 #: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "State"
 msgstr "Stan"
 
@@ -5535,15 +5567,13 @@ msgstr "Data"
 msgstr "Data"
 
 #: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
 msgid "Unregister"
-msgstr "Zarehistruj"
+msgstr "Vydal rehistracyju"
 
 #: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "Zapoŭni nižej infarmacyjaj, kab zarehistravać tvoj novy kont."
+msgstr "Zapoŭni nižej infarmacyjaj, kab źmianić rehistracyju tvajho kontu."
 
 #: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
@@ -5560,43 +5590,39 @@ msgstr "Zarehistruj"
 msgstr "Zarehistruj"
 
 #: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "Źmiani źviestki karystalnika dla %s"
+msgstr "Źmiani rehistracyju kontu na %s"
 
 #: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
+#, c-format
 msgid "Register New Account at %s"
-msgstr "Zarehistruj novy kont XMPP"
+msgstr "Zarehistruj novy kont na %s"
 
 #: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
 msgid "Change Registration"
-msgstr "Źmiani status na"
+msgstr "Źmiani rehistracyju"
 
 #: ../libpurple/protocols/jabber/jabber.c:1120
 #: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
 msgid "Error unregistering account"
-msgstr "Pamyłka źmieny źviestak kontu"
+msgstr "Pamyłka vydaleńnia rehistracyi kontu"
 
 #: ../libpurple/protocols/jabber/jabber.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:1127
-#, fuzzy
 msgid "Account successfully unregistered"
-msgstr "Ty paśpiachova stvaryŭ Qun"
+msgstr "Rehistracyja kontu paśpiachova vydalenaja"
 
 #: ../libpurple/protocols/jabber/jabber.c:1284
 msgid "Initializing Stream"
 msgstr "Inicyjalizacyja płyni"
 
 #: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "Inicyjalizacyja płyni"
+msgstr "Inicyjalizacyja SSL/TLS"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:392
 msgid "Authenticating"
 msgstr "AÅ­taryzacyja"
 
@@ -5609,7 +5635,7 @@ msgstr "Paŭtornaja inicyjalizacyja pły
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5656
 msgid "Not Authorized"
 msgstr "Nie aÅ­taryzavany"
 
@@ -5650,7 +5676,7 @@ msgstr "Padpiska"
 #: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/jabber/jabber.c:1602
 #: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
+#: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1212
 #: ../libpurple/protocols/silc10/buddy.c:1557
@@ -5663,27 +5689,24 @@ msgstr "Nastroj"
 #: ../libpurple/protocols/jabber/jabber.c:1580
 #: ../libpurple/protocols/jabber/jabber.c:1603
 #: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
 msgid "Mood Text"
-msgstr "Typ kryvi"
+msgstr "Tekst nastroju"
 
 #: ../libpurple/protocols/jabber/jabber.c:1535
 #: ../libpurple/protocols/jabber/jabber.c:1558
 #: ../libpurple/protocols/jabber/jabber.c:1581
 #: ../libpurple/protocols/jabber/jabber.c:1604
 #: ../libpurple/protocols/jabber/jabber.c:1627
-#, fuzzy
 msgid "Tune Artist"
-msgstr "Mastaki"
+msgstr "VykanaÅ­ca melodyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:1536
 #: ../libpurple/protocols/jabber/jabber.c:1559
 #: ../libpurple/protocols/jabber/jabber.c:1582
 #: ../libpurple/protocols/jabber/jabber.c:1605
 #: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
 msgid "Tune Title"
-msgstr "Nazva"
+msgstr "Nazva melodyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:1537
 #: ../libpurple/protocols/jabber/jabber.c:1560
@@ -5691,7 +5714,7 @@ msgid "Tune Album"
 #: ../libpurple/protocols/jabber/jabber.c:1606
 #: ../libpurple/protocols/jabber/jabber.c:1629
 msgid "Tune Album"
-msgstr ""
+msgstr "Albom melodyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:1538
 #: ../libpurple/protocols/jabber/jabber.c:1561
@@ -5699,16 +5722,15 @@ msgid "Tune Genre"
 #: ../libpurple/protocols/jabber/jabber.c:1607
 #: ../libpurple/protocols/jabber/jabber.c:1630
 msgid "Tune Genre"
-msgstr ""
+msgstr "Styl melodyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:1539
 #: ../libpurple/protocols/jabber/jabber.c:1562
 #: ../libpurple/protocols/jabber/jabber.c:1585
 #: ../libpurple/protocols/jabber/jabber.c:1608
 #: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
 msgid "Tune Comment"
-msgstr "Kamentar siabra"
+msgstr "Kamentar melodyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:1540
 #: ../libpurple/protocols/jabber/jabber.c:1563
@@ -5716,7 +5738,7 @@ msgid "Tune Track"
 #: ../libpurple/protocols/jabber/jabber.c:1609
 #: ../libpurple/protocols/jabber/jabber.c:1632
 msgid "Tune Track"
-msgstr ""
+msgstr "Ściežka melodyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:1541
 #: ../libpurple/protocols/jabber/jabber.c:1564
@@ -5724,7 +5746,7 @@ msgid "Tune Time"
 #: ../libpurple/protocols/jabber/jabber.c:1610
 #: ../libpurple/protocols/jabber/jabber.c:1633
 msgid "Tune Time"
-msgstr ""
+msgstr "Praciahłaść melodyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:1542
 #: ../libpurple/protocols/jabber/jabber.c:1565
@@ -5732,7 +5754,7 @@ msgid "Tune Year"
 #: ../libpurple/protocols/jabber/jabber.c:1611
 #: ../libpurple/protocols/jabber/jabber.c:1634
 msgid "Tune Year"
-msgstr ""
+msgstr "Hod melodyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:1543
 #: ../libpurple/protocols/jabber/jabber.c:1566
@@ -5740,16 +5762,15 @@ msgid "Tune URL"
 #: ../libpurple/protocols/jabber/jabber.c:1612
 #: ../libpurple/protocols/jabber/jabber.c:1635
 msgid "Tune URL"
-msgstr ""
+msgstr "Adras (URL) melodyi"
 
 #: ../libpurple/protocols/jabber/jabber.c:1545
 #: ../libpurple/protocols/jabber/jabber.c:1568
 #: ../libpurple/protocols/jabber/jabber.c:1591
 #: ../libpurple/protocols/jabber/jabber.c:1614
 #: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "Dazvol"
+msgstr "Dazvol zvon"
 
 #: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
@@ -5778,7 +5799,7 @@ msgstr "Akreśl tvoj novy parol"
 msgstr "Akreśl tvoj novy parol"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6442
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -5786,7 +5807,7 @@ msgstr "Akreśl źviestki karystalnika..
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/oscar/oscar.c:6453
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -6027,52 +6048,69 @@ msgstr "Niemahčyma kiknuć karystalnika
 msgstr "Niemahčyma kiknuć karystalnika %s"
 
 #: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "Niemahčyma zabanić karystalnika %s"
+msgstr "Niemahčyma pingnuć karystalnika %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+#: ../libpurple/protocols/jabber/jabber.c:2203
+#: ../libpurple/protocols/jabber/jabber.c:2214
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+msgstr "Niemahčyma pazvanić, bo ničoha nie viadoma pra karystalnika %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2209
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+msgstr "Niemahčyma pazvanić, bo karystalnik %s pa-za sietkaj."
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2240
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr ""
-"Niemahčyma dasłać fajł da %s, karystalnik nie padtrymvaje pieradačy fajłaŭ"
+msgstr "Niemahčyma pazvanić, bo karystalnik %s nie padtrymvaje hetaha."
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:2262
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+msgid "Buzz"
+msgstr "Zvani"
+
+#: ../libpurple/protocols/jabber/jabber.c:2263
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s paźvinieŭ tabie!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2264
+#: ../libpurple/protocols/yahoo/yahoo.c:4123
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Zvon dla %s..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2296
 msgid "config:  Configure a chat room."
 msgstr "config:  Skanfihuruj pakoj hutarki."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Skanfihuruj pakoj hutarki."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "part [room]:  Leave the room."
 msgstr "part [pakoj]:  Pakiń pakoj."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2314
 msgid "register:  Register with a chat room."
 msgstr "register:  Zarehistruj pakoj hutarki."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2320
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novaja tema]:  Pakažy albo źmiani temu."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;karystalnik&gt; [pakoj]:  Zabań karystalnika ŭ pakoi."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#: ../libpurple/protocols/jabber/jabber.c:2332
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6080,7 +6118,7 @@ msgstr ""
 "affiliate &lt;karystalnik&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Akreśl suviaź karystalnika z pakojem."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2338
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6088,34 +6126,34 @@ msgstr ""
 "role &lt;karystalnik&gt; &lt;moderator|participant|visitor|none&gt;: Akreśl "
 "rolu karystalnika Å­ pakoi."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;karystalnik&gt; [paviedamleńnie]:  Zaprasi karystalnika ŭ pakoj."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;pakoj&gt; [server]:  Dałučysia da hutarki na hetym servery."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2356
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;karystalnik&gt; [pakoj]:  Kikni karystalnika z pakoju."
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;karystalnik&gt; &lt;paviedamleńnie&gt;:  Dašli pryvatnaje "
 "paviedamleńnie inšamu karystalniku."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\tPingni karystalnika/kampanent/server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2372
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Naplaci karystalniku, kab toj źviarnuŭ uvahu"
+msgstr "buzz: Pazvani karystalniku, kab toj źviarnuŭ uvahu"
 
 #. *< type
 #. *< ui_requirement
@@ -6139,7 +6177,7 @@ msgid "Require SSL/TLS"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:210
 msgid "Require SSL/TLS"
-msgstr ""
+msgstr "Vymahaj SSL/TLS"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
@@ -6150,8 +6188,8 @@ msgstr "Dazvol aÅ­taryzacyju prostym tek
 msgstr "Dazvol aŭtaryzacyju prostym tekstam praź niešyfravanyja kanały"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/myspace/myspace.c:3283
+#: ../libpurple/protocols/simple/simple.c:1925
 msgid "Connect port"
 msgstr "Spałučysia z partom"
 
@@ -6159,7 +6197,7 @@ msgstr "Spałučysia z partom"
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
+#: ../libpurple/protocols/myspace/myspace.c:3280
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -6194,12 +6232,6 @@ msgstr "Pamyłka paviedamleńnia XMPP"
 msgid "XMPP Message Error"
 msgstr "Pamyłka paviedamleńnia XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s uvachodzić."
-
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6209,16 +6241,16 @@ msgstr "Pamyłka razboru XML"
 msgid "XML Parse error"
 msgstr "Pamyłka razboru XML"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:423
 msgid "Unknown Error in presence"
 msgstr "Jość nieviadomaja pamyłka"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:504
+#: ../libpurple/protocols/jabber/presence.c:505
 msgid "Create New Room"
 msgstr "Stvary novy pakoj"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:506
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6226,20 +6258,20 @@ msgstr ""
 "Ty stvaraješ novy pakoj. Chočaš skanfihuravać jaho albo pryniać zmoŭčanyja "
 "nałady?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:512
 msgid "_Configure Room"
 msgstr "_Skanfihuruj pakoj"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:513
 msgid "_Accept Defaults"
 msgstr "_Pryjmi zmoŭčanyja nałady"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:555
 #, c-format
 msgid "Error in chat %s"
 msgstr "Pamyłka ŭ hutarcy %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Pamyłka dałučeńnia da hutarki %s"
@@ -6281,64 +6313,66 @@ msgstr "Abiary resurs"
 msgid "Select a Resource"
 msgstr "Abiary resurs"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
-msgstr "Režymy karystalnika"
+msgstr "Redahuj nastroj karystalnika"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
-msgstr ""
+msgstr "Abiary svoj nastroj sa śpisu."
 
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
 msgid "Set"
-msgstr "_Akreśl"
+msgstr "Akreśl"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
-msgstr "Dašli paviedamleńnie..."
+msgstr "Akreśl nastroj..."
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "Akreśl limit karystalnikaŭ"
+msgstr "Akreśl mianušku karystalnika"
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "Uviadzi novuju nazvu dla %s"
+msgstr "Akreśl novuju mianušku dla siabie."
 
 #: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
+"Hetaja infarmacyja bačnaja dla ŭsich kontaŭ z tvajho śpisu kantaktaŭ, tamu "
+"abiary što-niebudź adpaviednaje."
 
-#: ../libpurple/protocols/jabber/usernick.c:99
-#, fuzzy
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
-msgstr "Mianuška"
+msgstr "Akreśl mianušku..."
 
 #: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
 msgid "Actions"
-msgstr "Dziejańnie"
+msgstr "Dziejańni"
 
 #: ../libpurple/protocols/jabber/xdata.c:380
-#, fuzzy
 msgid "Select an action"
-msgstr "Abiary fajł"
+msgstr "Abiary dziejańnie"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:163
+msgid "Unable to connect to contact server"
+msgstr "Niemahčyma spałučycca z kamunikacyjnym serveram"
+
+#: ../libpurple/protocols/msn/contact.c:923
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Niemahčyma atrymać adrasnuju knihu MSN"
+
+#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Prablema synchranizacyi śpisu siabroŭ u %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6347,7 +6381,7 @@ msgstr ""
 "%s u lakalnym śpisie znachodzicca ŭ hrupie \"%s\", ale nia ŭ śpisie na "
 "servery. Chočaš dadać hetaha siabra?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6357,275 +6391,222 @@ msgstr ""
 "siabra?"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
 msgid "Unable to parse message"
 msgstr "Niemahčyma razabrać paviedamleńnie"
 
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksyčnaja pamyłka (mahčyma, pamyłka klijenta)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
 msgid "Invalid e-mail address"
 msgstr "Niapravilny adras e-mail"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
 msgid "User does not exist"
 msgstr "Karystalnik nie isnuje"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Nie staje całkam akreślenaje nazvy damenu"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
 msgid "Already logged in"
 msgstr "Užo ŭvajšoŭ/uvajšła"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
 msgid "Invalid screen name"
 msgstr "Niapravilnaja bačnaja nazva"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
 msgid "Invalid friendly name"
 msgstr "Niapravilnaja pryjaznaja nazva"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
 msgid "List full"
 msgstr "Åšpis zapoÅ­nieny"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
 msgid "Already there"
 msgstr "Užo tut"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
 msgid "Not on list"
 msgstr "Nia ŭ śpisie"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
 msgstr "Karystalnik adłučany"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
 msgid "Already in the mode"
 msgstr "Užo ŭ hetym režymie"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
 msgid "Already in opposite list"
 msgstr "Užo ŭ supraćlehłym śpisie"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
 msgid "Too many groups"
 msgstr "Zašmat hrupaŭ"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
 msgid "Invalid group"
 msgstr "Niapravilnaja hrupa"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
 msgid "User not in group"
 msgstr "Karystalnik nia Å­ hrupie"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
 msgid "Group name too long"
 msgstr "Nazva hrupy zadaÅ­haja"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Niemahčyma vydalić nulavuju hrupu"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Sproba dadać karystalnika ŭ niaisnuju hrupu"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
 msgid "Switchboard failed"
 msgstr "Pamyłka pultu"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
 msgid "Notify transfer failed"
 msgstr "Pamyłka infarmavańnia ab pieradačy"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
 msgid "Required fields missing"
 msgstr "Nie staje vymahanych paloÅ­"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Zašmat hitoŭ da FND"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
 msgid "Not logged in"
 msgstr "Nie ŭvajšoŭ/uvajšła"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Servis časova niedastupny"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
 msgid "Database server error"
 msgstr "Pamyłka servera bazy źviestak"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
 msgid "Command disabled"
 msgstr "Zahad adklučany"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
 msgid "File operation error"
 msgstr "Pamyłka fajłavaj aperacyi"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
 msgid "Memory allocation error"
 msgstr "Pamyłka raźmierkavańnia pamiaci"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Niapravilnaja vartaść CHL dasłanaja na server"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
 msgid "Server busy"
 msgstr "Server zaniaty"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
 msgid "Server unavailable"
 msgstr "Server niedastupny"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
 msgid "Peer notification server down"
 msgstr "Server infarmavańnia ab roŭniach adklučany"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
 msgid "Database connect error"
 msgstr "Pamyłka spałučeńnia z serveram bazy źviestak"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server adklučajecca (pakidaju karabel)"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
 msgid "Error creating connection"
 msgstr "Pamyłka stvareńnia spałučeńnia"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parametry CVR albo nieviadomyja, albo niedazvolenyja"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
 msgid "Unable to write"
 msgstr "Niemahčyma zapisać"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
 msgid "Session overload"
 msgstr "Sesija abciažaranaja"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
 msgid "User is too active"
 msgstr "Karystalnik zanadta aktyÅ­ny"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
 msgid "Too many sessions"
 msgstr "Nadta Å¡mat sesij"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
 msgid "Passport not verified"
 msgstr "Pašpart nie pravierany"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
 msgid "Bad friend file"
 msgstr "Kiepski fajł siabroŭ"
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
 msgid "Not expected"
 msgstr "Niečakany"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Pryjaznaja nazva mianiajecca nadta chutka"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
 msgid "Server too busy"
 msgstr "Server nadta zaniaty"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
+#: ../libpurple/protocols/oscar/oscar.c:1383
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "Pamyłka aŭtaryzacyi"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Nie dazvolena, kali adłučany"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
 msgid "Not accepting new users"
 msgstr "Nie pryjmajucca novyja karystalniki"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Dziciačy pašpart biaz baćkoŭskaj zhody"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Kont pašpartu jašče nie pravierany"
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
 msgid "Bad ticket"
 msgstr "Kipski kvitok"
 
@@ -6641,47 +6622,47 @@ msgid "Nudge"
 
 #: ../libpurple/protocols/msn/msn.c:130
 msgid "Nudge"
-msgstr ""
+msgstr "Å turchani"
 
 #: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s uvachodzić."
+msgstr "%s šturchnuła ciabie!"
 
 #: ../libpurple/protocols/msn/msn.c:132
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "Šturchańnie %s..."
 
 #: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Tvaja pryjaznaja nazva MSN zadaÅ­haja."
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:286
 msgid "Set your friendly name."
 msgstr "Akreśl svaju pryjaznuju nazvu."
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:287
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Heta nazva, jakuju buduć bačyć inšyja siabry z MSN."
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:305
 msgid "Set your home phone number."
 msgstr "Akreśl svoj chatni telefonny numar."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Set your work phone number."
 msgstr "Akreśl svoj pracoŭny telefonny numar."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339
 msgid "Set your mobile phone number."
 msgstr "Akreśl svoj mabilny telefonny numar."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354
 msgid "Allow MSN Mobile pages?"
 msgstr "Dazvolić staronki MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:355
 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?"
@@ -6689,323 +6670,326 @@ msgstr ""
 "Chočaš dazvolić ci zabaranić ludziam z tvajho śpisu siabroŭ dasyłać tabie "
 "staronki MSN Mobile, na tvoj sotavy telefon albo mabilnuju pryładu?"
 
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:361
 msgid "Allow"
 msgstr "Dazvol"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362
 msgid "Disallow"
 msgstr "Zabarani"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378
 msgid "This Hotmail account may not be active."
 msgstr "Hety kont Hotmail moža być niezadziejničanym."
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:404
 msgid "Send a mobile message."
 msgstr "Dašli mabilnaje paviedamleńnie."
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406
 msgid "Page"
 msgstr "Staronka"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Maju ciabie"
+#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:643 ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:657 ../libpurple/protocols/msn/msn.c:663
+#: ../libpurple/protocols/msn/msn.c:669
+msgid "Current media"
+msgstr "Dziejnaje medyja"
 
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Budu chutka"
 
-#: ../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/msn/msn.c:655 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
 #: ../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:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Zaniaty"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "RazmaÅ­laju pa telefonie"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "Adyjšoŭ pajeści"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "Set Friendly Name..."
 msgstr "Akreśl pryjaznuju nazvu..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:703
 msgid "Set Home Phone Number..."
 msgstr "Akreśl chatni telefonny numar..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:707
 msgid "Set Work Phone Number..."
 msgstr "Akreśl pracoŭny telefonny numar..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:711
 msgid "Set Mobile Phone Number..."
 msgstr "Akreśl mabilny telefonny numar..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:717
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Uklučy/adklučy mabilnyja pryłady..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:722
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Dazvol/zabarani mabilnyja staronki..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:733
 msgid "Open Hotmail Inbox"
 msgstr "Adčyni Ŭvachodnyja Hotmail'a"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:757
 msgid "Send to Mobile"
 msgstr "Dašli na mabilnik"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:767
+#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "Inicyjuj _hutarku"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:805
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "MSN vymahaje padtrymki SSL. Kali Å‚aska, zainstaluj padtrmvanuju biblijateku "
 "SSL."
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:833
 msgid "Failed to connect to server."
 msgstr "Pamyłka spałučeńnia z serveram."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1621 ../libpurple/protocols/msn/msn.c:1964
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Pamyłka atrymańnia profilu"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1687 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Ahulnaje"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1694
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Uzrost"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1696
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Zaniatak"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1697
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1480
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Raźmiaščeńnie"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1702 ../libpurple/protocols/msn/msn.c:1894
+#: ../libpurple/protocols/msn/msn.c:1900 ../libpurple/protocols/msn/msn.c:1907
 msgid "Hobbies and Interests"
 msgstr "Zachapleńni j zacikaŭlenaści"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1708 ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1834 ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1849 ../libpurple/protocols/msn/msn.c:1856
 msgid "A Little About Me"
 msgstr "Krychu pra mianie"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1725
 msgid "Social"
 msgstr "Hramadzkaje"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1727
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Siamiejny stan"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1728
 msgid "Interests"
 msgstr "Zacikaŭlenaści"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1729
 msgid "Pets"
 msgstr "Chatnija žyvioły"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1730
 msgid "Hometown"
 msgstr "Rodnaje miesta"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1731
 msgid "Places Lived"
 msgstr "Miescy, dzie žyŭ"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1732
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1733
 msgid "Humor"
 msgstr "Humar"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1734
 msgid "Music"
 msgstr "Muzyka"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1735 ../libpurple/protocols/msn/msn.c:1916
+#: ../libpurple/protocols/msn/msn.c:1922
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Ulubionaja cytata"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1752
 msgid "Contact Info"
 msgstr "Kantaktnaja infarmacyja"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1753
 msgid "Personal"
 msgstr "Pryvatnaje"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "Significant Other"
 msgstr "Inšaje značnaje"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1757
 msgid "Home Phone"
 msgstr "Chatni telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1758
 msgid "Home Phone 2"
 msgstr "Chatni telefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Home Address"
 msgstr "Chatni adras"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1760
 msgid "Personal Mobile"
 msgstr "Persanalny mabilnik"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Home Fax"
 msgstr "Chatni faks"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1762
 msgid "Personal E-Mail"
 msgstr "Persanalny E-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1763
 msgid "Personal IM"
 msgstr "Persanalny kont chutkich paviedamleńniaŭ"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1765
 msgid "Anniversary"
 msgstr "Jubilej"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1781
 msgid "Work"
 msgstr "Praca"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Pasada"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Company"
 msgstr "Kampanija"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Addzieł"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1786
 msgid "Profession"
 msgstr "Prafesija"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1787
 msgid "Work Phone"
 msgstr "PracoÅ­ny telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1788
 msgid "Work Phone 2"
 msgstr "PracoÅ­ny telefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Address"
 msgstr "PracoÅ­ny adras"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1790
 msgid "Work Mobile"
 msgstr "PracoÅ­ny mabilnik"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Work Pager"
 msgstr "PracoÅ­ny pager"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work Fax"
 msgstr "PracoÅ­ny faks"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Work E-Mail"
 msgstr "PracoÅ­ny E-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1794
 msgid "Work IM"
 msgstr "Pracoŭny kont chutkich paviedamleńniaŭ"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1795
 msgid "Start Date"
 msgstr "Pačatkovaja data"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1865 ../libpurple/protocols/msn/msn.c:1871
+#: ../libpurple/protocols/msn/msn.c:1878 ../libpurple/protocols/msn/msn.c:1885
 msgid "Favorite Things"
 msgstr "Ulubionyja rečy"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1930
 msgid "Last Updated"
 msgstr "Apošniaja aktualizacyja"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1941
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Chatniaja staronka"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1965
 msgid "The user has not created a public profile."
 msgstr "Karystalnik nie stvaryŭ publičnaha profilu."
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:1966
 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 "
@@ -7014,7 +6998,7 @@ msgstr ""
 "MSN paviedamiła, što nia moža znajści profil karystalnika. Heta značyć, što "
 "albo karystalnik nie isnuje, albo što jon nie stvaryŭ publičnaha profilu."
 
-#: ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/msn/msn.c:1970
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7022,7 +7006,7 @@ msgstr ""
 "Niemahčyma znajści choć jakoj infarmacyi ŭ profili karystalnika. Mabyć, "
 "karystalnik nie isnuje."
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:1978
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Spasyłka na profil"
@@ -7037,101 +7021,103 @@ msgstr "Spasyłka na profil"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "Plugin pratakołu MSN"
+#: ../libpurple/protocols/msn/msn.c:2265 ../libpurple/protocols/msn/msn.c:2267
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Plugin pratakołu Windows Live Messenger'a"
 
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2302
 msgid "Use HTTP Method"
 msgstr "Užyj metad HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:2307
 msgid "HTTP Method Server"
-msgstr "Testavy server IPC"
+msgstr "Server metadu HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2312
 msgid "Show custom smileys"
-msgstr "Pakazvaj asablivyja ŭśmieški"
+msgstr "Pakazvaj asablivyja smajły"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2320
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: šturchani karystalnika, kab pryciahnuć jahonuju ŭvahu"
 
-#: ../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 "Niemahčyma spałučycca"
+#: ../libpurple/protocols/msn/nexus.c:137
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Aŭtaryzacyja Windows Live ID:Niemahčyma spałučycca"
 
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:272
+msgid "Windows Live ID authentication Failed"
+msgstr "Pamyłka aŭtaryzacyi Windows Live ID"
+
+#: ../libpurple/protocols/msn/notification.c:185
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s nie źjaŭlajecca pravilnaj hrupaj."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:371
 msgid "Unknown error."
 msgstr "Nieviadomaja pamyłka."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s na %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s Å¡turchaje ciabie!"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Nieviadomaja pamyłka (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Niemahčyma dadać karystalnika"
+
+#: ../libpurple/protocols/msn/notification.c:897
+#, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Niemahčyma dadać karystalnika na %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Niemahčyma zablakavać karystalnika na %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Niemahčyma dać dazvoł karystalniku na %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Niemahčyma dadać %s, bo tvoj śpis siabroŭ zapoŭnieny."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s nie źjaŭlajecca pravilnym kontam pašpartu."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
 msgid "Service Temporarily Unavailable."
 msgstr "Servis časova niedastupny."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1263
 msgid "Unable to rename group"
 msgstr "Niemahčyma źmianić nazvu dla hrupy"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1318
 msgid "Unable to delete group"
 msgstr "Niemahčyma vydalić hrupu"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1934
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7166,6 +7152,29 @@ msgstr[2] ""
 "\n"
 "Paśla zakančeńnia techničnaha absłuhoŭvańnia, ty zmožaš uvajści."
 
+#: ../libpurple/protocols/msn/oim.c:142
+msgid "Unable to connect to OIM server"
+msgstr "Niemahčyma spałučycca z serveram OIM"
+
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Niemahčyma spałučycca"
+
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "Pamyłka zapisu"
@@ -7183,57 +7192,57 @@ msgstr ""
 "Pamyłka spałučeńnia ad serveru %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:338
 msgid "Our protocol is not supported by the server."
 msgstr "Naš pratakoł nie padtrymvajecca serveram."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:342
 msgid "Error parsing HTTP."
 msgstr "Pamyłka razboru HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/msn/session.c:346
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Ty ŭvajšoŭ ź inšaha miesca."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:351
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Servery MSN časova niedastupnyja. Kali łaska, pačakaj i paŭtary znoŭ."
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:356
 msgid "The MSN servers are going down temporarily."
 msgstr "Servery MSN časova vyklučajucca."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:361
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Niemahčyma aŭtaryzavacca: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:366
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Tvoj śpis siabroŭ MSN časova niedastupny. Kali łaska, pačakaj i paŭtary znoŭ."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msn/session.c:389
 msgid "Handshaking"
 msgstr "Paciskańnie ruk"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:390
 msgid "Starting authentication"
 msgstr "Pačatak aŭtaryzacyi"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:391
 msgid "Getting cookie"
 msgstr "Atrymańnie ciestka"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:393
 msgid "Sending cookie"
 msgstr "Dasyłańnie ciestka"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:394
 msgid "Retrieving buddy list"
 msgstr "Atrymańnie śpisu siabroŭ"
 
@@ -7249,29 +7258,29 @@ msgstr "Pajšoŭ pajeści"
 msgid "Out To Lunch"
 msgstr "Pajšoŭ pajeści"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 "Paviedamleńnie moža być nie dasłanym, bo adbyłosia pieravyšeńnie terminu "
 "čakańnia:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:406
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Niemahčyma dasłać paviedamleńnie, nielha, pakul niabačny:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:410
 msgid "Message could not be sent because the user is offline:"
 msgstr "Niemahčyma dasłać paviedamleńnie, bo karystalnik adłučany:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:414
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Niemahčyma dasłać paviedamleńnie, bo adbyłasia pamyłka spałučeńnia:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Niemahčyma dasłać paviedamleńnie, bo my dasyłajem nadta chutka:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:422
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -7280,49 +7289,53 @@ msgstr ""
 "serveram. Chutčej za ŭsio, heta prablema servera, pasprabuj znoŭ praź "
 "niekalki chvilin:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:429
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Niemahčyma dasłać paviedamleńnie, bo adbyłasia pamyłka z pultom:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:437
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Paviedamleńnie moža być nie dasłanym, bo adbyłasia nieviadomaja pamyłka:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s dadaje ciabie ŭ svoj śpis siabroŭ."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s vydalaje ciabie sa svajho śpisu siabroŭ."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Niemahčyma dadać \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "Akreślenaja bačnaja nazva niapravilnaja."
 
 #: ../libpurple/protocols/myspace/myspace.c:111
-#, fuzzy
 msgid "Missing Cipher"
-msgstr "Å yfar"
+msgstr "Adsutny Å¡yfar"
 
 #: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "Niemahčyma znajści šyfar RC4"
 
 #: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
+"Aktualizuj libpurple da versii z padtrymkaj RC4 (>=2.0.1). Plugin MySpaceIM "
+"nia budzie zahružany."
 
 #: ../libpurple/protocols/myspace/myspace.c:286
 #, c-format
@@ -7330,219 +7343,206 @@ msgstr ""
 "Sorry, passwords over %d characters in length (yours is %d) are not "
 "supported by MySpace."
 msgstr ""
+"Prabač, ale paroli daŭžynioj, bolšaj za %d znakaŭ (tvoj z %d) nie padtrymvajucca "
+"pasłuhaj MySpace."
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1810
 msgid "MySpaceIM Error"
-msgstr ""
+msgstr "Pamyłka MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:349
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:350
 msgid "Reading challenge"
-msgstr "Pamyłka čytańnia"
+msgstr "Vyklik na čytańni"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:356
 msgid "Unexpected challenge length from server"
-msgstr "Niapravilny vyklik ad servera"
+msgstr "Niečakanaja daŭžynia vykliku ad servera"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Logging in"
-msgstr "ÄŒasopisy"
+msgstr "Uvachod"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1293
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgstr "Spałučeńnie z serveram zhublenaje (źviestki nie atrymanyja na "
+"praciahu %d sekundaÅ­)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1335
 msgid "New mail messages"
-msgstr "Dašli paviedamleńnie"
+msgstr "Novyja paštovyja paviedamleńni"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1336
 msgid "New blog comments"
-msgstr ""
+msgstr "Novyja kamentary Å­ blogu"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1337
 msgid "New profile comments"
-msgstr ""
+msgstr "Novyja kamentary Å­ profili"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1338
 msgid "New friend requests!"
-msgstr ""
+msgstr "Novyja zapyty siabroÅ­stva!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New picture comments"
-msgstr ""
+msgstr "Novyja kamentary Å­ malunkach"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "MySpace"
-msgstr ""
+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:1543
+#: ../libpurple/protocols/myspace/myspace.c:1550
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Spałučany"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1561
+#: ../libpurple/protocols/myspace/myspace.c:1563
 msgid "No username set"
-msgstr "Biaz nazvy"
+msgstr "Nazva karystalnika nie akreślenaja"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
+#: ../libpurple/protocols/myspace/myspace.c:1562
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
 msgstr ""
+"Pierajdzi na http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username, abiary nazvu karystalnika i pasprabuj uvajści znoŭ."
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/myspace.c:1789
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "Praces viarnuŭ kod pamyłki %d"
+msgstr "Pamyłka pratakołu, kod %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1981
+#: ../libpurple/protocols/myspace/myspace.c:2015
 msgid "Failed to add buddy"
-msgstr "Pamyłka dałučeńnia siabra da hutarki"
+msgstr "Pamyłka dadańnia siabra"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1981
 msgid "'addbuddy' command failed."
-msgstr "Zahruzi śpis siabroŭ z fajłu..."
+msgstr "Pamyłka zahadu \"addbuddy\"."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2015
+#: ../libpurple/protocols/myspace/myspace.c:2252
 msgid "persist command failed"
-msgstr "Pamyłka pultu"
+msgstr "Pamyłka zahad persist"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2120
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "Takoha karystalnika nie isnuje: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2121
 msgid "User lookup"
-msgstr "Pakoi karystalnikaÅ­"
+msgstr "Pošuk karystalnikaŭ"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2233
+#: ../libpurple/protocols/myspace/myspace.c:2252
+#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "Failed to remove buddy"
-msgstr "Pamyłka dałučeńnia siabra da hutarki"
+msgstr "Pamyłka vydaleńnia siabra"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2233
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "Pamyłka zahadu \"delbuddy\""
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "blocklist command failed"
-msgstr "Pamyłka pultu"
+msgstr "Pamyłka zahadu blocklist"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2320
 msgid "Invalid input condition"
-msgstr "Zakančeńnie spałučeńnia"
+msgstr "Niapravilnaja Å­mova Å­vodu"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2338
+#: ../libpurple/protocols/myspace/myspace.c:2369
 msgid "Read buffer full"
-msgstr "ÄŒarha zapoÅ­nienaja"
+msgstr "Zapoŭnieny bufer dla čytańnia"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2407
 msgid "Unparseable message"
-msgstr "Niemahčyma razabrać paviedamleńnie"
+msgstr "Nieraźbiralnaje paviedamleńnie"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/myspace.c:2476
+#, c-format
 msgid "Couldn't connect to host: %s (%d)"
-msgstr "Niemahčyma spałučycca z hostam"
+msgstr "Niemahčyma spałučycca z hostam: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2647
 msgid "IM Friends"
-msgstr "_Pryvatnych voknach"
+msgstr "Siabry IM"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2747
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr ""
+"%d siabroÅ­ byli dadadzienyja ci aktualizavanyja z servera (taksama i siabry, "
+"jakija ŭžo jość u śpisie na servery)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2748
 msgid "Add contacts from server"
-msgstr "Niapravilny adkaz ad servera."
+msgstr "Dadaj kantakty z servera"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2800
+#: ../libpurple/protocols/myspace/myspace.c:2865
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "Dadaj siabroÅ­ z MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2801
 msgid "Importing friends failed"
-msgstr "pamyłka zahruzki plugina"
+msgstr "Pamyłka impartavańnia siabroŭ"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2857
 msgid "Find people..."
-msgstr "Å ukaj siabroj..."
+msgstr "Å ukaj ludziej..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2860
 msgid "Change IM name..."
-msgstr "Źmiani parol..."
+msgstr "Źmiani nazvu IM..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3162
 msgid "myim URL handler"
-msgstr ""
+msgstr "Słužnik dla myim URL"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3163
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "Niemahčyma znajści prydatnaha kontu MySpaceIM, kab adčynić hety adras (URL) myim."
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3164
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "Uklučy patrebny kont MySpaceIM i pasprabuj znoŭ."
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3287
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Pakazvaj pakazvanuju nazvu ŭ tekście statusu"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3290
 msgid "Show headline in status text"
-msgstr ""
+msgstr "Pakazvaj zahałoŭki ŭ tekście statusu"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:3295
 msgid "Send emoticons"
-msgstr "Opcyi huku"
+msgstr "Dasyłaj smajły"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3300
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "Pamiery ekranu (punktaÅ­ na cal"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3303
 msgid "Base font size (points)"
-msgstr ""
+msgstr "Pamier bazavaha Å¡ryftu (u punktach)"
 
 #: ../libpurple/protocols/myspace/user.c:95
 #: ../libpurple/protocols/zephyr/zephyr.c:786
@@ -7550,177 +7550,194 @@ msgstr "Karystalnik"
 msgid "User"
 msgstr "Karystalnik"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2979
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/myspace/user.c:124
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
-msgstr "_Ručka:"
+msgstr "Zahałovak"
 
-#: ../libpurple/protocols/myspace/user.c:129
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
-msgstr "Huki"
+msgstr "Pieśnia"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
-msgstr ""
+msgstr "Usich siabroÅ­"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
-msgstr "Začyni razmovu"
+msgstr "Versija klijenta"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
-msgstr ""
+msgstr "Učapi"
 
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s uvachodzić."
+msgstr "%s čaplajecca da ciabie!"
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "Čaplańnie da %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
-msgstr ""
+msgstr "Laśni"
 
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:54
+#, c-format
 msgid "%s has whacked you!"
-msgstr "Karystalnik zablakavaÅ­ ciabie"
+msgstr "%s lasnuÅ­ pa tabie!"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "Laskańnie pa %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:59
 msgid "Torch"
-msgstr "Tema"
+msgstr "Padpali"
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
 msgid "%s has torched you!"
-msgstr "Karystalnik zablakavaÅ­ ciabie"
+msgstr "%s padpaliÅ­ ciabie!"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "Padpał %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
-msgstr ""
+msgstr "Całuj"
 
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s uvachodzić."
+msgstr "%s całuje ciabie!"
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "Całavańnie %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
-msgstr ""
+msgstr "Abdymi"
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s uvachodzić."
+msgstr "%s abniaÅ­ ciabie!"
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "Abdymańnie %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
 msgid "Slap"
-msgstr "Sonny"
+msgstr "Daj poÅ­chi"
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s uvachodzić."
+msgstr "%s daÅ­ tabie poÅ­chi!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "PoÅ­cha dla %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
 msgid "Goose"
-msgstr "Stračany"
+msgstr "Å lopni"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s adychodzić."
+msgstr "%s Å¡lopaje ciabie!"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "Goosing %s..."
-msgstr "Pošuk %s"
+msgstr "Šlopańnie pa %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
 msgid "High-five"
-msgstr ""
+msgstr "Daj piać"
 
-#: ../libpurple/protocols/myspace/zap.c:51
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:76
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s uvachodzić."
+msgstr "%s kryčyć tabie: \"Daj piać!\""
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "Dajem piać dla %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:81
 msgid "Punk"
-msgstr ""
+msgstr "Åšciabajsia"
 
-#: ../libpurple/protocols/myspace/zap.c:52
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:81
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s uvachodzić."
+msgstr "%s ściabiecca ź ciabie!"
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "Ściabańnie z %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:90
 msgid "Raspberry"
-msgstr ""
+msgstr "Kpi"
 
-#: ../libpurple/protocols/myspace/zap.c:53
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:90
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s uvachodzić."
+msgstr "%s kpić ź ciabie!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "Kpim z %s..."
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -7855,43 +7872,43 @@ msgstr "Pamyłka ŭvachodu (%s)."
 msgid "Login failed (%s)."
 msgstr "Pamyłka ŭvachodu (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Niemahčyma dasłać paviedamleńnie. Niemahčyma atrymać padrabiaznaści ab "
 "karystalniku (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:398
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Niemahčyma dadać %s u tvoj śpis siabroŭ (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Niemahčyma dasłać paviedamleńnie (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Niemahčyma zaprasić karystalnika (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Niemahčyma dasłać paviedamleńnie da %s. Niemahčyma stvaryć kanferencyju (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:539
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 "Niemahčyma dasłać paviedamleńnie. Niemahčyma stvaryć kanferencyju (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7900,7 +7917,7 @@ msgstr ""
 "Niemahčyma pieranieści karystalnika %s u tečku %s u śpisie na servery. "
 "Pamyłka ŭ časie stvareńnia tečki (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:634
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7909,61 +7926,61 @@ msgstr ""
 "Niemahčyma dadać %s u tvoj śpis siabroŭ. Pamyłka stvareńnia tečki ŭ śpisie "
 "na na servery (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:707
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Niemahčyma atrymać padrabiaznaści ab karystalniku %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Niemahčyma dadać karystalnika ŭ tajemny śpis (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Niemahčyma dadać %s u śpis admaŭleńnia (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Niemahčyma dadać %s u śpis dazvołu (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Niemahčyma vydalić %s z tajemnaha śpisu (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Niemahčyma źmianić nałady tajemnaści na servery (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Niemahčyma stvaryć kanferencyju (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
 msgstr "Pamyłka kamunikacyi z serveram. Začynieńnie spałučeńnia."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "Telefonny numar"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Persanalnaja nazva"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Poštaspyn"
 
-#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/novell/novell.c:1504
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ID karystalnika"
@@ -7974,41 +7991,41 @@ msgstr "ID karystalnika"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr "PoÅ­naje imia"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Kanferencyja GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1670
 msgid "Unable to make SSL connection to server."
 msgstr "Niemahčyma zrabić spałučeńnie SSL z serveram."
 
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "AÅ­taryzacyja..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
 msgstr "Niemahčyma spałučycca z serveram."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
 msgstr "Čakańnie adkazu..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s zaprošany/zaprošanaja da hetaje razmovy."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "Zaprašeńnie da razmovy"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8019,16 +8036,15 @@ msgstr ""
 "\n"
 "Dasłanaje: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "Chočaš dałučycca da razmovy?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2017
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Ty vyjšaŭ, bo ŭvajšoŭ ź inšaha kamputara."
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2074
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8040,7 +8056,7 @@ msgstr ""
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2172
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8048,12 +8064,11 @@ msgstr ""
 "Niemahčyma spałučycca z serveram. Akreśl adras servera, ź jakim chočaš "
 "spałučycca."
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2200
 msgid "Error. SSL support is not installed."
 msgstr "Pamyłka. Padtrymka SSL nie zainstalavanaja."
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2509
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Hetaja kanferencyja začynienaja. Bolš nielha dasyłać paviedamleńni."
 
@@ -8067,33 +8082,33 @@ msgstr "Hetaja kanferencyja začynienaja
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plugin pratakołu Novell GroupWise Messenger'a"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "Adras servera"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "Port servera"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
+#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "Server začyniŭ spałučeńnie."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8102,10 +8117,10 @@ msgstr ""
 "Spałučeńnie z serversm stračanaje:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
+#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
+#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr "Pry spałučeńni z serveram atrymanyja niapravilnyja źviestki."
 
@@ -8140,37 +8155,46 @@ msgstr "Plugin pratakołu ICQ"
 msgstr "Plugin pratakołu ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kadavańnie"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "Addaleny karystalnik začyniŭ spałučeńnie."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "Addaleny karystalnik admoviÅ­ tvajmu zapytu."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Spałučeńnie z addalenym karystalnikam stračanaje:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 "Pry spałučeńni z addalenym karystalnikam atrymanyja niapravilnyja źviestki."
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Niemahčyma spałučycca z addalenym karystalnikam."
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Prostaje spałučeńnie"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s pasprabavaŭ dasłać tabie fajł %s, ale my dazvalajem tolki fajły da %s praz "
+"Prostuju razmovu. Pasprabuj pieradaču fajłaŭ.\n"
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -8294,8 +8318,8 @@ msgstr ""
 "roznyja kadavańni, albo %s karystajecca prablemnym klijentam.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2391
+#: ../pidgin/gtkutils.c:2421
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Ikona siabra"
@@ -8317,7 +8341,7 @@ msgstr "Hutarka"
 msgstr "Hutarka"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6064
 msgid "Get File"
 msgstr "Atrymaj fajł"
 
@@ -8390,49 +8414,43 @@ msgstr "Kamera"
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5834
 msgid "Free For Chat"
 msgstr "Volny dla hutarki"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5869
 msgid "Not Available"
 msgstr "Niedastupny"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5855
 msgid "Occupied"
 msgstr "Zaniaty"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
 msgid "Web Aware"
 msgstr "Ahladaju sieciva"
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "Niabačny"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
 msgid "Online"
 msgstr "Spałučany"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
 msgid "IP Address"
 msgstr "IP Adras"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Warning Level"
 msgstr "Uzrovień aściarohi"
 
@@ -8471,7 +8489,7 @@ msgstr "Zakančeńnie spałučeńnia"
 msgid "Finalizing connection"
 msgstr "Zakančeńnie spałučeńnia"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
+#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8483,29 +8501,29 @@ msgstr ""
 "pačynacca ź litary i ŭtrymlivać tolki litary, ličby j prabieły, albo tolki "
 "ličby."
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Niapravilnaja bačnaja nazva."
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1048
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Niapravilny parol."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid "Your account is currently suspended."
 msgstr "Tvoj kont dziejna Å­sypleny."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1364
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Servis AOL Instant Messenger'a časova niedastupny."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1380
 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."
@@ -8513,44 +8531,44 @@ msgstr ""
 "Ty spałučaŭsia j adłučaŭsia nadta časta. Pačakaj dziesiać chvilin i paŭtary "
 "znoŭ. Kali ty praciahnieš svaje sproby, tabie pryjdziecca pačakać jašče bolš."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#: ../libpurple/protocols/oscar/oscar.c:1374
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versija tvajho klijenta nadta staraja. Kali Å‚aska, abnavisia na %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1413
 msgid "Could Not Connect"
 msgstr "Niemahčyma spałučycca"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "Atrymanaja aÅ­taryzacyja"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1439
 msgid "The SecurID key entered is invalid."
 msgstr "Akreśleny kluč SecurID niapravilny."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Enter SecurID"
 msgstr "Akreśl SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1453
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Uviadzi 6-ličbavy numar ź ličbavaha displaju."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:2247
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:6220 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8559,54 +8577,54 @@ msgstr ""
 "Ty možaš być chutka adłučany. Ty možaš užyć TOC, pakul heta nia budzie "
 "vypraŭlena. Pravier aktualnaść na %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:1540
 msgid "Unable to get a valid AIM login hash."
 msgstr "Niemahčyma atrymać pravilny hash uvachodu dla AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Ty možaš być chutka adłučany. Pravier aktualnaść na %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1628
 msgid "Unable to get a valid login hash."
 msgstr "Niemahčyma atrymać pravilny hash uvachodu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1658
 msgid "Password sent"
 msgstr "Parol dasłany"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1714
 msgid "Unable to initialize connection"
 msgstr "Niemahčyma inicyjavać spałučeńnie"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2205
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Kali łaska, aŭtaryzuj mianie, kab ja moh dadać ciabie ŭ svoj śpis siabroŭ."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2245
 msgid "Authorization Request Message:"
 msgstr "Paviedamleńnie ab zapycie aŭtaryzacyi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2246
 msgid "Please authorize me!"
 msgstr "Kali Å‚aska, aÅ­taryzuj mianie!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2287
+#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:5315
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Pryčyna nie akreślenaja."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2294
 msgid "Authorization Denied Message:"
 msgstr "Paviedamleńnie ab admovie aŭtaryzacyi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2422
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8617,17 +8635,17 @@ msgstr ""
 "nastupnaj pryčyny:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2423
 msgid "ICQ authorization denied."
 msgstr "AÅ­taryzacyja ICQ admoÅ­lenaja."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2430
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Karystalnik %u dazvoliŭ tabie dadać siabie da tvajho śpisu siabroŭ."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2438
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8640,7 +8658,7 @@ msgstr ""
 "Ad: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2446
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8653,7 +8671,7 @@ msgstr ""
 "Ad: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2454
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8666,24 +8684,24 @@ msgstr ""
 "Paviedamleńnie:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Karystalnik ICQ %u dasłaŭ tabie siabra: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2481
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Chočaš dadać hetaha siabra da svajho śpisu siabroŭ?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2486 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Dadaj"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2487
 msgid "_Decline"
 msgstr "_AdmoÅ­"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, 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."
@@ -8691,7 +8709,7 @@ msgstr[2] "Ty zhubiŭ %hu paviedamleńni
 msgstr[1] "Ty zhubiŭ %hu paviedamleńni ad %s, bo jany byłi niapravilnymi."
 msgstr[2] "Ty zhubiŭ %hu paviedamleńniaŭ ad %s, bo jany byłi niapravilnymi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2620
 #, 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."
@@ -8699,7 +8717,7 @@ msgstr[2] "Ty zhubiŭ %hu paviedamleńni
 msgstr[1] "Ty zhubiŭ %hu paviedamleńni ad %s, bo jany byłi nadta daŭhimi."
 msgstr[2] "Ty zhubiŭ %hu paviedamleńniaŭ ad %s, bo jany byłi nadta daŭhimi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2629
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8712,7 +8730,7 @@ msgstr[2] ""
 msgstr[2] ""
 "Ty zhubiŭ %hu paviedamleńniaŭ ad %s, bo limit častaty byŭ pieravyšany."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2638
 #, 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."
@@ -8720,7 +8738,7 @@ msgstr[2] "Ty zhubiŭ %hu paviedamleńni
 msgstr[1] "Ty zhubiŭ %hu paviedamleńni ad %s, bo jon/jana byŭ nadta zły."
 msgstr[2] "Ty zhubiŭ %hu paviedamleńniaŭ ad %s, bo jon/jana byŭ nadta zły."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2647
 #, 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."
@@ -8728,7 +8746,7 @@ msgstr[2] "Ty zhubiŭ %hu paviedamleńni
 msgstr[1] "Ty zhubiŭ %hu paviedamleńni ad %s, bo ty nadta zły."
 msgstr[2] "Ty zhubiŭ %hu paviedamleńniaŭ ad %s, bo ty nadta zły."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2656
 #, 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."
@@ -8737,47 +8755,47 @@ msgstr[2] "Ty zhubiŭ %hu paviedamleńni
 msgstr[2] "Ty zhubiŭ %hu paviedamleńniaŭ ad %s ź nieviadomaj pryčyny."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2811
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Niemahčyma dasłać paviedamleńnie: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2880
 msgid "Unknown reason."
 msgstr "Nieviadomaja pryčyna."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
+#: ../libpurple/protocols/oscar/oscar.c:2814
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Niemahčyma dasłać paviedamleńnie da %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2880
 #, c-format
 msgid "User information not available: %s"
 msgstr "Źviestki ab karystalniku niedastupnyja: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Online Since"
 msgstr "Spałučany ad"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2916
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Udzielničaje ad"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2951
 msgid "Available Message"
 msgstr "Dastupnaje paviedamleńnie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3059
 msgid "Your AIM connection may be lost."
 msgstr "Tvajo spałučeńnie AIM moža zhubicca."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3247
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8785,7 +8803,7 @@ msgstr ""
 "[Niemahčyma pakazać paviedamleńnie ad hetaha karystalnika, bo jano ŭtrymvaje "
 "niapravilnyja znaki.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8793,53 +8811,53 @@ msgstr ""
 "Apošniaje tvajo dziejańnie nia moža być vykananym, bo ty pieravysiŭ limit "
 "častaty. Kali łaska, pačakaj 10 sekundaŭ i paŭtary znoŭ."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3494
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ty adłučyŭsia ad pakoju hutarki %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3744
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mabilny telefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Personal Web Page"
 msgstr "Pryvatnaja sieciÅ­naja staronka"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3798
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Dadatkovyja źviestki"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3819
 msgid "Zip Code"
 msgstr "Zip kod"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Division"
 msgstr "Padzieł"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Position"
 msgstr "Pasada"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3833
 msgid "Web Page"
 msgstr "SieciÅ­naja staronka"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "Work Information"
 msgstr "Pracoŭnyja źviestki"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Pop-Up Message"
 msgstr "Vypłyŭnoje paviedamleńnie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3932
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -8847,30 +8865,29 @@ msgstr[2] "Nastupnyja bačnyja nazvy źv
 msgstr[1] "Nastupnyja bačnyja nazvy źviazanyja z %s"
 msgstr[2] "Nastupnyja bačnyja nazvy źviazanyja z %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3937
 msgid "Screen name"
 msgstr "Bačnaja nazva"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3963
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ničoha nia znojdziena dla adrasu e-maila %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3984
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Ty pavinny atrymać list z prośbaj paćvierdzić %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3986
 msgid "Account Confirmation Requested"
 msgstr "Zapytanaje paćvierdžańnie kontu"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4017
 msgid "Error Changing Account Info"
 msgstr "Pamyłka źmieny źviestak kontu"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8879,13 +8896,13 @@ msgstr ""
 "Pamyłka 0x%04x: Niemahčyma adfarmatavać bačnuju nazvu, bo zapytanaja bačnaja "
 "nazva adroźnivajecca ad aryhinalnaj."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Pamyłka 0x%04x: Niemahčyma adfarmatavać bačnuju nazvu, bo jana niapravilnaja."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8894,7 +8911,7 @@ msgstr ""
 "Pamyłka 0x%04x: Niemahčyma adfarmatavać bačnuju nazvu, bo zapytanaja bačnaja "
 "nazva zadaÅ­haja."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8903,7 +8920,7 @@ msgstr ""
 "Pamyłka 0x%04x: Niemahčyma źmianić adras e-mail, bo ŭžo adzin zapyt čakaje "
 "raźviazańnia dla hetaje bačnaj nazvy."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8912,7 +8929,7 @@ msgstr ""
 "Pamyłka 0x%04x: Niemahčyma źmianić adras e-mail, bo akreśleny adras maje "
 "nadta šmat bačnych nazvaŭ, źviazanych ź im."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8921,32 +8938,32 @@ msgstr ""
 "Pamyłka 0x%04x: Niemahčyma źmianić adras e-mail, bo akreśleny adras "
 "niapravilny."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Pamyłka 0x%04x: Nieviadomaja pamyłka."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4048
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Adras e-mail dla %s - %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4050
 msgid "Account Info"
 msgstr "Źviestki kontu"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4233
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Tvaja vyjava IM nie dasłanaja. Ty pavinny spałučycca naŭprost, kab dasyłać "
 "vyjavy IM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4504
 msgid "Unable to set AIM profile."
 msgstr "Niemahčyma akreślić profil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4505
 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 "
@@ -8956,7 +8973,7 @@ msgstr ""
 "ŭvachodu. Tvoj profil zastajecca nieakreślenym; pasprabuj akreślić jaho "
 "znoŭ, kali ty całkam spałučyśsia."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4519
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8974,11 +8991,11 @@ msgstr[2] ""
 "Maksymalny pamier profilu ŭ %d bajtaŭ pieravyšany. Jon byŭ abatnuty dziela "
 "ciabie."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4524
 msgid "Profile too long."
 msgstr "Profil nadta vialiki."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4569
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8996,11 +9013,11 @@ msgstr[2] ""
 "Maksymalny pamier paviedamleńnia ab adychodzie ŭ %d bajtaŭ pieravyšany. Jon "
 "byÅ­ abatnuty dziela ciabie."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4574
 msgid "Away message too long."
 msgstr "Paviedamleńnie ab adychodzie nadta vialikaje."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4647
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9011,17 +9028,17 @@ msgstr ""
 "pavinny być albo pravilnym adrasam e-mail, albo pačynacca ź litary i "
 "ŭtrymvać tolki litary, ličby j prabieły, albo ŭtrymvać tolki ličby."
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4649
+#: ../libpurple/protocols/oscar/oscar.c:5101
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Unable To Add"
 msgstr "Niemahčyma dadać"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4768
 msgid "Unable To Retrieve Buddy List"
 msgstr "Niemahčyma atrymać śpis siabroŭ"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4769
 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."
@@ -9030,15 +9047,15 @@ msgstr ""
 "siabroŭ nia zhubleny, i chutčej za ŭsio jon stanie dastupnym praź niekalki "
 "hadzin."
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4951
+#: ../libpurple/protocols/oscar/oscar.c:4953
+#: ../libpurple/protocols/oscar/oscar.c:5181
+#: ../libpurple/protocols/oscar/oscar.c:5182
+#: ../libpurple/protocols/oscar/oscar.c:5187
 msgid "Orphans"
 msgstr "Siroty"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5099
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9047,17 +9064,17 @@ msgstr ""
 "Niemahčyma dadać siabra %s, bo ŭ tvaim śpisie siabroŭ nadta šmat siabroŭ. "
 "Vydal adnaho ź ich i pasprabuj znoŭ."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5099
+#: ../libpurple/protocols/oscar/oscar.c:5114
 msgid "(no name)"
 msgstr "(biaz nazvy)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5113
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Niemahčyma dadać siabra %s ź nieviadomaje pryčyny."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9066,22 +9083,22 @@ msgstr ""
 "Karystalnik %s dazvoliŭ tabie dadać ciabie ŭ jahony śpis siabroŭ. Chočaš "
 "dadać jaho?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5238
 msgid "Authorization Given"
 msgstr "AÅ­taryzacyja dadzienaja"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Karystalnik %s dazvoliŭ tabie dadać jaho ŭ tvoj śpis siabroŭ."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Granted"
 msgstr "AÅ­taryzacyja atrymanaja"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5315
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9092,53 +9109,53 @@ msgstr ""
 "nastupnaj pryčyny:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5316
 msgid "Authorization Denied"
 msgstr "AÅ­taryzacyja admoÅ­lenaja"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5352
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Abmianiajsia:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5392
 msgid "Invalid chat name specified."
 msgstr "Akreślenaja niapravilnaja nazva hutarki."
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5461
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Tvaja vyjava IM nie dasłanaja. Ty nia možaš dasyłać vyjavy IM u hutarkach "
 "AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5623
+#: ../libpurple/protocols/oscar/oscar.c:5628
 msgid "Away Message"
 msgstr "Paviedamleńnie ab adychodzie"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5628
 msgid "<i>(retrieving)</i>"
-msgstr "<i>(atrmańnie)</i>"
+msgstr "<i>(atrymańnie)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5828
 msgid "iTunes Music Store Link"
 msgstr "Spasyłka na muzyčnuju kramu iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5936
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kamentar siabra na %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5937
 msgid "Buddy Comment:"
 msgstr "Kamentar siabra:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5984
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Ty abraŭ adčynić Prostaje spałučeńnie IM z %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5988
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9146,66 +9163,66 @@ msgstr ""
 "Heta rasceńvajecca jak niebiaśpiečnaja ryzyka, bo takim čynam ty vykryvaješ "
 "svoj IP adras. Chočaš praciahvać?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5994
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "_Spałučysia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6029
 msgid "Get AIM Info"
 msgstr "Atrymaj źviestki AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Edit Buddy Comment"
 msgstr "Redahuj kamentar siabra"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6043
 msgid "Get Status Msg"
 msgstr "Atrymaj paviedamleńnie statusu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6056
 msgid "Direct IM"
 msgstr "Prostaje IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6078
 msgid "Re-request Authorization"
 msgstr "Pierazapytaj aÅ­taryzacyi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6137
 msgid "Require authorization"
 msgstr "Vymahaj aÅ­taryzacyi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6140
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web (uklučyŭšy heta, ty pačnieš atrymvać SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6145
 msgid "ICQ Privacy Options"
 msgstr "Opcyi tajemnaści ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "The new formatting is invalid."
 msgstr "Novaje farmatavańnie niapravilnaje."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Farmatavańnie bačnaj nazvy moža źmianiać tolki ŭžyvańnie vialikich litar i "
 "prabiełaŭ."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6218
 msgid "Change Address To:"
 msgstr "Źmiani adras na:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ty nie čakaješ aŭtaryzacyi</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6267
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Ty čakaješ aŭtaryzacyi ad nastupnych siabroŭ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6268
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9213,73 +9230,73 @@ msgstr ""
 "Ty možaš pierazapytać aŭtaryzacyi ŭ hetych siabroŭ, praz pravy klik i "
 "abraÅ­Å¡y \"Pierazapytaj aÅ­taryzacyi\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6285
 msgid "Find Buddy by E-Mail"
 msgstr "Å ukaj siabra pa e-maile"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "Search for a buddy by e-mail address"
 msgstr "Šukaj siabra pa adrasie e-maiłu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6287
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Akreśl adras e-mail siabra, jakoha ty šukaješ."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6290
 msgid "_Search"
 msgstr "Å _ukaj"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6448
 msgid "Set User Info (URL)..."
 msgstr "Akreśl źviestki karystalnika (spasyłka)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Change Password (URL)"
 msgstr "Źmiani parol (spasyłka)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6463
 msgid "Configure IM Forwarding (URL)"
 msgstr "Skanfihuruj pieranakiravańnie IM (spasyłka)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Set Privacy Options..."
 msgstr "Akreśl opcyi tajemnaści..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Confirm Account"
 msgstr "Paćvierdź kont"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Pakažy dziejna zarehistravany adras e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6488
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Źmiani dziejna zarehistravany adras e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6495
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pakažy siabroŭ, što čakajuć aŭtaryzacyi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6501
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Å ukaj siabra pa adrasie e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6506
 msgid "Search for Buddy by Information"
 msgstr "Šukaj siabra pa źviestkach"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6574
 msgid "Use recent buddies group"
 msgstr "Užyj hrupu niadaŭnich siabroŭ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6577
 msgid "Show how long you have been idle"
 msgstr "Pakazvaj, jak doŭha ty biaździejničaješ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6732
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9287,27 +9304,26 @@ msgstr ""
 "Zaŭsiody ŭžyvaj proxy-server ICQ dziela pieradačy fajłaŭ\n"
 "(marudniej, ale nie vykryvaje tvajho IP adrasa)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Prapanova dla %s spałučycca z nami na %s:%hu dziela Prostaha IM."
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Sproba spałučycca z %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
 msgstr "Sproba spałučycca praz proxy-server."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s prapanuje naŭprost spałučycca z %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
+#: ../libpurple/protocols/oscar/peer.c:1039
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -9468,20 +9484,20 @@ msgstr "Inšaje"
 msgid "Other"
 msgstr "Inšaje"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Madyfikuj infarmacuju pra ciabie"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Aktualizuj infarmacyju pra ciabie"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Infarmacyja pra ciabie aktualizavanaja"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -9490,8 +9506,8 @@ msgstr ""
 "Akreśleńnie asablivych vyhladaŭ pakul nie padtrymvajecca. Kali łaska, abiary "
 "vyjavu z %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Niapravilny vyhlad QQ"
 
@@ -9764,7 +9780,7 @@ msgstr "Pamyłka zapytu znaku ŭvachodu"
 msgid "Error requesting login token"
 msgstr "Pamyłka zapytu znaku ŭvachodu"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:488
 msgid "Unable to login, check debug log"
 msgstr "Niemahčyma ŭvajści, pravier debugavy časopis"
 
@@ -9900,7 +9916,7 @@ msgid "%d canceled the transfer of %s"
 #: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
-msgstr "%d anulavaj pieradaču fajłu %s"
+msgstr "%d anulavaŭ pieradaču fajłu %s"
 
 #: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
@@ -10138,7 +10154,7 @@ msgstr "Dašli TESTAVUJU abviestku"
 msgid "Send TEST Announcement"
 msgstr "Dašli TESTAVUJU abviestku"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4434
 msgid "Topic:"
 msgstr "Tema:"
 
@@ -10163,7 +10179,7 @@ msgstr "Supolny server Sametime nie akre
 msgid "No Sametime Community Server Specified"
 msgstr "Supolny server Sametime nie akreśleny"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4368
 msgid "Connect"
 msgstr "Spałučy"
 
@@ -10217,10 +10233,6 @@ msgstr ""
 "Identyfikataru '%s' nie adpaviadaje nivodzin z karystalnikaÅ­ u tvajoj "
 "supolnaści Sametime. Hety zapis byŭ vydaleny z tvajho śpisu siabroŭ."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Niemahčyma dadać karystalnika"
-
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -10342,7 +10354,7 @@ msgstr ""
 "možaš dadać hetych karystalnikaŭ u svoj śpis siabroŭ albo dasłać im "
 "paviedamleńni z knopkami aperacyj."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:762
 msgid "Search Results"
 msgstr "Vyniki pošuku"
 
@@ -10919,7 +10931,6 @@ msgstr "<br><b>Tema kanału:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Režymy kanału:</b> "
 
@@ -10958,7 +10969,6 @@ msgstr "Åšpis publičnych klučoÅ­ kanaÅ
 
 #: ../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 "
@@ -11581,7 +11591,6 @@ msgstr "Spałučeńnia z serveram SILC"
 msgstr "Spałučeńnia z serveram SILC"
 
 #: ../libpurple/protocols/silc/silc.c:352
-#, c-format
 msgid "Could not load SILC key pair"
 msgstr "Niemahčyma zahruzić paru klučoŭ SILC"
 
@@ -11610,8 +11619,7 @@ msgstr "Tvoj ciapierašni nastroj"
 msgstr "Tvoj ciapierašni nastroj"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
 msgid "Normal"
 msgstr "Zvyčajny"
 
@@ -12010,7 +12018,7 @@ msgstr "Pratakoł bieśpiečnych žyvych
 msgstr "Pratakoł bieśpiečnych žyvych internet-kanferencyj (SILC)"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
 msgid "Network"
 msgstr "Sietka"
 
@@ -12206,53 +12214,43 @@ msgstr "Niama statystyki servera"
 msgstr "Niama statystyki servera"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Pamyłka: Nieadpaviednaść versij, aktualizuj svajho klijenta"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Pamyłka: Addaleny host nie daviaraje/nie padtrymvaje tvoj publičny kluč"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Pamyłka: Addaleny host nie padtrymvaje prapanavanuju hrupu KE"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Pamyłka: Addaleny host nie padtrymvaje prapanavany šyfar"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Pamyłka: Addaleny host nie padtrymvaje prapanavany PKCS"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Pamyłka: Addaleny host nie padtrymvaje prapanavanuju hash-funkcyju"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Pamyłka: Addaleny host nie padtrymvaje prapanavany HMAC"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Pamyłka: Niapravilny podpis"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Pamyłka: Niapravilnaje ciestka"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Pamyłka: Pamyłka aŭtaryzacyi"
 
@@ -12274,36 +12272,35 @@ msgstr "Niemahčyma zahruzić paru kluč
 msgstr "Niemahčyma zahruzić paru klučoŭ SILC: %s"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:417
 msgid "Could not write"
 msgstr "Niemahyma zapisać"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:439
+#: ../libpurple/protocols/simple/simple.c:1545
 msgid "Could not connect"
 msgstr "Niemahčyma spałučycca"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1062
 msgid "Unknown server response."
-msgstr "Nieviadomaja pryčyna."
+msgstr "Nieviadomy adkaz servera."
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1621
+#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1685
 msgid "Could not create listen socket"
 msgstr "Niemahčyma stvaryć sokiet dziela słuchańnia"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1602
 msgid "Couldn't resolve host"
 msgstr "Niemahčyma vyjaśnić host"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1693
 msgid "Could not resolve hostname"
 msgstr "Niemahčyma vyjaśnić nazvu hostu"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1710
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Bačnyja nazvy SIP nia mohuć utrymvać prabiełaŭ albo znakaŭ @"
 
@@ -12315,36 +12312,36 @@ msgstr "Bačnyja nazvy SIP nia mohuć ut
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin pratakołu SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1894
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin pratakołu SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:1922
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publikuj status (uvaha: usie zmohuć nazirać za taboju)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:1928
 msgid "Use UDP"
 msgstr "Užyj UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1930
 msgid "Use proxy"
 msgstr "Užyj proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1932
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:1934
 msgid "Auth User"
 msgstr "AÅ­taryzuj karystalnika"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1936
 msgid "Auth Domain"
 msgstr "AÅ­taryzuj damen"
 
@@ -12389,7 +12386,6 @@ msgstr "Aściaroha dla %s nie dazvolenaj
 msgstr "Aściaroha dla %s nie dazvolenaja."
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Paviedamleńnie nie pryniataje, ty pieravysiŭ limit chutkaści servera."
 
@@ -12414,47 +12410,38 @@ msgstr "Ty zhubiŭ paviedamleńnie ad %s
 msgstr "Ty zhubiŭ paviedamleńnie ad %s, bo jano buło dasłanaje nadta chutka."
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "Pamyłka."
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "Nadta Å¡mat adpaviednikaÅ­."
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "Treba bolš udakładnieńniaŭ."
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Servis katalohu časova niedastupny."
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "Pošuk pa e-maile abmiežavany."
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "Klučavoje słova ihnaravanaje."
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "Niama klučavych słovaŭ."
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "Karystalnik nia maje źviestak z katalohu."
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "Kraina nie padtrymvajecca."
 
@@ -12464,22 +12451,18 @@ msgstr "Nieviadomaja pamyłka: %s."
 msgstr "Nieviadomaja pamyłka: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Niapravilnaja bačnaja nazva albo parol."
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Servis časova niedastupny."
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Tvoj uzrovień aściarohi nadta vysoki, kab uvachodzić."
 
 #: ../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."
@@ -12518,8 +12501,8 @@ msgstr "Parol paśpiachova źmienieny"
 msgid "Password Change Successful"
 msgstr "Parol paśpiachova źmienieny"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5925
+#: ../pidgin/gtkblist.c:6281
 msgid "_Group:"
 msgstr "_Hrupa:"
 
@@ -12580,25 +12563,25 @@ msgstr "Plugin pratakołu TOC"
 msgid "TOC Protocol Plugin"
 msgstr "Plugin pratakołu TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgstr "%s dasyłaje tabie zaprašeńnie ŭ videahutarku, jakaja jašče nie padtrymvajecca."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Tvajo paviedamleńnie Yahoo! nie dasłanaje."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Systemnaje paviedamleńnie Yahoo! dla %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Paviedamleńnie admovy aŭtaryzacyi:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12606,16 +12589,16 @@ msgstr ""
 msgstr ""
 "%s (zvarotna) zabaraniŭ tabie dadać siabie da śpisu z nastupnaj pryčyny: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s (zvarotna) zabaraniŭ tabie dadać siabie da śpisu."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Dadańnie siabra nie dazvolenaje"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12625,11 +12608,11 @@ msgstr ""
 "Server Yahoo paprasiŭ užyć niezrazumieła jaki metad aŭtaryzacyi. Mabyć, ty "
 "nia zmožaš paśpiachova ŭvajści ŭ Yahoo. Pravier aktualizacyi na %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Pamyłka aŭtaryzacyi Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12638,50 +12621,50 @@ msgstr ""
 "Ty pasprabavaŭ praihnaravać %s, ale jon jość u tvaim śpisie siabroŭ. "
 "Kliknuŭšy \"Tak\", ty vydališ i praihnaruješ hetaha siabra."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Ihnaravać siabra?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Tvoj kont zablakavany, kali Å‚aska, naviedaj sajt Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Numar %d nieviadomaj pamyłki. Naviedvańnie sajtu Yahoo! moža vypravić hetuju "
 "prablemu."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Niemahčyma dadać siabra %s u hrupu %s ŭ śpis z servera dla kontu %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "Niemahčyma dadać siabra ŭ śpis z servera"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hukavy %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "Atrymany niečakany adkaz HTTP ad servera."
 
-#: ../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/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Pamyłka spałučeńnia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12690,7 +12673,7 @@ msgstr ""
 "Spałučeńnie z %s zhublenaje:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12699,113 +12682,103 @@ msgstr ""
 "Niemahčyma spałučycca z %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Nia doma"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Nie la kamputara"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Nia Å­ ofisie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "Na vakacyjach"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "Hulaju"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Niama ŭ śpisie z servera"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "Źjaŭlajsia ŭ sietcy"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr "Źjaŭlajsia stała pa-za sietkaj"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "Prysutnaść"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "Źjaŭlajsia pa-za sietkaj"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr "Nie źjaŭlajsia stała pa-za sietkaj"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Dałučysia da hutarki"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Inicyjalizuj kanferencyju"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "Nałady prysutnaści"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr "Pačni durnotu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "Jaki ID aktyvizavać?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Join whom in chat?"
 msgstr "Da kaho dałučycca ŭ hutarcy?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Aktyvizuj ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Dałučysia da karystalnika ŭ hutarcy..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr "Adčyni Ŭvachodnyja"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;pakoj&gt;:  Uvajdzi Å­ pakoj hutarki Å­ sietcy Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4143
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Pakažy śpis pakojaŭ u sietcy Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4151
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Prapanuj karystalniku pačać sesiju Durnoty"
 
@@ -12819,56 +12792,56 @@ msgstr "doodle: Prapanuj karystalniku pa
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
 #: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4362
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin pratakołu Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonija"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Pager server"
 msgstr "Server pagera"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Japan Pager server"
 msgstr "Japonski server pagera"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Pager port"
 msgstr "Port pagera"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "File transfer server"
 msgstr "Server pieradačy fajłaŭ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan file transfer server"
 msgstr "Japonski server pieradačy fajłaŭ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "File transfer port"
 msgstr "Port pieradačy fajłaŭ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Chat room locale"
 msgstr "Lakalnaść pakoju hutarki"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ihnaruj zaprašeńni na kanferencyi i ŭ pakoi hutarak"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Chat room list URL"
 msgstr "Spasyłka na śpis pakojaŭ hutarak"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat server"
 msgstr "Server hutarak Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "Yahoo Chat port"
 msgstr "Port hutarak Yahoo"
 
@@ -13234,8 +13207,8 @@ msgstr "Vykryćcio"
 msgid "Exposure"
 msgstr "Vykryćcio"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13244,28 +13217,28 @@ msgstr ""
 "Niemahčyma stvaryć sokiet:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Niemahčyma razabrać adkaz ad HTTP proxy: %s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Pamyłka spałučeńnia %d z HTTP proxy"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Dostup niedazvoleny: HTTP proxy-server zabaraniaje tunelavać port %d."
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "Pamyłka vyjaśnieńnia %s."
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "Niemahčyma vyjaśnić nazvu hostu"
 
@@ -13306,14 +13279,14 @@ msgid "Requesting %s's attention..."
 #: ../libpurple/server.c:302
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "Zapyt uvahi Å­ %s..."
 
 #: ../libpurple/server.c:347
 #, c-format
 msgid "%s has requested your attention!"
-msgstr ""
+msgstr "%s prosić tvajoj uvahi!"
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13322,19 +13295,18 @@ msgstr ""
 "%s zaprašaje %s u pakoj dla hutarki %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s zaprašaje %s u pakoj dla hutarki %s\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Pryjmi zaprašeńnie na hutarku?"
 
 #: ../libpurple/sslconn.c:164
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "Pamyłka spałučeńnia"
+msgstr "Pamyłka spałučeńnia SSL"
 
 #: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
@@ -13342,18 +13314,18 @@ msgid "SSL peer presented an invalid cer
 
 #: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
-msgstr ""
+msgstr "Klijent SSL vydaÅ­ niapravilny sertyfikat"
 
 #: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "Nieviadomaja pamyłka"
+msgstr "Nieviadomaja pamyłka SSL"
 
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Zdymi akreśleńnie"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Nie turbuj mianie"
 
@@ -13370,47 +13342,62 @@ msgstr "%s źmianiaje status z %s na %s"
 msgid "%s changed status from %s to %s"
 msgstr "%s źmianiaje status z %s na %s"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:612
 #, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) źmianiaje status z %s na %s"
+
+#: ../libpurple/status.c:623
+#, c-format
 msgid "%s is now %s"
 msgstr "%s ciapier %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:625
 #, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) ciapier %s"
+
+#: ../libpurple/status.c:631
+#, c-format
 msgid "%s is no longer %s"
 msgstr "%s bolš nie %s"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:633
 #, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) bolš nie %s"
+
+#: ../libpurple/status.c:1244
+#, c-format
 msgid "%s became idle"
 msgstr "%s biaździejničaje"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1261
 #, c-format
 msgid "%s became unidle"
 msgstr "%s pierapyniaje biaździejańnie"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1324
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s biaździejničaje"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1326
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s pierapyniaje biaździejańnie"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:701
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2706
 #, c-format
 msgid "Error Reading %s"
 msgstr "Pamyłka čytańnia %s"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2707
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13419,15 +13406,15 @@ msgstr ""
 "Pry čytańni tvajho %s adbyłasia pamyłka. Jany nie byli zahružanyja, a stary "
 "fajł pieranazvany ŭ %s~."
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3207
 msgid "Calculating..."
 msgstr "Padlik..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3210
 msgid "Unknown."
 msgstr "Nieviadomy."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3236
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -13435,7 +13422,7 @@ msgstr[2] "%d sekundaÅ­"
 msgstr[1] "%d sekundy"
 msgstr[2] "%d sekundaÅ­"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3248
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -13443,7 +13430,7 @@ msgstr[2] "%d dzion"
 msgstr[1] "%d dni"
 msgstr[2] "%d dzion"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3256
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -13451,7 +13438,7 @@ msgstr[2] "%s, %d hadzin"
 msgstr[1] "%s, %d hadziny"
 msgstr[2] "%s, %d hadzin"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -13459,7 +13446,7 @@ msgstr[2] "%d hadzin"
 msgstr[1] "%d hadziny"
 msgstr[2] "%d hadzin"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -13467,7 +13454,7 @@ msgstr[2] "%s, %d chvilin"
 msgstr[1] "%s, %d chviliny"
 msgstr[2] "%s, %d chvilin"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -13475,17 +13462,17 @@ msgstr[2] "%d chvilin"
 msgstr[1] "%d chviliny"
 msgstr[2] "%d chvilin"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3536
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Niemahčyma adčynić %s: Nadta šmat pieranakiravańniaŭ"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3573 ../libpurple/util.c:3869
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Niemahčyma spałučycca z %s"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3696
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13494,17 +13481,17 @@ msgstr ""
 "Niemahčyma vydzialić dastatkova pamiaci, kab źmiaścić źviestki z %s. Mabyć, "
 "web-server čynić štości niadobraje."
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3731
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Pamyłka čytańnia z %s: %s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3762
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Pamyłka zapisu ŭ %s: %s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3787
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Niemahčyma spałučycca z %s: %s"
@@ -13521,11 +13508,11 @@ msgstr "Dasyłaj chutkija paviedamleńni
 msgid "Send instant messages over multiple protocols"
 msgstr "Dasyłaj chutkija paviedamleńni praz raznastajnyja pratakoły"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Aryjentacyja"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Aryjentacyja treju."
 
@@ -13594,7 +13581,7 @@ msgstr "SOCKS 5"
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
 msgid "Use Environmental Settings"
 msgstr "Užyj nałady asiarodździa"
 
@@ -13616,15 +13603,15 @@ msgstr "Opcyi proxy"
 msgid "Proxy Options"
 msgstr "Opcyi proxy"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
 msgid "Proxy _type:"
 msgstr "_Typ proxy:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -13632,44 +13619,43 @@ msgstr "Nazva _karystalnika:"
 msgid "_Username:"
 msgstr "Nazva _karystalnika:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
 msgid "Pa_ssword:"
 msgstr "P_arol:"
 
 #: ../pidgin/gtkaccount.c:1195
-#, fuzzy
 msgid "Unable to save new account"
-msgstr "Niemahčyma stvaryć spałučeńnie"
+msgstr "Niemahčyma zapisać novy kont"
 
 #: ../pidgin/gtkaccount.c:1196
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "Kont z akreślenym kryteram užo isnuje."
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1474
 msgid "Add Account"
 msgstr "Dadaj kont"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1493
 msgid "_Basic"
 msgstr "_Prosty"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1500
 msgid "Create this new account on the server"
-msgstr ""
+msgstr "Stvary hety novy kont na servery"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1516
 msgid "_Advanced"
 msgstr "_Prasunuty"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1974 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Uklučany"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2002
 msgid "Protocol"
 msgstr "Pratakoł"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2202
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13692,251 +13678,276 @@ msgstr ""
 "Ty zmožaš viarnucca da hetaha vakna, kab dadać, adredahavać albo vydalić "
 "konty praz <b>Konty->Dadaj/Redahuj</b> u vaknie Åšpisu siabroÅ­"
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "Dałučysia da hutarki"
+#: ../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] "Ty maješ %d kantakt z nazvaj %s. Chočaš źlić jaho ŭ adno?"
+msgstr[1] "Ty maješ %d kantakty z nazvaj %s. Chočaš źlić ich u adno?"
+msgstr[2] "Ty maješ %d kantaktaŭ z nazvaj %s. Chočaš źlić ich u adno?"
 
-#: ../pidgin/gtkblist.c:788
+#: ../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 ""
+"Kali buduć złučanyja hetyja kantakty, jany buduć mieć adzin zapis u śpisie "
+"siabroŭ i vykarystoŭvać adno vakno razmovy. Ty možaš padzialić ich znoŭ, "
+"abraÅ­Å¡y \"Razharni\" z kantekstavaha menu kantaktaÅ­"
+
+#: ../pidgin/gtkblist.c:527
+msgid "_Merge"
+msgstr "_Złučy"
+
+#: ../pidgin/gtkblist.c:945
+msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 "Akreśl adpaviednyja źviestki ab hutarcy, u jakoj ty chočaš paŭdzielničać.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6242
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Kont:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Blakuj"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1245
 msgid "Un_block"
 msgstr "Raz_blakuj"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1288
+msgid "Move to"
+msgstr "Pieraniasi Å­"
+
+#: ../pidgin/gtkblist.c:1328
 msgid "Get _Info"
 msgstr "Atrymaj ź_viestki"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Razmova"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Dašli fajł"
+#: ../pidgin/gtkblist.c:1337
+msgid "_Send File..."
+msgstr "_Dašli fajł..."
 
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "Dadaj siabroŭskuju _začepku"
+#: ../pidgin/gtkblist.c:1344
+msgid "Add Buddy _Pounce..."
+msgstr "Dadaj siabroŭskuju _začepku..."
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
 msgid "View _Log"
 msgstr "Pakažy _časopis"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1359
+msgid "Hide when offline"
+msgstr "Chavaj, kali adłučany"
+
+#: ../pidgin/gtkblist.c:1359
+msgid "Show when offline"
+msgstr "Pakazvaj, kali adłučany"
+
+#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
 msgid "_Remove"
 msgstr "_Vydal"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "Dadaj _siabra"
+#: ../pidgin/gtkblist.c:1434
+msgid "Add _Buddy..."
+msgstr "Dadaj _siabra..."
 
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "Dadaj _hutarku"
+#: ../pidgin/gtkblist.c:1437
+msgid "Add C_hat..."
+msgstr "Dadaj _hutarku..."
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1440
 msgid "_Delete Group"
 msgstr "_Vydal hrupu"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1442
 msgid "_Rename"
 msgstr "_Źmiani nazvu"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Dałučysia"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1464
 msgid "Auto-Join"
 msgstr "Aŭtamatyčna dałučajsia"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1466
+msgid "Persistent"
+msgstr "Stały"
+
+#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
 msgid "_Collapse"
 msgstr "_Zharni"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1532
 msgid "_Expand"
 msgstr "_Razharni"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
+#: ../pidgin/gtkblist.c:4929 ../pidgin/gtkblist.c:4942
 msgid "/Tools/Mute Sounds"
 msgstr "/Pryładździe/Adklučy huki"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4919
+#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Ty dziejna nie karystajeśsia kontam, dla jakoha možna dadać takoha siabra."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3067
 msgid "/_Buddies"
 msgstr "/_Siabry"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Siabry/Novaje chutkaje _paviedamleńnie..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Siabry/Dałučysia da _hutarki..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Get User _Info..."
 msgstr "/Siabry/Atrymaj ź_viestki ab karystalniku..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/View User _Log..."
-msgstr "/Siabry/Pakažy _časovis dla karystalnika..."
+msgstr "/Siabry/Pakažy _časopis dla karystalnika..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/_Siabry"
+#: ../pidgin/gtkblist.c:3073
+msgid "/Buddies/Sh_ow"
+msgstr "/Siabry/Pa_kažy"
 
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
+#: ../pidgin/gtkblist.c:3074
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "Siabry/Pakažy _adłučanych siabroŭ"
+msgstr "/Siabry/Pakažy/_Adłučanyja siabry"
 
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
+#: ../pidgin/gtkblist.c:3075
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Siabry/Pakažy _pustyja hrupy"
+msgstr "/Siabry/Pakažy/_Pustyja hrupy"
 
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
+#: ../pidgin/gtkblist.c:3076
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Siabry/Pakažy _padrabiaznaści ab siabry"
+msgstr "/Siabry/Pakažy/_Padrabiaznaści ab siabry"
 
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
+#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Siabry/Pakažy _terminy biaździejnaści"
+msgstr "/Siabry/Pakažy/_Terminy biaździejnaści"
 
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
+#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Siabry/Pakažy _pustyja hrupy"
+msgstr "/Siabry/Pakažy/_Ikony pratakołaŭ"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Siabry/_Sartuj siabroÅ­"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3081
 msgid "/Buddies/_Add Buddy..."
 msgstr "/SIabry/_Dadaj siabra..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Add C_hat..."
 msgstr "/Siabry/Dadaj _hutarku..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Add _Group..."
 msgstr "/Siabry/Dadaj _hrupu..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/_Quit"
 msgstr "/Siabry/_Vyjdzi"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3088
 msgid "/_Accounts"
 msgstr "/_Konty"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Konty/Dadaj\\/Redahuj"
+#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6943
+msgid "/Accounts/Manage"
+msgstr "/Konty/Kiruj"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Tools"
 msgstr "/_Pryładździe"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3093
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Pryładździe/Siabroŭskija _začepki"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
+#: ../pidgin/gtkblist.c:3094
 msgid "/Tools/_Certificates"
-msgstr "/Pryładździe/_Nałady"
+msgstr "/Pryładździe/_Sertyfikaty"
 
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3095
 msgid "/Tools/Plu_gins"
 msgstr "/Pryładździe/Plu_giny"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3096
 msgid "/Tools/Pr_eferences"
 msgstr "/Pryładździe/_Nałady"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3097
 msgid "/Tools/Pr_ivacy"
 msgstr "/Pryładździe/_Tajemnaść"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3099
 msgid "/Tools/_File Transfers"
 msgstr "/Pryładździe/_Pieradačy fajłaŭ"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3100
 msgid "/Tools/R_oom List"
 msgstr "/Pryładździe/_Śpis pakojaŭ"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3101
 msgid "/Tools/System _Log"
 msgstr "/Pryładździe/Systemny _časopis"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/Mute _Sounds"
 msgstr "/Pryładździe/Adklučy _huki"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3105
 msgid "/_Help"
 msgstr "/_Dapamoha"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3106
 msgid "/Help/Online _Help"
 msgstr "/Dapamoha/_Dapamoha Å­ sietcy"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3107
 msgid "/Help/_Debug Window"
 msgstr "/Dapamoha/_Debugavaje vakno"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
 msgid "/Help/_About"
 msgstr "/Dapamoha/_Ab prahramie"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3140
 #, c-format
 msgid ""
 "\n"
@@ -13945,78 +13956,79 @@ msgstr ""
 "\n"
 "<b>Kont:</b> %s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3218
 msgid "Buddy Alias"
 msgstr "Alias siabra"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3247
 msgid "Logged In"
 msgstr "Uvajšoŭ/Uvajšła"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3293
 msgid "Last Seen"
 msgstr "Apošni raz bačany"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3314
 msgid "Spooky"
 msgstr "Pryvid"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3316
 msgid "Awesome"
 msgstr "Žachlivy"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3318
 msgid "Rockin'"
 msgstr "Kruty!"
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3657
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Biaździejničaje %dd %dh %02dch"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3659
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Biaździejničaje %dh %02dch"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3661
 #, c-format
 msgid "Idle %dm"
 msgstr "Biaździejničaje %dch"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3814
 msgid "/Buddies/New Instant Message..."
 msgstr "/Siabry/Novaje chutkaje paviedamleńnie..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3815 ../pidgin/gtkblist.c:3848
 msgid "/Buddies/Join a Chat..."
 msgstr "/Siabry/Dałučysia da hutarki..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3816
 msgid "/Buddies/Get User Info..."
 msgstr "/Siabry/Atrymaj źviestki ab karystalniku..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3817
 msgid "/Buddies/Add Buddy..."
 msgstr "/Siabry/Dadaj siabra..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3818 ../pidgin/gtkblist.c:3851
 msgid "/Buddies/Add Chat..."
 msgstr "/Siabry/Dadaj hutarku..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3819
 msgid "/Buddies/Add Group..."
 msgstr "/Siabry/Dadaj hrupu..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3854
 msgid "/Tools/Privacy"
 msgstr "/Pryładździe/Tajemnaść"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3857
 msgid "/Tools/Room List"
 msgstr "/Pryładździe/Śpis pakojaŭ"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3989 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -14024,93 +14036,84 @@ msgstr[2] "%d niečytanych paviedamleńn
 msgstr[1] "%d niečytanyja paviedamleńni ad %s\n"
 msgstr[2] "%d niečytanych paviedamleńniaŭ ad %s\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4149
 msgid "Manually"
 msgstr "Samastojna"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Pa alfabecie"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4152
 msgid "By status"
 msgstr "Pa statusie"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4153
 msgid "By log size"
 msgstr "Pa pamiery časopisaŭ"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4358 ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "%s adłučajecca"
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4393
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s adłučajecca: %s</span>"
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4545
 msgid "<b>Username:</b>"
 msgstr "<b>Nazva karystalnika:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4552
 msgid "<b>Password:</b>"
 msgstr "<b>Parol:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4563
 msgid "_Login"
 msgstr "_Uvajdzi"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4646
 msgid "/Accounts"
 msgstr "/Konty"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4660
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Zaprašajem u %s!</span>\n"
 "\n"
 "Ty nia maješ uklučanych kontaŭ. Uklučy svaje konty razmovaŭ u vaknie "
-"<b>Konty</b> praz menu <b>Konty->Dadaj/Redahuj</b>. Kali ŭklučyš konty, ty "
+"<b>Konty</b> praz menu <b>Konty->Kiruj</b>. Kali ŭklučyš konty, ty "
 "zmožaš uvajści, akreślić svoj status, razmaŭlać ź siabrami."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
+#: ../pidgin/gtkblist.c:4923
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Siabry/Pakažy adłučanych siabroŭ"
+msgstr "/Siabry/Pakažy/Adłučanyja siabry"
 
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
+#: ../pidgin/gtkblist.c:4926
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Siabry/Pakažy pustyja hrupy"
+msgstr "/Siabry/Pakažy/Pustyja hrupy"
 
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
+#: ../pidgin/gtkblist.c:4932
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Siabry/Pakažy padrabiaznaści ab siabry"
+msgstr "/Siabry/Pakažy/Padrabiaznaści ab siabry"
 
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
+#: ../pidgin/gtkblist.c:4935
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Siabry/Pakažy terminy biaździejnaści"
+msgstr "/Siabry/Pakažy/Terminy biaździejnaści"
 
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
+#: ../pidgin/gtkblist.c:4938
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Siabry/Pakažy pustyja hrupy"
+msgstr "/Siabry/Pakažy/Ikony pratakołaŭ"
 
-#: ../pidgin/gtkblist.c:5507
+#: ../pidgin/gtkblist.c:5850
 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. "
@@ -14120,20 +14123,25 @@ msgstr ""
 "Dadatkova ty možaš akreślić alias, albo mianušku, dla siabra. Alias budzie "
 "pakazany na miescy bačnaj nazvy, dzie tolki mahčyma.\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5873
+msgid "A_ccount:"
+msgstr "_Kont:"
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:5885
 msgid "_Screen name:"
 msgstr "_Bačnaja nazva:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:5907 ../pidgin/gtkblist.c:6263
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6175
 msgid "This protocol does not support chat rooms."
 msgstr "Hety pratakoł nie padtrymvaje pakojaŭ dla hutarki."
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6191
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14141,7 +14149,7 @@ msgstr ""
 "Ty dziejna nie karystajeśsia nivodnym z pratakołaŭ, jakija padtrymvajuć "
 "mahčymaść viadzieńnia hutarki."
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6232
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14149,49 +14157,56 @@ msgstr ""
 "Akreśl alias i adpaviednyja źviestki ab hutarcy, jakuju ty chočaš dadać u "
 "svoj śpis siabroŭ.\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6291
+msgid "Autojoin when account becomes online."
+msgstr "Aŭtamatyčna dałučajsia, kali kont uvachodzić u sietku."
+
+#: ../pidgin/gtkblist.c:6292
+msgid "Hide chat when the window is closed."
+msgstr "Chavaj hutarku, kali vakno začynienaje."
+
+#: ../pidgin/gtkblist.c:6318
 msgid "Please enter the name of the group to be added."
 msgstr "Akreśl nazvu hrupy, jakuju treba dadać."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6963
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Konty/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:6987
 msgid "_Edit Account"
 msgstr "_Redahuj kont"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7000 ../pidgin/gtkconv.c:3143
 msgid "No actions available"
 msgstr "Dziejańni niedastupnyja"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7008
 msgid "_Disable"
 msgstr "_Adklučy"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7020
 msgid "Enable Account"
 msgstr "Uklučy kont"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7026
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Konty/Uklučy kont"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7075
 msgid "/Tools"
 msgstr "/Pryładździe"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7145
 msgid "/Buddies/Sort Buddies"
 msgstr "/Siabry/Sartuj siabroÅ­"
 
 #. Widget creation function
 #: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
 msgid "SSL Servers"
-msgstr "Server"
+msgstr "Servery SSL"
 
-#: ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkconn.c:181
 #, c-format
 msgid ""
 "%s\n"
@@ -14204,27 +14219,27 @@ msgstr ""
 "%s nia budzie paŭtarać sproby spałučycca z kontam, pakul ty nia vypraviš "
 "pamyłku j nia ŭklučyš kont znoŭ."
 
-#: ../pidgin/gtkconv.c:482
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "Nieviadomy zahad."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Hety siabra nie z taho ž pratakołu, što j hetaja hutarka."
 
-#: ../pidgin/gtkconv.c:774
+#: ../pidgin/gtkconv.c:816
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Ty dziejna nie karystajeśsia kontam, z dapamohaj jakoha možna zaprasić "
 "hetaha siabra."
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "Zaprasi siabra Å­ pakoj dla hutarak"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14232,188 +14247,183 @@ msgstr ""
 "Akreśl nazvu karystalnika, jakoha ty chočaš zaprasić, razam ź "
 "nieabaviazkovym tekstam zaprašeńnia."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "_Siabra:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Paviedamleńnie:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Niemahčyma adčynić fajł."
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Razmova z %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "Zapišy razmovu"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Å ukaj"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Å to Å¡ukaj:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "Zdymi ihnaravańnie"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1679
 msgid "Ignore"
 msgstr "Ihnaruj"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "Atrymaj paviedamleńnie adychodu"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "Apošnija replika"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "Niemahčyma zapisać fajł z ikonaj na dysku."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "Zapišy ikonu"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "Animuj"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "Schavaj ikonu"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "Zapišy ikonu jak..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "Akreśl asablivuju ikonu..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "Vydal asablivuju ikonu"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
-msgstr ""
+msgstr "Pakažy ŭsio"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/_Razmova"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Razmova/Novaje chutkaje _paviedamleńnie..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/Razmova/_Å ukaj..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/Razmova/Pakažy _časopis"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/Razmova/_Zapišy jak..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Razmova/_Ačyść bufer prakrutki"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/Razmova/_Dašli fajł..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Razmova/Dadaj siabroŭskuju _začepku..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/Razmova/_Atrymaj źviestki"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/Razmova/_Zaprasi..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/Razmova/_Jašče"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/Razmova/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/Razmova/_Blakuj..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/Razmova/_Razblakuj..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/Razmova/_Dadaj..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/Razmova/_Vydal..."
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Razmova/Ustaŭ _spasyłku..."
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Razmova/UstaÅ­ _vyjavu..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/Razmova/_Začyni"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/_Opcyi"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/Opcyi/Uklučy _viadzieńnie časopisaŭ"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcyi/Uklučy _huki"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcyi/Pakažy paneli pryładździa dziela farmatavańnia"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcyi/Pakažy _adbitki času"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/More"
 msgstr "/Razmova/Jašče"
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3187
 msgid "/Options"
 msgstr "/Opcyi"
 
@@ -14422,97 +14432,97 @@ msgstr "/Opcyi"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3222 ../pidgin/gtkconv.c:3254
 msgid "/Conversation"
 msgstr "/Razmova"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/View Log"
 msgstr "/Razmova/Pakažy časopis"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3268
 msgid "/Conversation/Send File..."
 msgstr "/Razmova/Dašli fajł..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Razmova/Dadaj siabroŭskuju začepku..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3278
 msgid "/Conversation/Get Info"
 msgstr "/Razmova/Atrymaj źviestki"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Invite..."
 msgstr "/Razmova/Zaprasi..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3288
 msgid "/Conversation/Alias..."
 msgstr "/Razmova/Alias..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3292
 msgid "/Conversation/Block..."
 msgstr "/Razmova/Blakuj..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3296
 msgid "/Conversation/Unblock..."
 msgstr "/Razmova/Razblakuj..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3300
 msgid "/Conversation/Add..."
 msgstr "/Razmova/Dadaj..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Remove..."
 msgstr "/Razmova/Vydal..."
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3310
 msgid "/Conversation/Insert Link..."
 msgstr "/Razmova/Ustaŭ spasyłku..."
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3314
 msgid "/Conversation/Insert Image..."
 msgstr "/Razmova/UstaÅ­ vyjavu..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3320
 msgid "/Options/Enable Logging"
 msgstr "/Opcyi/Uklučy viadzieńnie časopisaŭ"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Sounds"
 msgstr "/Opcyi/Uklučy huki"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3336
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcyi/Pakažy paneli pryładździa dziela farmatavańnia"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Timestamps"
 msgstr "/Opcyi/Pakažy adbitki času"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3416 ../pidgin/gtkconv.c:3458
 msgid "User is typing..."
 msgstr "Karystalnik piša..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3461
 msgid "User has typed something and stopped"
 msgstr "Karystalnik napisaŭ niešta j spyniŭsia"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "_Dašli"
+#: ../pidgin/gtkconv.c:3645 ../pidgin/gtkconv.c:8181
+msgid "S_end To"
+msgstr "D_ašli da"
 
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4357
 msgid "_Send"
 msgstr "_Dašli"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4470
 msgid "0 people in room"
 msgstr "0 čałaviek u pakoi"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5844 ../pidgin/gtkconv.c:5965
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -14520,76 +14530,76 @@ msgstr[2] "%d čałaviek ŭ pakoj"
 msgstr[1] "%d čałavieki ŭ pakoj"
 msgstr[2] "%d čałaviek ŭ pakoj"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6572 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Piša"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6576
 msgid "Stopped Typing"
 msgstr "Spynijsia pisać"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6579
 msgid "Nick Said"
 msgstr "Pramoviŭ mianušku"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6582 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Niepračytanyja paviedamleńni"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6588
 msgid "New Event"
 msgstr "Novaja padzieja"
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7700
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Ačyščaje ŭsie bufery prakrutki razmovaŭ."
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7863
 msgid "Confirm close"
 msgstr "Paćvierdź začynieńnie"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7895
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Ty maješ niepračytanyja paviedamleńni. Ty sapraŭdy chočaš začynić vakno?"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8514
 msgid "Close other tabs"
 msgstr "Začyni inšyja kartki"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8520
 msgid "Close all tabs"
 msgstr "Začyni ŭsie kartki"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8528
 msgid "Detach this tab"
 msgstr "Adłučy hetuju kartku"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8534
 msgid "Close this tab"
 msgstr "Začyni hetuju kartku"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9039
 msgid "Close conversation"
 msgstr "Začyni razmovu"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9641
 msgid "Last created window"
 msgstr "Apošniaje stvoranaje vakno"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9643
 msgid "Separate IM and Chat windows"
 msgstr "Asobnyja vokny dziela pryvatnych razmoÅ­ i hutarak"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9645 ../pidgin/gtkprefs.c:1417
 msgid "New window"
 msgstr "Novaje vakno"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9647
 msgid "By group"
 msgstr "Pa hrupach"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9649
 msgid "By account"
 msgstr "Pa kontach"
 
@@ -14683,7 +14693,7 @@ msgid "Senior Contributor/QA"
 
 #: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "Važny ŭdzielnik/Tester"
 
 #: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
@@ -14720,7 +14730,7 @@ msgid "Belarusian Latin"
 
 #: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "Biełaruskaja łacinka"
 
 #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 #: ../pidgin/gtkdialogs.c:227
@@ -14878,9 +14888,8 @@ msgstr "Kurdzkaja"
 msgstr "Kurdzkaja"
 
 #: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "LeÅ­"
+msgstr "Laoskaja"
 
 #: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
 #: ../pidgin/gtkdialogs.c:253
@@ -15007,7 +15016,7 @@ msgstr "Ab %s"
 msgstr "Ab %s"
 
 #: ../pidgin/gtkdialogs.c:400
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
@@ -15019,18 +15028,16 @@ msgstr ""
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
-"%s - heta hrafičny modulny klijent kamunikacyj, zasnavany na libpurple, jaki "
-"moža spałučacca ź sietkami AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/"
-"SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu i QQ. "
-"Prahrama napisanaja z dapamohaj GTK+.<BR><BR>Ty možaš źmianiać i "
-"raspaŭsiudžvać prahramu zhodna z umovami GPL (versii 2 ci paźniejšaj). "
+"%s - heta hrafičny modulny klijent paviedamleńniaŭ, zasnavany na libpurple, "
+"jaki moža spałučacca ź sietkami AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/"
+"SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, "
+"Gadu-Gadu i QQ. Prahrama napisanaja z dapamohaj GTK+.<BR><BR>Ty možaš źmianiać i raspaŭsiudžvać prahramu zhodna z umovami GPL (versii 2 ci paźniejšaj). "
 "Kopija GPL zachoŭvajecca ŭ fajle 'COPYING', jaki raspaŭsiudžvajecca razam z %"
-"s. Aŭtarskija pravy na %s naležać udzielnikam raspracoŭki.  Poŭny śpis "
-"udzielnikaÅ­ hladzi Å­ fajle 'COPYRIGHT'.  My nie dajem harantyj na hetuju "
+"s. Aŭtarskija pravy na %s naležać udzielnikam raspracoŭki. Poŭny śpis "
+"udzielnikaÅ­ hladzi Å­ fajle 'COPYRIGHT'. My nie dajem harantyj na hetuju "
 "prahramu.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:418
-#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
 
@@ -15066,22 +15073,32 @@ msgstr "Debugavyja źviestki"
 msgid "Debugging Information"
 msgstr "Debugavyja źviestki"
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:753 ../pidgin/gtkdialogs.c:892
+#: ../pidgin/gtkdialogs.c:973
+msgid "_Name"
+msgstr "_Nazva"
+
+#: ../pidgin/gtkdialogs.c:758 ../pidgin/gtkdialogs.c:897
+#: ../pidgin/gtkdialogs.c:978
+msgid "_Account"
+msgstr "_Kont"
+
+#: ../pidgin/gtkdialogs.c:905
 msgid "Get User Info"
 msgstr "Atrymaj źviestki ab karystalniku"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:907
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Akreśl bačnuju nazvu ci alias asoby, pra jakuju chočaš atrymać źviestki."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:997
 msgid "View User Log"
 msgstr "Pakažy časopis dla karystalnika"
 
-#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:999
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -15089,32 +15106,32 @@ msgstr ""
 "Akreśl bačnuju nazvu ci alias asoby, dla jakoj chočaš ahladzieć časopis "
 "razmovaÅ­."
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Contact"
 msgstr "Stvary alias dla kantaktu"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this contact."
 msgstr "Akreśl alias dla hetaha kantaktu."
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1042
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Akreśl alias dla %s."
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1044
 msgid "Alias Buddy"
 msgstr "Stvary alias dla siabra"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Alias Chat"
 msgstr "Stvary alias dla hutarki"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1066
 msgid "Enter an alias for this chat."
 msgstr "Akreśl alias dla hetaj hutarki."
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1105
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15132,30 +15149,30 @@ msgstr[2] ""
 "Ty vydalaješ kantakt z %s i %d inšymi siabrami sa svajho śpisu siabroŭ. "
 "Chočaš praciahvać?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1113
 msgid "Remove Contact"
 msgstr "Vydal kantakt"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1116
 msgid "_Remove Contact"
 msgstr "_Vydal kantakt"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1147
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "Ty źlivaješ hrupu z nazvaj %s i hrupu z nazvaj %s. Chočaš praciahvać?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1154
 msgid "Merge Groups"
 msgstr "Źli hrupy"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1157
 msgid "_Merge Groups"
 msgstr "_Źli hrupy"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1207
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15164,70 +15181,69 @@ msgstr ""
 "Ty vydalaješ hrupu %s i ŭsich jaje ŭdzielnikaŭ sa svajho śpisu siabroŭ. "
 "Chočaš praciahvać?"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1210
 msgid "Remove Group"
 msgstr "Vydal hrupu"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1213
 msgid "_Remove Group"
 msgstr "_Vydal hrupu"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1246
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Ty vydalaješ %s sa svajho śpisu siabroŭ. Chočaš praciahvać?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1249
 msgid "Remove Buddy"
 msgstr "Vydal siabra"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1252
 msgid "_Remove Buddy"
 msgstr "_Vydal siabra"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1273
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Ty vydalaješ hutarku %s sa svajho śpisu siabroŭ. Chočaš praciahvać?"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1276
 msgid "Remove Chat"
 msgstr "Vydal hutarku"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1279
 msgid "_Remove Chat"
 msgstr "_Vydal hutarku"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr ""
 "Dziela ahladu astatnich niepračytanych paviedamleńniaŭ - pravy klik...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Źmiani status"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "Pakažy śpis siabroŭ"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "Novaje paviedamleńnie..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "Adklučy huki"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
-msgstr "Mirhaj pry novych paviedamleńniach"
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
+msgstr "Mirhaj pry novym paviedamleńni"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "Vyjdzi"
 
@@ -15318,43 +15334,43 @@ msgstr "P_raciahvaj"
 msgid "_Resume"
 msgstr "P_raciahvaj"
 
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:817
 msgid "Paste as Plain _Text"
 msgstr "Uklej jak zvyčajny _tekst"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:834 ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "_Reset formatting"
 msgstr "_Viarni farmatavańnie"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1374
 msgid "Hyperlink color"
 msgstr "Koler hiperspasyłak"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1375
 msgid "Color to draw hyperlinks."
 msgstr "Koler hiperspasyłak."
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1378
 msgid "Hyperlink prelight color"
 msgstr "Koler padśviatleńnia hiperspasyłak"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1379
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Koler padśviatleńnia hiperspasyłak, kali kursor naviedzieny na ich."
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1599
 msgid "_Copy E-Mail Address"
 msgstr "_Skapijuj adras e-mail"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1611
 msgid "_Open Link in Browser"
 msgstr "_Adčyni spasyłku ŭ hartačy"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1621
 msgid "_Copy Link Location"
 msgstr "_Skapijuj adras spasyłki"
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3371
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15364,7 +15380,7 @@ msgstr ""
 "\n"
 "Užyvajem zmoŭčany PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3374
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15374,7 +15390,7 @@ msgstr ""
 "\n"
 "Užyvajem zmoŭčany PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3403
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15385,7 +15401,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3406
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15396,12 +15412,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3484 ../pidgin/gtkimhtml.c:3496
 msgid "Save Image"
 msgstr "Zapišy vyjavu"
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3524
 msgid "_Save Image..."
 msgstr "_Zapišy vyjavu..."
 
@@ -15441,7 +15456,7 @@ msgstr "Ustaŭ spasyłku"
 msgid "Insert Link"
 msgstr "Ustaŭ spasyłku"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1263
 msgid "_Insert"
 msgstr "_UstaÅ­"
 
@@ -15456,25 +15471,24 @@ msgid "This theme has no available smile
 
 #: ../pidgin/gtkimhtmltoolbar.c:761
 msgid "This theme has no available smileys."
-msgstr "Hetaja tema nia maje smajłaŭ."
+msgstr "Hety matyŭ nia maje smajłaŭ."
 
 #. show everything
 #: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
 msgstr "Uśmichnisia!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1220
 msgid "_Font"
 msgstr "_Å ryft"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
 msgid "Group Items"
-msgstr "ID hrupy"
+msgstr "Hrupuj elementy"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
-msgstr ""
+msgstr "Razhrupuj elementy"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
@@ -15490,106 +15504,99 @@ msgid "Strikethrough"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
-msgstr ""
+msgstr "Pierakreśl"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Increase Font Size"
-msgstr ""
+msgstr "Pavialič pamier šryftu"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "Pamienš pamier šryftu"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1096
-#, fuzzy
 msgid "Font Face"
-msgstr "_Vyhlad Å¡ryftu"
+msgstr "Vyhlad Å¡ryftu"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
 msgid "Background Color"
-msgstr "_Fonavy koler"
+msgstr "Fonavy koler"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
 msgid "Foreground Color"
-msgstr "Koler _tekstu"
+msgstr "Koler tekstu"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
 msgid "Reset Formatting"
-msgstr "_Viarni farmatavańnie"
+msgstr "Viarni farmatavańnie"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1103
-#, fuzzy
 msgid "Insert IM Image"
-msgstr "UstaÅ­ vyjavu"
+msgstr "UstaÅ­ vyjavu IM"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
 msgid "Insert Smiley"
-msgstr "UstaÅ­ vyjavu"
+msgstr "Ustaŭ smajł"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<b>_Bold</b>"
 msgstr "<b>_TÅ‚usty</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<i>_Italic</i>"
 msgstr "<i>_KursiÅ­</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<u>_Underline</u>"
 msgstr "<u>_Padkreśleny</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr "<span size='larger'>_Bolšy</span>"
+msgstr "<span strikethrough='true'>Pierakreśleny</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Bolšy</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "_Normal"
 msgstr "_Zvyčajny"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Mienšy</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Font face"
 msgstr "_Vyhlad Å¡ryftu"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Foreground _color"
 msgstr "Koler _tekstu"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Bac_kground color"
 msgstr "_Fonavy koler"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Smajł"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1271
 msgid "_Image"
 msgstr "_Vyjava"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1277
 msgid "_Link"
 msgstr "_Spasyłka"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1283
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "_Haryzantalnaja linija"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1305
+msgid "_Smile!"
+msgstr "_Uśmichnisia!"
+
 #: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
@@ -15666,17 +15673,17 @@ msgstr "Ahulny pamier časopisaŭ:"
 msgid "Total log size:"
 msgstr "Ahulny pamier časopisaŭ:"
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:710
 #, c-format
 msgid "Conversations in %s"
 msgstr "Razmovy Å­ %s"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
 #, c-format
 msgid "Conversations with %s"
 msgstr "Razmovy z %s"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:810
 msgid "System Log"
 msgstr "Systemny časopis"
 
@@ -15686,7 +15693,7 @@ msgstr "%s %s. Pasprabuj `%s -h' dla pad
 msgstr "%s %s. Pasprabuj `%s -h' dla padrabiaźniejšych źviestak.\n"
 
 #: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15698,6 +15705,7 @@ msgid ""
 "  -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"
@@ -15706,17 +15714,18 @@ msgstr ""
 "  -c, --config=KATALOH zachoŭvaj kanfihuracyjnyja fajły ŭ KATALOHU\n"
 "  -d, --debug          pakazvaj debugavyja paviedamleńni na standartnym "
 "vyjści\n"
-"  -h, --help           pakažy dapamohu j vyjdzi\n"
+"  -h, --help           pakažy hetuju dapamohu j vyjdzi\n"
 "  -m, --multiple       nie praviaraj, kab byÅ­ adziny abjekt pracesu\n"
 "  -n, --nologin        nie ŭvachodź aŭtamatyčna\n"
 "  -l, --login[=NAZVA]  uvachodź aŭtamatyčna (dadatkovy arhument NAZVA\n"
 "                       akreślaje patrebnyja konty, padzielenyja koskami)\n"
+"  --display=DYSPŁEJ    akreśl dyspłej X\n"
 "  -v, --version        pakažy dziejnuju versiju j vyjdzi\n"
 
-#: ../pidgin/gtkmain.c:512
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:516
+#, c-format
 msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15734,7 +15743,7 @@ msgstr ""
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"%s viarnuła pamyłku sehmentacyi i pasprabavała zrabić core-fajł.\n"
+"%s %s viarnuła pamyłku sehmentacyi i pasprabavała zrabić core-fajł.\n"
 "Heta pamyłka ŭ prahramie, jakaja adbyłasia nie\n"
 "praź ciabie.\n"
 "\n"
@@ -15749,12 +15758,12 @@ msgstr ""
 "\n"
 "Kali tabie treba dadatkovyja raźjaśnieńni, źviarnisia da SeanEgn albo\n"
 "da LSchiere (u AIM). Kantaktnaja infarmacyja Seana j Luka dla inšych\n"
-"pratakołaŭ vykładzienaja tut:\n"
+"pratakołaŭ vykładzienaja na\n"
 "%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -15766,7 +15775,7 @@ msgstr "<span weight=\"bold\" size=\"lar
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Majem novuju poštu!</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:545
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -15774,30 +15783,30 @@ msgstr[2] "%s maje %d novych paviedamleÅ
 msgstr[1] "%s maje %d novyja paviedamleńni."
 msgstr[2] "%s maje %d novych paviedamleńniaŭ."
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>Majem %d novy list.</b>"
-msgstr[1] "<b>Majem %d novyja listy.</b>"
-msgstr[2] "<b>Majem %d novych listoÅ­.</b>"
+#: ../pidgin/gtknotify.c:569
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>%d novy list.</b>"
+msgstr[1] "<b>%d novyja listy.</b>"
+msgstr[2] "<b>%d novych listoÅ­.</b>"
 
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:997
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Zahad hartača \"%s\" niapravilny."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:999 ../pidgin/gtknotify.c:1011
+#: ../pidgin/gtknotify.c:1024 ../pidgin/gtknotify.c:1152
 msgid "Unable to open URL"
 msgstr "Niemahčyma adčynić spasyłku"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1009 ../pidgin/gtknotify.c:1022
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Pamyłka ŭruchamleńnia \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1145
+#: ../pidgin/gtknotify.c:1153
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Abrany 'Admysłovy' hartač, ale zahad nie akreśleny."
@@ -15849,95 +15858,95 @@ msgstr "Abiary fajł"
 msgstr "Abiary fajł"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "Čyja začepka"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "Nazva _siabra:"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "_Uvachodzić"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "_Vychodzić"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "_Adychodzić"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "Via_rtajecca"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "_Biaździejničaje"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "_Spyniaje biaździejnaść"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "_Pačynaje pisać"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Pr_ypyniajecca pisać"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "Spyn_iajecca pisać"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "_Dasyłaje paviedamleńnie"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "_Adčyni vakno razmovy"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "_Paviedam u vypłyŭnym aknie"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Dašli _paviedamleńnie"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "_Vykanaj zahad"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "_Hraj huk"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "_Ahladaj..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "Ah_ladaj..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "_Pieradahlad"
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:805
 msgid "P_ounce only when my status is not Available"
 msgstr "_ÄŒaplajsia, tolki kali ja niedastupny"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:810
 msgid "_Recurring"
 msgstr "_PaÅ­tarajecca"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1253
 msgid "Pounce Target"
 msgstr "Meta začepki"
 
@@ -15959,8 +15968,8 @@ msgstr ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
-"Abiary patrebny matyŭ ź nižejšaha śpisu. Novyja matyvy možna zainstalavać, "
-"pierakinuŭšy ich myššu ŭ śpis matyvaŭ."
+"Abiary patrebny matyŭ smajłaŭ ź nižejšaha śpisu. Novyja matyvy možna "
+"zainstalavać, pierakinuŭšy ich myššu ŭ śpis matyvaŭ."
 
 #: ../pidgin/gtkprefs.c:732
 msgid "Icon"
@@ -15986,7 +15995,7 @@ msgstr "_Chavaj novyja pryvatnyja razmov
 msgid "_Hide new IM conversations:"
 msgstr "_Chavaj novyja pryvatnyja razmovy:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
 msgid "When away"
 msgstr "Kali adyjšoŭ"
 
@@ -16039,55 +16048,59 @@ msgstr "Pakazvaj _farmatavańnie ŭvacho
 msgid "Show _formatting on incoming messages"
 msgstr "Pakazvaj _farmatavańnie ŭvachodnych paviedamleńniaŭ"
 
-#: ../pidgin/gtkprefs.c:998
+#: ../pidgin/gtkprefs.c:997
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Začyniaj razmovy adrazu z kartkaj"
+
+#: ../pidgin/gtkprefs.c:1000
 msgid "Show _detailed information"
 msgstr "Pakažy _padrabiaznyja źviestki"
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:1002
 msgid "Enable buddy ic_on animation"
 msgstr "Animuj _ikonu siabra"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1009
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Paviedamlaj siabram, što ty im pišaš"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1012
 msgid "Highlight _misspelled words"
 msgstr "_Padśviatlaj pamyłkovyja słovy"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1016
 msgid "Use smooth-scrolling"
 msgstr "Užyj miakkuju prakrutku"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1019
 msgid "F_lash window when IMs are received"
 msgstr "Mir_haj vaknom, kali atrymanyja novyja paviedamleńni"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1021
 msgid "Minimi_ze new conversation windows"
 msgstr "_Minimalizuj novyja vokny razmovaÅ­"
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:1025
 msgid "Font"
 msgstr "Å ryft"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1027
 msgid "Use document font from _theme"
 msgstr "Užyj šryft dakumentu z _matyvu"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use font from _theme"
 msgstr "Užyj šryft z _matyvu"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1031
 msgid "Conversation _font:"
 msgstr "Å ryft _razmovy:"
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1045
 msgid "Default Formatting"
 msgstr "Zmoŭčanaje farmatavańnie"
 
-#: ../pidgin/gtkprefs.c:1062
+#: ../pidgin/gtkprefs.c:1064
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16095,119 +16108,119 @@ msgstr ""
 "Tak buduć vyhladać tvaje paviedamleńni, kali ty ŭžyvaješ pratakoły, jakija "
 "padtrymvajuć farmatavańnie."
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1130
 msgid "ST_UN server:"
 msgstr "ST_UN server:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1142
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Prykład: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1146
 msgid "_Autodetect IP address"
 msgstr "_Aŭtamatyčna vyznačaj IP adras"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1155
 msgid "Public _IP:"
 msgstr "Publičny _IP:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "Ports"
 msgstr "Porty"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Samastojna akreśl intervał partoŭ, jakija treba słuchać"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1190
 msgid "_Start port:"
 msgstr "_Pačatkovy port:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1197
 msgid "_End port:"
 msgstr "_Kancavy port:"
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1205
 msgid "Proxy Server"
 msgstr "Proxy-server"
 
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1209
 msgid "No proxy"
 msgstr "Biaz proxy"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1265
 msgid "_User:"
 msgstr "_Karystalnik:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "GNOME Default"
 msgstr "Zmoŭčany dla GNOME"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1337
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1338
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1348
 msgid "Manual"
 msgstr "Samastojna"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1401
 msgid "Browser Selection"
 msgstr "Vybar hartača"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1405
 msgid "_Browser:"
 msgstr "_Hartač:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "_Open link in:"
 msgstr "_Adčyniaj spasyłki ŭ:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "Browser default"
 msgstr "Zmoŭčana dla hartača"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1416
 msgid "Existing window"
 msgstr "NajaÅ­naje vakno"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1418
 msgid "New tab"
 msgstr "Novaja kartka"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1432
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16216,69 +16229,63 @@ msgstr ""
 "_Samastojna:\n"
 "(%s dziela spasyłki)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log _format:"
 msgstr "_Farmat časopisaŭ:"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all _instant messages"
 msgstr "Zapisvaj usie _chutkija paviedamleńni"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "Zapisvaj usie _hutarki"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1481
 msgid "Log all _status changes to system log"
 msgstr "Zapisvaj usie _źmieny statusu ŭ systemny časopis"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1627
 msgid "Sound Selection"
 msgstr "Vybar huku"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1637
 msgid "Quietest"
 msgstr "Najcišejšaja"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1639
 msgid "Quieter"
 msgstr "Cišejšaja"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1641
 msgid "Quiet"
 msgstr "Cichaja"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1645
 msgid "Loud"
 msgstr "Hučnaja"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1647
 msgid "Louder"
 msgstr "Hučniejšaja"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1649
 msgid "Loudest"
 msgstr "Najhučniejšaja"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1715
 msgid "_Method:"
 msgstr "_Metad:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1717
 msgid "Console beep"
 msgstr "Syhnał kansoli"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1724
 msgid "No sounds"
 msgstr "Biaz hukaÅ­"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1732
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16287,81 +16294,81 @@ msgstr ""
 "_Zahad dziela huku:\n"
 "(%s dziela nazvy fajłu)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1759
 msgid "Sounds when conversation has _focus"
 msgstr "Huki, kali razmova s_fakusavanaja"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1761
 msgid "Enable sounds:"
 msgstr "Uklučy huki:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1772
 msgid "Volume:"
 msgstr "Hučnaść:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1852
 msgid "Play"
 msgstr "Hraj"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "_Report idle time:"
 msgstr "_Infarmuj ab terminie biaździejnaści:"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:1934
 msgid "Based on keyboard or mouse use"
 msgstr "Hledziačy na ŭžyćcio klavijatury j myšy"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:1943
 msgid "_Auto-reply:"
 msgstr "_Aŭtamatyčna adkazvaj:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1947
 msgid "When both away and idle"
 msgstr "Kali i adyjšoŭ, i biaździejny"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:1953
 msgid "Auto-away"
 msgstr "Aŭtamatyčny adychod"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1955
 msgid "Change status when _idle"
 msgstr "Źmianiaj status, kali _biaździejničaju"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:1959
 msgid "_Minutes before becoming idle:"
 msgstr "_Chvilin da biaździejnaści:"
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:1967
 msgid "Change _status to:"
 msgstr "Źmianiaj _status na:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:1988
 msgid "Status at Startup"
 msgstr "Pačatkovy status"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1990
 msgid "Use status from last _exit at startup"
 msgstr "Užyj apošni status da ŭruchamleńnia"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:1996
 msgid "Status to a_pply at startup:"
 msgstr "Užyj status pry _ŭruchamleńni:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2034
 msgid "Interface"
 msgstr "Interfejs"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "Matyvy smajłaŭ"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2043
 msgid "Browser"
 msgstr "Hartač"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2047
 msgid "Status / Idle"
 msgstr "Status/Biaździejnaść"
 
@@ -16529,37 +16536,37 @@ msgstr "ÄŒakaÅ„nie sietkavaha spaÅ‚učeÅ
 msgid "Waiting for network connection"
 msgstr "Čakańnie sietkavaha spałučeńnia"
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkutils.c:633
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1400 ../pidgin/gtkutils.c:1423
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Pry zahruzcy %s adbyłasia nastupnaja pamyłka: %s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1403 ../pidgin/gtkutils.c:1425
 msgid "Failed to load image"
 msgstr "Pamyłka zahruzki vyjavy"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Niemahčyma dasłać kataloh %s."
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s nia moža pieradavać katalohi. Ty musiš dasyłać fajły paasobku."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1534 ../pidgin/gtkutils.c:1546
+#: ../pidgin/gtkutils.c:1553
 msgid "You have dragged an image"
 msgstr "Ty pieraciahnuÅ­ vyjavu"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1535
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -16567,23 +16574,23 @@ msgstr ""
 "Ty možaš pieradać hetuju vyjavu jak fajł, ułučyć jaje ŭ svajo paviedamleńnie "
 "albo zrabić jaje siabroŭskaj ikonaj dziela karystalnika."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1541 ../pidgin/gtkutils.c:1561
 msgid "Set as buddy icon"
 msgstr "Zrabi siabroÅ­skaj ikonaj"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Send image file"
 msgstr "Dašli fajł vyjavy"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1562
 msgid "Insert in message"
 msgstr "Ustaŭ u paviedamleńnie"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1547
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Chočaš zrabić hetuju vyjavu siabroŭskaj ikonaj dla hetaha siabra?"
 
-#: ../pidgin/gtkutils.c:1551
+#: ../pidgin/gtkutils.c:1554
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16591,7 +16598,7 @@ msgstr ""
 "Ty možaš pieradać hetuju vyjavu jak fajł albo zrabić jaje siabroŭskaj ikonaj "
 "dla hetaha siabra."
 
-#: ../pidgin/gtkutils.c:1552
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16604,11 +16611,11 @@ msgstr ""
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1614
 msgid "Cannot send launcher"
 msgstr "Niemahčyma dasłać uruchamlalnik"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1614
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16616,7 +16623,7 @@ msgstr ""
 "Ty pieraciahnuŭ uruchamlalnik prahramy sa stała. Chutčej za ŭsio, ty chočaš "
 "dasłać toje, na što jon pakazvaje, a nia sam uruchamlalnik."
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2349
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16627,25 +16634,25 @@ msgstr ""
 "<b>Pamier fajłu:</b> %s\n"
 "<b>Pamier vyjavy:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2645
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Fajł '%s' nadta vialiki dla %s. Pasprabuj mienšuju vyjavu.\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2647
 msgid "Icon Error"
 msgstr "Pamyłka ikony"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2648
 msgid "Could not set icon"
 msgstr "Niemahčyma akreślić ikonu"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2748
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Pamyłka adčynieńnia fajłu '%s': %s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2797
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -16853,7 +16860,7 @@ msgstr "Atrymanyja paviedamleńni"
 msgid "Received Messages"
 msgstr "Atrymanyja paviedamleńni"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Abiary koler dla %s"
@@ -17125,7 +17132,7 @@ msgstr ""
 "\n"
 "<b>SiabroÅ­skaja natatka</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Historyja"
 
@@ -17382,45 +17389,36 @@ msgstr "Haryzantalny padzieł GtkTreeVie
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Haryzantalny padzieł GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Element razmovy"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Historyja razmovy"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Hartač časopisaŭ"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "Dyjaloh zapytu"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Dyjaloh infarmavańnia"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Abiary koler"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
 msgstr "Abiary Å¡ryft interfejsu"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Abiary Å¡ryft dla %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "Å ryft interfejsu GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "MatyÅ­ tekstavych skarotaÅ­ GTK+"
 
@@ -17444,36 +17442,36 @@ msgstr "MatyÅ­ tekstavych skarotaÅ­ GTK+
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Kolery interfejsu"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Pamiery widgetaÅ­"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Å ryfty"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Fajłavaje pryładździe Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Zapišy nałady ŭ %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Pieračytaj fajły gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:538
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Kiravańnie matyvam GTK+ dla Pidgin'a"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Daje mahčymaść źmianić šyroka ŭžyvanyja nałady gtkrc."
 
@@ -17612,7 +17610,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "SiabroÅ­ski ticker"
 
@@ -17620,7 +17618,7 @@ msgstr "SiabroÅ­ski ticker"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Haryzantalnaja versija śpisu siabroŭ z prakrutkaj."
 
@@ -17655,7 +17653,6 @@ msgstr "Opcyi farmatavaÅ„nia adbitkaÅ­ Ä
 msgstr "Opcyi farmatavańnia adbitkaŭ času"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Prymusova ŭžyvaj 24-hadzinny farmat času"
 
@@ -17871,128 +17868,3 @@ msgstr "Hety plugin užyvajecca dziela d
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP."
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Pakažy adłučanych siabroŭ"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Port"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Pa statusie"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Pa pamiery časopisaŭ"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Niemahčyma spałučycca z serveram."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Abiary adrasnuju knihu j natatak"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Dziejny znak"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Plugin pratakołu Novell GroupWise Messenger'a"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Pamyłka: Pamyłka aŭtaryzacyi"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s Å¡turchaje ciabie!"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Nieviadomaja pamyłka"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Niemahčyma spałučycca z serveram."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s źmianiaje status z %s na %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s ciapier %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s bolš nie %s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Paviedamleńnie:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Dašli fajł"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Dadaj siabroŭskuju začepku..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Nie dazvolena, kali adłučany"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Nie dazvolena, kali adłučany"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Dadaj siabra"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Dadaj hutarku"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persydzkaja"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Konty"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Kont:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Dašli da"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Uśmichnisia!"
-
-#~ msgid "You have just sent a Nudge!"
-#~ msgstr "Ty tolki što dasłaŭ Nudge!"
-
-#~ msgid "Would like to add him?"
-#~ msgstr "Chočaš dadać jaho/jaje?"
-
-#~ msgid "%s just sent you a Buzz!"
-#~ msgstr "%s dasyłaje tabie plotki!"
-
-#~ msgid "You have just sent a Buzz!"
-#~ msgstr "Ty dasyłaješ plotki!"
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/Opcyi/Pakažy siabroŭskuju _ikonu"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/Opcyi/Pakažy siabroŭskuju ikonu"
============================================================
--- po/ko.po	824ac8ab4a77f80e6df6922b3f8bd900f9a55b66
+++ po/ko.po	017f45ea1cadefa8083e581e7124916a2fa7b023
@@ -10,7 +10,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: gaim 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-16 00:55-0700\n"
+"POT-Creation-Date: 2005-10-27 16:12-0400\n"
 "PO-Revision-Date: 2007-10-01 16:15+0900\n"
 "Last-Translator: sushizang <sushizang at empal.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation at gnome.or.kr>\n"
@@ -21,557 +21,529 @@ msgstr ""
 "X-Poedit-Language: Korean\n"
 "X-Poedit-Country: KOREA, REPUBLIC OF\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
-#, fuzzy
-msgid "Finch"
-msgstr "프랑스어"
+#: ../gaim.desktop.in.h:1
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin 인터넷 메신저"
 
-#: ../finch/finch.c:206
-#, c-format
-msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s 상세 정보는 `%s -h' 를 입력해 주십시오.\n"
+#: ../gaim.desktop.in.h:2
+msgid "Internet Messenger"
+msgstr "인터넷 메신저"
 
-#: ../finch/finch.c:208
-#, c-format
-msgid ""
-"%s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s\n"
-"사용법: %s [옵션]...\n"
-"\n"
-"  -c, --config=DIR    DIR에 있는 설정 파일 사용\n"
-"  -d, --debug         디버그 정보를 표준 출력으로 표시\n"
-"  -h, --help          이 도움말을 표시하고 종료\n"
-"  -n, --nologin       자동으로 로그인 하지 않음\n"
-"  -v, --version       현재 버전을 표시하고 종료\n"
+#: ../gaim.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "복수의 프로토콜을 이용하여 인터넷 메시지를 보냅니다."
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
-#, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr ""
-
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:235 ../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/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
-#: ../libpurple/protocols/silc10/ops.c:1451
+#: ../console/gntaccount.c:119
+#: ../console/gntblist.c:272
+#: ../console/gntblist.c:390
+#: ../console/gntblist.c:403
+#: ../console/gntplugin.c:154
+#: ../console/gntplugin.c:199
+#: ../console/gntstatus.c:291
+#: ../console/gntstatus.c:299
+#: ../libgaim/protocols/jabber/buddy.c:1399
+#: ../libgaim/protocols/jabber/chat.c:679
+#: ../libgaim/protocols/jabber/chat.c:690
+#: ../libgaim/protocols/jabber/jabber.c:1210
+#: ../libgaim/protocols/qq/group_join.c:324
+#: ../libgaim/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "오류"
 
-#: ../finch/gntaccount.c:124
+#: ../console/gntaccount.c:119
 msgid "Account was not added"
 msgstr "계정이 추가되지 않았습니다."
 
-#: ../finch/gntaccount.c:125
+#: ../console/gntaccount.c:120
 msgid "Screenname of an account must be non-empty."
 msgstr "계정의 아이디를 입력해야 합니다."
 
-#: ../finch/gntaccount.c:437
+#: ../console/gntaccount.c:423
+#: ../gtk/gtkaccount.c:567
 msgid "New mail notifications"
 msgstr "새 메일 알림"
 
-#: ../finch/gntaccount.c:447
+#: ../console/gntaccount.c:433
+#: ../gtk/gtkaccount.c:496
 msgid "Remember password"
 msgstr "비밀번호 저장"
 
-#: ../finch/gntaccount.c:485
-msgid "There's no protocol plugins installed."
-msgstr ""
-
-#: ../finch/gntaccount.c:486
-msgid "(You probably forgot to 'make install'.)"
-msgstr ""
-
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1474 ../pidgin/gtkblist.c:4367
+#: ../console/gntaccount.c:474
+#: ../gtk/gtkaccount.c:1430
+#: ../gtk/gtkblist.c:3868
 msgid "Modify Account"
 msgstr "계정 편집"
 
-#: ../finch/gntaccount.c:496
+#: ../console/gntaccount.c:474
 msgid "New Account"
 msgstr "새 계정"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
+#: ../console/gntaccount.c:500
+#: ../gtk/gtkaccount.c:407
+#: ../gtk/gtkft.c:695
 msgid "Protocol:"
 msgstr "프로토콜:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
+#: ../console/gntaccount.c:508
+#: ../gtk/gtkaccount.c:412
+#: ../gtk/gtkblist.c:5229
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "아이디:"
 
-#: ../finch/gntaccount.c:542
+#: ../console/gntaccount.c:521
+#: ../gtk/gtkaccount.c:487
 msgid "Password:"
 msgstr "비밀번호:"
 
-#: ../finch/gntaccount.c:552
+#: ../console/gntaccount.c:531
+#: ../gtk/gtkblist.c:5250
+#: ../gtk/gtkblist.c:5613
 msgid "Alias:"
 msgstr "별칭:"
 
-#. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287
-#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:472 ../finch/gntpounce.c:459
-#: ../finch/gntpounce.c:667 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
-#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2416
-#: ../libpurple/protocols/jabber/buddy.c:2452
-#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:202
-#: ../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:6148
-#: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:525
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1034
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
-#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1909
-#: ../pidgin/gtkaccount.c:2496 ../pidgin/gtkblist.c:6321
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1108
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1593
+#: ../console/gntaccount.c:554
+#: ../console/gntaccount.c:615
+#: ../console/gntaccount.c:834
+#: ../console/gntblist.c:313
+#: ../console/gntblist.c:380
+#: ../console/gntblist.c:413
+#: ../console/gntblist.c:737
+#: ../console/gntblist.c:906
+#: ../console/gntblist.c:997
+#: ../console/gntblist.c:2021
+#: ../console/gntprefs.c:224
+#: ../console/gntstatus.c:139
+#: ../console/gntstatus.c:472
+#: ../console/gntstatus.c:597
+#: ../gtk/gtkaccount.c:1866
+#: ../gtk/gtkaccount.c:2433
+#: ../gtk/gtkblist.c:5669
+#: ../gtk/gtkdialogs.c:685
+#: ../gtk/gtkdialogs.c:822
+#: ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:932
+#: ../gtk/gtkdialogs.c:954
+#: ../gtk/gtkdialogs.c:974
+#: ../gtk/gtkdialogs.c:1018
+#: ../gtk/gtkdialogs.c:1056
+#: ../gtk/gtkdialogs.c:1110
+#: ../gtk/gtkdialogs.c:1147
+#: ../gtk/gtkdialogs.c:1172
+#: ../gtk/gtkimhtmltoolbar.c:419
+#: ../gtk/gtkplugin.c:286
+#: ../gtk/gtkpounce.c:1098
+#: ../gtk/gtkprivacy.c:566
+#: ../gtk/gtkprivacy.c:579
+#: ../gtk/gtkprivacy.c:604
+#: ../gtk/gtkprivacy.c:615
+#: ../gtk/gtkrequest.c:270
+#: ../gtk/gtksavedstatuses.c:336
+#: ../libgaim/account.c:961
+#: ../libgaim/account.c:1149
+#: ../libgaim/account.c:1183
+#: ../libgaim/conversation.c:1164
+#: ../libgaim/plugins/buddynote.c:51
+#: ../libgaim/protocols/gg/gg.c:498
+#: ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792
+#: ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1761
+#: ../libgaim/protocols/jabber/buddy.c:1795
+#: ../libgaim/protocols/jabber/chat.c:788
+#: ../libgaim/protocols/jabber/jabber.c:861
+#: ../libgaim/protocols/jabber/jabber.c:1365
+#: ../libgaim/protocols/jabber/xdata.c:338
+#: ../libgaim/protocols/msn/msn.c:249
+#: ../libgaim/protocols/msn/msn.c:264
+#: ../libgaim/protocols/msn/msn.c:279
+#: ../libgaim/protocols/msn/msn.c:294
+#: ../libgaim/protocols/msn/msn.c:311
+#: ../libgaim/protocols/oscar/oscar.c:6043
+#: ../libgaim/protocols/oscar/peer.c:1021
+#: ../libgaim/protocols/qq/buddy_info.c:484
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/buddy_opt.c:402
+#: ../libgaim/protocols/qq/group.c:124
+#: ../libgaim/protocols/qq/group_join.c:138
+#: ../libgaim/protocols/qq/group_join.c:359
+#: ../libgaim/protocols/qq/group_opt.c:142
+#: ../libgaim/protocols/qq/group_opt.c:392
+#: ../libgaim/protocols/qq/sys_msg.c:104
+#: ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:3410
+#: ../libgaim/protocols/sametime/sametime.c:3495
+#: ../libgaim/protocols/sametime/sametime.c:3665
+#: ../libgaim/protocols/sametime/sametime.c:5409
+#: ../libgaim/protocols/sametime/sametime.c:5498
+#: ../libgaim/protocols/sametime/sametime.c:5622
+#: ../libgaim/protocols/silc/buddy.c:467
+#: ../libgaim/protocols/silc/buddy.c:1078
+#: ../libgaim/protocols/silc/buddy.c:1183
+#: ../libgaim/protocols/silc/chat.c:597
+#: ../libgaim/protocols/silc/chat.c:726
+#: ../libgaim/protocols/silc/ops.c:1912
+#: ../libgaim/protocols/silc/silc.c:750
+#: ../libgaim/protocols/silc/silc.c:955
+#: ../libgaim/protocols/yahoo/yahoo.c:961
+#: ../libgaim/protocols/yahoo/yahoo.c:3208
+#: ../libgaim/protocols/yahoo/yahoo.c:3217
 msgid "Cancel"
 msgstr "취소"
 
-#. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:472 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../console/gntaccount.c:558
+#: ../console/gntprefs.c:224
+#: ../console/gntstatus.c:475
+#: ../console/gntstatus.c:585
+#: ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276
+#: ../libgaim/account.c:1182
+#: ../libgaim/plugins/buddynote.c:50
+#: ../libgaim/protocols/jabber/buddy.c:587
 msgid "Save"
 msgstr "저장"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1901
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
+#: ../console/gntaccount.c:610
+#: ../gtk/gtkaccount.c:1860
+#: ../gtk/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "정말 %s 을(를) 삭제하시겠습니까?"
 
-#: ../finch/gntaccount.c:635
+#. Close any other opened delete window
+#: ../console/gntaccount.c:614
 msgid "Delete Account"
 msgstr "계정 삭제"
 
-#. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1107 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
+#: ../console/gntaccount.c:615
+#: ../console/gntaccount.c:681
+#: ../console/gntstatus.c:139
+#: ../console/gntstatus.c:201
+#: ../gtk/gtkaccount.c:1865
+#: ../gtk/gtkpounce.c:1097
+#: ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:335
 msgid "Delete"
 msgstr "삭제"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2326 ../pidgin/gtkdocklet.c:715
+#: ../console/gntaccount.c:644
+#: ../console/gntblist.c:1927
+#: ../console/gntui.c:70
+#: ../gtk/gtkaccount.c:2259
+#: ../gtk/gtkdocklet.c:543
 msgid "Accounts"
 msgstr "계정"
 
-#: ../finch/gntaccount.c:675
+#: ../console/gntaccount.c:650
 msgid "You can enable/disable accounts from the following list."
 msgstr "다음 목록의 계정을 사용 또는 사용 안 함으로 변경할 수 있습니다."
 
-#. 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:2372
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../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:2495
-#: ../pidgin/gtkblist.c:6320 ../pidgin/gtkconv.c:1713
-#: ../pidgin/gtkrequest.c:275
+#: ../console/gntaccount.c:673
+#: ../console/gntaccount.c:833
+#: ../console/gntblist.c:313
+#: ../console/gntblist.c:380
+#: ../console/gntblist.c:413
+#: ../console/gntnotify.c:309
+#: ../console/gntstatus.c:191
+#: ../gtk/gtkaccount.c:2432
+#: ../gtk/gtkblist.c:5668
+#: ../gtk/gtkconv.c:1654
+#: ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870
+#: ../libgaim/protocols/qq/sys_msg.c:104
+#: ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:5497
+#: ../libgaim/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "추가"
 
-#. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../console/gntaccount.c:677
 msgid "Modify"
 msgstr "변경"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2442
+#: ../console/gntaccount.c:758
+#: ../gtk/gtkaccount.c:2379
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 님이 %s 님을 친구로 설정했습니다%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2494
+#: ../console/gntaccount.c:831
+#: ../gtk/gtkaccount.c:2431
 msgid "Add buddy to your list?"
 msgstr "친구 목록에 추가하시겠습니까?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2552
-#, c-format
-msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s%s%s%s 님이 %s 님을 친구 목록 %s%s에 추가하고 싶어 합니다."
-
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2575
-#: ../pidgin/gtkaccount.c:2581
-msgid "Authorize buddy?"
-msgstr "친구로서 승인하시겠습니까?"
-
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
-msgid "Authorize"
-msgstr "승인"
-
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
-msgid "Deny"
-msgstr "거부"
-
-#: ../finch/gntblist.c:289
+#: ../console/gntblist.c:264
 msgid "You must provide a screename for the buddy."
 msgstr "친구의 아이디를 지정해 주십시오."
 
-#: ../finch/gntblist.c:291
+#: ../console/gntblist.c:266
 msgid "You must provide a group."
 msgstr "그룹을 지정해 주십시오."
 
-#: ../finch/gntblist.c:293
+#: ../console/gntblist.c:268
 msgid "You must select an account."
 msgstr "계정을 선택해 주십시오."
 
-#: ../finch/gntblist.c:295
-msgid "The selected account is not online."
-msgstr ""
-
-#: ../finch/gntblist.c:300
+#: ../console/gntblist.c:272
 msgid "Error adding buddy"
 msgstr "친구를 추가하는 중 오류"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2903
-#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtksavedstatuses.c:980
+#: ../console/gntblist.c:297
+#: ../gtk/gtkaccount.c:1941
+#: ../gtk/gtksavedstatuses.c:923
+#: ../libgaim/protocols/oscar/oscar.c:2849
 msgid "Screen Name"
 msgstr "아이디"
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1507
-#: ../libpurple/protocols/silc/chat.c:606
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
+#: ../console/gntblist.c:300
+#: ../console/gntblist.c:372
+#: ../gtk/gtkdialogs.c:931
+#: ../gtk/gtkdialogs.c:953
+#: ../gtk/gtkdialogs.c:973
+#: ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/msn/msn.c:1362
+#: ../libgaim/protocols/silc/chat.c:587
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
+#: ../libgaim/protocols/zephyr/zephyr.c:789
+#: ../libgaim/protocols/zephyr/zephyr.c:1207
 msgid "Alias"
 msgstr "별칭"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
+#: ../console/gntblist.c:303
+#: ../console/gntblist.c:375
 msgid "Group"
 msgstr "그룹"
 
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../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:511 ../pidgin/gtkpounce.c:1275
-#: ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../console/gntblist.c:306
+#: ../console/gntblist.c:363
+#: ../console/gntblist.c:1166
+#: ../console/gntnotify.c:155
+#: ../console/gntstatus.c:563
+#: ../gtk/gtkblist.c:2710
+#: ../gtk/gtknotify.c:467
+#: ../gtk/gtkpounce.c:1265
+#: ../gtk/plugins/gevolution/gevolution.c:444
+#: ../libgaim/plugins/idle.c:153
+#: ../libgaim/plugins/idle.c:189
 msgid "Account"
 msgstr "계정"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5826
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
+#: ../console/gntblist.c:312
+#: ../console/gntblist.c:784
+#: ../gtk/gtkblist.c:5183
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libgaim/protocols/silc/buddy.c:736
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/buddy.c:1075
+#: ../libgaim/protocols/silc/buddy.c:1174
+#: ../libgaim/protocols/yahoo/yahoo.c:3122
 msgid "Add Buddy"
 msgstr "친구 추가"
 
-#: ../finch/gntblist.c:341
+#: ../console/gntblist.c:312
 msgid "Please enter buddy information."
 msgstr "친구의 정보를 입력해 주십시오."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
+#: ../console/gntblist.c:335
+#: ../libgaim/blist.c:1195
 msgid "Chats"
 msgstr "대화"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
-#: ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1753
-#: ../libpurple/protocols/msn/msn.c:1780
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
+#: ../console/gntblist.c:369
+#: ../gtk/gtkplugin.c:579
+#: ../gtk/gtkroomlist.c:621
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
+#: ../gtk/plugins/gevolution/assoc-buddy.c:123
+#: ../libgaim/protocols/jabber/jabber.c:792
+#: ../libgaim/protocols/msn/msn.c:1535
+#: ../libgaim/protocols/msn/msn.c:1600
+#: ../libgaim/protocols/msn/msn.c:1627
+#: ../libgaim/protocols/qq/buddy_info.c:44
 msgid "Name"
 msgstr "이름"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
-msgid "Auto-join"
-msgstr "자동 참가"
-
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6208
+#: ../console/gntblist.c:378
+#: ../console/gntblist.c:786
+#: ../gtk/gtkblist.c:5559
 msgid "Add Chat"
 msgstr "대화 추가"
 
-#: ../finch/gntblist.c:420
+#: ../console/gntblist.c:379
 msgid "You can edit more information from the context menu later."
 msgstr "오른쪽 클릭 메뉴로부터 정보를 편집할 수 있습니다."
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
+#: ../console/gntblist.c:390
+#: ../console/gntblist.c:403
 msgid "Error adding group"
 msgstr "그룹을 추가하는 중 오류"
 
-#: ../finch/gntblist.c:434
+#: ../console/gntblist.c:391
 msgid "You must give a name for the group to add."
 msgstr "추가할 그룹의 이름을 입력해 주십시오."
 
-#: ../finch/gntblist.c:447
+#: ../console/gntblist.c:404
 msgid "A group with the name already exists."
 msgstr "같은 이름의 그룹이 이미 존재합니다."
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6317
+#: ../console/gntblist.c:411
+#: ../console/gntblist.c:788
+#: ../gtk/gtkblist.c:5665
+#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../libgaim/protocols/sametime/sametime.c:5495
 msgid "Add Group"
 msgstr "그룹 추가"
 
-#: ../finch/gntblist.c:454
+#: ../console/gntblist.c:411
 msgid "Enter the name of the group"
 msgstr "추가할 그룹의 이름을 입력해 주십시오."
 
-#: ../finch/gntblist.c:802
+#: ../console/gntblist.c:736
 msgid "Edit Chat"
 msgstr "대화 편집"
 
-#: ../finch/gntblist.c:802
+#: ../console/gntblist.c:736
 msgid "Please Update the necessary fields."
 msgstr "필요한 항목을 갱신해 주십시오."
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#: ../console/gntblist.c:737
+#: ../console/gntstatus.c:196
 msgid "Edit"
 msgstr "편집"
 
-#: ../finch/gntblist.c:828
+#: ../console/gntblist.c:751
+msgid "Auto-join"
+msgstr "자동 참가"
+
+#: ../console/gntblist.c:760
 msgid "Edit Settings"
 msgstr "설정 편집"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
-#, fuzzy
-msgid "Information"
-msgstr "직업"
-
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
-#, fuzzy
-msgid "Retrieving..."
-msgstr "사용자가 무언가를 입력하고 있습니다..."
-
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
-#: ../libpurple/protocols/silc/chat.c:899
-#: ../libpurple/protocols/silc10/chat.c:883
+#: ../console/gntblist.c:806
+#: ../libgaim/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "정보 가져오기"
 
-#: ../finch/gntblist.c:908
+#: ../console/gntblist.c:811
 msgid "Add Buddy Pounce"
 msgstr "친구 알림 추가"
 
-#. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1661
+#: ../console/gntblist.c:818
+#: ../gtk/gtkconv.c:1602
+#: ../libgaim/protocols/oscar/oscar.c:633
 msgid "Send File"
 msgstr "파일 전송"
 
-#: ../finch/gntblist.c:919
+#: ../console/gntblist.c:822
 msgid "View Log"
 msgstr "로그 보기"
 
-#: ../finch/gntblist.c:1000
+#: ../console/gntblist.c:902
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "%s 님의 새 이름을 입력해 주십시오."
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#: ../console/gntblist.c:904
+#: ../console/gntblist.c:905
+#: ../console/gntblist.c:1116
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: ../finch/gntblist.c:1002
-#, fuzzy
-msgid "Set Alias"
-msgstr "별칭"
-
-#: ../finch/gntblist.c:1003
+#: ../console/gntblist.c:904
 msgid "Enter empty string to reset the name."
 msgstr "빈 문자열을 입력하면 이름이 초기화 됩니다."
 
-#: ../finch/gntblist.c:1079
+#: ../console/gntblist.c:977
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "이 연락처를 삭제하면 그 안에 있는 친구의 정보도 모두 삭제됩니다."
 
-#: ../finch/gntblist.c:1087
+#: ../console/gntblist.c:985
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "이 그룹을 삭제하면 그 안에 있는 친구의 정보도 모두 삭제됩니다."
 
-#: ../finch/gntblist.c:1092
+#: ../console/gntblist.c:990
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "정말 %s 을(를) 삭제하시겠습니까?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1095
+#: ../console/gntblist.c:993
 msgid "Confirm Remove"
 msgstr "삭제 확인"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtkstatusbox.c:264
+#: ../console/gntblist.c:996
+#: ../console/gntblist.c:1118
+#: ../gtk/gtkblist.c:1106
+#: ../gtk/gtkconv.c:1651
+#: ../gtk/gtkrequest.c:275
+#: ../gtk/gtkstatusbox.c:248
 msgid "Remove"
 msgstr "삭제"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2422 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4610
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
+#: ../console/gntblist.c:1093
+#: ../console/gntblist.c:2088
+#: ../console/gntprefs.c:219
+#: ../console/gntui.c:71
+#: ../gtk/gtkblist.c:4091
+#: ../gtk/plugins/win32/winprefs/winprefs.c:327
 msgid "Buddy List"
 msgstr "친구 목록"
 
-#: ../finch/gntblist.c:1257
+#: ../console/gntblist.c:1123
 msgid "Place tagged"
 msgstr "Place tagged"
 
-#: ../finch/gntblist.c:1262
+#: ../console/gntblist.c:1128
 msgid "Toggle Tag"
 msgstr "Toggle Tag"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
-#: ../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/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:1691
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
-#: ../libpurple/protocols/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
+#: ../console/gntblist.c:1161
+#: ../gtk/gtkblist.c:2734
+#: ../libgaim/protocols/gg/gg.c:627
+#: ../libgaim/protocols/gg/gg.c:1035
+#: ../libgaim/protocols/gg/gg.c:1110
+#: ../libgaim/protocols/gg/gg.c:2207
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:814
+#: ../libgaim/protocols/jabber/buddy.c:1562
+#: ../libgaim/protocols/jabber/buddy.c:1744
+#: ../libgaim/protocols/jabber/jabber.c:802
+#: ../libgaim/protocols/msn/msn.c:1370
+#: ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/silc/buddy.c:1528
+#: ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179
+#: ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
 msgid "Nickname"
 msgstr "별명"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:354
-#: ../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:2927
-#: ../libpurple/protocols/yahoo/yahoo.c:3099
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
-#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
+#: ../console/gntblist.c:1181
+#: ../gtk/gtkblist.c:2754
+#: ../gtk/gtkblist.c:3307
+#: ../gtk/gtkprefs.c:1807
+#: ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:645
+#: ../libgaim/protocols/jabber/buddy.c:683
+#: ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2860
+#: ../libgaim/protocols/oscar/oscar.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:2876
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
 msgid "Idle"
 msgstr "대기 상태"
 
-#: ../finch/gntblist.c:1334
-#, fuzzy
-msgid "On Mobile"
-msgstr "휴대 기기"
-
-#: ../finch/gntblist.c:1415
+#: ../console/gntblist.c:1270
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -580,12 +552,12 @@ msgstr ""
 "온라인: %d\n"
 "합계: %d"
 
-#: ../finch/gntblist.c:1424
+#: ../console/gntblist.c:1279
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "계정: %s (%s)"
 
-#: ../finch/gntblist.c:1436
+#: ../console/gntblist.c:1291
 #, c-format
 msgid ""
 "\n"
@@ -594,304 +566,180 @@ msgstr ""
 "\n"
 "마지막 만남: %s 전"
 
-#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../console/gntblist.c:1540
+#: ../gtk/gtkdocklet.c:491
+#: ../gtk/gtkstatusbox.c:1000
 msgid "New..."
 msgstr "상태 추가..."
 
-#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../console/gntblist.c:1547
+#: ../gtk/gtkdocklet.c:492
+#: ../gtk/gtkstatusbox.c:1001
 msgid "Saved..."
 msgstr "다른 상태..."
 
-#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:343 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:531
+#: ../console/gntblist.c:1895
+#: ../console/gntplugin.c:216
+#: ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:544
+#: ../gtk/gtkplugin.c:528
 msgid "Plugins"
 msgstr "플러그인"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:767
+#: ../console/gntblist.c:2002
+#: ../gtk/gtkdialogs.c:666
+#: ../gtk/gtkdialogs.c:803
+#: ../gtk/gtkdialogs.c:883
+msgid "_Name"
+msgstr "이름(_N)"
+
+#: ../console/gntblist.c:2007
+#: ../gtk/gtkdialogs.c:671
+#: ../gtk/gtkdialogs.c:808
+#: ../gtk/gtkdialogs.c:888
+msgid "_Account"
+msgstr "계정(_A)"
+
+#: ../console/gntblist.c:2015
+#: ../gtk/gtkdialogs.c:679
 msgid "New Instant Message"
 msgstr "새 인스턴트 메시지"
 
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:769
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+#: ../console/gntblist.c:2017
+#: ../gtk/gtkdialogs.c:681
+msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "메시지로 대화할 상대의 아이디 또는 별칭을 입력해 주십시오."
 
-#. Not multiline
-#. Not masked?
-#. No hints?
-#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
-#: ../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:6147
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1033
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
-#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4366
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../console/gntblist.c:2020
+#: ../console/gntnotify.c:79
+#: ../gtk/gtkblist.c:3867
+#: ../gtk/gtkdialogs.c:684
+#: ../gtk/gtkdialogs.c:821
+#: ../gtk/gtkdialogs.c:912
+#: ../gtk/gtkrequest.c:269
+#: ../libgaim/account.c:960
+#: ../libgaim/account.c:1148
+#: ../libgaim/protocols/gg/gg.c:497
+#: ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791
+#: ../libgaim/protocols/jabber/jabber.c:1364
+#: ../libgaim/protocols/jabber/xdata.c:337
+#: ../libgaim/protocols/msn/msn.c:248
+#: ../libgaim/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:293
+#: ../libgaim/protocols/oscar/oscar.c:6042
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182
+#: ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462
+#: ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1297
+#: ../libgaim/protocols/silc/ops.c:1911
+#: ../libgaim/protocols/silc/silc.c:749
+#: ../libgaim/protocols/yahoo/yahoo.c:960
+#: ../libgaim/protocols/yahoo/yahoo.c:3207
+#: ../libgaim/protocols/yahoo/yahoo.c:3216
 msgid "OK"
 msgstr "확인"
 
-#: ../finch/gntblist.c:2270
-#, fuzzy
-msgid "Channel"
-msgstr "채널(_C):"
-
-#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:924
-msgid "Join a Chat"
-msgstr "대화 참가"
-
-#: ../finch/gntblist.c:2284
-#, fuzzy
-msgid "Please enter the name of the chat you want to join."
-msgstr "삽입할 링크의 URL을 입력해 주십시오."
-
-#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
-msgid "Join"
-msgstr "참가"
-
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:797
+#: ../console/gntblist.c:2039
+#: ../gtk/gtkpounce.c:776
 msgid "Options"
 msgstr "설정"
 
-#: ../finch/gntblist.c:2330
+#: ../console/gntblist.c:2045
 msgid "Send IM..."
 msgstr "메시지 보내기..."
 
-#: ../finch/gntblist.c:2334
-#, fuzzy
-msgid "Join Chat..."
-msgstr "대화에 참가"
+#: ../console/gntblist.c:2049
+msgid "Toggle offline buddies"
+msgstr "오프라인 친구로 전환"
 
-#: ../finch/gntblist.c:2338
-msgid "Show"
-msgstr ""
-
-#: ../finch/gntblist.c:2343
-#, fuzzy
-msgid "Empty groups"
-msgstr "그룹마다 공유"
-
-#: ../finch/gntblist.c:2349
-#, fuzzy
-msgid "Offline buddies"
-msgstr "오프라인 친구 표시"
-
-#: ../finch/gntblist.c:2355
-#, fuzzy
-msgid "Sort"
-msgstr "포트 번호"
-
-#: ../finch/gntblist.c:2360
-#, fuzzy
-msgid "By Status"
+#: ../console/gntblist.c:2053
+msgid "Sort by status"
 msgstr "상태순"
 
-#: ../finch/gntblist.c:2364 ../pidgin/gtkblist.c:4151
-msgid "Alphabetically"
+#: ../console/gntblist.c:2057
+msgid "Sort alphabetically"
 msgstr "알파벳순"
 
-#: ../finch/gntblist.c:2368
-#, fuzzy
-msgid "By Log Size"
+#: ../console/gntblist.c:2061
+msgid "Sort by log size"
 msgstr "로그 크기순"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-msgid "Certificate Import"
-msgstr "인증 가져오기"
-
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
-msgid "Specify a hostname"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
-msgid "Type the host name this certificate is for."
-msgstr "이 인증을 위한 호스트명을 입력하십시오."
-
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#: ../console/gntconn.c:36
 #, c-format
-msgid ""
-"File %s could not be imported.\n"
-"Make sure that the file is readable and in PEM format.\n"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
-msgid "Certificate Import Error"
-msgstr "인증 가져오기 오류"
-
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
-msgid "X.509 certificate import failed"
-msgstr "X.509 인증 가져오기 실패"
-
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-msgid "Select a PEM certificate"
-msgstr "PEM 인증 선택"
-
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
-#, c-format
-msgid ""
-"Export to file %s failed.\n"
-"Check that you have write permission to the target path\n"
-msgstr ""
-"%s 파일로 내보내기 실패함.\n"
-"목적 경로에 쓰기 권한이 있는지 확인하십시오.\n"
-
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
-msgid "Certificate Export Error"
-msgstr "인증 내보내기 오류"
-
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
-msgid "X.509 certificate export failed"
-msgstr "X.509 인증 내보내기 실패"
-
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
-msgid "PEM X.509 Certificate Export"
-msgstr "PEM X.509 인증 내보내기"
-
-#: ../finch/gntcertmgr.c:188
-#, c-format
-msgid "Certificate for %s"
-msgstr "%s 인증"
-
-#: ../finch/gntcertmgr.c:195
-#, c-format
-msgid ""
-"Common name: %s\n"
-"\n"
-"SHA1 fingerprint:\n"
-"%s"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:198
-msgid "SSL Host Certificate"
-msgstr "SSL 호스트 인증"
-
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
-#, c-format
-msgid "Really delete certificate for %s?"
-msgstr "정말 %s 인증을 삭제하시겠습니까?"
-
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
-msgid "Confirm certificate delete"
-msgstr "인증 삭제 확인"
-
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
-msgid "Certificate Manager"
-msgstr "인증 관리자"
-
-#. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:666
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "호스트명"
-
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
-#: ../pidgin/gtkdebug.c:835
-msgid "Info"
-msgstr "ì •ë³´"
-
-#. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:211 ../finch/gntplugin.c:403 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2469
-#: ../pidgin/gtkrequest.c:273
-msgid "Close"
-msgstr "닫기"
-
-#: ../finch/gntconn.c:125
-#, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
+#: ../console/gntconn.c:39
 #, c-format
 msgid "%s disconnected."
 msgstr "%s 님은 접속을 끊었습니다."
 
-#: ../finch/gntconn.c:129
+#: ../console/gntconn.c:40
 #, c-format
 msgid ""
-"%s\n"
-"\n"
-"Finch will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
+"%s was disconnected due to the following error:\n"
+"%s"
 msgstr ""
-"%s\n"
-"\n"
-"오류를 해결하고 계정을 다시 사용할 수 있을 때까지 방울새가 재접속하지 않습니"
-"다."
+"%s 님이 다음의 오류로 인해 접속을 끊었습니다:\n"
+"%s"
 
-#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4368
-msgid "Re-enable Account"
-msgstr "계정 재사용"
+#: ../console/gntconn.c:43
+#: ../gtk/gtkblist.c:3865
+#: ../libgaim/account.c:988
+#: ../libgaim/connection.c:107
+msgid "Connection Error"
+msgstr "접속 오류"
 
-#: ../finch/gntconv.c:139
+#: ../console/gntconv.c:102
 msgid "No such command."
 msgstr "그런 명령은 없습니다."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:531
+#: ../console/gntconv.c:106
+#: ../gtk/gtkconv.c:505
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "문법 오류: 그 명령에 대한 인수의 수가 잘못되었습니다."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:537
+#: ../console/gntconv.c:111
+#: ../gtk/gtkconv.c:510
 msgid "Your command failed for an unknown reason."
 msgstr "알 수 없는 이유로 명령 적용에 실패했습니다."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:544
+#: ../console/gntconv.c:116
+#: ../gtk/gtkconv.c:516
 msgid "That command only works in chats, not IMs."
 msgstr "그 명령은 메시지가 아닌, 대화에서만 동작합니다."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:547
+#: ../console/gntconv.c:119
+#: ../gtk/gtkconv.c:519
 msgid "That command only works in IMs, not chats."
 msgstr "그 명령은 대화가 아닌, 메시지에서만 동작합니다."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:552
+#: ../console/gntconv.c:123
+#: ../gtk/gtkconv.c:523
 msgid "That command doesn't work on this protocol."
 msgstr "그 명령은 이 프로토콜에서는 동작하지 않습니다."
 
-#: ../finch/gntconv.c:168
-#, fuzzy
-msgid "Message was not sent, because you are not signed on."
-msgstr "전송 시간이 너무 빨라서 메시지를 보내지 못했습니다:"
+#: ../console/gntconv.c:130
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "아직 지원되지 않는 명령입니다. 메시지를 보내지 못했습니다."
 
-#: ../finch/gntconv.c:251
+#: ../console/gntconv.c:232
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../console/gntconv.c:255
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
+#: ../console/gntconv.c:260
+#: ../console/gntconv.c:432
 #, c-format
 msgid ""
 "\n"
@@ -900,72 +748,27 @@ msgstr ""
 "\n"
 "%s 님이 무언가를 입력하고 있습니다..."
 
-#: ../finch/gntconv.c:298
-#, fuzzy
-msgid "You have left this chat."
-msgstr "대화로 이야기했습니다."
-
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1416
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "로그 기록이 시작되었습니다. 지금부터 대화가 로그에 기록됩니다."
-
-#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1424
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr "로그 기록이 중지되었습니다. 지금부터 대화가 로그에 기록되지 않습니다."
-
-#: ../finch/gntconv.c:469
-#, fuzzy
-msgid "Send To"
-msgstr "받을 사람(_S)"
-
-#: ../finch/gntconv.c:513
-#, fuzzy
-msgid "Conversation"
-msgstr "대화 창"
-
-#: ../finch/gntconv.c:519
-#, fuzzy
-msgid "Clear Scrollback"
-msgstr "/대화/화면 비우기(_R)"
-
-#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
-msgid "Show Timestamps"
-msgstr "타임스탬프 표시"
-
-#: ../finch/gntconv.c:539
-#, fuzzy
-msgid "Add Buddy Pounce..."
-msgstr "친구 알림 추가"
-
-#: ../finch/gntconv.c:554
-#, fuzzy
-msgid "Enable Logging"
-msgstr "/설정/로그 기록"
-
-#: ../finch/gntconv.c:560
-#, fuzzy
-msgid "Enable Sounds"
-msgstr "소리를 재생할 때:"
-
-#: ../finch/gntconv.c:766
+#: ../console/gntconv.c:399
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:889
+#: ../console/gntconv.c:501
 msgid "List of users:\n"
 msgstr "사용자 목록\n"
 
-#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:371
+#: ../console/gntconv.c:625
+#: ../gtk/gtkconv.c:386
 msgid "Supported debug options are:  version"
 msgstr "지원하는 디버그 옵션은:  버전"
 
-#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:423
+#: ../console/gntconv.c:660
+#: ../gtk/gtkconv.c:422
 msgid "No such command (in this context)."
 msgstr "(이 오른쪽 클릭 메뉴에서는) 그런 명령은 없습니다."
 
-#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:426
+#: ../console/gntconv.c:663
+#: ../gtk/gtkconv.c:425
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -974,67 +777,58 @@ msgstr ""
 "\"/help &lt;명령&gt;\" 를 이용해 주십시오.\n"
 "이 오른쪽 클릭 메뉴에서는 다음의 명령을 이용할 수 있습니다:\n"
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7688
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"say &lt;메시지&gt;:  명령을 이용하지 않는 경우에도 메시지를 전송합니다."
+#: ../console/gntconv.c:702
+#: ../gtk/gtkconv.c:6824
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+msgstr "say &lt;메시지&gt;:  명령을 이용하지 않는 경우에도 메시지를 전송합니다."
 
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7691
+#: ../console/gntconv.c:705
+#: ../gtk/gtkconv.c:6827
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;동작&gt;:  친구 또는 대화에 IRC 형식의 동작을 전송합니다."
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7694
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;옵션&gt;:  이용 중인 대화 창에 다양한 디버그 정보를 전송합니다."
+#: ../console/gntconv.c:708
+#: ../gtk/gtkconv.c:6830
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr "debug &lt;옵션&gt;:  이용 중인 대화 창에 다양한 디버그 정보를 전송합니다."
 
-#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7697
+#: ../console/gntconv.c:711
+#: ../gtk/gtkconv.c:6833
 msgid "clear: Clears the conversation scrollback."
 msgstr "비우기: 대화 창에 있는 이전의 메시지를 삭제합니다."
 
-#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7703
+#: ../console/gntconv.c:714
+#: ../gtk/gtkconv.c:6836
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;명령&gt;:  특정 명령에 대한 도움말을 표시합니다."
 
-#: ../finch/gntconv.c:1163
-#, fuzzy
-msgid "users:  Show the list of users in the chat."
-msgstr "statuses: 저장 상태 창을 표시합니다."
-
-#: ../finch/gntconv.c:1168
+#: ../console/gntconv.c:719
 msgid "plugins: Show the plugins window."
 msgstr "plugins: 플러그인 창을 표시합니다."
 
-#: ../finch/gntconv.c:1171
+#: ../console/gntconv.c:722
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: 친구 목록을 표시합니다."
 
-#: ../finch/gntconv.c:1174
+#: ../console/gntconv.c:725
 msgid "accounts: Show the accounts window."
 msgstr "accounts: 계정 창을 표시합니다."
 
-#: ../finch/gntconv.c:1177
+#: ../console/gntconv.c:728
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: 디버그 창을 표시합니다."
 
-#: ../finch/gntconv.c:1180
+#: ../console/gntconv.c:731
 msgid "prefs: Show the preference window."
 msgstr "prefs: 설정 창을 표시"
 
-#: ../finch/gntconv.c:1183
+#: ../console/gntconv.c:734
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: 저장 상태 창을 표시합니다."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "파일을 열 수 없습니다."
-
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../console/gntdebug.c:214
+#: ../console/gntui.c:72
+#: ../gtk/gtkdebug.c:708
 msgid "Debug Window"
 msgstr "디버그 창"
 
@@ -1042,188 +836,131 @@ msgstr "디버그 창"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:754
+#: ../console/gntdebug.c:235
+#: ../gtk/gtkdebug.c:767
 msgid "Clear"
 msgstr "비우기"
 
-#: ../finch/gntdebug.c:303
-#, fuzzy
-msgid "Filter:"
-msgstr "í•„í„°"
-
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
+#: ../console/gntdebug.c:240
+#: ../gtk/gtkdebug.c:776
 msgid "Pause"
 msgstr "일시정지"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
-#, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "파일 전송 - %d%% / %d 개의 파일"
+#: ../console/gntdebug.c:245
+#: ../gtk/gtkdebug.c:783
+#: ../gtk/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "타임스탬프"
 
-#. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
-msgid "File Transfers"
-msgstr "파일 전송"
+#: ../console/gntgaim.c:227
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s 상세 정보는 `%s -h' 를 입력해 주십시오.\n"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
-msgid "Progress"
-msgstr "진행"
-
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
-msgid "Filename"
-msgstr "파일명"
-
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
-msgid "Size"
-msgstr "크기"
-
-#: ../finch/gntft.c:201
-#, fuzzy
-msgid "Speed"
-msgstr "속도:"
-
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
-msgid "Remaining"
-msgstr "남은 양"
-
-#. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:358
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:596 ../libpurple/protocols/msn/msn.c:603
-#: ../libpurple/protocols/novell/novell.c:2840
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2715
-#: ../libpurple/protocols/oscar/oscar.c:3795
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
-msgid "Status"
-msgstr "상태"
-
-#: ../finch/gntft.c:211
-#, fuzzy
-msgid "Close this window when all transfers finish"
-msgstr "전송이 완료되면 이 창을 닫음(_F)"
-
-#: ../finch/gntft.c:218
-#, fuzzy
-msgid "Clear finished transfers"
-msgstr "완료된 전송은 비우기(_L)"
-
-#: ../finch/gntft.c:232
-#, fuzzy
-msgid "Stop"
-msgstr "ìž…ë ¥"
-
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
-msgid "Waiting for transfer to begin"
-msgstr "전송 시작을 기다리고 있습니다."
-
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
-msgid "Canceled"
-msgstr "취소되었습니다."
-
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
-msgid "Failed"
-msgstr "실패했습니다."
-
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
-#, fuzzy, c-format
-msgid "%.2f KiB/s"
-msgstr "%.2f K바이트/초"
-
-#: ../finch/gntft.c:431
+#: ../console/gntgaim.c:229
 #, c-format
-msgid "The file was saved as %s."
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
 msgstr ""
+"%s\n"
+"사용법: %s [옵션]...\n"
+"\n"
+"  -c, --config=DIR    DIR에 있는 설정 파일 사용\n"
+"  -d, --debug         디버그 정보를 표준 출력으로 표시\n"
+"  -h, --help          이 도움말을 표시하고 종료\n"
+"  -n, --nologin       자동으로 로그인 하지 않음\n"
+"  -v, --version       현재 버전을 표시하고 종료\n"
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
-msgid "Finished"
-msgstr "완료되었습니다."
-
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:388
-msgid "Transferring"
-msgstr "전송 중 입니다."
-
-#: ../finch/gntnotify.c:165
+#: ../console/gntnotify.c:146
 msgid "Emails"
 msgstr "이메일"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
+#: ../console/gntnotify.c:152
+#: ../console/gntnotify.c:206
 msgid "You have mail!"
 msgstr "새로운 메일이 도착했습니다!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:518
-msgid "Sender"
+#: ../console/gntnotify.c:155
+#: ../libgaim/protocols/jabber/jabber.c:1155
+msgid "From"
 msgstr "보낸 사람"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:525
+#: ../console/gntnotify.c:155
+#: ../gtk/gtknotify.c:481
 msgid "Subject"
 msgstr "제목"
 
-#: ../finch/gntnotify.c:202
+#: ../console/gntnotify.c:163
+#: ../console/gntplugin.c:178
+#: ../console/gntplugin.c:259
+#: ../console/gntstatus.c:206
+#: ../gtk/gtkaccount.c:2406
+#: ../gtk/gtkrequest.c:272
+#: ../libgaim/protocols/msn/msn.c:355
+#: ../libgaim/protocols/silc/util.c:377
+msgid "Close"
+msgstr "닫기"
+
+#: ../console/gntnotify.c:182
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) 에는 %d 개의 새 메일이 있습니다."
 msgstr[1] "%s (%s) 에는 %d 개의 새 메일이 있습니다."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:341
+#: ../console/gntnotify.c:206
+#: ../gtk/gtknotify.c:322
 msgid "New Mail"
 msgstr "새로운 메일"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:948
+#: ../console/gntnotify.c:230
+#: ../gtk/gtknotify.c:856
 #, c-format
 msgid "Info for %s"
 msgstr "%s 님의 정보"
 
-#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:949
+#: ../console/gntnotify.c:232
+#: ../gtk/gtknotify.c:858
+#: ../libgaim/protocols/toc/toc.c:476
 msgid "Buddy Information"
 msgstr "친구 정보"
 
-#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
+#: ../console/gntnotify.c:306
 msgid "Continue"
 msgstr "계속"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
+#: ../console/gntnotify.c:312
+#: ../gtk/gtkconv.c:1630
+#: ../gtk/gtkdebug.c:862
+msgid "Info"
+msgstr "ì •ë³´"
+
+#: ../console/gntnotify.c:315
+#: ../gtk/gtkconv.c:1591
 msgid "IM"
 msgstr "인스턴트 메시지"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../console/gntnotify.c:318
+msgid "Join"
+msgstr "참가"
+
+#: ../console/gntnotify.c:321
+#: ../libgaim/protocols/sametime/sametime.c:3494
 msgid "Invite"
 msgstr "초대"
 
-#: ../finch/gntnotify.c:400
+#: ../console/gntnotify.c:324
 msgid "(none)"
 msgstr "(없음)"
 
-#: ../finch/gntplugin.c:76 ../finch/gntplugin.c:85
-msgid "ERROR"
-msgstr ""
-
-#: ../finch/gntplugin.c:76
-#, fuzzy
-msgid "loading plugin failed"
-msgstr "Ping 에 실패했습니다."
-
-#: ../finch/gntplugin.c:85
-msgid "unloading plugin failed"
-msgstr ""
-
-#: ../finch/gntplugin.c:130
+#: ../console/gntplugin.c:102
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1240,1138 +977,5054 @@ msgstr ""
 "웹사이트: %s\n"
 "파일명: %s\n"
 
-#: ../finch/gntplugin.c:188
+#: ../console/gntplugin.c:155
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "그것을 설정하기 전에 적절한 플러그인을 로드해 주십시오."
 
-#: ../finch/gntplugin.c:236
+#: ../console/gntplugin.c:193
+msgid "..."
+msgstr "..."
+
+#: ../console/gntplugin.c:194
+msgid "Still need to do something about this."
+msgstr "아직 무언가 해야 할 일이 남은 것 같습니다."
+
+#: ../console/gntplugin.c:200
 msgid "No configuration options for this plugin."
 msgstr "이 플러그인에 대한 옵션이 설정되어 있지 않습니다."
 
-#: ../finch/gntplugin.c:257
-#, fuzzy
-msgid "Error loading plugin"
-msgstr "플러그인을 읽어 들이는 중 오류가 발생했습니다."
+#: ../console/gntplugin.c:221
+msgid "You can (un)load plugins from the following list."
+msgstr "다음의 목록에 있는 플러그인을 로드하거나 해제할 수 있습니다."
 
-#: ../finch/gntplugin.c:258
-msgid "The selected file is not a valid plugin."
+#: ../console/gntplugin.c:264
+msgid "Configure Plugin"
+msgstr "플러그인 설정"
+
+#: ../console/gntprefs.c:122
+msgid "Show Idle Time"
+msgstr "대기 시간 표시"
+
+#: ../console/gntprefs.c:123
+msgid "Show Offline Buddies"
+msgstr "오프라인 친구 표시"
+
+#: ../console/gntprefs.c:129
+msgid "Show Timestamps"
+msgstr "타임스탬프 표시"
+
+#: ../console/gntprefs.c:130
+msgid "Notify buddies when you are typing"
+msgstr "메시지를 입력 중일 때 친구에게 알림"
+
+#: ../console/gntprefs.c:136
+msgid "Log format"
+msgstr "로그 서식"
+
+#: ../console/gntprefs.c:137
+msgid "Log IMs"
+msgstr "메시지를 로그에 기록"
+
+#: ../console/gntprefs.c:138
+msgid "Log chats"
+msgstr "대화를 로그에 기록"
+
+#: ../console/gntprefs.c:139
+msgid "Log status change events"
+msgstr "로그 상태 변경 이벤트"
+
+#. Conversations
+#: ../console/gntprefs.c:220
+#: ../gtk/gtkprefs.c:898
+#: ../gtk/gtkprefs.c:1915
+#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+msgid "Conversations"
+msgstr "대화 창"
+
+#: ../console/gntprefs.c:221
+#: ../gtk/gtkprefs.c:1355
+#: ../gtk/gtkprefs.c:1926
+msgid "Logging"
+msgstr "로그 기록"
+
+#: ../console/gntprefs.c:223
+#: ../console/gntui.c:74
+#: ../gtk/gtkdocklet.c:545
+#: ../gtk/gtkprefs.c:1951
+msgid "Preferences"
+msgstr "설정"
+
+#: ../console/gntrequest.c:495
+msgid "Not implemented yet."
+msgstr "아직 실행되지 않았습니다."
+
+#: ../console/gntstatus.c:135
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "정말 %s 님을 삭제하시겠습니까?"
+
+#: ../console/gntstatus.c:138
+msgid "Delete Status"
+msgstr "상태 삭제"
+
+#: ../console/gntstatus.c:167
+#: ../gtk/gtksavedstatuses.c:556
+msgid "Saved Statuses"
+msgstr "저장된 상태"
+
+#: ../console/gntstatus.c:174
+#: ../console/gntstatus.c:526
+#: ../gtk/gtksavedstatuses.c:463
+#: ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:931
+#: ../libgaim/protocols/novell/novell.c:1484
+msgid "Title"
+msgstr "제목"
+
+#: ../console/gntstatus.c:174
+#: ../gtk/gtksavedstatuses.c:478
+msgid "Type"
+msgstr "형식"
+
+#: ../console/gntstatus.c:174
+#: ../console/gntstatus.c:551
+#: ../console/gntstatus.c:563
+#: ../gtk/gtksavedstatuses.c:489
+#: ../gtk/gtksavedstatuses.c:953
+#: ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../libgaim/protocols/bonjour/bonjour.c:263
+#: ../libgaim/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/gg/gg.c:1062
+#: ../libgaim/protocols/gg/gg.c:1591
+#: ../libgaim/protocols/gg/gg.c:1609
+#: ../libgaim/protocols/gg/gg.c:1619
+#: ../libgaim/protocols/gg/gg.c:1625
+#: ../libgaim/protocols/gg/gg.c:1634
+#: ../libgaim/protocols/gg/gg.c:1639
+#: ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1227
+#: ../libgaim/protocols/jabber/jabber.c:1237
+#: ../libgaim/protocols/jabber/jabber.c:1247
+#: ../libgaim/protocols/jabber/jabber.c:1257
+#: ../libgaim/protocols/jabber/jabber.c:1267
+#: ../libgaim/protocols/jabber/jabber.c:1279
+#: ../libgaim/protocols/novell/novell.c:2873
+#: ../libgaim/protocols/novell/novell.c:2976
+#: ../libgaim/protocols/novell/novell.c:2982
+#: ../libgaim/protocols/novell/novell.c:2988
+#: ../libgaim/protocols/oscar/oscar.c:5501
+#: ../libgaim/protocols/oscar/oscar.c:5729
+#: ../libgaim/protocols/oscar/oscar.c:5741
+#: ../libgaim/protocols/oscar/oscar.c:5754
+#: ../libgaim/protocols/oscar/oscar.c:5761
+#: ../libgaim/protocols/oscar/oscar.c:5768
+#: ../libgaim/protocols/sametime/sametime.c:3308
+#: ../libgaim/protocols/sametime/sametime.c:3314
+#: ../libgaim/protocols/sametime/sametime.c:3320
+#: ../libgaim/protocols/sametime/sametime.c:3399
+#: ../libgaim/protocols/silc/buddy.c:1544
+#: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3450
+#: ../libgaim/protocols/yahoo/yahoo.c:3456
+#: ../libgaim/protocols/zephyr/zephyr.c:2337
+msgid "Message"
+msgstr "메시지"
+
+#. Use
+#: ../console/gntstatus.c:186
+#: ../console/gntstatus.c:580
+msgid "Use"
+msgstr "사용"
+
+#: ../console/gntstatus.c:291
+msgid "Invalid title"
+msgstr "잘못된 제목입니다."
+
+#: ../console/gntstatus.c:292
+msgid "Please enter a non-empty title for the status."
+msgstr "상태 제목을 입력해 주십시오."
+
+#: ../console/gntstatus.c:299
+msgid "Duplicate title"
+msgstr "중복된 제목입니다."
+
+#: ../console/gntstatus.c:300
+msgid "Please enter a different title for the status."
+msgstr "다른 제목을 입력해 주십시오."
+
+#: ../console/gntstatus.c:440
+msgid "Substatus"
+msgstr "하위 상태"
+
+#. Set up stuff for the account box
+#: ../console/gntstatus.c:443
+#: ../gtk/gtkblist.c:5277
+#: ../gtk/gtkblist.c:5593
+msgid "Account:"
+msgstr "계정:"
+
+#: ../console/gntstatus.c:451
+#: ../gtk/gtkft.c:698
+msgid "Status:"
+msgstr "상태:"
+
+#: ../console/gntstatus.c:466
+msgid "Message:"
+msgstr "메시지:"
+
+#: ../console/gntstatus.c:515
+msgid "Edit Status"
+msgstr "상태 편집"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../console/gntstatus.c:534
+#: ../console/gntstatus.c:563
+#: ../gtk/gtkblist.c:2798
+#: ../gtk/gtkblist.c:2811
+#: ../gtk/gtkblist.c:2813
+#: ../gtk/gtksavedstatuses.c:942
+#: ../gtk/gtksavedstatuses.c:1089
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/gg/gg.c:1024
+#: ../libgaim/protocols/gg/gg.c:1588
+#: ../libgaim/protocols/gg/gg.c:1596
+#: ../libgaim/protocols/jabber/buddy.c:637
+#: ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:674
+#: ../libgaim/protocols/jabber/jabber.c:1195
+#: ../libgaim/protocols/msn/msn.c:547
+#: ../libgaim/protocols/novell/novell.c:2870
+#: ../libgaim/protocols/oscar/oscar.c:800
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:2655
+#: ../libgaim/protocols/sametime/sametime.c:3285
+#: ../libgaim/protocols/sametime/sametime.c:4170
+#: ../libgaim/protocols/yahoo/yahoo.c:3027
+msgid "Status"
+msgstr "상태"
+
+#: ../console/gntstatus.c:557
+msgid "Use different status for following accounts"
+msgstr "다음의 계정으로 다른 상태를 사용"
+
+#. Save & Use
+#: ../console/gntstatus.c:591
+msgid "Save & Use"
+msgstr "저장 및 사용"
+
+#: ../console/gntui.c:75
+msgid "Statuses"
+msgstr "상태"
+
+#: ../console/plugins/gntgf.c:209
+#, c-format
+msgid "%s just signed on"
+msgstr "%s 님이 접속했습니다."
+
+#: ../console/plugins/gntgf.c:216
+#, c-format
+msgid "%s just signed off"
+msgstr "%s 님이 접속을 끊었습니다."
+
+#: ../console/plugins/gntgf.c:224
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s 님이 나에게 메시지를 보내 왔습니다."
+
+#: ../console/plugins/gntgf.c:243
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s 님이 별명을 불렀습니다. (%s)"
+
+#: ../console/plugins/gntgf.c:245
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s 님이 메시지를 전송합니다. (%s)"
+
+#: ../console/plugins/gntgf.c:283
+msgid "Buddy signs on/off"
+msgstr "친구가 접속/접속 해제했을 때"
+
+#: ../console/plugins/gntgf.c:284
+msgid "You receive an IM"
+msgstr "메시지를 받을 때"
+
+#: ../console/plugins/gntgf.c:285
+msgid "Someone speaks in a chat"
+msgstr "대화에서 누군가가 나를 호출했을 때"
+
+#: ../console/plugins/gntgf.c:286
+msgid "Someone says your name in a chat"
+msgstr "대화에서 누군가가 내 이름을 입력했을 때"
+
+#: ../console/plugins/gntgf.c:314
+msgid "Notify with a toaster when"
+msgstr "다음의 경우에 Toaster와 함께 알림"
+
+#: ../console/plugins/gntgf.c:329
+msgid "Beep too!"
+msgstr "비프음 포함!"
+
+#: ../console/plugins/gntgf.c:335
+msgid "Set URGENT for the terminal window."
+msgstr "터미널 창 속성이 긴급으로 되었을 때"
+
+#: ../console/plugins/gntgf.c:355
+msgid "GntGf"
+msgstr "GntGf"
+
+#: ../console/plugins/gntgf.c:357
+#: ../console/plugins/gntgf.c:358
+msgid "Toaster plugin"
+msgstr "Toaster 플러그인"
+
+#: ../console/plugins/gnthistory.c:116
+#: ../gtk/plugins/history.c:120
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>%s 님과 %s 의 대화</b><br>"
+
+#: ../console/plugins/gnthistory.c:138
+#: ../gtk/plugins/history.c:147
+msgid "History Plugin Requires Logging"
+msgstr "로그 기능은 히스토리 플러그인이 필요합니다."
+
+#: ../console/plugins/gnthistory.c:139
+#: ../gtk/plugins/history.c:148
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
+"로그를 기록하려면 [도구] -> [설정] -> [로그 기록] 을 선택해 주십시오.\n"
+"\n"
+"인스턴트 메시지 혹은 대화의 로그를 기록해 두면, 히스토리 플러그인의 기능을 이용 가능하게 됩니다."
 
-#: ../finch/gntplugin.c:259
+#: ../console/plugins/gnthistory.c:179
+msgid "GntHistory"
+msgstr "GntHistory"
+
+#: ../console/plugins/gnthistory.c:181
+#: ../gtk/plugins/history.c:190
+msgid "Shows recently logged conversations in new conversations."
+msgstr "새로운 대화를 시작할 때 최근 로그에 기록된 대화를 삽입합니다."
+
+#: ../console/plugins/gnthistory.c:182
+#: ../gtk/plugins/history.c:191
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+msgstr "새로운 대화가 시작되면 이전 대화의 맨 마지막 메시지를 앞 부분에 추가합니다."
+
+#: ../console/plugins/lastlog.c:69
+msgid "Lastlog"
+msgstr "마지막 로그"
+
+#: ../console/plugins/lastlog.c:99
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr "마지막 로그: 과거의 로그에 있는 부분 문자열을 검색합니다."
+
+#: ../console/plugins/lastlog.c:121
+msgid "GntLastlog"
+msgstr "GntLastlog"
+
+#: ../console/plugins/lastlog.c:123
+#: ../console/plugins/lastlog.c:124
+msgid "Lastlog plugin"
+msgstr "Lastlog 플러그인입니다."
+
+#: ../gtk/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "ë°©í–¥"
+
+#: ../gtk/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "트레이의 방향입니다."
+
+#: ../gtk/gaimstock.c:137
+msgid "_Alias"
+msgstr "별칭(_A)"
+
+#. join button
+#: ../gtk/gaimstock.c:138
+#: ../gtk/gtkblist.c:1186
+#: ../gtk/gtkroomlist.c:306
+#: ../gtk/gtkroomlist.c:463
+msgid "_Join"
+msgstr "참가(_J)"
+
+#: ../gtk/gaimstock.c:139
+msgid "Close _tabs"
+msgstr "탭 닫기(_T)"
+
+#: ../gtk/gaimstock.c:140
+#: ../gtk/gtkblist.c:1069
+msgid "I_M"
+msgstr "인스턴트 메시지(_M)"
+
+#: ../gtk/gaimstock.c:141
+msgid "_Get Info"
+msgstr "정보 가져오기(_G)"
+
+#: ../gtk/gaimstock.c:142
+msgid "_Invite"
+msgstr "초대(_I)"
+
+#: ../gtk/gaimstock.c:143
+msgid "_Modify"
+msgstr "변경(_M)"
+
+#: ../gtk/gaimstock.c:144
+msgid "_Open Mail"
+msgstr "메일 열기(_O)"
+
+#. Pause button
+#: ../gtk/gaimstock.c:145
+#: ../gtk/gtkft.c:835
+msgid "_Pause"
+msgstr "일시정지(_P)"
+
+#. Build the login options frame.
+#: ../gtk/gtkaccount.c:390
+msgid "Login Options"
+msgstr "로그인 설정"
+
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "프로토콜(_T):"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "아이디(_N):"
+
+#: ../pidgin/gtkaccount.c:531
+msgid "_Local alias:"
+msgstr "별칭(_L):"
+
+#: ../pidgin/gtkaccount.c:535
+msgid "Remember pass_word"
+msgstr "비밀번호 저장"
+
+#. Build the user options frame.
+#: ../gtk/gtkaccount.c:554
+msgid "User Options"
+msgstr "사용자 설정"
+
+#: ../pidgin/gtkaccount.c:606
+msgid "New _mail notifications"
+msgstr "새 메일 알림"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:611
+msgid "Use this buddy _icon for this account:"
+msgstr "다음 아이콘 사용:"
+
+#. Build the protocol options frame.
+#: ../gtk/gtkaccount.c:684
+#, c-format
+msgid "%s Options"
+msgstr "%s 설정"
+
+#: ../gtk/gtkaccount.c:881
+msgid "Use GNOME Proxy Settings"
+msgstr "GNOME 프록시 설정 사용"
+
+#: ../gtk/gtkaccount.c:882
+msgid "Use Global Proxy Settings"
+msgstr "글로벌 프록시 설정 사용"
+
+#: ../gtk/gtkaccount.c:888
+msgid "No Proxy"
+msgstr "프록시 없음"
+
+#: ../gtk/gtkaccount.c:894
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../gtk/gtkaccount.c:900
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#: ../gtk/gtkaccount.c:906
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#: ../gtk/gtkaccount.c:912
+#: ../gtk/gtkprefs.c:1100
+msgid "Use Environmental Settings"
+msgstr "환경 설정 사용"
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../gtk/gtkaccount.c:951
+msgid "If you look real closely"
+msgstr "가까이 잘 보면"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../gtk/gtkaccount.c:954
+msgid "you can see the butterflies mating"
+msgstr "나비가 친구가 되어 있는 것을 알 수 있습니다."
+
+#: ../gtk/gtkaccount.c:975
+msgid "Proxy Options"
+msgstr "프록시 설정"
+
+#: ../gtk/gtkaccount.c:989
+#: ../gtk/gtkprefs.c:1094
+msgid "Proxy _type:"
+msgstr "프록시 형식(_T):"
+
+#: ../gtk/gtkaccount.c:998
+#: ../gtk/gtkprefs.c:1115
+msgid "_Host:"
+msgstr "호스트명(_H):"
+
+#: ../gtk/gtkaccount.c:1002
+#: ../gtk/gtkprefs.c:1133
+msgid "_Port:"
+msgstr "포트 번호(_P):"
+
+#: ../gtk/gtkaccount.c:1010
+msgid "_Username:"
+msgstr "사용자명(_U):"
+
+#: ../gtk/gtkaccount.c:1017
+#: ../gtk/gtkprefs.c:1170
+msgid "Pa_ssword:"
+msgstr "비밀번호(_S):"
+
+#: ../gtk/gtkaccount.c:1428
+msgid "Add Account"
+msgstr "계정 추가"
+
+#: ../gtk/gtkaccount.c:1452
+msgid "_Basic"
+msgstr "기본 설정(_B)"
+
+#: ../gtk/gtkaccount.c:1463
+msgid "_Advanced"
+msgstr "고급 설정(_A)"
+
+#. Register button
+#: ../gtk/gtkaccount.c:1478
+#: ../libgaim/protocols/jabber/jabber.c:860
+msgid "Register"
+msgstr "등록"
+
+#: ../gtk/gtkaccount.c:1933
+#: ../gtk/gtkplugin.c:566
+msgid "Enabled"
+msgstr "사용"
+
+#: ../gtk/gtkaccount.c:1961
+msgid "Protocol"
+msgstr "프로토콜"
+
+#: ../gtk/gtkaccount.c:2483
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s 님이 %s 님을 친구 목록 %s%s에 추가하고 싶어 합니다."
+
+#: ../gtk/gtkaccount.c:2506
+#: ../gtk/gtkaccount.c:2512
+msgid "Authorize buddy?"
+msgstr "친구로서 승인하시겠습니까?"
+
+#: ../gtk/gtkaccount.c:2507
+#: ../gtk/gtkaccount.c:2513
+msgid "Authorize"
+msgstr "승인"
+
+#: ../gtk/gtkaccount.c:2508
+#: ../gtk/gtkaccount.c:2514
+msgid "Deny"
+msgstr "거부"
+
+#: ../gtk/gtkblist.c:709
+msgid "Join a Chat"
+msgstr "대화 참가"
+
+#: ../gtk/gtkblist.c:730
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
+msgstr "참가할 대화에 대해 적당한 정보를 입력해 주십시오.\n"
+
+#: ../gtk/gtkblist.c:741
+#: ../gtk/gtkpounce.c:529
+#: ../gtk/gtkroomlist.c:399
+msgid "_Account:"
+msgstr "계정(_A):"
+
+#: ../gtk/gtkblist.c:1015
+#: ../gtk/gtkprivacy.c:603
+#: ../gtk/gtkprivacy.c:614
+msgid "_Block"
+msgstr "거부(_B)"
+
+#: ../gtk/gtkblist.c:1015
+msgid "Un_block"
+msgstr "거부 안 함(_B)"
+
+#: ../gtk/gtkblist.c:1066
+msgid "Get _Info"
+msgstr "정보 가져오기(_I)"
+
+#: ../gtk/gtkblist.c:1075
+msgid "_Send File"
+msgstr "파일 전송(_S)"
+
+#: ../gtk/gtkblist.c:1082
+msgid "Add Buddy _Pounce"
+msgstr "친구 알림 추가(_P)"
+
+#: ../gtk/gtkblist.c:1086
+#: ../gtk/gtkblist.c:1090
+#: ../gtk/gtkblist.c:1190
+#: ../gtk/gtkblist.c:1213
+msgid "View _Log"
+msgstr "로그 보기(_L)"
+
+#: ../gtk/gtkblist.c:1103
+msgid "Alias..."
+msgstr "별칭..."
+
+#: ../gtk/gtkblist.c:1112
+#: ../gtk/gtkblist.c:1198
+#: ../gtk/gtkblist.c:1219
+msgid "_Alias..."
+msgstr "별칭(_A)..."
+
+#: ../gtk/gtkblist.c:1114
+#: ../gtk/gtkblist.c:1200
+#: ../gtk/gtkblist.c:1221
+msgid "_Remove"
+msgstr "삭제(_R)"
+
+#: ../gtk/gtkblist.c:1161
+msgid "Add a _Buddy"
+msgstr "친구 추가(_B)"
+
+#: ../gtk/gtkblist.c:1163
+msgid "Add a C_hat"
+msgstr "대화 추가(_H)"
+
+#: ../gtk/gtkblist.c:1166
+msgid "_Delete Group"
+msgstr "그룹 삭제(_D)"
+
+#: ../gtk/gtkblist.c:1168
+msgid "_Rename"
+msgstr "이름 바꾸기(_R)"
+
+#: ../gtk/gtkblist.c:1188
+msgid "Auto-Join"
+msgstr "자동 참가"
+
+#: ../gtk/gtkblist.c:1226
+#: ../gtk/gtkblist.c:1249
+msgid "_Collapse"
+msgstr "숨기기(_C)"
+
+#: ../gtk/gtkblist.c:1254
+msgid "_Expand"
+msgstr "보이기(_E)"
+
+#: ../gtk/gtkblist.c:1500
+#: ../gtk/gtkblist.c:1512
+#: ../gtk/gtkblist.c:4374
+#: ../gtk/gtkblist.c:4384
+msgid "/Tools/Mute Sounds"
+msgstr "/도구/소리 끄기"
+
+#: ../gtk/gtkblist.c:1972
+#: ../gtk/gtkconv.c:4415
+#: ../gtk/gtkpounce.c:421
+msgid "You are not currently signed on with an account that can add that buddy."
+msgstr "지금 친구 추가가 가능한 계정에 접속되어 있지 않습니다."
+
+#. Buddies menu
+#: ../gtk/gtkblist.c:2567
+msgid "/_Buddies"
+msgstr "/친구(_B)"
+
+#: ../gtk/gtkblist.c:2568
+msgid "/Buddies/New Instant _Message..."
+msgstr "/친구/새 인스턴스 메시지(_M)..."
+
+#: ../gtk/gtkblist.c:2569
+msgid "/Buddies/Join a _Chat..."
+msgstr "/친구/대화 참가(_C)..."
+
+#: ../gtk/gtkblist.c:2570
+msgid "/Buddies/Get User _Info..."
+msgstr "/친구/사용자 정보 가져오기(_I)..."
+
+#: ../gtk/gtkblist.c:2571
+msgid "/Buddies/View User _Log..."
+msgstr "/친구/사용자 로그 보기(_L)..."
+
+#: ../gtk/gtkblist.c:2573
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/친구/오프라인 친구 표시(_O)"
+
+#: ../gtk/gtkblist.c:2574
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/친구/빈 그룹 표시(_E)"
+
+#: ../gtk/gtkblist.c:2575
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/친구/친구 상세 표시(_D)"
+
+#: ../gtk/gtkblist.c:2576
+msgid "/Buddies/Show Idle _Times"
+msgstr "/친구/대기 시간 표시(_T)"
+
+#: ../gtk/gtkblist.c:2577
+msgid "/Buddies/_Sort Buddies"
+msgstr "/친구/친구 정렬(_S)"
+
+#: ../gtk/gtkblist.c:2579
+msgid "/Buddies/_Add Buddy..."
+msgstr "/친구/친구 추가(_A)..."
+
+#: ../gtk/gtkblist.c:2580
+msgid "/Buddies/Add C_hat..."
+msgstr "/친구/대화 추가(_H)..."
+
+#: ../gtk/gtkblist.c:2581
+msgid "/Buddies/Add _Group..."
+msgstr "/친구/그룹 추가(_G)..."
+
+#: ../gtk/gtkblist.c:2583
+msgid "/Buddies/_Quit"
+msgstr "/친구/종료(_Q)"
+
+#. Accounts menu
+#: ../gtk/gtkblist.c:2586
+msgid "/_Accounts"
+msgstr "/계정(_A)"
+
+#: ../gtk/gtkblist.c:2587
+#: ../gtk/gtkblist.c:6279
+msgid "/Accounts/Add\\/Edit"
+msgstr "/계정/추가\\/편집"
+
+#. Tools
+#: ../gtk/gtkblist.c:2590
+msgid "/_Tools"
+msgstr "/도구(_T)"
+
+#: ../gtk/gtkblist.c:2591
+msgid "/Tools/Buddy _Pounces"
+msgstr "/도구/친구 알림(_P)"
+
+#: ../gtk/gtkblist.c:2592
+msgid "/Tools/Plu_gins"
+msgstr "/도구/플러그인(_G)"
+
+#: ../gtk/gtkblist.c:2593
+msgid "/Tools/Pr_eferences"
+msgstr "/도구/설정(_E)"
+
+#: ../gtk/gtkblist.c:2594
+msgid "/Tools/Pr_ivacy"
+msgstr "/도구/개인 정보(_I)"
+
+#: ../gtk/gtkblist.c:2596
+msgid "/Tools/_File Transfers"
+msgstr "/도구/파일 전송(_F)"
+
+#: ../gtk/gtkblist.c:2597
+msgid "/Tools/R_oom List"
+msgstr "/도구/대화실 목록(_O)"
+
+#: ../gtk/gtkblist.c:2598
+msgid "/Tools/System _Log"
+msgstr "/도구/시스템 로그(_L)"
+
+#: ../gtk/gtkblist.c:2600
+msgid "/Tools/Mute _Sounds"
+msgstr "/도구/소리 끄기(_S)"
+
+#. Help
+#: ../gtk/gtkblist.c:2603
+msgid "/_Help"
+msgstr "/도움말(_H)"
+
+#: ../gtk/gtkblist.c:2604
+msgid "/Help/Online _Help"
+msgstr "/도움말/온라인 도움말(_H)"
+
+#: ../gtk/gtkblist.c:2605
+msgid "/Help/_Debug Window"
+msgstr "/도움말/디버그 창(_D)"
+
+#: ../gtk/gtkblist.c:2606
+msgid "/Help/_About"
+msgstr "/도움말/Pidgin 정보(_A)"
+
+#: ../gtk/gtkblist.c:2638
+#, c-format
 msgid ""
-"Please open the debug window and try again to see the exact error message."
+"\n"
+"<b>Account:</b> %s"
 msgstr ""
+"\n"
+"<b>계정:</b> %s"
 
-#: ../finch/gntplugin.c:322
-msgid "Select plugin to install"
+#: ../gtk/gtkblist.c:2722
+msgid "Buddy Alias"
+msgstr "친구의 별칭"
+
+#: ../gtk/gtkblist.c:2743
+msgid "Logged In"
+msgstr "접속 시간"
+
+#: ../gtk/gtkblist.c:2789
+msgid "Last Seen"
+msgstr "마지막에 만난 것은"
+
+#: ../gtk/gtkblist.c:2798
+#: ../gtk/gtkblist.c:3286
+#: ../gtk/gtkdocklet.c:471
+#: ../gtk/gtkstatusbox.c:990
+#: ../libgaim/protocols/gg/gg.c:993
+#: ../libgaim/protocols/jabber/buddy.c:1401
+#: ../libgaim/protocols/novell/novell.c:2863
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:5551
+#: ../libgaim/protocols/qq/qq.c:170
+#: ../libgaim/protocols/qq/qq.c:177
+#: ../libgaim/protocols/yahoo/yahoo.c:2878
+#: ../libgaim/status.c:154
+msgid "Offline"
+msgstr "오프라인"
+
+#: ../gtk/gtkblist.c:2809
+#: ../gtk/gtkprefs.c:680
+#: ../libgaim/protocols/jabber/buddy.c:289
+#: ../libgaim/protocols/jabber/buddy.c:937
+#: ../libgaim/protocols/jabber/chat.c:777
+msgid "Description"
+msgstr "설명"
+
+#: ../gtk/gtkblist.c:2809
+msgid "Spooky"
+msgstr "Spooky"
+
+#: ../gtk/gtkblist.c:2811
+msgid "Awesome"
+msgstr "Awesome"
+
+#: ../gtk/gtkblist.c:2813
+msgid "Rockin'"
+msgstr "Rockin'"
+
+#: ../gtk/gtkblist.c:3302
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "대기 시간: %dh %02dm"
+
+#: ../gtk/gtkblist.c:3304
+#, c-format
+msgid "Idle %dm"
+msgstr "대기 시간: %dm"
+
+#: ../gtk/gtkblist.c:3435
+msgid "/Buddies/New Instant Message..."
+msgstr "/친구/새 인스턴트 메시지..."
+
+#: ../gtk/gtkblist.c:3436
+#: ../gtk/gtkblist.c:3469
+msgid "/Buddies/Join a Chat..."
+msgstr "/친구/대화 참가..."
+
+#: ../gtk/gtkblist.c:3437
+msgid "/Buddies/Get User Info..."
+msgstr "/친구/사용자 정보 가져오기..."
+
+#: ../gtk/gtkblist.c:3438
+msgid "/Buddies/Add Buddy..."
+msgstr "/친구/친구 추가..."
+
+#: ../gtk/gtkblist.c:3439
+#: ../gtk/gtkblist.c:3472
+msgid "/Buddies/Add Chat..."
+msgstr "/친구/대화 추가..."
+
+#: ../gtk/gtkblist.c:3440
+msgid "/Buddies/Add Group..."
+msgstr "/친구/그룹 추가..."
+
+#: ../gtk/gtkblist.c:3475
+msgid "/Tools/Buddy Pounces"
+msgstr "/도구/친구 알림"
+
+#: ../gtk/gtkblist.c:3478
+msgid "/Tools/Privacy"
+msgstr "/도구/개인 정보"
+
+#: ../gtk/gtkblist.c:3481
+msgid "/Tools/Room List"
+msgstr "/도구/대화실 목록"
+
+#: ../gtk/gtkblist.c:3578
+#: ../gtk/gtkdocklet.c:152
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%2$s 님으로부터 %1$d개의 읽지 않은 메일이 있습니다.\n"
+msgstr[1] "%2$s さんから %1$d個の未?のメッセ?ジがあります\n"
+
+#: ../gtk/gtkblist.c:3654
+msgid "Manually"
+msgstr "수동 정렬"
+
+#: ../gtk/gtkblist.c:3656
+msgid "Alphabetically"
+msgstr "알파벳순"
+
+#: ../gtk/gtkblist.c:3657
+msgid "By status"
+msgstr "상태순"
+
+#: ../gtk/gtkblist.c:3658
+msgid "By log size"
+msgstr "로그 크기순"
+
+#: ../gtk/gtkblist.c:3860
+#: ../gtk/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "%s 님은 접속을 끊었습니다."
+
+#: ../gtk/gtkblist.c:3869
+#: ../libgaim/protocols/sametime/sametime.c:3664
+msgid "Connect"
+msgstr "접속"
+
+#: ../gtk/gtkblist.c:3869
+msgid "Re-enable Account"
+msgstr "계정 재사용"
+
+#: ../gtk/gtkblist.c:3890
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s 님은 접속을 끊었습니다: %s</span>"
+
+#: ../gtk/gtkblist.c:4027
+msgid "<b>Username:</b>"
+msgstr "<b>사용자명</b>:"
+
+#: ../gtk/gtkblist.c:4034
+msgid "<b>Password:</b>"
+msgstr "<b>비밀번호</b>:"
+
+#: ../gtk/gtkblist.c:4045
+msgid "_Login"
+msgstr "로그인(_L)"
+
+#: ../gtk/gtkblist.c:4127
+msgid "/Accounts"
+msgstr "/계정"
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: ../gtk/gtkblist.c:4368
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/친구/오프라인 친구 표시"
+
+#: ../gtk/gtkblist.c:4371
+msgid "/Buddies/Show Empty Groups"
+msgstr "/친구/빈 그룹 표시"
+
+#: ../gtk/gtkblist.c:4377
+msgid "/Buddies/Show Buddy Details"
+msgstr "/친구/친구 상세 표시"
+
+#: ../gtk/gtkblist.c:4380
+msgid "/Buddies/Show Idle Times"
+msgstr "/친구/대기 시간 표시"
+
+#: ../gtk/gtkblist.c:5073
+#: ../gtk/plugins/gevolution/gevolution.c:97
+#: ../gtk/plugins/gevolution/gevo-util.c:64
+#: ../libgaim/blist.c:521
+#: ../libgaim/blist.c:1294
+#: ../libgaim/blist.c:1523
+#: ../libgaim/protocols/jabber/roster.c:68
+msgid "Buddies"
+msgstr "친구"
+
+#: ../gtk/gtkblist.c:5207
+msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr "친구 목록에 추가하고자 하는 상대의 아이디를 입력해 주십시오. 친구의 별칭 또는 별명을 입력할 수 있습니다(선택 사항). 별칭은 가능한 경우 아이디 대신으로 표시됩니다.\n"
+
+#: ../gtk/gtkblist.c:5267
+#: ../gtk/gtkblist.c:5628
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
+#: ../gtk/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "그룹:"
+
+#: ../gtk/gtkblist.c:5526
+msgid "This protocol does not support chat rooms."
+msgstr "이 프로토콜에서는 대화실을 지원하지 않습니다."
+
+#: ../gtk/gtkblist.c:5542
+msgid "You are not currently signed on with any protocols that have the ability to chat."
+msgstr "대화가 가능한 프로토콜로 접속되어 있지 않습니다."
+
+#: ../gtk/gtkblist.c:5583
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "이 대화의 별칭과 친구 목록에 추가할 때의 적당한 정보를 입력해 주십시오.\n"
+
+#: ../gtk/gtkblist.c:5666
+msgid "Please enter the name of the group to be added."
+msgstr "참가할 그룹명을 입력해 주십시오."
+
+#: ../gtk/gtkblist.c:6299
+msgid "<GaimMain>/Accounts/"
+msgstr "<PidginMain>/계정/"
+
+#: ../gtk/gtkblist.c:6324
+msgid "_Edit Account"
+msgstr "계정 편집(_E)"
+
+#: ../gtk/gtkblist.c:6357
+#: ../gtk/gtkblist.c:6363
+#: ../gtk/gtkconv.c:2858
+msgid "No actions available"
+msgstr "이용 가능한 동작이 없습니다."
+
+#: ../gtk/gtkblist.c:6371
+msgid "_Disable"
+msgstr "사용 안 함(_D)"
+
+#: ../gtk/gtkblist.c:6383
+msgid "Enable Account"
+msgstr "계정 사용"
+
+#: ../gtk/gtkblist.c:6389
+msgid "<GaimMain>/Accounts/Enable Account"
+msgstr "<PidginMain>/계정/계정을 사용합니다."
+
+#: ../gtk/gtkblist.c:6438
+msgid "/Tools"
+msgstr "/도구"
+
+#: ../gtk/gtkblist.c:6508
+msgid "/Buddies/Sort Buddies"
+msgstr "/친구/친구 정렬"
+
+#: ../gtk/gtkconn.c:179
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
+"%s\n"
+"\n"
+"오류를 해결하고 계정을 다시 사용할 수 있을 때까지 %s이 재접속하지 않습니다."
 
-#: ../finch/gntplugin.c:348
-msgid "You can (un)load plugins from the following list."
-msgstr "다음의 목록에 있는 플러그인을 로드하거나 해제할 수 있습니다."
+#: ../finch/gntconn.c:129
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"오류를 해결하고 계정을 다시 사용할 수 있을 때까지 방울새가 재접속하지 않습니다."
 
-#: ../finch/gntplugin.c:399
-msgid "Install Plugin..."
+#: ../gtk/gtkconv.c:766
+#: ../gtk/gtkconv.c:792
+msgid "That buddy is not on the same protocol as this chat."
+msgstr "그 친구는 이 대화의 동일 프로토콜 상에 있지 않습니다."
+
+#: ../gtk/gtkconv.c:786
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr "지금 그 친구를 초대 가능한 계정으로 접속되어 있지 않습니다."
+
+#: ../gtk/gtkconv.c:839
+msgid "Invite Buddy Into Chat Room"
+msgstr "친구를 대화실로 초대"
+
+#. Put our happy label in it.
+#: ../gtk/gtkconv.c:869
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgstr "초대하고자 하는 상대의 이름과 초대 메시지(선택 사항)을 입력해 주십시오."
+
+#: ../gtk/gtkconv.c:890
+msgid "_Buddy:"
+msgstr "친구(_B):"
+
+#: ../gtk/gtkconv.c:910
+#: ../gtk/gtksavedstatuses.c:1141
+#: ../gtk/gtksavedstatuses.c:1477
+msgid "_Message:"
+msgstr "메시지(_M):"
+
+#: ../gtk/gtkconv.c:967
+#: ../gtk/gtkconv.c:2420
+#: ../gtk/gtkdebug.c:218
+#: ../gtk/gtkft.c:542
+msgid "Unable to open file."
+msgstr "파일을 열 수 없습니다."
+
+#: ../gtk/gtkconv.c:973
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>%s 님과의 대화</h1>\n"
+
+#: ../gtk/gtkconv.c:997
+msgid "Save Conversation"
+msgstr "대화 저장"
+
+#: ../gtk/gtkconv.c:1144
+#: ../gtk/gtkdebug.c:166
+#: ../gtk/gtkdebug.c:756
+msgid "Find"
+msgstr "찾기"
+
+#: ../gtk/gtkconv.c:1170
+#: ../gtk/gtkdebug.c:194
+msgid "_Search for:"
+msgstr "검색 단어(_S):"
+
+#: ../gtk/gtkconv.c:1341
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "로그 기록이 시작되었습니다. 지금부터 대화가 로그에 기록됩니다."
+
+#: ../gtk/gtkconv.c:1349
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "로그 기록이 중지되었습니다. 지금부터 대화가 로그에 기록되지 않습니다."
+
+#: ../gtk/gtkconv.c:1617
+msgid "Un-Ignore"
+msgstr "무시 안 함"
+
+#: ../gtk/gtkconv.c:1620
+msgid "Ignore"
+msgstr "무시할 대상"
+
+#: ../gtk/gtkconv.c:1640
+msgid "Get Away Message"
+msgstr "자리 비움 메시지"
+
+#: ../gtk/gtkconv.c:1663
+msgid "Last said"
+msgstr "마지막 메시지:"
+
+#: ../gtk/gtkconv.c:2428
+msgid "Unable to save icon file to disk."
+msgstr "아이콘 파일을 저장할 수 없습니다."
+
+#: ../gtk/gtkconv.c:2498
+msgid "Save Icon"
+msgstr "아이콘 저장"
+
+#: ../gtk/gtkconv.c:2547
+msgid "Animate"
+msgstr "애니메이션 사용"
+
+#: ../gtk/gtkconv.c:2552
+msgid "Hide Icon"
+msgstr "아이콘 숨기기"
+
+#: ../gtk/gtkconv.c:2555
+msgid "Save Icon As..."
+msgstr "아이콘을 다른 이름으로 저장..."
+
+#: ../gtk/gtkconv.c:2559
+msgid "Set Custom Icon..."
+msgstr "사용자 아이콘 설정..."
+
+#: ../gtk/gtkconv.c:2566
+msgid "Remove Custom Icon"
+msgstr "사용자 아이콘 삭제"
+
+#. Conversation menu
+#: ../gtk/gtkconv.c:2707
+msgid "/_Conversation"
+msgstr "/대화(_C)"
+
+#: ../gtk/gtkconv.c:2709
+msgid "/Conversation/New Instant _Message..."
+msgstr "/대화/새 인스턴트 메시지(_M)..."
+
+#: ../gtk/gtkconv.c:2714
+msgid "/Conversation/_Find..."
+msgstr "/대화/찾기(_F)..."
+
+#: ../gtk/gtkconv.c:2716
+msgid "/Conversation/View _Log"
+msgstr "/대화/로그 보기(_L)"
+
+#: ../gtk/gtkconv.c:2717
+msgid "/Conversation/_Save As..."
+msgstr "/대화/다른 이름으로 저장(_S)..."
+
+#: ../gtk/gtkconv.c:2719
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/대화/화면 비우기(_R)"
+
+#: ../gtk/gtkconv.c:2723
+msgid "/Conversation/Se_nd File..."
+msgstr "/대화/파일 전송(_N)..."
+
+#: ../gtk/gtkconv.c:2724
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/대화/친구 알림 추가(_P)..."
+
+#: ../gtk/gtkconv.c:2726
+msgid "/Conversation/_Get Info"
+msgstr "/대화/정보 가져오기(_G)"
+
+#: ../gtk/gtkconv.c:2728
+msgid "/Conversation/In_vite..."
+msgstr "/대화/초대(_V)..."
+
+#: ../gtk/gtkconv.c:2730
+msgid "/Conversation/M_ore"
+msgstr "/대화/자세히(_O)"
+
+#: ../gtk/gtkconv.c:2734
+msgid "/Conversation/Al_ias..."
+msgstr "/대화/별칭(_I)..."
+
+#: ../gtk/gtkconv.c:2736
+msgid "/Conversation/_Block..."
+msgstr "/대화/거부(_B)..."
+
+#: ../gtk/gtkconv.c:2738
+msgid "/Conversation/_Add..."
+msgstr "/대화/추가(_A)..."
+
+#: ../gtk/gtkconv.c:2740
+msgid "/Conversation/_Remove..."
+msgstr "/대화/삭제(_R)..."
+
+#: ../gtk/gtkconv.c:2745
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/대화/링크 삽입(_K)..."
+
+#: ../gtk/gtkconv.c:2747
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/대화/이미지 삽입(_E)..."
+
+#: ../gtk/gtkconv.c:2752
+msgid "/Conversation/_Close"
+msgstr "/대화/닫기(_C)"
+
+#. Options
+#: ../gtk/gtkconv.c:2756
+msgid "/_Options"
+msgstr "/설정(_O)"
+
+#: ../gtk/gtkconv.c:2757
+msgid "/Options/Enable _Logging"
+msgstr "/설정/로그 기록(_L)"
+
+#: ../gtk/gtkconv.c:2758
+msgid "/Options/Enable _Sounds"
+msgstr "/설정/소리 사용(_S)"
+
+#: ../gtk/gtkconv.c:2759
+msgid "/Options/Show Buddy _Icon"
+msgstr "/설정/친구 아이콘 표시(_I)"
+
+#: ../gtk/gtkconv.c:2761
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/설정/서식 도구모음 표시(_T)"
+
+#: ../gtk/gtkconv.c:2762
+msgid "/Options/Show Ti_mestamps"
+msgstr "/설정/타임스탬프 표시(_M)"
+
+#: ../gtk/gtkconv.c:2837
+msgid "/Conversation/More"
+msgstr "/대화/자세히(_O)"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../gtk/gtkconv.c:2882
+#: ../gtk/gtkconv.c:2914
+msgid "/Conversation"
+msgstr "/대화"
+
+#: ../gtk/gtkconv.c:2922
+msgid "/Conversation/View Log"
+msgstr "/대화/로그 보기"
+
+#: ../gtk/gtkconv.c:2928
+msgid "/Conversation/Send File..."
+msgstr "/대화/파일 전송..."
+
+#: ../gtk/gtkconv.c:2932
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/대화/친구 알림 추가..."
+
+#: ../gtk/gtkconv.c:2938
+msgid "/Conversation/Get Info"
+msgstr "/대화/정보 가져오기..."
+
+#: ../gtk/gtkconv.c:2942
+msgid "/Conversation/Invite..."
+msgstr "/대화/초대..."
+
+#: ../gtk/gtkconv.c:2948
+msgid "/Conversation/Alias..."
+msgstr "/대화/별칭..."
+
+#: ../gtk/gtkconv.c:2952
+msgid "/Conversation/Block..."
+msgstr "/대화/거부..."
+
+#: ../gtk/gtkconv.c:2956
+msgid "/Conversation/Add..."
+msgstr "/대화/추가..."
+
+#: ../gtk/gtkconv.c:2960
+msgid "/Conversation/Remove..."
+msgstr "/대화/삭제..."
+
+#: ../gtk/gtkconv.c:2966
+msgid "/Conversation/Insert Link..."
+msgstr "/대화/링크 삽입..."
+
+#: ../gtk/gtkconv.c:2970
+msgid "/Conversation/Insert Image..."
+msgstr "/대화/이미지 삽입..."
+
+#: ../gtk/gtkconv.c:2976
+msgid "/Options/Enable Logging"
+msgstr "/설정/로그 기록"
+
+#: ../gtk/gtkconv.c:2979
+msgid "/Options/Enable Sounds"
+msgstr "/설정/소리 사용"
+
+#: ../gtk/gtkconv.c:2992
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/설정/서식 도구모음 표시"
+
+#: ../gtk/gtkconv.c:2995
+msgid "/Options/Show Timestamps"
+msgstr "/설정/타임스탬프 표시"
+
+#: ../gtk/gtkconv.c:2998
+msgid "/Options/Show Buddy Icon"
+msgstr "/설정/친구 아이콘 표시"
+
+#: ../gtk/gtkconv.c:3074
+msgid "User is typing..."
+msgstr "사용자가 무언가를 입력하고 있습니다..."
+
+#: ../gtk/gtkconv.c:3077
+msgid "User has typed something and stopped"
+msgstr "사용자는 무언가를 입력하다가 일시중지 상태입니다."
+
+#. Build the Send To menu
+#: ../gtk/gtkconv.c:3260
+msgid "_Send To"
+msgstr "받을 사람(_S)"
+
+#: ../gtk/gtkconv.c:3967
+msgid "_Send"
+msgstr "보내기(_S)"
+
+#: ../gtk/gtkconv.c:4063
+#: ../libgaim/protocols/sametime/sametime.c:3606
+msgid "Topic:"
+msgstr "주제:"
+
+#. Setup the label telling how many people are in the room.
+#: ../gtk/gtkconv.c:4115
+msgid "0 people in room"
+msgstr "아무도 없습니다."
+
+#: ../gtk/gtkconv.c:5181
+#: ../gtk/gtkconv.c:5302
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "대화실에 %d 명이 있습니다."
+msgstr[1] "대화실에 %d 명이 있습니다."
+
+#: ../gtk/gtkconv.c:5855
+#: ../gtk/gtkstatusbox.c:567
+msgid "Typing"
+msgstr "입력 중입니다."
+
+#: ../gtk/gtkconv.c:5861
+msgid "Stopped Typing"
+msgstr "입력을 중지했습니다."
+
+#: ../gtk/gtkconv.c:5866
+msgid "Nick Said"
+msgstr "Nick Said"
+
+#: ../gtk/gtkconv.c:5871
+#: ../gtk/gtkdocklet.c:513
+msgid "Unread Messages"
+msgstr "읽지 않은 메시지"
+
+#: ../gtk/gtkconv.c:5876
+msgid "New Event"
+msgstr "새 이벤트"
+
+#: ../gtk/gtkconv.c:6997
+msgid "Confirm close"
+msgstr "닫기 확인"
+
+#: ../gtk/gtkconv.c:7029
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "아직 읽지 않은 메시지가 있습니다. 정말 창을 닫으시겠습니까?"
+
+#: ../gtk/gtkconv.c:7564
+msgid "Close other tabs"
+msgstr "다른 탭 닫기"
+
+#: ../gtk/gtkconv.c:7570
+msgid "Close all tabs"
+msgstr "모든 탭 닫기"
+
+#: ../gtk/gtkconv.c:7578
+msgid "Detach this tab"
+msgstr "이 탭을 분리"
+
+#: ../gtk/gtkconv.c:7584
+msgid "Close this tab"
+msgstr "이 탭을 닫기"
+
+#: ../gtk/gtkconv.c:7855
+msgid "Close conversation"
+msgstr "대화 창을 닫습니다."
+
+#: ../gtk/gtkconv.c:8319
+msgid "Last created window"
+msgstr "마지막에 생성한 창을 재이용"
+
+#: ../gtk/gtkconv.c:8321
+msgid "Separate IM and Chat windows"
+msgstr "메시지와 대화 창을 분리"
+
+#: ../gtk/gtkconv.c:8323
+#: ../gtk/gtkprefs.c:1303
+msgid "New window"
+msgstr "새 창으로 열기"
+
+#: ../gtk/gtkconv.c:8325
+msgid "By group"
+msgstr "그룹마다 공유"
+
+#: ../gtk/gtkconv.c:8327
+msgid "By account"
+msgstr "계정마다 공유"
+
+#: ../gtk/gtkdebug.c:233
+msgid "Save Debug Log"
+msgstr "디버그 로그 저장"
+
+#: ../gtk/gtkdebug.c:594
+msgid "Invert"
+msgstr "결과 반전"
+
+#: ../gtk/gtkdebug.c:597
+msgid "Highlight matches"
+msgstr "일치하는 단어 강조 표시"
+
+#: ../gtk/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "아이콘만(_I)"
+
+#: ../gtk/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "문자만(_T)"
+
+#: ../gtk/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "둘 다(_B)"
+
+#: ../gtk/gtkdebug.c:802
+msgid "Filter"
+msgstr "í•„í„°"
+
+#: ../gtk/gtkdebug.c:821
+msgid "Right click for more options."
+msgstr "오른쪽 클릭 메뉴에 추가 옵션 표시"
+
+#: ../gtk/gtkdebug.c:851
+msgid "Level "
+msgstr "수준"
+
+#: ../gtk/gtkdebug.c:852
+#: ../gtk/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr "디버그 필터 수준을 선택해 주십시오."
+
+#: ../gtk/gtkdebug.c:860
+msgid "All"
+msgstr "모두"
+
+#: ../gtk/gtkdebug.c:861
+msgid "Misc"
+msgstr "기타"
+
+#: ../gtk/gtkdebug.c:863
+msgid "Warning"
+msgstr "경고"
+
+#: ../gtk/gtkdebug.c:864
+msgid "Error "
+msgstr "오류"
+
+#: ../gtk/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "치명적 오류"
+
+#: ../gtk/gtkdialogs.c:66
+#: ../gtk/gtkdialogs.c:110
+msgid "lead developer"
+msgstr "수석 개발자"
+
+#: ../gtk/gtkdialogs.c:67
+#: ../gtk/gtkdialogs.c:68
+#: ../gtk/gtkdialogs.c:69
+#: ../gtk/gtkdialogs.c:70
+#: ../gtk/gtkdialogs.c:71
+#: ../gtk/gtkdialogs.c:73
+#: ../gtk/gtkdialogs.c:74
+#: ../gtk/gtkdialogs.c:75
+#: ../gtk/gtkdialogs.c:76
+#: ../gtk/gtkdialogs.c:77
+#: ../gtk/gtkdialogs.c:78
+#: ../gtk/gtkdialogs.c:81
+#: ../gtk/gtkdialogs.c:82
+#: ../gtk/gtkdialogs.c:83
+msgid "developer"
+msgstr "개발자"
+
+#: ../gtk/gtkdialogs.c:72
+msgid "developer & webmaster"
+msgstr "개발자/웹마스터"
+
+#: ../gtk/gtkdialogs.c:79
+msgid "support"
+msgstr "지원"
+
+#: ../gtk/gtkdialogs.c:80
+msgid "support/QA"
+msgstr "지원/QA"
+
+#: ../gtk/gtkdialogs.c:102
+msgid "win32 port"
+msgstr "Win32 포팅"
+
+#: ../gtk/gtkdialogs.c:103
+#: ../gtk/gtkdialogs.c:104
+msgid "maintainer"
+msgstr "관리자"
+
+#: ../gtk/gtkdialogs.c:105
+msgid "libfaim maintainer"
+msgstr "libfaim 관리자"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../gtk/gtkdialogs.c:107
+msgid "hacker and designated driver [lazy bum]"
+msgstr "해커 및 지정 드라이버 [lazy bum]"
+
+#: ../gtk/gtkdialogs.c:108
+msgid "Jabber developer"
+msgstr "Jabber 개발자"
+
+#: ../gtk/gtkdialogs.c:109
+msgid "original author"
+msgstr "초기 제작자"
+
+#: ../gtk/gtkdialogs.c:116
+msgid "Arabic"
+msgstr "아라비아어"
+
+#: ../gtk/gtkdialogs.c:117
+#: ../gtk/gtkdialogs.c:118
+#: ../gtk/gtkdialogs.c:190
+msgid "Bulgarian"
+msgstr "불가리아어"
+
+#: ../gtk/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:120
+msgid "Bengali"
+msgstr "벵갈어"
+
+#: ../gtk/gtkdialogs.c:121
+msgid "Bosnian"
+msgstr "보스니아어"
+
+#: ../gtk/gtkdialogs.c:122
+#: ../gtk/gtkdialogs.c:191
+#: ../gtk/gtkdialogs.c:192
+msgid "Catalan"
+msgstr "카타로니아어"
+
+#: ../gtk/gtkdialogs.c:123
+#: ../gtk/gtkdialogs.c:124
+msgid "Valencian-Catalan"
+msgstr "발렌시아-카타로니아어"
+
+#: ../gtk/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:193
+msgid "Czech"
+msgstr "체코어"
+
+#: ../gtk/gtkdialogs.c:126
+msgid "Danish"
+msgstr "덴마크어"
+
+#: ../gtk/gtkdialogs.c:127
+#: ../gtk/gtkdialogs.c:128
+#: ../gtk/gtkdialogs.c:194
+msgid "German"
+msgstr "독일어"
+
+#: ../gtk/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:130
+#: ../gtk/gtkdialogs.c:131
+msgid "Dzongkha"
+msgstr "징카어"
+
+#: ../gtk/gtkdialogs.c:132
+#: ../gtk/gtkdialogs.c:133
+msgid "Greek"
+msgstr "그리스어"
+
+#: ../gtk/gtkdialogs.c:134
+msgid "Australian English"
+msgstr "영어 (호주)"
+
+#: ../gtk/gtkdialogs.c:135
+msgid "Canadian English"
+msgstr "영어 (캐나다)"
+
+#: ../gtk/gtkdialogs.c:136
+msgid "British English"
+msgstr "영어 (영국)"
+
+#: ../gtk/gtkdialogs.c:137
+msgid "Esperanto"
+msgstr "에스페란토어"
+
+#: ../gtk/gtkdialogs.c:138
+#: ../gtk/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:196
+#: ../gtk/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:198
+msgid "Spanish"
+msgstr "스페인어"
+
+#: ../gtk/gtkdialogs.c:139
+#: ../gtk/gtkdialogs.c:140
+msgid "Euskera(Basque)"
+msgstr "유케라 (바스크어)"
+
+#: ../gtk/gtkdialogs.c:141
+#: ../gtk/gtkdialogs.c:142
+#: ../gtk/gtkdialogs.c:143
+msgid "Persian"
+msgstr "페르시아어"
+
+#: ../gtk/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:199
+#: ../gtk/gtkdialogs.c:200
+msgid "Finnish"
+msgstr "핀란드어"
+
+#: ../gtk/gtkdialogs.c:145
+#: ../gtk/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:204
+msgid "French"
+msgstr "프랑스어"
+
+#: ../gtk/gtkdialogs.c:146
+msgid "Galician"
+msgstr "갈리시아어"
+
+#: ../gtk/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:148
+msgid "Gujarati"
+msgstr "구자라티어"
+
+#: ../gtk/gtkdialogs.c:149
+#: ../gtk/gtkdialogs.c:205
+msgid "Hebrew"
+msgstr "히브리어"
+
+#: ../gtk/gtkdialogs.c:150
+msgid "Hindi"
+msgstr "힌디어"
+
+#: ../gtk/gtkdialogs.c:151
+msgid "Hungarian"
+msgstr "헝가리어"
+
+#: ../gtk/gtkdialogs.c:152
+#: ../gtk/gtkdialogs.c:206
+msgid "Italian"
+msgstr "이태리어"
+
+#: ../gtk/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:207
+#: ../gtk/gtkdialogs.c:208
+#: ../gtk/gtkdialogs.c:209
+msgid "Japanese"
+msgstr "일본어"
+
+#: ../gtk/gtkdialogs.c:154
+#: ../gtk/gtkdialogs.c:210
+msgid "Georgian"
+msgstr "그루지아어"
+
+#: ../gtk/gtkdialogs.c:155
+#: ../gtk/gtkdialogs.c:211
+msgid "Korean"
+msgstr "한국어"
+
+#: ../gtk/gtkdialogs.c:156
+#: ../gtk/gtkdialogs.c:157
+#: ../gtk/gtkdialogs.c:158
+msgid "Kurdish"
+msgstr "쿠르드어"
+
+#: ../gtk/gtkdialogs.c:159
+#: ../gtk/gtkdialogs.c:212
+#: ../gtk/gtkdialogs.c:213
+msgid "Lithuanian"
+msgstr "리투아니아어"
+
+#: ../gtk/gtkdialogs.c:160
+msgid "Macedonian"
+msgstr "마케도니아어"
+
+#: ../gtk/gtkdialogs.c:161
+msgid "Nepali"
+msgstr "네팔어"
+
+#: ../gtk/gtkdialogs.c:162
+msgid "Dutch, Flemish"
+msgstr "네덜란드, 프란다스어"
+
+#: ../gtk/gtkdialogs.c:163
+msgid "Norwegian"
+msgstr "노르웨이어"
+
+#: ../gtk/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:165
+#: ../gtk/gtkdialogs.c:214
+msgid "Polish"
+msgstr "폴란드어"
+
+#: ../gtk/gtkdialogs.c:166
+msgid "Portuguese"
+msgstr "포르투갈어"
+
+#: ../gtk/gtkdialogs.c:167
+msgid "Portuguese-Brazil"
+msgstr "포르투갈-브라질어"
+
+#: ../gtk/gtkdialogs.c:168
+msgid "Romanian"
+msgstr "루마니아어"
+
+#: ../gtk/gtkdialogs.c:169
+#: ../gtk/gtkdialogs.c:215
+#: ../gtk/gtkdialogs.c:216
+msgid "Russian"
+msgstr "러시아어"
+
+#: ../gtk/gtkdialogs.c:170
+#: ../gtk/gtkdialogs.c:171
+msgid "Serbian"
+msgstr "세르비아어"
+
+#: ../gtk/gtkdialogs.c:172
+#: ../gtk/gtkdialogs.c:217
+msgid "Slovak"
+msgstr "슬로바키아어"
+
+#: ../gtk/gtkdialogs.c:173
+#: ../gtk/gtkdialogs.c:218
+msgid "Slovenian"
+msgstr "슬로베니아어"
+
+#: ../gtk/gtkdialogs.c:174
+msgid "Albanian"
+msgstr "알바니아어"
+
+#: ../gtk/gtkdialogs.c:175
+#: ../gtk/gtkdialogs.c:219
+msgid "Swedish"
+msgstr "스웨덴어"
+
+#: ../gtk/gtkdialogs.c:176
+msgid "Tamil"
+msgstr "타밀어"
+
+#: ../gtk/gtkdialogs.c:177
+msgid "Telugu"
+msgstr "텔루구어"
+
+#: ../gtk/gtkdialogs.c:178
+msgid "Thai"
+msgstr "타이어"
+
+#: ../gtk/gtkdialogs.c:179
+msgid "Turkish"
+msgstr "터키어"
+
+#: ../gtk/gtkdialogs.c:180
+msgid "Vietnamese"
+msgstr "베트남어"
+
+#: ../gtk/gtkdialogs.c:180
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh 및 Gnome-Vi 팀"
+
+#: ../gtk/gtkdialogs.c:181
+#: ../gtk/gtkdialogs.c:220
+msgid "Simplified Chinese"
+msgstr "중국어 (간체)"
+
+#: ../gtk/gtkdialogs.c:182
+#: ../gtk/gtkdialogs.c:183
+#: ../gtk/gtkdialogs.c:221
+msgid "Traditional Chinese"
+msgstr "중국어 (번체)"
+
+#: ../gtk/gtkdialogs.c:189
+msgid "Amharic"
+msgstr "아무하라어"
+
+#: ../gtk/gtkdialogs.c:301
+msgid "About %s"
+msgstr "%s ì •ë³´"
+
+#: ../pidgin/gtkdialogs.c:400
+#, c-format
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "%s은 AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu 그리고 QQ 프로토콜을 모두 이용할 수 있는 GTK+ 툴킷을 채용한 모듈형 메시지 클라이언트입니다.<BR><BR>GPL 라이센스(버전 2 이상)가 정하는 조항 하에 재배포 또는 변경이 가능합니다. GPL 복사가 본 %s 패키지 내에 'COPYING' 라고 하는 파일명으로서 포함되어 있습니다. %s의 저작권은 그 공헌자에게 귀속됩니다. 공헌자의 상세한 목록에 대해서는 'COPYRIGHT' 를 참조해 주십시오. 본 프로그램은 어떠한 보증도 하지 않습니다.<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:350
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #wingaim 채널<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:418
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net의 #pidgin 채널<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:359
+msgid "Current Developers"
+msgstr "현재 개발자"
+
+#: ../gtk/gtkdialogs.c:374
+msgid "Crazy Patch Writers"
+msgstr "Crazy Patch 제작자"
+
+#: ../gtk/gtkdialogs.c:389
+msgid "Retired Developers"
+msgstr "이전 개발자"
+
+#: ../gtk/gtkdialogs.c:404
+msgid "Current Translators"
+msgstr "현재 번역자"
+
+#: ../gtk/gtkdialogs.c:424
+msgid "Past Translators"
+msgstr "이전 번역자"
+
+#: ../gtk/gtkdialogs.c:442
+msgid "Debugging Information"
+msgstr "디버깅 정보"
+
+#: ../gtk/gtkdialogs.c:816
+msgid "Get User Info"
+msgstr "사용자 정보 가져오기"
+
+#: ../gtk/gtkdialogs.c:818
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
+msgstr "정보를 표시할 상대의 아이디 또는 별칭을 입력해 주십시오."
+
+#: ../gtk/gtkdialogs.c:907
+msgid "View User Log"
+msgstr "사용자 로그 보기"
+
+#: ../gtk/gtkdialogs.c:909
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
+msgstr "로그를 표시할 상대의 아이디 또는 별칭을 입력해 주십시오."
+
+#: ../gtk/gtkdialogs.c:928
+msgid "Alias Contact"
+msgstr "연락처 별칭"
+
+#: ../gtk/gtkdialogs.c:929
+msgid "Enter an alias for this contact."
+msgstr "이 연락처의 별칭을 입력해 주십시오."
+
+#: ../gtk/gtkdialogs.c:949
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "%s 의 별칭을 입력해 주십시오."
+
+#: ../gtk/gtkdialogs.c:951
+msgid "Alias Buddy"
+msgstr "친구 별칭"
+
+#: ../gtk/gtkdialogs.c:970
+msgid "Alias Chat"
+msgstr "대화 별칭"
+
+#: ../gtk/gtkdialogs.c:971
+msgid "Enter an alias for this chat."
+msgstr "이 대화의 별칭을 입력해 주십시오."
+
+#: ../gtk/gtkdialogs.c:1008
+#, c-format
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr[0] "친구 목록에서 %s 님을 포함한 %d 명의 친구의 삭제하려고 합니다. 계속 하시겠습니까?"
+msgstr[1] "친구 목록에서 %s 님을 포함한 %d 명의 친구의 삭제하려고 합니다. 계속 하시겠습니까?"
+
+#: ../gtk/gtkdialogs.c:1016
+msgid "Remove Contact"
+msgstr "연락처 삭제"
+
+#: ../gtk/gtkdialogs.c:1017
+msgid "_Remove Contact"
+msgstr "삭제(_R)"
+
+#: ../gtk/gtkdialogs.c:1047
+#, c-format
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+msgstr "%s 그룹과 %s 그룹을 하나로 통합하려고 합니다. 계속 하시겠습니까?"
+
+#: ../gtk/gtkdialogs.c:1054
+msgid "Merge Groups"
+msgstr "그룹 통합"
+
+#: ../gtk/gtkdialogs.c:1055
+msgid "_Merge Groups"
+msgstr "그룹 통합(_M)"
+
+#: ../gtk/gtkdialogs.c:1105
+#, c-format
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "친구 목록에서 %s 그룹과 그 구성원을 모두 삭제하려고 합니다. 계속 하시겠습니까?"
+
+#: ../gtk/gtkdialogs.c:1108
+msgid "Remove Group"
+msgstr "그룹 삭제"
+
+#: ../gtk/gtkdialogs.c:1109
+msgid "_Remove Group"
+msgstr "삭제(_R)"
+
+#: ../gtk/gtkdialogs.c:1142
+#, c-format
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "친구 목록에서 %s 을(를) 삭제하려고 합니다. 계속 하시겠습니까?"
+
+#: ../gtk/gtkdialogs.c:1145
+msgid "Remove Buddy"
+msgstr "친구 삭제"
+
+#: ../gtk/gtkdialogs.c:1146
+msgid "_Remove Buddy"
+msgstr "삭제(_R)"
+
+#: ../gtk/gtkdialogs.c:1167
+#, c-format
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+msgstr "친구 목록에서 %s 대화를 삭제하려고 합니다. 계속 하시겠습니까?"
+
+#: ../gtk/gtkdialogs.c:1170
+msgid "Remove Chat"
+msgstr "대화 삭제"
+
+#: ../gtk/gtkdialogs.c:1171
+msgid "_Remove Chat"
+msgstr "삭제(_R)"
+
+#: ../gtk/gtkdocklet.c:149
+msgid "Right-click for more unread messages...\n"
+msgstr "읽지 않은 메시지를 표시할 경우에는 오른쪽 버튼을 눌러주십시오...\n"
+
+#: ../gtk/gtkdocklet.c:456
+msgid "Change Status"
+msgstr "상태 바꾸기"
+
+#: ../gtk/gtkdocklet.c:459
+#: ../gtk/gtkstatusbox.c:987
+#: ../libgaim/protocols/gg/gg.c:996
+#: ../libgaim/protocols/jabber/buddy.c:1403
+#: ../libgaim/protocols/msn/state.c:29
+#: ../libgaim/protocols/msn/state.c:30
+#: ../libgaim/protocols/msn/state.c:37
+#: ../libgaim/protocols/msn/state.c:38
+#: ../libgaim/protocols/novell/novell.c:2851
+#: ../libgaim/protocols/yahoo/yahoo.c:2880
+#: ../libgaim/status.c:155
+msgid "Available"
+msgstr "사용 가능"
+
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../gtk/gtkdocklet.c:463
+#: ../gtk/gtkprefs.c:1821
+#: ../gtk/gtkstatusbox.c:988
+#: ../libgaim/protocols/gg/gg.c:999
+#: ../libgaim/protocols/irc/irc.c:524
+#: ../libgaim/protocols/irc/msgs.c:226
+#: ../libgaim/protocols/jabber/buddy.c:1407
+#: ../libgaim/protocols/novell/novell.c:2854
+#: ../libgaim/protocols/oscar/oscar.c:712
+#: ../libgaim/protocols/oscar/oscar.c:4498
+#: ../libgaim/protocols/oscar/oscar.c:5579
+#: ../libgaim/protocols/qq/qq.c:180
+#: ../libgaim/protocols/silc/buddy.c:1469
+#: ../libgaim/protocols/yahoo/yahoo.c:3353
+#: ../libgaim/protocols/yahoo/yahoo.c:3426
+#: ../libgaim/status.c:158
+msgid "Away"
+msgstr "자리 비움"
+
+#: ../gtk/gtkdocklet.c:467
+#: ../gtk/gtkstatusbox.c:989
+#: ../libgaim/protocols/oscar/oscar.c:716
+#: ../libgaim/protocols/qq/qq.c:183
+#: ../libgaim/protocols/yahoo/yahoo.c:2874
+#: ../libgaim/status.c:157
+msgid "Invisible"
+msgstr "숨김 상태"
+
+#: ../gtk/gtkdocklet.c:508
+msgid "Show Buddy List"
+msgstr "친구 목록 열기..."
+
+#: ../gtk/gtkdocklet.c:534
+msgid "New Message..."
+msgstr "새 메시지..."
+
+#: ../gtk/gtkdocklet.c:549
+msgid "Mute Sounds"
+msgstr "소리 끄기"
+
+#: ../gtk/gtkdocklet.c:556
+msgid "Blink on new message"
+msgstr "새로운 메시지가 도착하면 깜박거림"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../gtk/gtkdocklet.c:567
+msgid "Quit"
+msgstr "종료"
+
+#: ../gtk/gtkft.c:133
+#, c-format
+msgid "%.2f KB/s"
+msgstr "%.2f K바이트/초"
+
+#: ../gtk/gtkft.c:153
+msgid "Not started"
+msgstr "시작되지 않았습니다."
+
+#: ../gtk/gtkft.c:159
+#: ../libgaim/account.c:1714
+#: ../libgaim/protocols/gg/gg.c:1002
+#: ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:1397
+#: ../libgaim/protocols/jabber/buddy.c:1414
+#: ../libgaim/protocols/novell/novell.c:2866
+#: ../libgaim/protocols/qq/qq.c:230
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: ../gtk/gtkft.c:162
+#: ../gtk/gtkft.c:1118
+msgid "Finished"
+msgstr "완료되었습니다."
+
+#: ../gtk/gtkft.c:165
+#: ../gtk/gtkft.c:1056
+msgid "Canceled"
+msgstr "취소되었습니다."
+
+#: ../gtk/gtkft.c:168
+#: ../gtk/gtkft.c:975
+msgid "Waiting for transfer to begin"
+msgstr "전송 시작을 기다리고 있습니다."
+
+#: ../gtk/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "파일 전송 - %d%% / %d 개의 파일"
+
+#: ../gtk/gtkft.c:233
+#: ../gtk/gtkft.c:763
+msgid "File Transfers"
+msgstr "파일 전송"
+
+#: ../gtk/gtkft.c:273
+msgid "<b>Receiving As:</b>"
+msgstr "<b>받는 사람:</b>"
+
+#: ../gtk/gtkft.c:275
+msgid "<b>Receiving From:</b>"
+msgstr "<b>수신 위치:</b>"
+
+#: ../gtk/gtkft.c:279
+msgid "<b>Sending To:</b>"
+msgstr "<b>송신 위치:</b>"
+
+#: ../gtk/gtkft.c:281
+msgid "<b>Sending As:</b>"
+msgstr "<b>보낸 사람:</b>"
+
+#: ../gtk/gtkft.c:497
+msgid "There is no application configured to open this type of file."
+msgstr "이 형식의 파일을 열기 위해 지정된 응용 프로그램이 없습니다."
+
+#: ../gtk/gtkft.c:502
+msgid "An error occurred while opening the file."
+msgstr "파일을 여는 중 오류가 발생했습니다."
+
+#: ../gtk/gtkft.c:539
+#, c-format
+msgid "Error launching %s: %s"
+msgstr "%s 실행 중 오류: %s"
+
+#: ../gtk/gtkft.c:548
+#, c-format
+msgid "Error running %s"
+msgstr "%s 실행 중 오류"
+
+#: ../gtk/gtkft.c:549
+#, c-format
+msgid "Process returned error code %d"
+msgstr "프로세스가 오류 코드 %d 을(를) 반환했습니다."
+
+#: ../gtk/gtkft.c:644
+msgid "Progress"
+msgstr "진행"
+
+#: ../gtk/gtkft.c:651
+msgid "Filename"
+msgstr "파일명"
+
+#: ../gtk/gtkft.c:658
+msgid "Size"
+msgstr "크기"
+
+#: ../gtk/gtkft.c:665
+msgid "Remaining"
+msgstr "남은 양"
+
+#: ../gtk/gtkft.c:696
+msgid "Filename:"
+msgstr "파일명:"
+
+#: ../gtk/gtkft.c:697
+msgid "Local File:"
+msgstr "로컬 파일:"
+
+#: ../gtk/gtkft.c:699
+msgid "Speed:"
+msgstr "속도:"
+
+#: ../gtk/gtkft.c:700
+msgid "Time Elapsed:"
+msgstr "경과 시간:"
+
+#: ../gtk/gtkft.c:701
+msgid "Time Remaining:"
+msgstr "남은 시간:"
+
+#: ../gtk/gtkft.c:786
+msgid "Close this window when all transfers _finish"
+msgstr "전송이 완료되면 이 창을 닫음(_F)"
+
+#: ../gtk/gtkft.c:796
+msgid "C_lear finished transfers"
+msgstr "완료된 전송은 비우기(_L)"
+
+#. "Download Details" arrow
+#: ../gtk/gtkft.c:805
+msgid "File transfer _details"
+msgstr "파일 전송 상세(_D)"
+
+#. Resume button
+#: ../gtk/gtkft.c:845
+msgid "_Resume"
+msgstr "복귀(_R)"
+
+#: ../gtk/gtkft.c:1058
+msgid "Failed"
+msgstr "실패했습니다."
+
+#: ../gtk/gtkimhtml.c:793
+msgid "Paste as Plain _Text"
+msgstr "문자열로 붙여넣기(_T)"
+
+#: ../gtk/gtkimhtml.c:810
+msgid "_Reset formatting"
+msgstr "서식 초기화(_R)"
+
+#: ../gtk/gtkimhtml.c:1295
+msgid "Hyperlink color"
+msgstr "하이퍼링크 색상"
+
+#: ../gtk/gtkimhtml.c:1296
+msgid "Color to draw hyperlinks."
+msgstr "하이퍼링크를 나타내는 색상입니다."
+
+#: ../gtk/gtkimhtml.c:1299
+msgid "Hyperlink prelight color"
+msgstr "하이퍼링크 (prelight) 색상"
+
+#: ../gtk/gtkimhtml.c:1300
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "하이퍼링크 위에 커서가 놓였을 때의 색상입니다."
+
+#: ../gtk/gtkimhtml.c:1516
+msgid "_Copy E-Mail Address"
+msgstr "이메일 주소 복사(_C)"
+
+#: ../gtk/gtkimhtml.c:1528
+msgid "_Open Link in Browser"
+msgstr "링크를 브라우저로 열기(_O)"
+
+#: ../gtk/gtkimhtml.c:1538
+msgid "_Copy Link Location"
+msgstr "링크 주소 복사(_C)"
+
+#: ../gtk/gtkimhtml.c:3271
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
 msgstr ""
+"<span size='larger' weight='bold'>알 수 없는 파일 형식</span>\n"
+"\n"
+"기본 PNG 이미지로 인식합니다."
 
-#: ../finch/gntplugin.c:408
-msgid "Configure Plugin"
-msgstr "플러그인 설정"
+#: ../gtk/gtkimhtml.c:3274
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"알 수 없는 파일 형식입니다.\n"
+"\n"
+"기본 PNG 이미지로 인식합니다."
 
-#. copy the preferences to tmp values...
-#. * I liked "take affect immediately" Oh well :-(
-#. (that should have been "effect," right?)
-#. Back to instant-apply! I win!  BU-HAHAHA!
-#. Create the window
-#: ../finch/gntplugin.c:464 ../finch/gntplugin.c:471 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2069
-msgid "Preferences"
-msgstr "설정"
+#: ../gtk/gtkimhtml.c:3287
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>이미지 저장 중 오류</span>\n"
+"\n"
+"%s"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../gtk/gtkimhtml.c:3290
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"이미지 저장 중 오류\n"
+"\n"
+"%s"
+
+#: ../gtk/gtkimhtml.c:3370
+#: ../gtk/gtkimhtml.c:3382
+msgid "Save Image"
+msgstr "이미지 저장"
+
+#: ../gtk/gtkimhtml.c:3410
+msgid "_Save Image..."
+msgstr "이미지 저장(_S)..."
+
+#: ../gtk/gtkimhtmltoolbar.c:147
+msgid "Select Font"
+msgstr "글꼴 선택"
+
+#: ../gtk/gtkimhtmltoolbar.c:226
+msgid "Select Text Color"
+msgstr "글자색 선택"
+
+#: ../gtk/gtkimhtmltoolbar.c:305
+msgid "Select Background Color"
+msgstr "배경색 선택"
+
+#: ../gtk/gtkimhtmltoolbar.c:394
+msgid "_URL"
+msgstr "URL(_U)"
+
+#: ../gtk/gtkimhtmltoolbar.c:402
+msgid "_Description"
+msgstr "설명(_D)"
+
+#: ../gtk/gtkimhtmltoolbar.c:405
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+msgstr "삽입할 링크의 URL과 그 설명(선택 사항)을 입력해 주십시오."
+
+#: ../gtk/gtkimhtmltoolbar.c:409
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "삽입할 링크의 URL을 입력해 주십시오."
+
+#: ../gtk/gtkimhtmltoolbar.c:414
+msgid "Insert Link"
+msgstr "링크를 삽입합니다."
+
+#: ../gtk/gtkimhtmltoolbar.c:418
+msgid "_Insert"
+msgstr "삽입(_I)"
+
+#: ../gtk/gtkimhtmltoolbar.c:487
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "이미지 저장에 실패했습니다: %s\n"
+
+#: ../gtk/gtkimhtmltoolbar.c:513
+#: ../gtk/gtkimhtmltoolbar.c:523
+msgid "Insert Image"
+msgstr "이미지를 삽입합니다."
+
+#: ../gtk/gtkimhtmltoolbar.c:721
+msgid "This theme has no available smileys."
+msgstr "이 테마에는 이용 가능한 이모티콘이 없습니다."
+
+#. show everything
+#: ../gtk/gtkimhtmltoolbar.c:735
+msgid "Smile!"
+msgstr "이모티콘!"
+
+#: ../gtk/gtkimhtmltoolbar.c:922
+#: ../gtk/plugins/convcolors.c:278
+msgid "Bold"
+msgstr "굵게"
+
+#: ../gtk/gtkimhtmltoolbar.c:933
+#: ../gtk/plugins/convcolors.c:285
+msgid "Italic"
+msgstr "기울림"
+
+#: ../gtk/gtkimhtmltoolbar.c:944
+#: ../gtk/plugins/convcolors.c:292
+msgid "Underline"
+msgstr "밑줄"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1091
+msgid "Strikethrough"
+msgstr "취소줄"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Increase Font Size"
+msgstr "글자 크기 크게"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Decrease Font Size"
+msgstr "글자 크기 작게"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Font Face"
+msgstr "글꼴 종류"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1098
+msgid "Foreground Color"
+msgstr "글자색"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1097
+msgid "Background Color"
+msgstr "배경색"
+
+#: ../gtk/gtkimhtmltoolbar.c:1029
+msgid "Reset Formatting"
+msgstr "서식을 초기화 합니다."
+
+#: ../pidgin/gtkimhtmltoolbar.c:1103
+msgid "Insert IM Image"
+msgstr "IM 이미지를 삽입합니다."
+
+#: ../gtk/gtkimhtmltoolbar.c:1044
+msgid "Insert link"
+msgstr "링크 삽입"
+
+#: ../gtk/gtkimhtmltoolbar.c:1054
+msgid "Insert image"
+msgstr "이미지 삽입"
+
+#: ../gtk/gtkimhtmltoolbar.c:1065
+msgid "Insert Smiley"
+msgstr "이모티콘을 삽입합니다."
+
+#: ../pidgin/gtkimhtmltoolbar.c:1180
+msgid "<b>_Bold</b>"
+msgstr "<b>굵게(_B)</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1181
+msgid "<i>_Italic</i>"
+msgstr "<i>기울림(_I)</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1182
+msgid "<u>_Underline</u>"
+msgstr "<u>밑줄(_U)</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>취소줄</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1184
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>크게(_L)</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1186
+msgid "_Normal"
+msgstr "표준(_N)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1188
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>작게(_S)</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:1192
+msgid "_Font face"
+msgstr "글꼴(_F)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1193
+msgid "Foreground _color"
+msgstr "글자색(_C)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1194
+msgid "Bac_kground color"
+msgstr "배경색(_K)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1271
+msgid "_Image"
+msgstr "이미지(_I)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1277
+msgid "_Link"
+msgstr "링크(_L)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1283
+msgid "_Horizontal rule"
+msgstr "수평 눈금(_H)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1305
+msgid "_Smile!"
+msgstr "이모티콘(_S)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1305
+msgid "_Smiley"
+msgstr "이모티콘(_S)"
+
+#: ../pidgin/gtklog.c:293
+#, c-format
+msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
+msgstr "정말 %s 님과 %s 에 시작된 대화 기록을 영구적으로 삭제하시겠습니까?"
+
+#: ../pidgin/gtklog.c:304
+#, c-format
+msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
+msgstr "정말 %s 에서 %s 에 시작된 대화 기록을 영구적으로 삭제하시겠습니까?"
+
+#: ../pidgin/gtklog.c:309
+#, c-format
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
+msgstr "정말 %s 시작된 시스템 기록을 영구적으로 삭제하시겠습니까?"
+
+#: ../gtk/gtklog.c:234
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s 에서의 대화 (%s)</span>"
+
+#: ../gtk/gtklog.c:237
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>%s 님과의 대화 (%s)</span>"
+
+#: ../gtk/gtklog.c:284
+msgid "%B %Y"
+msgstr "%Yë…„%B"
+
+#: ../gtk/gtklog.c:331
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "시스템 이벤트 로그는 설정 창에서 \"상태 변경을 모두 시스템 로그에 기록\" 기능이 사용 가능일 때만 기록합니다."
+
+#: ../gtk/gtklog.c:335
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "인스턴트 메시지 로그는 설정 창에서 \"인스턴트 메시지를 모두 로그에 기록\" 기능이 사용 가능일 때만 기록합니다."
+
+#: ../gtk/gtklog.c:338
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "대화 로그는 설정 창에서 \"대화를 모두 로그에 기록\" 기능이 사용 가능일 때만 기록합니다."
+
+#: ../gtk/gtklog.c:342
+msgid "No logs were found"
+msgstr "로그를 찾을 수 없습니다."
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../gtk/gtklog.c:357
+msgid "_Browse logs folder"
+msgstr "로그 폴더 찾아보기(_B)"
+
+#: ../gtk/gtklog.c:425
+msgid "Total log size:"
+msgstr "로그 전체 크기:"
+
+#: ../gtk/gtklog.c:494
+#, c-format
+msgid "Conversations in %s"
+msgstr "%s 님과의 대화"
+
+#: ../gtk/gtklog.c:502
+#: ../gtk/gtklog.c:553
+#, c-format
+msgid "Conversations with %s"
+msgstr "%s 님과의 대화"
+
+#: ../gtk/gtklog.c:578
+msgid "System Log"
+msgstr "시스템 로그"
+
+#: ../gtk/gtkmain.c:346
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"사용법: %s [옵션]...\n"
+"\n"
+"  -c, --config=DIR    DIR에 있는 설정 파일 사용\n"
+"  -d, --debug         디버그 정보를 표준 출력으로 표시\n"
+"  -h, --help          이 도움말을 표시하고 종료\n"
+"  -n, --nologin       자동으로 로그인 하지 않음\n"
+"  -l, --login[=NAME]  자동으로 로그인 (선택 인수 NAME 은\n"
+"                      사용할 계정을 지정, 쉼표로 분리)\n"
+"  -v, --version       현재 버전을 표시하고 종료\n"
+
+#: ../gtk/gtkmain.c:528
+#, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%swiki/GetABacktrace\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%swiki/DeveloperPages\n"
+msgstr ""
+"세그먼트 오류가 발생하여 %s %s이(가)\n"
+"core 파일 출력을 시험했습니다.\n"
+"이것은 소프트웨어의 버그이며, 사용자 실수가 아닙니다.\n"
+"\n"
+"이 문제가 재현 가능하면, 다음 사이트로부터\n"
+"개발자에게 버그로서 보고해 주십시오.\n"
+"%ssimpleticket/\n"
+"\n"
+"문제를 재현하기 위한 순서와 core 파일로부터의\n"
+"버그 추적 정보도 첨부해 주십시오.\n"
+"버그 추적 정보의 취득 방법을 알 수 없는 경우에는\n"
+"다음 사이트에 있는 설명을 참조해 주십시오.\n"
+"%swiki/GetABacktrace\n"
+"\n"
+"도움말이 필요하면 IM 으로\n"
+"SeanEgn 씨 또는 LSchiere 씨 (모두 AIM 경우) 에게\n"
+"말을 걸어봐 주십시오 그 외의 프로토콜 경우에 대해서는\n"
+"다음 사이트를 참조해 주십시오.\n"
+"%swiki/DeveloperPages\n"
+
+#: ../gtk/gtknotify.c:328
+msgid "Open All Messages"
+msgstr "모든 메시지 열기"
+
+#: ../gtk/gtknotify.c:380
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">새로운 메일이 도착했습니다!</span>"
+
+#: ../gtk/gtknotify.c:474
+msgid "Sender"
+msgstr "보낸 사람"
+
+#: ../gtk/gtknotify.c:500
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s 에는 %d 개의 새로운 메시지가 있습니다."
+msgstr[1] "%s 에는 %d 개의 새로운 메시지가 있습니다."
+
+#: ../gtk/gtknotify.c:511
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] "<b>%d 개의 새로운 메시지가 있습니다.</b>"
+msgstr[1] "<b>%d 개의 새로운 메시지가 있습니다.</b>"
+
+#: ../gtk/gtknotify.c:699
+#: ../libgaim/protocols/sametime/sametime.c:5548
+msgid "Search Results"
+msgstr "검색 결과"
+
+#: ../gtk/gtknotify.c:899
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "브라우저 명령 \"%s\" 이(가) 올바르지 않습니다."
+
+#: ../gtk/gtknotify.c:901
+#: ../gtk/gtknotify.c:913
+#: ../gtk/gtknotify.c:926
+#: ../gtk/gtknotify.c:1054
+msgid "Unable to open URL"
+msgstr "URL을 열 수 없습니다."
+
+#: ../gtk/gtknotify.c:911
+#: ../gtk/gtknotify.c:924
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "\"%s\" 실행 중 오류: %s"
+
+#: ../gtk/gtknotify.c:1055
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "브라우저 명령이 '수동설정'으로 되어 있지만, 명령이 지정되어 있지 않습니다."
+
+#: ../gtk/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "다음의 플러그인을 해제합니다."
+
+#: ../gtk/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "복수의 플러그인을 해제합니다."
+
+#: ../gtk/gtkplugin.c:285
+msgid "Unload Plugins"
+msgstr "플러그인 해제"
+
+#: ../gtk/gtkplugin.c:397
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">제작자: </span> %s\n"
+"<span weight=\"bold\">웹사이트: </span> %s\n"
+"<span weight=\"bold\">파일명: </span> %s"
+
+#: ../gtk/gtkplugin.c:407
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">오류: %s\n"
+"업데이트가 있는 지 웹사이트에서 확인해 주십시오.</span>"
+
+#: ../gtk/gtkplugin.c:533
+msgid "Configure Pl_ugin"
+msgstr "플러그인 설정(_U)"
+
+#: ../gtk/gtkplugin.c:596
+msgid "<b>Plugin Details</b>"
+msgstr "<b>플러그인 상세</b>"
+
+#: ../gtk/gtkpounce.c:155
+msgid "Select a file"
+msgstr "파일 선택"
+
+#: ../gtk/gtkpounce.c:251
 msgid "Please enter a buddy to pounce."
 msgstr "알림을 받을 친구를 입력해 주십시오."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
+#: ../gtk/gtkpounce.c:505
 msgid "New Buddy Pounce"
 msgstr "새 친구 알림"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
+#: ../gtk/gtkpounce.c:505
 msgid "Edit Buddy Pounce"
 msgstr "친구 알림 편집"
 
-#: ../finch/gntpounce.c:333
-#, fuzzy
-msgid "Pounce Who"
+#. Create the "Pounce on Whom" frame.
+#: ../gtk/gtkpounce.c:522
+msgid "Pounce on Whom"
 msgstr "알림을 받을 친구"
 
-#. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
-msgid "Account:"
-msgstr "계정:"
-
-#: ../finch/gntpounce.c:358
-#, fuzzy
-msgid "Buddy name:"
+#: ../gtk/gtkpounce.c:549
+msgid "_Buddy name:"
 msgstr "친구 이름(_B):"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:592
+#: ../gtk/gtkpounce.c:575
 msgid "Pounce When Buddy..."
 msgstr "친구로부터 알림을 받을 때..."
 
-#: ../finch/gntpounce.c:376
-#, fuzzy
-msgid "Signs on"
+#: ../gtk/gtkpounce.c:583
+msgid "Si_gns on"
 msgstr "접속했을 때(_G)"
 
-#: ../finch/gntpounce.c:377
-#, fuzzy
-msgid "Signs off"
+#: ../gtk/gtkpounce.c:585
+msgid "Signs o_ff"
 msgstr "접속을 해제했을 때(_F)"
 
-#: ../finch/gntpounce.c:378
-#, fuzzy
-msgid "Goes away"
+#: ../gtk/gtkpounce.c:587
+msgid "Goes a_way"
 msgstr "자리 비움이 되었을 때(_W)"
 
-#: ../finch/gntpounce.c:379
-#, fuzzy
-msgid "Returns from away"
+#: ../gtk/gtkpounce.c:589
+msgid "Ret_urns from away"
 msgstr "자리 비움으로부터 복귀했을 때(_U)"
 
-#: ../finch/gntpounce.c:380
-#, fuzzy
-msgid "Becomes idle"
+#: ../gtk/gtkpounce.c:591
+msgid "Becomes _idle"
 msgstr "대기 상태가 되었을 때(_I)"
 
-#: ../finch/gntpounce.c:381
-#, fuzzy
-msgid "Is no longer idle"
+#: ../gtk/gtkpounce.c:593
+msgid "Is no longer i_dle"
 msgstr "대기 상태로부터 복귀했을 때(_D)"
 
-#: ../finch/gntpounce.c:382
-#, fuzzy
-msgid "Starts typing"
+#: ../gtk/gtkpounce.c:595
+msgid "Starts _typing"
 msgstr "입력 시작했을 때(_T)"
 
-#: ../finch/gntpounce.c:383
-#, fuzzy
-msgid "Pauses while typing"
+#: ../gtk/gtkpounce.c:597
+msgid "P_auses while typing"
 msgstr "입력을 일시 중지했을 때(_A)"
 
-#: ../finch/gntpounce.c:384
-#, fuzzy
-msgid "Stops typing"
+#: ../gtk/gtkpounce.c:599
+msgid "Stops t_yping"
 msgstr "입력을 멈추었을 때(_Y)"
 
-#: ../finch/gntpounce.c:385
-#, fuzzy
-msgid "Sends a message"
+#: ../gtk/gtkpounce.c:601
+msgid "Sends a _message"
 msgstr "메시지 전송 시(_M)"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:653
+#: ../gtk/gtkpounce.c:636
 msgid "Action"
 msgstr "알림을 받은 후 동작"
 
-#: ../finch/gntpounce.c:416
-#, fuzzy
-msgid "Open an IM window"
+#: ../gtk/gtkpounce.c:644
+msgid "Ope_n an IM window"
 msgstr "대화 창 열기(_N)"
 
-#: ../finch/gntpounce.c:417
-#, fuzzy
-msgid "Pop up a notification"
+#: ../gtk/gtkpounce.c:646
+msgid "_Pop up a notification"
 msgstr "팝업으로 알림(_P)"
 
-#: ../finch/gntpounce.c:418
-#, fuzzy
-msgid "Send a message"
+#: ../gtk/gtkpounce.c:648
+msgid "Send a _message"
 msgstr "메시지 보내기(_M)"
 
-#: ../finch/gntpounce.c:419
-#, fuzzy
-msgid "Execute a command"
+#: ../gtk/gtkpounce.c:650
+msgid "E_xecute a command"
 msgstr "명령 실행(_X)"
 
-#: ../finch/gntpounce.c:420
-#, fuzzy
-msgid "Play a sound"
+#: ../gtk/gtkpounce.c:652
+msgid "P_lay a sound"
 msgstr "소리 재생(_L)"
 
-#: ../finch/gntpounce.c:448
-#, fuzzy
-msgid "Pounce only when my status is not available"
-msgstr "자신의 상태를 지정할 수 없을 때에만 알림을 받음(_O)"
+#: ../gtk/gtkpounce.c:657
+msgid "Brows_e..."
+msgstr "찾아보기(_E)..."
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1288
-msgid "Recurring"
-msgstr "반복"
+#: ../gtk/gtkpounce.c:659
+msgid "Br_owse..."
+msgstr "찾아보기(_O)..."
 
-#: ../finch/gntpounce.c:618
-#, fuzzy
-msgid "Cannot create pounce"
-msgstr "별명을 변경할 수 없습니다."
+#: ../gtk/gtkpounce.c:660
+msgid "Pre_view"
+msgstr "미리보기(_V)"
 
-#: ../finch/gntpounce.c:619
-#, fuzzy
-msgid "You do not have any accounts."
-msgstr "계정을 선택해 주십시오."
+#: ../gtk/gtkpounce.c:784
+msgid "P_ounce only when my status is not available"
+msgstr "자신의 상태를 지정할 수 없을 때에만 알림을 받음(_O)"
 
-#: ../finch/gntpounce.c:620
-msgid "You must create an account first before you can create a pounce."
-msgstr ""
+#: ../gtk/gtkpounce.c:789
+msgid "_Recurring"
+msgstr "반복(_R)"
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1103
+#: ../gtk/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "정말 %2$s 님을 %1$s (으)로의 알림 설정을 삭제하시겠습니까?"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1332
+#: ../gtk/gtkpounce.c:1243
+msgid "Pounce Target"
+msgstr "알림 받을 상대"
+
+#: ../gtk/gtkpounce.c:1278
+msgid "Recurring"
+msgstr "반복"
+
+#: ../gtk/gtkpounce.c:1325
 msgid "Buddy Pounces"
 msgstr "친구 알림"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1459
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 님이 입력을 시작했습니다. (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1461
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 님이 입력을 일시정지했습니다. (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1463
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 님이 접속했습니다. (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1465
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 대기로부터 복귀했습니다. (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1467
+#: ../gtk/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 님이 자리 비움으로부터 복귀했습니다. (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1469
+#: ../gtk/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 님이 입력을 멈추었습니다. (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1471
+#: ../gtk/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 님이 접속을 해제했습니다. (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1473
+#: ../gtk/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 님이 대기 상태로 되었습니다. (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1475
+#: ../gtk/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 님이 자리 비움 상태로 되었습니다. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1477
+#: ../gtk/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 님이 나에게 메시지를 보냈습니다. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1478
-#, c-format
+#: ../gtk/gtkpounce.c:1471
 msgid "Unknown pounce event. Please report this!"
 msgstr "알 수 없는 \"알림\" 이벤트입니다. 꼭 보고해 주십시오!"
 
-#: ../finch/gntprefs.c:92
-#, fuzzy
-msgid "Based on keyboard use"
-msgstr "키보드나 마우스 조작을 시작했을 때"
+#: ../gtk/gtkprefs.c:509
+msgid "Smiley theme failed to unpack."
+msgstr "이모티콘 테마를 풀 수 없습니다."
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
-msgid "From last sent message"
-msgstr "마지막에 메시지를 보냈을 때"
+#: ../gtk/gtkprefs.c:638
+msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
+msgstr "아래의 목록으로부터 사용할 이모티콘 테마를 선택해 주십시오. 이 목록 중에 새로운 테마를 드래그앤드롭 하면 설치할 수 있습니다."
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
+#: ../gtk/gtkprefs.c:673
+msgid "Icon"
+msgstr "아이콘"
+
+#: ../gtk/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "시스템 트레이 아이콘"
+
+#: ../gtk/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "시스템 트레이 아이콘 표시(_S):"
+
+#: ../gtk/gtkprefs.c:819
+#: ../gtk/gtkprefs.c:831
+#: ../gtk/gtkprefs.c:1646
+#: ../gtk/plugins/timestamp_format.c:39
+#: ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:335
+msgid "Always"
+msgstr "항상"
+
+#: ../gtk/gtkprefs.c:820
+#: ../gtk/gtkprefs.c:829
+#: ../gtk/gtkprefs.c:1811
+#: ../gtk/gtkprefs.c:1825
+#: ../gtk/plugins/win32/winprefs/winprefs.c:334
+#: ../libgaim/plugins/autoreply.c:360
 msgid "Never"
 msgstr "안 함"
 
-#: ../finch/gntprefs.c:184
-msgid "Show Idle Time"
-msgstr "대기 시간 표시"
+#: ../gtk/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "메시지를 받았을 때"
 
-#: ../finch/gntprefs.c:185
-msgid "Show Offline Buddies"
-msgstr "오프라인 친구 표시"
+#: ../gtk/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "대화 창 숨기기"
 
-#: ../finch/gntprefs.c:192
-msgid "Notify buddies when you are typing"
-msgstr "메시지를 입력 중일 때 친구에게 알림"
+#: ../gtk/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "새 대화 창 숨기기(_H):"
 
-#: ../finch/gntprefs.c:198
-msgid "Log format"
-msgstr "로그 서식"
+#: ../gtk/gtkprefs.c:830
+#: ../gtk/gtkprefs.c:1826
+msgid "When away"
+msgstr "자리 비움일 때만"
 
-#: ../finch/gntprefs.c:199
-msgid "Log IMs"
-msgstr "메시지를 로그에 기록"
+#. All the tab options!
+#: ../gtk/gtkprefs.c:838
+msgid "Tabs"
+msgstr "탭"
 
-#: ../finch/gntprefs.c:200
-msgid "Log chats"
-msgstr "대화를 로그에 기록"
+#: ../gtk/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "탭 창에 메시지와 대화 표시(_T)"
 
-#: ../finch/gntprefs.c:201
-msgid "Log status change events"
-msgstr "로그 상태 변경 이벤트"
+#: ../gtk/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "탭에 닫기 버튼 표시(_U)"
 
-#: ../finch/gntprefs.c:207
-#, fuzzy
-msgid "Report Idle time"
+#: ../gtk/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "탭 위치(_P):"
+
+#: ../gtk/gtkprefs.c:859
+msgid "Top"
+msgstr "위쪽"
+
+#: ../gtk/gtkprefs.c:860
+msgid "Bottom"
+msgstr "아래쪽"
+
+#: ../gtk/gtkprefs.c:861
+msgid "Left"
+msgstr "왼쪽"
+
+#: ../gtk/gtkprefs.c:862
+msgid "Right"
+msgstr "오른쪽"
+
+#: ../gtk/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "왼쪽으로 수직방향"
+
+#: ../gtk/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "오른쪽으로 수직방향"
+
+#: ../gtk/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "새 대화(_E):"
+
+#: ../gtk/gtkprefs.c:900
+msgid "Show _formatting on incoming messages"
+msgstr "수신 메시지의 서식 표시(_F)"
+
+#: ../gtk/gtkprefs.c:903
+msgid "Show buddy _icons"
+msgstr "친구 아이콘 표시(_I)"
+
+#: ../gtk/gtkprefs.c:905
+msgid "Enable buddy ic_on animation"
+msgstr "친구 아이콘 애니메이션 표시(_O)"
+
+#: ../gtk/gtkprefs.c:912
+msgid "_Notify buddies that you are typing to them"
+msgstr "메시지가 입력 중임을 친구에게 알림(_N)"
+
+#: ../gtk/gtkprefs.c:915
+msgid "Highlight _misspelled words"
+msgstr "틀린 철자 강조 표시(_M)"
+
+#: ../gtk/gtkprefs.c:919
+msgid "Use smooth-scrolling"
+msgstr "부드러운 스크롤 사용"
+
+#: ../gtk/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "메시지를 받으면 창을 깜빡거림(_L)"
+
+#: ../pidgin/gtkprefs.c:943
+msgid "Font"
+msgstr "글꼴"
+
+#: ../pidgin/gtkprefs.c:945
+msgid "Use document font from _theme"
+msgstr "테마로부터 문서 글꼴 사용(_T)"
+
+#: ../pidgin/gtkprefs.c:947
+msgid "Use font from _theme"
+msgstr "테마로부터 글꼴 사용(_T)"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "Conversation _font:"
+msgstr "대화창 글꼴(_F):"
+
+#: ../gtk/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "기본 서식"
+
+#: ../gtk/gtkprefs.c:941
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
+msgstr "서식을 지원하는 프로토콜을 사용할 때, 보낸 메시지가 어떻게 표시되는지 나타냅니다. :)"
+
+#: ../gtk/gtkprefs.c:1015
+#: ../libgaim/protocols/oscar/oscar.c:817
+#: ../libgaim/protocols/oscar/oscar.c:3701
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
+msgid "IP Address"
+msgstr "IP 주소"
+
+#: ../gtk/gtkprefs.c:1017
+msgid "ST_UN server:"
+msgstr "STUN 서버(_U):"
+
+#: ../gtk/gtkprefs.c:1029
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">예: stunserver.org</span>"
+
+#: ../gtk/gtkprefs.c:1033
+msgid "_Autodetect IP address"
+msgstr "IP 주소를 자동으로 감지(_A)"
+
+#: ../gtk/gtkprefs.c:1042
+msgid "Public _IP:"
+msgstr "공인 IP(_I):"
+
+#: ../gtk/gtkprefs.c:1071
+msgid "Ports"
+msgstr "포트"
+
+#: ../gtk/gtkprefs.c:1074
+msgid "_Manually specify range of ports to listen on"
+msgstr "수동으로 감시할 포트 번호의 범위를 지정(_M)"
+
+#: ../gtk/gtkprefs.c:1077
+msgid "_Start port:"
+msgstr "시작 포트 번호(_S):"
+
+#: ../gtk/gtkprefs.c:1084
+msgid "_End port:"
+msgstr "종료 포트 번호(_E):"
+
+#: ../gtk/gtkprefs.c:1092
+msgid "Proxy Server"
+msgstr "프록시 서버"
+
+#: ../gtk/gtkprefs.c:1096
+msgid "No proxy"
+msgstr "프록시 없음"
+
+#: ../gtk/gtkprefs.c:1152
+msgid "_User:"
+msgstr "사용자명(_U):"
+
+#: ../gtk/gtkprefs.c:1216
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../gtk/gtkprefs.c:1217
+msgid "Opera"
+msgstr "Opera"
+
+#: ../gtk/gtkprefs.c:1218
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../gtk/gtkprefs.c:1219
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../gtk/gtkprefs.c:1220
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../gtk/gtkprefs.c:1221
+msgid "GNOME Default"
+msgstr "GNOME 디폴트"
+
+#: ../gtk/gtkprefs.c:1222
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../gtk/gtkprefs.c:1223
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../gtk/gtkprefs.c:1224
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../gtk/gtkprefs.c:1225
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../gtk/gtkprefs.c:1234
+msgid "Manual"
+msgstr "수동 설정"
+
+#: ../gtk/gtkprefs.c:1287
+msgid "Browser Selection"
+msgstr "브라우저 선택"
+
+#: ../gtk/gtkprefs.c:1291
+msgid "_Browser:"
+msgstr "브라우저(_B):"
+
+#: ../gtk/gtkprefs.c:1299
+msgid "_Open link in:"
+msgstr "링크를 여는 방식(_O):"
+
+#: ../gtk/gtkprefs.c:1301
+msgid "Browser default"
+msgstr "브라우저 설정에 따름"
+
+#: ../gtk/gtkprefs.c:1302
+msgid "Existing window"
+msgstr "기존 창에서 열기"
+
+#: ../gtk/gtkprefs.c:1304
+msgid "New tab"
+msgstr "새 탭으로 열기"
+
+#: ../gtk/gtkprefs.c:1318
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"수동 설정(_M):\n"
+"(URL은 %s (으)로 지정)"
+
+#: ../gtk/gtkprefs.c:1358
+msgid "Log _format:"
+msgstr "로그 서식(_F):"
+
+#: ../gtk/gtkprefs.c:1363
+msgid "Log all _instant messages"
+msgstr "메시지를 모두 기록에 기록(_L)"
+
+#: ../gtk/gtkprefs.c:1365
+msgid "Log all c_hats"
+msgstr "대화를 모두 로그에 기록(_H)"
+
+#: ../gtk/gtkprefs.c:1367
+msgid "Log all _status changes to system log"
+msgstr "상태 변경을 모두 로그에 기록(_S)"
+
+#: ../gtk/gtkprefs.c:1513
+msgid "Sound Selection"
+msgstr "소리 선택"
+
+#: ../gtk/gtkprefs.c:1521
+msgid "Quietest"
+msgstr "가장 조용히"
+
+#: ../gtk/gtkprefs.c:1523
+msgid "Quieter"
+msgstr "약간 조용히"
+
+#: ../gtk/gtkprefs.c:1525
+msgid "Quiet"
+msgstr "조용히"
+
+#: ../gtk/gtkprefs.c:1527
+#: ../libgaim/protocols/silc/silc.c:666
+msgid "Normal"
+msgstr "표준"
+
+#: ../gtk/gtkprefs.c:1529
+msgid "Loud"
+msgstr "크게"
+
+#: ../gtk/gtkprefs.c:1531
+msgid "Louder"
+msgstr "약간 크게"
+
+#: ../gtk/gtkprefs.c:1533
+msgid "Loudest"
+msgstr "가장 크게"
+
+#: ../gtk/gtkprefs.c:1596
+msgid "Sound Method"
+msgstr "소리 출력 방식"
+
+#: ../gtk/gtkprefs.c:1597
+msgid "_Method:"
+msgstr "방식(_M):"
+
+#: ../gtk/gtkprefs.c:1599
+msgid "Console beep"
+msgstr "비프음"
+
+#: ../gtk/gtkprefs.c:1601
+msgid "Automatic"
+msgstr "자동 선택"
+
+#: ../gtk/gtkprefs.c:1604
+msgid "Command"
+msgstr "명령 지정"
+
+#: ../gtk/gtkprefs.c:1605
+msgid "No sounds"
+msgstr "소리 없음"
+
+#: ../gtk/gtkprefs.c:1613
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"소리 명령(_O)\n"
+"(파일명은 %s (으)로 지정)"
+
+#: ../gtk/gtkprefs.c:1639
+msgid "Sound Options"
+msgstr "소리 설정"
+
+#: ../gtk/gtkprefs.c:1640
+msgid "Sounds when conversation has _focus"
+msgstr "대화 창이 활성되면 소리 재생(_F)"
+
+#: ../gtk/gtkprefs.c:1642
+msgid "Enable sounds:"
+msgstr "소리를 재생할 때:"
+
+#: ../gtk/gtkprefs.c:1644
+msgid "Only when available"
+msgstr "자리에 있을 때에만"
+
+#: ../gtk/gtkprefs.c:1645
+msgid "Only when not available"
+msgstr "자리에 없을 때에만"
+
+#: ../gtk/gtkprefs.c:1653
+msgid "Volume:"
+msgstr "음량:"
+
+#: ../gtk/gtkprefs.c:1681
+msgid "Sound Events"
+msgstr "이벤트마다 소리 재생"
+
+#: ../gtk/gtkprefs.c:1732
+msgid "Play"
+msgstr "재생"
+
+#: ../gtk/gtkprefs.c:1739
+msgid "Event"
+msgstr "이벤트"
+
+#: ../gtk/gtkprefs.c:1758
+msgid "Test"
+msgstr "미리 듣기"
+
+#: ../gtk/gtkprefs.c:1762
+msgid "Reset"
+msgstr "초기화"
+
+#: ../gtk/gtkprefs.c:1766
+msgid "Choose..."
+msgstr "선택..."
+
+#: ../gtk/gtkprefs.c:1809
+msgid "_Report idle time:"
 msgstr "대기 시간을 보고할 때(_R):"
 
-#: ../finch/gntprefs.c:208
-#, fuzzy
-msgid "Change status when idle"
+#: ../gtk/gtkprefs.c:1812
+msgid "From last sent message"
+msgstr "마지막에 메시지를 보냈을 때"
+
+#: ../gtk/gtkprefs.c:1814
+msgid "Based on keyboard or mouse use"
+msgstr "키보드나 마우스 조작을 시작했을 때"
+
+#: ../gtk/gtkprefs.c:1823
+msgid "_Auto-reply:"
+msgstr "자동 응답(_A):"
+
+#: ../gtk/gtkprefs.c:1827
+msgid "When both away and idle"
+msgstr "자리 비움으로 대기 상태일 때"
+
+#. Auto-away stuff
+#: ../gtk/gtkprefs.c:1833
+msgid "Auto-away"
+msgstr "자동 자리 비움"
+
+#: ../gtk/gtkprefs.c:1835
+msgid "Change status when _idle"
 msgstr "대기 상태가 되면 상태 변경(_I)"
 
-#: ../finch/gntprefs.c:209
-#, fuzzy
-msgid "Minutes before changing status"
+#: ../gtk/gtkprefs.c:1839
+msgid "_Minutes before changing status:"
 msgstr "상태를 변경할 때까지의 시간(분)(_M):"
 
-#: ../finch/gntprefs.c:210
-#, fuzzy
-msgid "Change status to"
+#: ../gtk/gtkprefs.c:1847
+msgid "Change _status to:"
 msgstr "다음 상태로 변경(_S):"
 
-#. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
-msgid "Conversations"
-msgstr "대화 창"
+#. Signon status stuff
+#: ../gtk/gtkprefs.c:1868
+msgid "Status at Startup"
+msgstr "시작 시의 상태"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
-msgid "Logging"
-msgstr "로그 기록"
+#: ../gtk/gtkprefs.c:1870
+msgid "Use status from last _exit at startup"
+msgstr "마지막 종료 시의 상태 유지(_E)"
 
-#: ../finch/gntrequest.c:585
-msgid "Not implemented yet."
-msgstr "아직 실행되지 않았습니다."
+#: ../gtk/gtkprefs.c:1876
+msgid "Status to a_pply at startup:"
+msgstr "시작 시에 적용할 상태(_P):"
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../gtk/gtkprefs.c:1914
+msgid "Interface"
+msgstr "인터페이스"
+
+#: ../gtk/gtkprefs.c:1916
+msgid "Smiley Themes"
+msgstr "이모티콘 테마"
+
+#: ../gtk/gtkprefs.c:1917
+msgid "Sounds"
+msgstr "소리"
+
+#: ../gtk/gtkprefs.c:1918
+#: ../libgaim/protocols/silc/silc.c:1848
+msgid "Network"
+msgstr "네트워크"
+
+#: ../gtk/gtkprefs.c:1923
+msgid "Browser"
+msgstr "브라우저"
+
+#: ../gtk/gtkprefs.c:1927
+msgid "Status / Idle"
+msgstr "상태 / 대기"
+
+#: ../gtk/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "모든 사용자로부터 연락 허가"
+
+#: ../gtk/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "친구 목록에 등록되어 있는 사용자만 허가"
+
+#: ../gtk/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "다음 사용자만 허가"
+
+#: ../gtk/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "모든 사용자 거부"
+
+#: ../gtk/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "다음 사용자만 거부"
+
+#: ../gtk/gtkprivacy.c:372
+msgid "Privacy"
+msgstr "개인 정보"
+
+#: ../gtk/gtkprivacy.c:385
+msgid "Changes to privacy settings take effect immediately."
+msgstr "개인 정보 설정의 변경은 즉시 반영됩니다."
+
+#. "Set privacy for:" label
+#: ../gtk/gtkprivacy.c:397
+msgid "Set privacy for:"
+msgstr "설정할 개인 정보:"
+
+#: ../gtk/gtkprivacy.c:560
+#: ../gtk/gtkprivacy.c:576
+msgid "Permit User"
+msgstr "허가할 사용자"
+
+#: ../gtk/gtkprivacy.c:561
+msgid "Type a user you permit to contact you."
+msgstr "연락을 허가할 사용자를 입력해 주십시오."
+
+#: ../gtk/gtkprivacy.c:562
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr "연락을 허가하지 않을 사용자의 이름을 입력해 주십시오."
+
+#: ../gtk/gtkprivacy.c:565
+#: ../gtk/gtkprivacy.c:578
+msgid "_Permit"
+msgstr "허가(_P)"
+
+#: ../gtk/gtkprivacy.c:570
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "%s 님으로부터의 연락을 허가하시겠습니까?"
+
+#: ../gtk/gtkprivacy.c:572
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "정말 %s 님에게 연락을 허가하시겠습니까?"
+
+#: ../gtk/gtkprivacy.c:599
+#: ../gtk/gtkprivacy.c:612
+msgid "Block User"
+msgstr "사용자 거부"
+
+#: ../gtk/gtkprivacy.c:600
+msgid "Type a user to block."
+msgstr "거부할 사용자를 입력해 주십시오."
+
+#: ../gtk/gtkprivacy.c:601
+msgid "Please enter the name of the user you wish to block."
+msgstr "거부하지 않을 사용자의 이름을 입력해 주십시오."
+
+#: ../gtk/gtkprivacy.c:608
+#, c-format
+msgid "Block %s?"
+msgstr "%s 님을 거부하시겠습니까?"
+
+#: ../gtk/gtkprivacy.c:610
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "정말 %s 님을 거부하시겠습니까?"
+
+#: ../gtk/gtkrequest.c:267
+#: ../libgaim/plugins/offlinemsg.c:159
+#: ../libgaim/protocols/msn/dialog.c:132
+#: ../libgaim/protocols/msn/msn.c:554
+#: ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1918
+#: ../libgaim/protocols/silc/buddy.c:313
+#: ../libgaim/protocols/silc/pk.c:117
+#: ../libgaim/protocols/silc/wb.c:303
+msgid "Yes"
+msgstr "예"
+
+#: ../gtk/gtkrequest.c:268
+#: ../libgaim/plugins/offlinemsg.c:160
+#: ../libgaim/protocols/msn/dialog.c:133
+#: ../libgaim/protocols/msn/msn.c:554
+#: ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1919
+#: ../libgaim/protocols/silc/buddy.c:314
+#: ../libgaim/protocols/silc/pk.c:118
+#: ../libgaim/protocols/silc/wb.c:304
+msgid "No"
+msgstr "아니오"
+
+#: ../gtk/gtkrequest.c:271
+msgid "Apply"
+msgstr "적용"
+
+#: ../gtk/gtkrequest.c:1469
+msgid "That file already exists"
+msgstr "이미 존재하는 파일입니다."
+
+#: ../gtk/gtkrequest.c:1470
+msgid "Would you like to overwrite it?"
+msgstr "덮어쓰시겠습니까?"
+
+#: ../gtk/gtkrequest.c:1471
+msgid "Overwrite"
+msgstr "덮어쓰기"
+
+#: ../gtk/gtkrequest.c:1472
+msgid "Choose New Name"
+msgstr "다른 이름 선택"
+
+#: ../gtk/gtkrequest.c:1514
+#: ../gtk/gtkrequest.c:1559
 msgid "Save File..."
 msgstr "파일 저장..."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../gtk/gtkrequest.c:1515
+#: ../gtk/gtkrequest.c:1560
 msgid "Open File..."
 msgstr "파일 열기"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../gtk/gtkrequest.c:1607
+#: ../gtk/gtkrequest.c:1621
+msgid "Select Folder..."
+msgstr "폴더 선택..."
+
+#: ../gtk/gtkroomlist.c:308
+#: ../libgaim/protocols/oscar/oscar.c:2466
+msgid "_Add"
+msgstr "추가(_A)"
+
+#: ../gtk/gtkroomlist.c:376
+msgid "Room List"
+msgstr "대화실 목록"
+
+#. list button
+#: ../gtk/gtkroomlist.c:446
+msgid "_Get List"
+msgstr "목록 가져오기(_G)"
+
+#. add button
+#: ../gtk/gtkroomlist.c:454
+msgid "_Add Chat"
+msgstr "대화 추가(_A)"
+
+#: ../gtk/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "정말 선택한 저장된 상태를 삭제하시겠습니까?"
+
+#. Use button
+#: ../gtk/gtksavedstatuses.c:579
+#: ../gtk/gtksavedstatuses.c:1213
+msgid "_Use"
+msgstr "사용(_U)"
+
+#: ../gtk/gtksavedstatuses.c:725
+msgid "Title already in use.  You must choose a unique title."
+msgstr "그 제목은 이미 사용 중입니다. 중복되지 않는 제목을 입력해 주십시오."
+
+#: ../gtk/gtksavedstatuses.c:913
+msgid "Different"
+msgstr "다른 상태"
+
+#: ../gtk/gtksavedstatuses.c:1106
+msgid "_Title:"
+msgstr "제목(_T):"
+
+#: ../gtk/gtksavedstatuses.c:1125
+#: ../gtk/gtksavedstatuses.c:1446
+msgid "_Status:"
+msgstr "상태(_S):"
+
+#. Different status message expander
+#: ../gtk/gtksavedstatuses.c:1157
+msgid "Use a _different status for some accounts"
+msgstr "같은 계정으로 다른 상태를 이용(_D)"
+
+#. Save & Use button
+#: ../gtk/gtksavedstatuses.c:1221
+msgid "Sa_ve & Use"
+msgstr "저장 후 사용(_V)"
+
+#: ../gtk/gtksavedstatuses.c:1427
+#, c-format
+msgid "Status for %s"
+msgstr "%s 의 상태"
+
+#: ../gtk/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "친구가 로그인 했습니다."
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../gtk/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "친구가 로그아웃 했습니다."
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../gtk/gtksound.c:65
 msgid "Message received"
 msgstr "메시지를 받았습니다."
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../gtk/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "수신한 메시지와 대화가 시작되었습니다."
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../gtk/gtksound.c:67
 msgid "Message sent"
 msgstr "메시지를 보냈습니다."
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../gtk/gtksound.c:68
 msgid "Person enters chat"
 msgstr "대화에 참가하러 왔습니다."
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../gtk/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "대화로부터 나갔습니다."
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../gtk/gtksound.c:70
 msgid "You talk in chat"
 msgstr "대화로 이야기했습니다."
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../gtk/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "다른 사람이 대화로 이야기 했습니다."
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../gtk/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "대화로 누군가가 나를 호출했습니다."
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:308
+#: ../gtk/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "GStreamer 오류"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:309
+#: ../gtk/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 초기화에 실패했습니다."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
-#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
-msgid "(default)"
-msgstr ""
+#. connect to the server
+#: ../gtk/gtkstatusbox.c:569
+#: ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1021
+#: ../libgaim/protocols/msn/session.c:344
+#: ../libgaim/protocols/novell/novell.c:2183
+#: ../libgaim/protocols/oscar/oscar.c:1267
+#: ../libgaim/protocols/qq/qq.c:136
+#: ../libgaim/protocols/sametime/sametime.c:3742
+#: ../libgaim/protocols/simple/simple.c:1669
+#: ../libgaim/protocols/yahoo/yahoo.c:2710
+#: ../libgaim/protocols/zephyr/zephyr.c:1621
+msgid "Connecting"
+msgstr "접속 중입니다."
 
-#: ../finch/gntsound.c:729
-#, fuzzy
-msgid "Select Sound File ..."
-msgstr "폴더 선택..."
+#: ../gtk/gtkstatusbox.c:571
+msgid "Waiting for network connection"
+msgstr "네트워크 접속 대기 중입니다."
 
-#: ../finch/gntsound.c:904
-#, fuzzy
-msgid "Sound Preferences"
-msgstr "설정"
+#: ../gtk/gtkutils.c:1310
+#: ../gtk/gtkutils.c:1333
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "%s 을(를) 불러올 때 오류가 발생했습니다: %s"
 
-#: ../finch/gntsound.c:915
-#, fuzzy
-msgid "Profiles"
-msgstr "프로파일"
+#: ../gtk/gtkutils.c:1313
+#: ../gtk/gtkutils.c:1335
+msgid "Failed to load image"
+msgstr "이미지 불러오기에 실패했습니다."
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
-msgid "Automatic"
-msgstr "자동 선택"
+#: ../gtk/gtkutils.c:1410
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "폴더 %s 은(는) 전송할 수 없습니다."
 
-#: ../finch/gntsound.c:957
-#, fuzzy
-msgid "Console Beep"
-msgstr "비프음"
+#: ../gtk/gtkutils.c:1412
+msgid "%s cannot transfer a folder. You will need to send the files within individually"
+msgstr "%s에서는 폴더 자체를 전송할 수 없습니다. 파일을 개별적으로 전송해 주십시오."
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
-msgid "Command"
-msgstr "명령 지정"
+#: ../gtk/gtkutils.c:1440
+#: ../gtk/gtkutils.c:1449
+#: ../gtk/gtkutils.c:1454
+msgid "You have dragged an image"
+msgstr "드래그 한 것은 이미지입니다."
 
-#: ../finch/gntsound.c:959
-#, fuzzy
-msgid "No Sound"
-msgstr "소리 없음"
+#: ../gtk/gtkutils.c:1441
+msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
+msgstr "이 이미지를 파일로 전송하거나 메시지 안에 삽입하거나 혹은 사용자의 친구 아이콘으로 이용할 수 있습니다."
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
-msgid "Sound Method"
-msgstr "소리 출력 방식"
+#: ../gtk/gtkutils.c:1445
+#: ../gtk/gtkutils.c:1460
+msgid "Set as buddy icon"
+msgstr "친구 아이콘으로 하기"
 
-#: ../finch/gntsound.c:966
-#, fuzzy
-msgid "Method: "
-msgstr "방식(_M):"
+#: ../gtk/gtkutils.c:1446
+#: ../gtk/gtkutils.c:1461
+msgid "Send image file"
+msgstr "파일로 보내기"
 
-#: ../finch/gntsound.c:973
-#, fuzzy, c-format
+#: ../gtk/gtkutils.c:1447
+#: ../gtk/gtkutils.c:1461
+msgid "Insert in message"
+msgstr "메시지 안에 삽입"
+
+#: ../gtk/gtkutils.c:1450
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "이 사용자의 친구 아이콘으로 이미지를 설정하시겠습니까?"
+
+#: ../gtk/gtkutils.c:1455
+msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
+msgstr "이 이미지를 파일로 전송하거나 메시지 안에 삽입하거나 혹은 사용자의 친구 아이콘으로 이용할 수 있습니다."
+
+#: ../gtk/gtkutils.c:1457
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "이 이미지를 메시지 안에 삽입하거나, 이 사용자의 친구 아이콘으로 이용할 수 있습니다."
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: ../gtk/gtkutils.c:1511
+msgid "Cannot send launcher"
+msgstr "실행기는 전송할 수 없습니다."
+
+#: ../gtk/gtkutils.c:1511
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr "드래그 한 것은 데스크탑 실행기입니다. 아마도 실행기 자신이 아닌, 실행기가 지시하고 있는 오브젝트를 전송하고자 할 것입니다."
+
+#: ../gtk/gtkutils.c:2343
+#, c-format
 msgid ""
-"Sound Command\n"
-"(%s for filename)"
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
 msgstr ""
-"소리 명령(_O)\n"
-"(파일명은 %s (으)로 지정)"
+"<b>파일:</b> %s\n"
+"<b>파일 크기:</b> %s\n"
+"<b>이미지 크기:</b> %dx%d"
 
-#. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
-msgid "Sound Options"
-msgstr "소리 설정"
+#. Label
+#: ../gtk/gtkutils.c:2387
+#: ../gtk/gtkutils.c:2409
+#: ../gtk/plugins/gevolution/new_person_dialog.c:338
+#: ../libgaim/protocols/oscar/oscar.c:618
+msgid "Buddy Icon"
+msgstr "친구 아이콘"
 
-#: ../finch/gntsound.c:982
-#, fuzzy
-msgid "Sounds when conversation has focus"
-msgstr "대화 창이 활성되면 소리 재생(_F)"
+#: ../gtk/gtkutils.c:2653
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "파일 '%s' 은(는) %s (으)로는 너무 큽니다. 더 작은 이미지로 시도해 보십시오.\n"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
-msgid "Always"
-msgstr "항상"
+#: ../gtk/gtkutils.c:2655
+msgid "Icon Error"
+msgstr "아이콘 오류"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
-msgid "Only when available"
-msgstr "자리에 있을 때에만"
+#: ../gtk/gtkutils.c:2656
+msgid "Could not set icon"
+msgstr "아이콘을 전송할 수 없었습니다."
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
-msgid "Only when not available"
-msgstr "자리에 없을 때에만"
+#: ../gtk/gtkutils.c:2757
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "파일 '%s' 을(를) 열 수 없었습니다: %s"
 
-#: ../finch/gntsound.c:999
-#, fuzzy
-msgid "Volume(0-100):"
-msgstr "음량:"
+#: ../gtk/gtkutils.c:2806
+#, c-format
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "이미지 '%s' 의 불러오기에 실패했습니다: 원인은 알 수 없으나, 아마도 잘못된 이미지 파일인 것 같습니다."
 
-#. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
-msgid "Sound Events"
-msgstr "이벤트마다 소리 재생"
+#: ../gtk/gtkwhiteboard.c:756
+#: ../gtk/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "파일 저장"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
-msgid "Event"
-msgstr "이벤트"
+#: ../gtk/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "색상 선택"
 
-#: ../finch/gntsound.c:1020
-#, fuzzy
-msgid "File"
-msgstr "í•„í„°"
+#: ../gtk/plugins/cap/cap.c:446
+msgid "Display Statistics"
+msgstr "통계 표시"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
-msgid "Test"
-msgstr "미리 듣기"
+#: ../gtk/plugins/cap/cap.c:458
+#: ../gtk/plugins/cap/cap.c:461
+msgid "Response Probability:"
+msgstr "응답 확률:"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
-msgid "Reset"
-msgstr "초기화"
+#: ../gtk/plugins/cap/cap.c:807
+msgid "Statistics Configuration"
+msgstr "통계 설정"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
-msgid "Choose..."
-msgstr "선택..."
+#. msg_difference spinner
+#: ../gtk/plugins/cap/cap.c:810
+msgid "Maximum response timeout:"
+msgstr "최대 응답 시간 초과:"
 
-#: ../finch/gntstatus.c:138
-#, c-format
-msgid "Are you sure you want to delete \"%s\""
-msgstr "정말 %s 님을 삭제하시겠습니까?"
+#: ../gtk/plugins/cap/cap.c:813
+#: ../gtk/plugins/cap/cap.c:820
+#: ../gtk/plugins/cap/cap.c:827
+#: ../gtk/plugins/timestamp.c:149
+msgid "minutes"
+msgstr "분간"
 
-#: ../finch/gntstatus.c:141
-msgid "Delete Status"
-msgstr "상태 삭제"
+#. last_seen spinner
+#: ../gtk/plugins/cap/cap.c:817
+msgid "Maximum last-seen difference:"
+msgstr "최대 last-seen 차이:"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
-msgid "Saved Statuses"
-msgstr "저장된 상태"
+#. threshold spinner
+#: ../gtk/plugins/cap/cap.c:824
+msgid "Threshold:"
+msgstr "임계값:"
 
-#: ../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
-#: ../pidgin/gtksavedstatuses.c:500
-msgid "Title"
-msgstr "제목"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/cap/cap.c:931
+msgid "Contact Availability Prediction"
+msgstr "연락 가능성 예측"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
-msgid "Type"
-msgstr "형식"
+#. *< name
+#. *< version
+#: ../gtk/plugins/cap/cap.c:933
+msgid "Contact Availability Prediction plugin."
+msgstr "친구와 대화할 가능성을 예측하는 플러그인입니다."
 
-#. Statuses are almost all the same. Define a macro to reduce code repetition.
-#. PurpleStatusPrimitive
-#. id - use default
-#. name - use default
-#. savable
-#. user_settable
-#. not independent
-#. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:270
-#: ../libpurple/protocols/bonjour/bonjour.c:277
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../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:5608
-#: ../libpurple/protocols/oscar/oscar.c:5826
-#: ../libpurple/protocols/oscar/oscar.c:5840
-#: ../libpurple/protocols/oscar/oscar.c:5856
-#: ../libpurple/protocols/oscar/oscar.c:5863
-#: ../libpurple/protocols/oscar/oscar.c:5870
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3753
-#: ../libpurple/protocols/yahoo/yahoo.c:3759
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
-msgid "Message"
-msgstr "메시지"
+#. *  summary
+#: ../gtk/plugins/cap/cap.c:934
+msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
+msgstr "연락 가능성을 예측하는 플러그인 (CAP) 을 사용하여 친구와 대화한 통계로부터 경험치를 표시합니다."
 
-#. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
-msgid "Use"
-msgstr "사용"
+#: ../gtk/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "대기 중인 친구"
 
-#: ../finch/gntstatus.c:301
-msgid "Invalid title"
-msgstr "잘못된 제목입니다."
+#: ../gtk/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "자리 비움 중인 친구"
 
-#: ../finch/gntstatus.c:302
-msgid "Please enter a non-empty title for the status."
-msgstr "상태 제목을 입력해 주십시오."
+#: ../gtk/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "\"장시간\" 자리 비움 상태의 친구"
 
-#: ../finch/gntstatus.c:310
-msgid "Duplicate title"
-msgstr "중복된 제목입니다."
+#. Not used yet.
+#: ../gtk/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "휴대 기기 친구"
 
-#: ../finch/gntstatus.c:311
-msgid "Please enter a different title for the status."
-msgstr "다른 제목을 입력해 주십시오."
+#: ../gtk/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "오프라인 친구"
 
-#: ../finch/gntstatus.c:452
-msgid "Substatus"
-msgstr "하위 상태"
+#: ../gtk/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "상태별 점수"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
-msgid "Status:"
-msgstr "상태:"
+#: ../gtk/plugins/contact_priority.c:118
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgstr "<i>가장 큰 점수</i> 를 갖는 친구가 우선적으로 연락됩니다.\n"
 
-#: ../finch/gntstatus.c:479
-msgid "Message:"
-msgstr "메시지:"
+#: ../gtk/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "점수가 같을 때에는 마지막 친구가 우선함"
 
-#: ../finch/gntstatus.c:528
-msgid "Edit Status"
-msgstr "상태 편집"
+#: ../gtk/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "계정별 점수"
 
-#: ../finch/gntstatus.c:570
-msgid "Use different status for following accounts"
-msgstr "다음의 계정으로 다른 상태를 사용"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "연락 우선 순위"
 
-#. Save & Use
-#: ../finch/gntstatus.c:604
-msgid "Save & Use"
-msgstr "저장 및 사용"
+#. *< name
+#. *< version
+#. *< summary
+#: ../gtk/plugins/contact_priority.c:185
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "친구의 여러 상태에 맞추어 우선 순위를 조절할 수 있습니다."
 
-#: ../finch/gntui.c:85
-msgid "Certificates"
-msgstr "인증"
+#. *< description
+#: ../gtk/plugins/contact_priority.c:187
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "연락 우선 순위를 계산할 때에 친구의 상태 (대기/자리 비움/오프라인 등)의 점수를 변경할 수 있습니다."
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
-msgid "Sounds"
-msgstr "소리"
+#: ../gtk/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Conversation Colors"
 
-#: ../finch/gntui.c:91
-msgid "Statuses"
-msgstr "상태"
+#: ../gtk/plugins/convcolors.c:25
+#: ../gtk/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "대화 창안에 표시하는 메시지의 색상을 설정합니다."
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-msgid "Error loading the plugin."
-msgstr "플러그인을 읽어 들이는 중 오류가 발생했습니다."
+#: ../gtk/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "오류 메시지"
 
-#: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
-msgid "Couldn't find X display"
-msgstr "파일을 열 수 없었습니다."
+#: ../gtk/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "강조 표시 메시지"
 
-#: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
-msgid "Couldn't find window"
-msgstr "파일을 열 수 없었습니다."
+#: ../gtk/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "시스템 메시지"
 
-#: ../finch/plugins/gntclipboard.c:129
-msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+#: ../gtk/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "보낸 메시지"
 
-#: ../finch/plugins/gntclipboard.c:158
-msgid "GntClipboard"
-msgstr ""
+#: ../gtk/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "받은 메시지"
 
-#: ../finch/plugins/gntclipboard.c:160
-#, fuzzy
-msgid "Clipboard plugin"
-msgstr "Toaster 플러그인"
+#: ../gtk/plugins/convcolors.c:201
+#: ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "%s (으)로 사용할 색상 선택"
 
-#: ../finch/plugins/gntclipboard.c:161
+#: ../gtk/plugins/convcolors.c:300
+#: ../gtk/plugins/gaimrc.c:448
+#: ../libgaim/protocols/msn/msn.c:1532
+msgid "General"
+msgstr "일반"
+
+#: ../gtk/plugins/convcolors.c:301
+msgid "Ignore incoming format"
+msgstr "수신한 메시지 서식 무시"
+
+#: ../gtk/plugins/convcolors.c:302
+msgid "Apply in Chats"
+msgstr "대화 적용"
+
+#: ../gtk/plugins/convcolors.c:303
+msgid "Apply in IMs"
+msgstr "메시지에 적용"
+
+#: ../gtk/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "대화 횟수순으로 정렬"
+
+#: ../gtk/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Conversation Placement"
+
+#: ../gtk/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "창마다 대화 탭의 개수"
+
+#: ../gtk/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "대화 탭을 번호순으로 배치할 때 메시지와 대화 창을 분리"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "대화 탭을 배치할 때의 옵션입니다."
+
+#. *< summary
+#. *  description
+#: ../gtk/plugins/extplacement.c:139
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgstr "대화 창마다에 대화 탭의 개수를 제한하여, 선택적으로 메시지와 대화 창을 분리합니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gaiminc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin 데모 플러그인"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "다양한 동작을 실행하는 샘플 플러그인입니다 - 설명을 참조해 주십시오."
+
+#. *  description
+#: ../gtk/plugins/gaiminc.c:96
 msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
 msgstr ""
+"이것은 다양한 동작을 실행하는 정말 대단한 플러그인입니다:\n"
+"- 로그인하면 프로그램의 제작자를 알려줍니다.\n"
+"- 수신한 모든 문자를 반전시킵니다.\n"
+"- 로그인하면 친구 목록의 사람들에게 메시지를 즉시 보냅니다."
 
-#: ../finch/plugins/gntgf.c:231
+#: ../gtk/plugins/gaimrc.c:41
+msgid "Cursor Color"
+msgstr "커서 색상"
+
+#: ../gtk/plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "두번째 커서 색상"
+
+#: ../gtk/plugins/gaimrc.c:43
+msgid "Hyperlink Color"
+msgstr "하이퍼링크 색상"
+
+#: ../gtk/plugins/gaimrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "GtkTreeView Expander 크기"
+
+#: ../gtk/plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView 수평방향 분리자"
+
+#: ../gtk/plugins/gaimrc.c:76
+msgid "Conversation Entry"
+msgstr "메지시 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "대화 히스토리 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "로그 뷰어 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr "질문 창의 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:80
+msgid "Notify Dialog"
+msgstr "알림 창의 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "GtkTreeView의 Expander를 들여쓰기 함"
+
+#: ../gtk/plugins/gaimrc.c:322
+msgid "Select Color"
+msgstr "글꼴 색상"
+
+#: ../gtk/plugins/gaimrc.c:361
 #, c-format
-msgid "%s just signed on"
-msgstr "%s 님이 접속했습니다."
+msgid "Select Font for %s"
+msgstr "%s (으)로 사용할 글꼴 선택"
 
-#: ../finch/plugins/gntgf.c:238
+#: ../gtk/plugins/gaimrc.c:398
+msgid "Select Interface Font"
+msgstr "인터페이스 글꼴 선택"
+
+#: ../gtk/plugins/gaimrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+ 인터페이스 글꼴"
+
+#: ../gtk/plugins/gaimrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ 글자 바로 가기 테마"
+
+#: ../gtk/plugins/gaimrc.c:508
+msgid "Interface colors"
+msgstr "인터페이스 색상"
+
+#: ../gtk/plugins/gaimrc.c:532
+msgid "Widget Sizes"
+msgstr "Widget 크기"
+
+#: ../gtk/plugins/gaimrc.c:553
+msgid "Fonts"
+msgstr "글꼴"
+
+#: ../gtk/plugins/gaimrc.c:576
+msgid "Tools"
+msgstr "도구"
+
+#: ../gtk/plugins/gaimrc.c:581
 #, c-format
-msgid "%s just signed off"
-msgstr "%s 님이 접속을 끊었습니다."
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "이 설정을 \"%s%sgtkrc-2.0\" 에 저장"
 
-#: ../finch/plugins/gntgf.c:246
-#, c-format
-msgid "%s sent you a message"
-msgstr "%s 님이 나에게 메시지를 보내 왔습니다."
+#: ../gtk/plugins/gaimrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "이 \"gtkrc\" 파일을 읽어들임"
 
-#: ../finch/plugins/gntgf.c:265
-#, c-format
-msgid "%s said your nick in %s"
-msgstr "%s 님이 별명을 불렀습니다. (%s)"
+#: ../gtk/plugins/gaimrc.c:616
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Pidgin GTK+ 테마 정의"
 
-#: ../finch/plugins/gntgf.c:267
+#: ../gtk/plugins/gaimrc.c:618
+#: ../gtk/plugins/gaimrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "\"gtkrc\" 의 설정에 접근하는 기능을 제공합니다."
+
+#. Configuration frame
+#: ../gtk/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "마우스 제스처 설정"
+
+#: ../gtk/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "마우스 가운데 버튼"
+
+#: ../gtk/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "마우스 오른쪽 버튼"
+
+#. "Visual gesture display" checkbox
+#: ../gtk/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "마우스 제스처를 시각적으로 표시(_V)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "마우스 제스처"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "마우스 제스처 기능을 제공합니다."
+
+#. *  description
+#: ../gtk/plugins/gestures/gestures.c:294
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"대화 창에서 마우스 제스처 기능을 제공합니다.\n"
+"다음의 동작을 실행하는 경우에는, 마우스 가운데 버튼을 드래그 해 주십시오:\n"
+"\n"
+"아래→오른쪽으로 드래그 하면 대화를 닫습니다.\n"
+"위→왼쪽으로 드래그 하면 이전의 대화로 이동합니다.\n"
+"위→오른쪽으로 드래그 하면 다음의 대화로 이동합니다."
+
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "인스턴트 메신저"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr "아래의 주소록으로부터 친구를 선택하거나 또는 친구를 새로 추가해 주십시오."
+
+#. "Search"
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
+#: ../gtk/plugins/gevolution/assoc-buddy.c:358
+#: ../libgaim/protocols/jabber/buddy.c:1760
+#: ../libgaim/protocols/qq/group.c:123
+#: ../libgaim/protocols/qq/group_im.c:139
+#: ../libgaim/protocols/qq/sys_msg.c:162
+#: ../libgaim/protocols/qq/sys_msg.c:232
+#: ../libgaim/protocols/qq/sys_msg.c:250
+#: ../libgaim/protocols/sametime/sametime.c:5621
+msgid "Search"
+msgstr "검색"
+
+#. "New Person" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
+#: ../gtk/plugins/gevolution/assoc-buddy.c:469
+#: ../gtk/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "새 친구"
+
+#. "Select Buddy" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "친구 선택"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/assoc-buddy.c:345
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "주소록으로부터 추가할 친구를 선택하거나 또는 새 친구를 작성해 주십시오."
+
+#. Add the expander
+#: ../gtk/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "사용자 상세(_D)"
+
+#. "Associate Buddy" button
+#: ../gtk/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "친구와의 연대(_A)"
+
+#: ../gtk/plugins/gevolution/eds-utils.c:73
+#: ../gtk/plugins/gevolution/eds-utils.c:86
+#: ../libgaim/protocols/jabber/jabber.c:1162
+msgid "None"
+msgstr "없음"
+
+#: ../gtk/plugins/gevolution/gevolution.c:239
+#: ../gtk/plugins/gevolution/gevolution.c:245
+msgid "Unable to send e-mail"
+msgstr "이메일을 보낼 수 없음"
+
+#: ../gtk/plugins/gevolution/gevolution.c:240
+msgid "The evolution executable was not found in the PATH."
+msgstr "환경변수 PATH 로부터 Evolution의 실행 형식을 찾을 수 없습니다."
+
+#: ../gtk/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr "이 친구의 이메일 주소가 없습니다."
+
+#: ../gtk/plugins/gevolution/gevolution.c:272
+msgid "Add to Address Book"
+msgstr "주소록에 추가"
+
+#: ../gtk/plugins/gevolution/gevolution.c:284
+msgid "Send E-Mail"
+msgstr "이메일 전송"
+
+#. Configuration frame
+#: ../gtk/plugins/gevolution/gevolution.c:411
+msgid "Evolution Integration Configuration"
+msgstr "Evolution과의 연대 설정"
+
+#. Label
+#: ../gtk/plugins/gevolution/gevolution.c:414
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "자동으로 친구로 추가할 계정을 모두 선택해 주십시오."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gevolution/gevolution.c:521
+msgid "Evolution Integration"
+msgstr "Evolution과의 연대"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gevolution/gevolution.c:524
+#: ../gtk/plugins/gevolution/gevolution.c:526
+msgid "Provides integration with Evolution."
+msgstr "Evolution과의 연대 기능을 제공합니다."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "사용자 정보를 입력해 주십시오."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "친구 목록의 이름과 계정 형식을 입력해 주십시오."
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "계정 형식:"
+
+#. Optional Information section
+#: ../gtk/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "추가 정보:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "이름:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "성:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "이메일:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK 신호 시험"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gtk-signals-test.c:163
+#: ../gtk/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "모든 UI 신호가 정상적으로 동작하는지 시험합니다."
+
+#: ../gtk/plugins/history.c:188
+msgid "History"
+msgstr "History"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Iconify on Away"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/iconaway.c:85
+#: ../gtk/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "자리를 벗어나면 친구 목록과 대화 창을 아이콘화 합니다."
+
+#: ../gtk/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "메일 확인"
+
+#: ../gtk/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "새 로컬 메일을 확인합니다."
+
+#: ../gtk/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "새로운 메일이 있으면 그것을 표시하기 위한 작은 상자를 친구 목록에 추가합니다."
+
+#: ../gtk/plugins/markerline.c:23
+msgid "Markerline"
+msgstr "Markerline"
+
+#: ../gtk/plugins/markerline.c:25
+#: ../gtk/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "대화 창 안에 있는 새 메시지에 밑줄을 그립니다."
+
+#: ../gtk/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr "밑줄 적용 대상"
+
+#: ../gtk/plugins/markerline.c:250
+#: ../gtk/plugins/notify.c:674
+msgid "_IM windows"
+msgstr "메시지 창(_I)"
+
+#: ../gtk/plugins/markerline.c:254
+#: ../gtk/plugins/notify.c:681
+msgid "C_hat windows"
+msgstr "대화 창(_H)"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr "음악 메시지 세션을 요구했습니다. 수락할 경우에는 MM 아이콘을 눌러 주십시오."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "음악 메시지 세션에 들어갔습니다."
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
+msgid "Music Messaging"
+msgstr "음악 메시지"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "실행 중인 명령에서 충돌이 발생했습니다:"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
+msgid "Error Running Editor"
+msgstr "편집기 실행 오류"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+msgid "The following error has occurred:"
+msgstr "다음의 오류가 발생했습니다:"
+
+#. Configuration frame
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
+msgid "Music Messaging Configuration"
+msgstr "음악 메시지 설정"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr "점수 편집기 경로"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
+msgid "_Apply"
+msgstr "적용(_A)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "합작하기 위한 음악 메시지 플러그인입니다."
+
+#. *  summary
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr "실시간으로 공통 점수를 편집함으로써 여러 명의 친구 사이에서 음악의 일부분을 동시에 연주할 수 있도록 하는 음악 메시지 플러그인입니다."
+
+#. ---------- "Notify For" ----------
+#: ../gtk/plugins/notify.c:670
+msgid "Notify For"
+msgstr "연락처"
+
+#: ../gtk/plugins/notify.c:689
+msgid "\t_Only when someone says your screen name"
+msgstr "\t누군가가 나의 아이디를 호출할 때만(_O)"
+
+#: ../gtk/plugins/notify.c:699
+msgid "_Focused windows"
+msgstr "활성 창(_F)"
+
+#. ---------- "Notification Methods" ----------
+#: ../gtk/plugins/notify.c:707
+msgid "Notification Methods"
+msgstr "알림 방식"
+
+#: ../gtk/plugins/notify.c:714
+msgid "Prepend _string into window title:"
+msgstr "문자열을 창 제목 앞부분에 추가(_S):"
+
+#. Count method button
+#: ../gtk/plugins/notify.c:733
+msgid "Insert c_ount of new messages into window title"
+msgstr "새 메시지 수를 창 제목에 삽입(_O)"
+
+#. Count xprop method button
+#: ../gtk/plugins/notify.c:742
+msgid "Insert count of new message into _X property"
+msgstr "새 메시지 수를 X 속성에 삽입(_X)"
+
+#. Urgent method button
+#: ../gtk/plugins/notify.c:750
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "창 관리자에게 \"긴급\" 힌트 설정(_U)"
+
+#. Raise window method button
+#: ../gtk/plugins/notify.c:759
+msgid "R_aise conversation window"
+msgstr "대화 창을 전면으로 표시(_A)"
+
+#. ---------- "Notification Removals" ----------
+#: ../gtk/plugins/notify.c:767
+msgid "Notification Removal"
+msgstr "알림을 삭제할 시기"
+
+#. Remove on focus button
+#: ../gtk/plugins/notify.c:772
+msgid "Remove when conversation window _gains focus"
+msgstr "대화 창이 활성되면(_G)"
+
+#. Remove on click button
+#: ../gtk/plugins/notify.c:779
+msgid "Remove when conversation window _receives click"
+msgstr "대화 창을 클릭하면(_R)"
+
+#. Remove on type button
+#: ../gtk/plugins/notify.c:787
+msgid "Remove when _typing in conversation window"
+msgstr "대화 창에서 무언가를 입력하면(_T)"
+
+#. Remove on message send button
+#: ../gtk/plugins/notify.c:795
+msgid "Remove when a _message gets sent"
+msgstr "메시지를 전송하면(_M)"
+
+#. Remove on conversation switch button
+#: ../gtk/plugins/notify.c:804
+msgid "Remove on switch to conversation ta_b"
+msgstr "대화 창의 탭이 전환되면(_B)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/notify.c:893
+msgid "Message Notification"
+msgstr "Message Notification"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/notify.c:896
+#: ../gtk/plugins/notify.c:898
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "읽지 않은 메시지를 알리는 다양한 방법을 제공합니다."
+
+#: ../gtk/plugins/raw.c:175
+msgid "Raw"
+msgstr "Raw 데이터"
+
+#: ../gtk/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "Raw 데이터를 문자 형식의 프로토콜로 전송할 수 있습니다."
+
+#: ../gtk/plugins/raw.c:178
+msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "입력한 Raw 데이터를 문자 형식 프로토콜 (Jabber, MSN, IRC, TOC) 에 전송할 수 있습니다. 전송할 때에는 입력 상자 안에서 [엔터] 키를 눌러 주십시오. 디버그 창에서 전송 내용을 감시해 주십시오."
+
+#: ../gtk/plugins/relnot.c:75
 #, c-format
-msgid "%s sent a message in %s"
-msgstr "%s 님이 메시지를 전송합니다. (%s)"
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>변경 로그:</b>\n"
+"%s<br><br>"
 
-#: ../finch/plugins/gntgf.c:305
-msgid "Buddy signs on/off"
-msgstr "친구가 접속/접속 해제했을 때"
+#: ../gtk/plugins/relnot.c:84
+#: ../gtk/plugins/relnot.c:85
+msgid "New Version Available"
+msgstr "최신 버전 알림"
 
-#: ../finch/plugins/gntgf.c:306
-msgid "You receive an IM"
-msgstr "메시지를 받을 때"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "Release Notification"
 
-#: ../finch/plugins/gntgf.c:307
-msgid "Someone speaks in a chat"
-msgstr "대화에서 누군가가 나를 호출했을 때"
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "최신 릴리즈의 정보를 주기적으로 확인합니다."
 
-#: ../finch/plugins/gntgf.c:308
-msgid "Someone says your name in a chat"
-msgstr "대화에서 누군가가 내 이름을 입력했을 때"
+#. *  description
+#: ../gtk/plugins/relnot.c:148
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "최신 릴리즈를 주기적으로 확인하여 변경 로그 (ChangeLog) 를 사용자에게 알립니다."
 
-#: ../finch/plugins/gntgf.c:336
-msgid "Notify with a toaster when"
-msgstr "다음의 경우에 Toaster와 함께 알림"
+#: ../gtk/plugins/spellchk.c:1965
+msgid "Duplicate Correction"
+msgstr "문자열이 중복되고 있습니다."
 
-#: ../finch/plugins/gntgf.c:351
-msgid "Beep too!"
-msgstr "비프음 포함!"
+#: ../gtk/plugins/spellchk.c:1966
+msgid "The specified word already exists in the correction list."
+msgstr "지정한 문자열은 이미 목록에 있습니다."
 
-#: ../finch/plugins/gntgf.c:357
-msgid "Set URGENT for the terminal window."
-msgstr "터미널 창 속성이 긴급으로 되었을 때"
+#: ../gtk/plugins/spellchk.c:2180
+msgid "Text Replacements"
+msgstr "문자열 대체"
 
-#: ../finch/plugins/gntgf.c:377
-msgid "GntGf"
-msgstr "GntGf"
+#: ../gtk/plugins/spellchk.c:2203
+msgid "You type"
+msgstr "입력한 문자열"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
-msgid "Toaster plugin"
-msgstr "Toaster 플러그인"
+#: ../gtk/plugins/spellchk.c:2217
+msgid "You send"
+msgstr "실제 전송할 문자열"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:125
-#, c-format
-msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>%s 님과 %s 의 대화</b><br>"
+#: ../gtk/plugins/spellchk.c:2231
+msgid "Whole words only"
+msgstr "단어만"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:153
-msgid "History Plugin Requires Logging"
-msgstr "로그 기능은 히스토리 플러그인이 필요합니다."
+#: ../gtk/plugins/spellchk.c:2243
+msgid "Case sensitive"
+msgstr "대/소문자 구별"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:154
+#: ../gtk/plugins/spellchk.c:2269
+msgid "Add a new text replacement"
+msgstr "새로운 대체 추가"
+
+#: ../gtk/plugins/spellchk.c:2285
+msgid "You _type:"
+msgstr "입력한 문자열(_T):"
+
+#: ../gtk/plugins/spellchk.c:2302
+msgid "You _send:"
+msgstr "실제 전송할 문자열(_S):"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../gtk/plugins/spellchk.c:2314
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "대/소문자 구별(_E)"
+
+#: ../gtk/plugins/spellchk.c:2316
+msgid "Only replace _whole words"
+msgstr "단어가 일치할 때 대체(_W)"
+
+#: ../gtk/plugins/spellchk.c:2341
+msgid "General Text Replacement Options"
+msgstr "일반적인 문자열의 대체 설정"
+
+#: ../gtk/plugins/spellchk.c:2342
+msgid "Enable replacement of last word on send"
+msgstr "전송 시에 정리하여 대체"
+
+#: ../gtk/plugins/spellchk.c:2367
+msgid "Text replacement"
+msgstr "Text replacement"
+
+#: ../gtk/plugins/spellchk.c:2369
+#: ../gtk/plugins/spellchk.c:2370
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "사용자가 정의한 규칙에 따라 실제로 전송할 메지시를 대체합니다."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/ticker/ticker.c:77
+#: ../gtk/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Buddy Ticker"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/ticker/ticker.c:358
+#: ../gtk/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "친구 목록을 수평방향으로 스크롤하는 버전입니다."
+
+#: ../gtk/plugins/timestamp.c:136
+msgid "Display Timestamps Every"
+msgstr "타임스탬프 표시 간격"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp.c:195
+msgid "Timestamp"
+msgstr "Timestamp"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp.c:198
+msgid "Display iChat-style timestamps"
+msgstr "iChat 형식의 타임스탬프를 표시합니다."
+
+#. *  description
+#: ../gtk/plugins/timestamp.c:200
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "iChat 형식의 타임스탬프를 N분 마다 대화에 삽입합니다."
+
+#: ../gtk/plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "타임스탬프 서식 설정"
+
+#: ../gtk/plugins/timestamp_format.c:27
+msgid "_Force 24-hour time format"
+msgstr "강제적으로 24-시간제 적용(_F)"
+
+#: ../gtk/plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "표시할 조건:"
+
+#: ../gtk/plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "대화 창(_N):"
+
+#: ../gtk/plugins/timestamp_format.c:37
+#: ../gtk/plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "메시지가 지연되었을 때"
+
+#: ../gtk/plugins/timestamp_format.c:38
+#: ../gtk/plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "메시지가 지연되고 있는 대화 시"
+
+#: ../gtk/plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "메시지 로그(_M):"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "Message Timestamp Formats"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "메시지에 부여하는 타임스탬프의 서식을 정의합니다."
+
+#. *  description
+#: ../gtk/plugins/timestamp_format.c:154
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "이 플러그인을 사용하면 대화나 로그 메시지에 부여하는 타임스탬프의 형식을 정의할 수 있습니다."
+
+#: ../gtk/plugins/xmppconsole.c:665
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>로그아웃 했습니다.</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/xmppconsole.c:745
+#: ../gtk/plugins/xmppconsole.c:841
+#: ../gtk/plugins/xmppconsole.c:860
+msgid "XMPP Console"
+msgstr "XMPP 콘솔"
+
+#: ../gtk/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "계정: "
+
+#: ../gtk/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP에 접속되어 있지 않습니다.</font>"
+
+#: ../gtk/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr "<iq/> stanza 를 삽입합니다."
+
+#: ../gtk/plugins/xmppconsole.c:799
+msgid "Insert a <presence/> stanza."
+msgstr "<presence/> stanza 를 삽입합니다."
+
+#: ../gtk/plugins/xmppconsole.c:808
+msgid "Insert a <message/> stanza."
+msgstr "<message/> stanza 를 삽입합니다."
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/xmppconsole.c:863
+msgid "Send and receive raw XMPP stanzas."
+msgstr "낮은 수준의 XMPP stanza 를 전송 또는 수신합니다."
+
+#. *  description
+#: ../gtk/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr "이것은 XMPP 서버 또는 클라이언트를 디버그 할 때에 편리한 플러그인입니다."
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "불투명도:"
+
+#. IM Convo trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "메시지 대화 창"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "대화 창의 투명도(_I)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "대화 창 안에 슬라이드바 표시(_S)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "활성되면 대화 창의 투명도 해제"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "항상 맨 위에"
+
+#. Buddy List trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "친구 목록 창"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "친구 목록 투명도(_B)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "활성되면 친구 목록의 투명도 해제"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Transparency"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "친구 목록과 대화 창을 계단식으로 투명화 합니다."
+
+#. *  description
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
 msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"로그를 기록하려면 [도구] -> [설정] -> [로그 기록] 을 선택해 주십시오.\n"
+"이 플러그인은 가변식 투과를 사용하여 친구 목록과 대화 창을 투명하게 합니다.\n"
 "\n"
-"인스턴트 메시지 혹은 대화의 로그를 기록해 두면, 히스토리 플러그인의 기능을 이"
-"용 가능하게 됩니다."
+"* 주: 이 플러그인은 윈도우즈 2000 이상에서만 동작합니다."
 
-#: ../finch/plugins/gnthistory.c:179
-msgid "GntHistory"
-msgstr "GntHistory"
+#: ../gtk/plugins/win32/winprefs/winprefs.c:306
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ 런타임 버전"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
-msgid "Shows recently logged conversations in new conversations."
-msgstr "새로운 대화를 시작할 때 최근 로그에 기록된 대화를 삽입합니다."
+#. Autostart
+#: ../gtk/plugins/win32/winprefs/winprefs.c:314
+msgid "Startup"
+msgstr "시작"
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:198
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr ""
-"새로운 대화가 시작되면 이전 대화의 맨 마지막 메시지를 앞 부분에 추가합니다."
+#: ../gtk/plugins/win32/winprefs/winprefs.c:315
+msgid "_Start %s on Windows startup"
+msgstr "윈도우즈 시작 시 %s 실행(_S)"
 
-#: ../finch/plugins/lastlog.c:69
-msgid "Lastlog"
-msgstr "마지막 로그"
+#: ../gtk/plugins/win32/winprefs/winprefs.c:328
+msgid "_Dockable Buddy List"
+msgstr "친구 목록을 결합할 수 있게(_D)"
 
-#. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
-msgid "lastlog: Searches for a substring in the backlog."
-msgstr "마지막 로그: 과거의 로그에 있는 부분 문자열을 검색합니다."
+#. Blist On Top
+#: ../gtk/plugins/win32/winprefs/winprefs.c:332
+msgid "_Keep Buddy List window on top:"
+msgstr "친구 목록을 맨 위로 배치한 상태 유지(_K):"
 
-#: ../finch/plugins/lastlog.c:122
-msgid "GntLastlog"
-msgstr "GntLastlog"
+#. XXX: Did this ever work?
+#: ../gtk/plugins/win32/winprefs/winprefs.c:337
+msgid "Only when docked"
+msgstr "결합했을 때만"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
-#, fuzzy
-msgid "Lastlog plugin."
-msgstr "Lastlog 플러그인입니다."
+#: ../gtk/plugins/win32/winprefs/winprefs.c:342
+msgid "_Flash window when chat messages are received"
+msgstr "대화에서 메시지를 받으면 창을 깜박거림(_F)"
 
-#: ../libpurple/account.c:791
+#: ../libgaim/account.c:769
 msgid "accounts"
 msgstr "계정"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libgaim/account.c:915
 msgid "Password is required to sign on."
 msgstr "접속하기 위해서는 비밀번호가 필요합니다."
 
-#: ../libpurple/account.c:992
+#: ../libgaim/account.c:940
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "%s (%s) 의 비밀번호를 입력해 주십시오."
 
-#: ../libpurple/account.c:999
+#: ../libgaim/account.c:947
 msgid "Enter Password"
 msgstr "비밀번호 입력"
 
-#: ../libpurple/account.c:1004
+#: ../libgaim/account.c:952
 msgid "Save password"
 msgstr "비밀번호 저장"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
+#: ../libgaim/account.c:986
+#: ../libgaim/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "프로토콜 %s 의 플러그인이 없습니다."
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4363
-msgid "Connection Error"
-msgstr "접속 오류"
-
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libgaim/account.c:1085
+#: ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1317
 msgid "New passwords do not match."
 msgstr "새 비밀번호가 일치하지 않습니다."
 
-#: ../libpurple/account.c:1208
+#: ../libgaim/account.c:1094
 msgid "Fill out all fields completely."
 msgstr "모든 항목을 완전히 채워 주십시오."
 
-#: ../libpurple/account.c:1231
+#: ../libgaim/account.c:1117
 msgid "Original password"
 msgstr "기존 비밀번호"
 
-#: ../libpurple/account.c:1238
+#: ../libgaim/account.c:1124
 msgid "New password"
 msgstr "새 비밀번호"
 
-#: ../libpurple/account.c:1245
+#: ../libgaim/account.c:1131
 msgid "New password (again)"
 msgstr "비밀번호 (재확인)"
 
-#: ../libpurple/account.c:1251
+#: ../libgaim/account.c:1137
 #, c-format
 msgid "Change password for %s"
 msgstr "%s 의 비밀번호 변경"
 
-#: ../libpurple/account.c:1259
+#: ../libgaim/account.c:1145
 msgid "Please enter your current password and your new password."
 msgstr "현재 사용하고 있는 비밀번호와 새 비밀번호를 입력해 주십시오."
 
-#: ../libpurple/account.c:1290
+#: ../libgaim/account.c:1175
 #, c-format
 msgid "Change user information for %s"
 msgstr "%s 의 사용자 정보 변경"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libgaim/account.c:1178
+#: ../libgaim/protocols/toc/toc.c:1690
 msgid "Set User Info"
 msgstr "사용자 정보 설정"
 
-#: ../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/qq/qq.c:232 ../pidgin/gtkft.c:160
-msgid "Unknown"
-msgstr "알 수 없음"
-
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3246 ../pidgin/gtkblist.c:5716
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
-msgid "Buddies"
-msgstr "친구"
-
-#: ../libpurple/blist.c:548
+#: ../libgaim/blist.c:548
 msgid "buddy list"
 msgstr "친구 목록"
 
-#: ../libpurple/certificate.c:558
-msgid "(DOES NOT MATCH)"
-msgstr ""
-
-#. Make messages
-#: ../libpurple/certificate.c:562
+#: ../libgaim/blist.c:1919
 #, c-format
-msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgid "%d buddy from group %s was not removed because it belongs to an account which is disabled or offline.  This buddy and the group were not removed.\n"
+msgid_plural "%d buddies from group %s were not removed because they belong to accounts which are currently disabled or offline.  These buddies and the group were not removed.\n"
+msgstr[0] "%d 개의 계정이 사용 안 함 또는 오프라인 상태이기 때문에 그 계정을 그룹 %s (으)로부터 삭제하지 못했습니다. 그 친구와 그룹은 삭제할 수 없습니다.\n"
+msgstr[1] "%d 개의 계정이 사용 안 함 또는 오프라인 상태이기 때문에 그 계정을 그룹 %s (으)로부터 삭제하지 못했습니다. 그 친구와 그룹은 삭제할 수 없습니다.\n"
 
-#: ../libpurple/certificate.c:563
-#, c-format
-msgid ""
-"Common name: %s %s\n"
-"Fingerprint (SHA1): %s"
-msgstr ""
+#: ../libgaim/blist.c:1929
+msgid "Group not removed"
+msgstr "그룹을 삭제할 수 없습니다."
 
-#. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:568
-msgid "Single-use Certificate Verification"
-msgstr ""
-
-#. Scheme name
-#. Pool name
-#: ../libpurple/certificate.c:885
-#, fuzzy
-msgid "Certificate Authorities"
-msgstr "인증 가져오기"
-
-#. Scheme name
-#. Pool name
-#: ../libpurple/certificate.c:1053
-#, fuzzy
-msgid "SSL Peers Cache"
-msgstr "SSL 서버"
-
-#. Make messages
-#: ../libpurple/certificate.c:1184
-#, fuzzy, c-format
-msgid "Accept certificate for %s?"
-msgstr "%s 인증"
-
-#. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1190
-#, fuzzy
-msgid "SSL Certificate Verification"
-msgstr "SSL 호스트 인증"
-
-#. Number of actions
-#: ../libpurple/certificate.c:1199
-#, fuzzy
-msgid "Accept"
-msgstr "허가(_A)"
-
-#: ../libpurple/certificate.c:1200 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Reject"
-msgstr "거부"
-
-#: ../libpurple/certificate.c:1201
-#, fuzzy
-msgid "_View Certificate..."
-msgstr "인증"
-
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1301
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1326
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-
-#: ../libpurple/certificate.c:1344
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr ""
-
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-#: ../libpurple/certificate.c:1352 ../libpurple/certificate.c:1421
-#, fuzzy
-msgid "SSL Certificate Error"
-msgstr "인증 가져오기 오류"
-
-#: ../libpurple/certificate.c:1353
-#, fuzzy
-msgid "Invalid certificate chain"
-msgstr "잘못된 제목입니다."
-
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1373
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr "루트 인증 데이터베이스가 없습니다.이 인증은 유효화 되지 못했습니다."
-
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1396
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-
-#: ../libpurple/certificate.c:1413
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-
-#: ../libpurple/certificate.c:1422
-msgid "Invalid certificate authority signature"
-msgstr ""
-
-#. Make messages
-#: ../libpurple/certificate.c:1886
-#, c-format
-msgid ""
-"Common name: %s\n"
-"\n"
-"Fingerprint (SHA1): %s\n"
-"\n"
-"Activation date: %s\n"
-"Expiration date: %s\n"
-msgstr ""
-
-#. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1895
-#, fuzzy
-msgid "Certificate Information"
-msgstr "인증 가져오기"
-
-#: ../libpurple/connection.c:107
+#: ../libgaim/connection.c:106
 msgid "Registration Error"
 msgstr "등록 오류"
 
-#: ../libpurple/connection.c:180
-#, fuzzy
-msgid "Unregistration Error"
-msgstr "등록 오류"
-
-#: ../libpurple/connection.c:350
+#: ../libgaim/connection.c:292
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s 님이 접속했습니다."
 
-#: ../libpurple/connection.c:380
+#: ../libgaim/connection.c:322
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s 님이 접속을 끊었습니다."
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2340
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:363
-msgid "Unknown error"
-msgstr "알 수 없는 오류"
-
-#: ../libpurple/conversation.c:170
+#: ../libgaim/conversation.c:165
 msgid "Unable to send message: The message is too large."
 msgstr "메시지 전송 실패: 메시지가 너무 깁니다."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#: ../libgaim/conversation.c:168
+#: ../libgaim/conversation.c:181
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "%s 님에게 메시지를 보낼 수 없습니다."
 
-#: ../libpurple/conversation.c:174
+#: ../libgaim/conversation.c:169
 msgid "The message is too large."
 msgstr "메시지가 너무 깁니다."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
+#: ../libgaim/conversation.c:178
 msgid "Unable to send message."
 msgstr "메시지를 보낼 수 없습니다."
 
-#: ../libpurple/conversation.c:1211
+#: ../libgaim/conversation.c:1162
 msgid "Send Message"
 msgstr "메시지 전송"
 
-#: ../libpurple/conversation.c:1214
+#: ../libgaim/conversation.c:1163
 msgid "_Send Message"
 msgstr "메시지 전송(_S)"
 
-#: ../libpurple/conversation.c:1620
+#: ../libgaim/conversation.c:1566
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 님이 대화실에 들어왔습니다."
 
-#: ../libpurple/conversation.c:1623
+#: ../libgaim/conversation.c:1569
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 님이 대화실에 들어왔습니다."
 
-#: ../libpurple/conversation.c:1733
+#: ../libgaim/conversation.c:1674
 #, c-format
 msgid "You are now known as %s"
 msgstr "나는 %s (으)로 인식되었습니다"
 
-#: ../libpurple/conversation.c:1753
+#: ../libgaim/conversation.c:1694
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 님은 %s (으)로 인식되었습니다"
 
-#: ../libpurple/conversation.c:1828
+#: ../libgaim/conversation.c:1767
 #, c-format
 msgid "%s left the room."
 msgstr "%s 님이 대화실을 나갔습니다."
 
-#: ../libpurple/conversation.c:1831
+#: ../libgaim/conversation.c:1770
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 님이 대화실 (%s) (으)로부터 나갔습니다."
 
-#: ../libpurple/dbus-server.c:584
+#: ../libgaim/desktopitem.c:286
+#: ../libgaim/desktopitem.c:877
+msgid "No name"
+msgstr "이름 없음"
+
+#: ../libgaim/dbus-server.c:578
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "새 접속을 열 수 없습니다: %s"
 
-#: ../libpurple/dbus-server.c:596
+#: ../libgaim/dbus-server.c:590
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "이름 가져오기에 실패했습니다: %s"
 
-#: ../libpurple/dbus-server.c:610
+#: ../libgaim/dbus-server.c:603
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "서버명 가져오기에 실패했습니다: %s"
 
-#: ../libpurple/dbus-server.h:84
-msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
-
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
-msgid "No name"
-msgstr "이름 없음"
-
-#: ../libpurple/dnsquery.c:511
+#: ../libgaim/dnsquery.c:491
 msgid "Unable to create new resolver process\n"
 msgstr "새 resolver 프로세스를 생성할 수 없습니다.\n"
 
-#: ../libpurple/dnsquery.c:516
+#: ../libgaim/dnsquery.c:496
 msgid "Unable to send request to resolver process\n"
 msgstr "resolver 프로세스에 요구를 보낼 수 없습니다.\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
+#: ../libgaim/dnsquery.c:529
+#: ../libgaim/dnsquery.c:677
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2380,13 +6033,14 @@ msgstr ""
 "%s 해석 중 오류:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
-#: ../libpurple/dnsquery.c:830
+#: ../libgaim/dnsquery.c:532
+#: ../libgaim/dnsquery.c:691
+#: ../libgaim/dnsquery.c:799
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "%s 해석 중 오류: %d"
 
-#: ../libpurple/dnsquery.c:574
+#: ../libgaim/dnsquery.c:554
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2395,21 +6049,21 @@ msgstr ""
 "resolver 프로세스로부터 읽는 중 오류:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:578
-#, c-format
+#: ../libgaim/dnsquery.c:558
 msgid "EOF while reading from resolver process"
 msgstr "resolver 프로세스로부터 읽는 중 EOF"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libgaim/dnsquery.c:735
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "스레드 생성에 실패했습니다: %s"
 
-#: ../libpurple/dnsquery.c:763
+#: ../libgaim/dnsquery.c:736
 msgid "Unknown reason"
 msgstr "이유를 알 수 없습니다."
 
-#: ../libpurple/ft.c:209
+#: ../libgaim/ft.c:195
+#: ../libgaim/protocols/msn/msn.c:408
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2418,7 +6072,7 @@ msgstr ""
 "%s 읽는 중 오류 \n"
 "%s\n"
 
-#: ../libpurple/ft.c:213
+#: ../libgaim/ft.c:199
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2427,7 +6081,7 @@ msgstr ""
 "%s 쓰는 중 오류: \n"
 "%s\n"
 
-#: ../libpurple/ft.c:217
+#: ../libgaim/ft.c:203
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2436,39 +6090,39 @@ msgstr ""
 "%s 접근 중 오류:\n"
 "%s\n"
 
-#: ../libpurple/ft.c:253
+#: ../libgaim/ft.c:239
 msgid "Directory is not writable."
 msgstr "디렉토리에 쓰기 권한이 없습니다."
 
-#: ../libpurple/ft.c:268
+#: ../libgaim/ft.c:254
 msgid "Cannot send a file of 0 bytes."
 msgstr "0 바이트 파일은 보낼 수 없습니다."
 
-#: ../libpurple/ft.c:278
+#: ../libgaim/ft.c:264
 msgid "Cannot send a directory."
 msgstr "폴더는 전송할 수 없습니다."
 
-#: ../libpurple/ft.c:287
+#: ../libgaim/ft.c:273
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 은(는) 올바른 파일이 아닙니다. 덮어쓰기가 거부됩니다.\n"
 
-#: ../libpurple/ft.c:347
+#: ../libgaim/ft.c:331
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 님이 %s (%s) 을(를) 전송하고자 합니다."
 
-#: ../libpurple/ft.c:354
+#: ../libgaim/ft.c:338
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 님이 파일을 전송하고자 합니다."
 
-#: ../libpurple/ft.c:397
+#: ../libgaim/ft.c:379
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "%s 님으로부터의 파일 전송 요구를 승락하시겠습니까?"
 
-#: ../libpurple/ft.c:401
+#: ../libgaim/ft.c:383
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2479,406 +6133,368 @@ msgstr ""
 "리모트 호스트: %s\n"
 "리모트 포트: %d"
 
-#: ../libpurple/ft.c:436
+#: ../libgaim/ft.c:416
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 님이 파일 %s 의 전송을 요구하고 있습니다."
 
-#: ../libpurple/ft.c:488
+#: ../libgaim/ft.c:468
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 은(는) 올바른 파일명이 아닙니다.\n"
 
-#: ../libpurple/ft.c:509
+#: ../libgaim/ft.c:489
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%s 을(를) %s 에게 전송할 것을 전달하고 있습니다."
 
-#: ../libpurple/ft.c:521
+#: ../libgaim/ft.c:501
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "%s 을(를) %s (으)로부터 전송을 시작하고 있습니다."
 
-#: ../libpurple/ft.c:682
+#: ../libgaim/ft.c:655
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "파일 %s 의 전송이 완료되었습니다."
 
-#: ../libpurple/ft.c:685
-#, c-format
+#: ../libgaim/ft.c:658
 msgid "File transfer complete"
 msgstr "파일 전송이 완료되었습니다."
 
-#: ../libpurple/ft.c:1103
+#: ../libgaim/ft.c:1075
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "%s 의 전송이 취소되었습니다."
 
-#: ../libpurple/ft.c:1108
-#, c-format
+#: ../libgaim/ft.c:1080
 msgid "File transfer cancelled"
 msgstr "파일 전송이 취소되었습니다."
 
-#: ../libpurple/ft.c:1166
+#: ../libgaim/ft.c:1138
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 님이 %s 의 전송을 취소했습니다."
 
-#: ../libpurple/ft.c:1171
+#: ../libgaim/ft.c:1143
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 님이 파일 전송을 취소했습니다."
 
-#: ../libpurple/ft.c:1228
+#: ../libgaim/ft.c:1200
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "%s (으)로의 파일 전송에 실패했습니다."
 
-#: ../libpurple/ft.c:1230
+#: ../libgaim/ft.c:1202
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "%s (으)로부터의 파일 전송에 실패했습니다."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
+#: ../libgaim/gconf/gaim.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "터미널로부터 명령 수행"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
+#: ../libgaim/gconf/gaim.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "\"aim\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
+#: ../libgaim/gconf/gaim.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "\"gg\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
+#: ../libgaim/gconf/gaim.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "\"icq\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
+#: ../libgaim/gconf/gaim.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "\"irc\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
+#: ../libgaim/gconf/gaim.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "\"msnim\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
+#: ../libgaim/gconf/gaim.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "\"sip\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
+#: ../libgaim/gconf/gaim.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "\"xmpp\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
+#: ../libgaim/gconf/gaim.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "\"ymsgr\" URL을 처리할 때 사용하는 명령입니다 (이용 가능한 경우)."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
+#: ../libgaim/gconf/gaim.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "\"aim\" 용 핸들"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
+#: ../libgaim/gconf/gaim.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "\"gg\" 용 핸들"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
+#: ../libgaim/gconf/gaim.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "\"icq\" 용 핸들"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
+#: ../libgaim/gconf/gaim.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "\"irc\" 용 핸들"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
+#: ../libgaim/gconf/gaim.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "\"msnim\" 용 핸들"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
+#: ../libgaim/gconf/gaim.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "\"sip\" 용 핸들"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
+#: ../libgaim/gconf/gaim.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "\"xmpp\" 용 핸들"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
+#: ../libgaim/gconf/gaim.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "\"ymsgr\" 용 핸들"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
-msgstr ""
-"\"command\" 키로 지정한 명령으로 \"aim\" URL을 처리하는 경우에는 TRUE 입니다."
+#: ../libgaim/gconf/gaim.schemas.in.h:18
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"aim\" URL을 처리하는 경우에는 TRUE 입니다."
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
-msgstr ""
-"\"command\" 키로 지정한 명령으로 \"gg\" URL을 처리하는 경우에는 TRUE 입니다."
+#: ../libgaim/gconf/gaim.schemas.in.h:19
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"gg\" URL을 처리하는 경우에는 TRUE 입니다."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
-msgstr ""
-"\"command\" 키로 지정한 명령으로 \"icq\" URL을 처리하는 경우에는 TRUE 입니다."
+#: ../libgaim/gconf/gaim.schemas.in.h:20
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"icq\" URL을 처리하는 경우에는 TRUE 입니다."
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
-msgstr ""
-"\"command\" 키로 지정한 명령으로 \"irc\" URL을 처리하는 경우에는 TRUE 입니다."
+#: ../libgaim/gconf/gaim.schemas.in.h:21
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"irc\" URL을 처리하는 경우에는 TRUE 입니다."
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
-msgstr ""
-"\"command\" 키로 지정한 명령으로 \"msnim\" URL을 처리하는 경우에는 TRUE 입니"
-"다."
+#: ../libgaim/gconf/gaim.schemas.in.h:22
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"msnim\" URL을 처리하는 경우에는 TRUE 입니다."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
-msgstr ""
-"\"command\" 키로 지정한 명령으로 \"sip\" URL을 처리하는 경우에는 TRUE 입니다."
+#: ../libgaim/gconf/gaim.schemas.in.h:23
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"sip\" URL을 처리하는 경우에는 TRUE 입니다."
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
-msgstr ""
-"\"command\" 키로 지정한 명령으로 \"xmpp\" URL을 처리하는 경우에는 TRUE 입니"
-"다."
+#: ../libgaim/gconf/gaim.schemas.in.h:24
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"xmpp\" URL을 처리하는 경우에는 TRUE 입니다."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
-msgstr ""
-"\"command\" 키로 지정한 명령으로 \"ymsgr\" URL을 처리하는 경우에는 TRUE 입니"
-"다."
+#: ../libgaim/gconf/gaim.schemas.in.h:25
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+msgstr "\"command\" 키로 지정한 명령으로 \"ymsgr\" URL을 처리하는 경우에는 TRUE 입니다."
 
-#: ../libpurple/gconf/purple.schemas.in.h:26
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
-msgstr ""
-"이 형식의 URL을 처리하기 위해 사용하는 명령을 터미널로부터 시작하는 경우에는 "
-"TRUE 입니다."
+#: ../libgaim/gconf/gaim.schemas.in.h:26
+msgid "True if the command used to handle this type of URL should be run in a terminal."
+msgstr "이 형식의 URL을 처리하기 위해 사용하는 명령을 터미널로부터 시작하는 경우에는 TRUE 입니다."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
+#: ../libgaim/gconf/gaim.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "지정한 명령으로 \"aim\" URL을 처리할까 말까"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
+#: ../libgaim/gconf/gaim.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "지정한 명령으로 \"gg\" URL을 처리할까 말까"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
+#: ../libgaim/gconf/gaim.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "지정한 명령으로 \"icq\" URL을 처리할까 말까"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
+#: ../libgaim/gconf/gaim.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "지정한 명령으로 \"irc\" URL을 처리할까 말까"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
+#: ../libgaim/gconf/gaim.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "지정한 명령으로 \"msnim\" URL을 처리할까 말까"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
+#: ../libgaim/gconf/gaim.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "지정한 명령으로 \"sip\" URL을 처리할까 말까"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
+#: ../libgaim/gconf/gaim.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "지정한 명령으로 \"xmpp\" URL을 처리할까 말까"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
+#: ../libgaim/gconf/gaim.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "지정한 명령으로 \"ymsgr\" URL을 처리할까 말까"
 
-#: ../libpurple/log.c:183
+#: ../libgaim/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">로그 기록에는 읽기 함수가 없습니다.</font></b>"
 
-#: ../libpurple/log.c:598
+#: ../libgaim/log.c:562
 msgid "HTML"
 msgstr "HTML 형식"
 
-#: ../libpurple/log.c:612
+#: ../libgaim/log.c:573
 msgid "Plain text"
 msgstr "일반 문자열"
 
-#: ../libpurple/log.c:626
-msgid "Old flat format"
-msgstr ""
-
-#: ../libpurple/log.c:839
+#: ../libgaim/log.c:691
 msgid "Logging of this conversation failed."
 msgstr "이 메시지의 로그를 기록하지 못했습니다."
 
-#: ../libpurple/log.c:1282
+#: ../libgaim/log.c:1041
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
+#: ../libgaim/log.c:1115
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1368
+#: ../libgaim/log.c:1117
 #, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+#: ../libgaim/log.c:1175
+#: ../libgaim/log.c:1306
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>로그 파일을 찾을 수 없습니다!</b></font>"
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
+#: ../libgaim/log.c:1187
+#: ../libgaim/log.c:1320
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>파일을 읽지 못했습니다: %s</b></font>"
 
-#: ../libpurple/log.c:1500
+#: ../libgaim/log.c:1249
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libgaim/plugin.c:282
+#: ../libgaim/protocols/jabber/buddy.c:1685
+#: ../libgaim/protocols/msn/servconn.c:139
+#: ../libgaim/protocols/msn/session.c:321
+#: ../libgaim/protocols/oscar/oscar.c:2719
+msgid "Unknown error"
+msgstr "알 수 없는 오류"
+
+#: ../libgaim/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s 을(를) 사용하고 있으나, 이 플러그인은 %s 이(가) 필요합니다."
 
-#: ../libpurple/plugin.c:380
+#: ../libgaim/plugin.c:434
 #, c-format
-msgid "This plugin has not defined an ID."
-msgstr ""
-
-#: ../libpurple/plugin.c:448
-#, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "플러그인 매직 번호 (%d) 이(가) 일치하지 않습니다: %d 매직 번호 필요"
 
-#: ../libpurple/plugin.c:465
+#: ../libgaim/plugin.c:451
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI 버전 (%d.%d.x) 이(가) 일치하지 않습니다: %d.%d.x 버전 필요"
 
-#: ../libpurple/plugin.c:482
+#: ../libgaim/plugin.c:468
 msgid "Plugin does not implement all required functions"
 msgstr "플러그인이 필요한 모든 함수를 실행하지 못했습니다."
 
-#: ../libpurple/plugin.c:547
+#: ../libgaim/plugin.c:533
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
-msgstr ""
-"요구하는 플러그인 %s 을(를) 찾을 수 없습니다. 이 플러그인을 설치한 후, 다시 "
-"시도해 보십시오."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgstr "요구하는 플러그인 %s 을(를) 찾을 수 없습니다. 이 플러그인을 설치한 후, 다시 시도해 보십시오."
 
-#: ../libpurple/plugin.c:552
-#, fuzzy
-msgid "Unable to load the plugin"
-msgstr "플러그인을 읽을 수 없었습니다."
+#: ../libgaim/plugin.c:538
+msgid "Error loading the plugin."
+msgstr "플러그인을 읽어 들이는 중 오류가 발생했습니다."
 
-#: ../libpurple/plugin.c:574
+#: ../libgaim/plugin.c:560
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "요구하는 플러그인 %s 을(를) 읽을 수 없었습니다."
 
-#: ../libpurple/plugin.c:578
+#: ../libgaim/plugin.c:564
 msgid "Unable to load your plugin."
 msgstr "플러그인을 읽을 수 없었습니다."
 
-#: ../libpurple/plugin.c:677
+#: ../libgaim/plugin.c:664
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "의존성이 있는 플러그인 %s 해제에 실패했습니다"
 
-#: ../libpurple/plugin.c:681
+#: ../libgaim/plugin.c:669
 msgid "There were errors unloading the plugin."
 msgstr "플러그인을 해제하는 동안에 오류가 발생했습니다."
 
-#: ../libpurple/plugins/autoaccept.c:23
+#: ../libgaim/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Autoaccept"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+#: ../libgaim/plugins/autoaccept.c:25
+#: ../libgaim/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "선택한 사용자로부터의 파일 요구를 자동으로 수락합니다."
 
-#: ../libpurple/plugins/autoaccept.c:80
+#: ../libgaim/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr "\"%2$s\" 님으로부터 \"%1$s\" 파일 전송 수락을 완료했습니다."
 
-#: ../libpurple/plugins/autoaccept.c:82
+#: ../libgaim/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "수락 완료"
 
-#: ../libpurple/plugins/autoaccept.c:160
+#: ../libgaim/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "%s 님으로부터 파일 전송을 수락하면"
 
-#: ../libpurple/plugins/autoaccept.c:162
+#: ../libgaim/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr "자동 수락 설정"
 
-#: ../libpurple/plugins/autoaccept.c:164
+#: ../libgaim/plugins/autoaccept.c:164
+#: ../libgaim/plugins/autoreply.c:225
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: ../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:1456
-#: ../libpurple/protocols/oscar/oscar.c:2248
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/oscar.c:5995
-#: ../libpurple/protocols/oscar/oscar.c:6221
-#: ../libpurple/protocols/oscar/oscar.c:6291 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
+#: ../libgaim/plugins/autoaccept.c:165
+#: ../libgaim/plugins/autoreply.c:226
+#: ../libgaim/plugins/idle.c:170
+#: ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228
+#: ../libgaim/protocols/oscar/oscar.c:1432
+#: ../libgaim/protocols/oscar/oscar.c:2234
+#: ../libgaim/protocols/oscar/oscar.c:2280
+#: ../libgaim/protocols/oscar/oscar.c:5838
+#: ../libgaim/protocols/oscar/oscar.c:5890
+#: ../libgaim/protocols/oscar/oscar.c:6068
+#: ../libgaim/protocols/oscar/oscar.c:6124
+#: ../libgaim/protocols/oscar/oscar.c:6193
+#: ../libgaim/request.h:1350
+#: ../libgaim/request.h:1360
 msgid "_Cancel"
 msgstr "취소(_C)"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libgaim/plugins/autoaccept.c:166
 msgid "Ask"
 msgstr "물어보기"
 
-#: ../libpurple/plugins/autoaccept.c:169
+#: ../libgaim/plugins/autoaccept.c:167
 msgid "Auto Accept"
 msgstr "자동으로 수락"
 
-#: ../libpurple/plugins/autoaccept.c:170
+#: ../libgaim/plugins/autoaccept.c:168
 msgid "Auto Reject"
 msgstr "자동 거부"
 
-#: ../libpurple/plugins/autoaccept.c:185
+#: ../libgaim/plugins/autoaccept.c:181
 msgid "Autoaccept File Transfers..."
 msgstr "파일 전송의 자동 수락..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
+#: ../libgaim/plugins/autoaccept.c:211
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2886,11 +6502,11 @@ msgstr ""
 "파일 저장 위치\n"
 "(절대 경로로 지정)"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libgaim/plugins/autoaccept.c:216
 msgid "Automatically reject from users not in buddy list"
 msgstr "친구 목록에 없는 사용자로부터의 요구는 거부"
 
-#: ../libpurple/plugins/autoaccept.c:224
+#: ../libgaim/plugins/autoaccept.c:220
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2898,39 +6514,124 @@ msgstr ""
 "자동 수락에 의한 파일이 전송을 완료하면 팝업으로 알림\n"
 "(파일을 전송한 상대와 대화가 없는 경우에만)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1764
-#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libgaim/plugins/autoreply.c:23
+msgid "Autoreply"
+msgstr "Autoreply"
+
+#: ../libgaim/plugins/autoreply.c:25
+msgid "Autoreply for all the protocols"
+msgstr "모든 프로토콜로 자동 응답합니다."
+
+#: ../libgaim/plugins/autoreply.c:26
+msgid "This plugin lets you set autoreply message for any protocol. You can set the global autoreply message from the Plugin-options dialog. To set some specific autoreply message for a particular buddy, right click on the buddy in the buddy-list window. To set autoreply messages for some account, go to the `Advanced' tab of the Account-edit dialog."
+msgstr "이 프로토콜을 사용하면 어떤 종류의 프로토콜로도 자동으로 응답할 수 있게 됩니다. [플러그인 설정]에서 공통으로 사용할 자동 응답 메시지를 지정할 수 있습니다. 특정 친구에 대해 자동 응답 메시지를 지정하려면, 친구 목록의 친구 위에서 오른쪽 클릭해 주십시오. 계정마다 자동 응답 메시지를 지정하려면, 계정 편집 창의 \"고급 설정\" 탭을 이용하십시오."
+
+#. XXX: There should be a way to reset to the default/account-default autoreply
+#: ../libgaim/plugins/autoreply.c:218
+#, c-format
+msgid "Set autoreply message for %s"
+msgstr "%s 에 대한 자동 응답 메시지"
+
+#: ../libgaim/plugins/autoreply.c:220
+msgid "Set Autoreply Message"
+msgstr "자동 응답 메시지 설정"
+
+#: ../libgaim/plugins/autoreply.c:221
+msgid "The following message will be sent to the buddy when the buddy sends you a message and autoreply is enabled."
+msgstr "자동 응답을 사용함으로 할 때 친구가 메시지를 보내 오면, 다음 메시지를 상대에게 전송합니다:"
+
+#: ../libgaim/plugins/autoreply.c:238
+msgid "Set _Autoreply Message"
+msgstr "자동 응답 메시지 설정(_A)"
+
+#: ../libgaim/plugins/autoreply.c:249
+msgid "Autoreply message"
+msgstr "자동 응답 메시지"
+
+#: ../libgaim/plugins/autoreply.c:336
+msgid "Send autoreply messages when"
+msgstr "자동 응답 메시지를 보낼 시기"
+
+#: ../libgaim/plugins/autoreply.c:340
+msgid "When my account is _away"
+msgstr "내가 자리 비움일 때(_A)"
+
+#: ../libgaim/plugins/autoreply.c:344
+msgid "When my account is _idle"
+msgstr "내가 대기 중일 때(_I)"
+
+#: ../libgaim/plugins/autoreply.c:348
+msgid "_Default reply"
+msgstr "기본 응답(_D)"
+
+#: ../libgaim/plugins/autoreply.c:354
+msgid "Status message"
+msgstr "상태 메시지"
+
+#: ../libgaim/plugins/autoreply.c:358
+msgid "Autoreply with status message"
+msgstr "상태 메시지를 추가하여 자동 응답"
+
+#: ../libgaim/plugins/autoreply.c:362
+msgid "Always when there is a status message"
+msgstr "항상"
+
+#: ../libgaim/plugins/autoreply.c:364
+msgid "Only when there's no autoreply message"
+msgstr "자동 응답이 없을 때만"
+
+#: ../libgaim/plugins/autoreply.c:369
+msgid "Delay between autoreplies"
+msgstr "자동 응답 간격"
+
+#: ../libgaim/plugins/autoreply.c:373
+msgid "_Minimum delay (mins)"
+msgstr "간격(분)(_M)"
+
+#: ../libgaim/plugins/autoreply.c:377
+msgid "Times to send autoreplies"
+msgstr "자동 응답 회수"
+
+#: ../libgaim/plugins/autoreply.c:381
+msgid "Ma_ximum count"
+msgstr "최대값(_X)"
+
+#: ../libgaim/plugins/autoreply.c:428
+msgid "I am currently not available. Please leave your message, and I will get back to you as soon as possible."
+msgstr "지금 저는 응답할 수 있는 상태가 아니므로, 메시지를 남겨 주십시오. 확인하는 대로 연락을 드리겠습니다."
+
+#: ../libgaim/plugins/buddynote.c:46
+#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1641
 msgid "Notes"
 msgstr "메모"
 
-#: ../libpurple/plugins/buddynote.c:47
+#: ../libgaim/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "아래에 메모를 입력해 주십시오..."
 
-#: ../libpurple/plugins/buddynote.c:65
+#: ../libgaim/plugins/buddynote.c:61
 msgid "Edit Notes..."
 msgstr "메모 편집..."
 
-#. *< major version
-#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libgaim/plugins/buddynote.c:87
 msgid "Buddy Notes"
 msgstr "Buddy Notes"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
+#: ../libgaim/plugins/buddynote.c:89
 msgid "Store notes on particular buddies."
 msgstr "특정 친구에게 메모를 남깁니다."
 
-#. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
+#. *  summary
+#: ../libgaim/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "친구 목록에 있는 친구에게 메모를 남기기 위한 기능을 추가합니다."
 
@@ -2940,7 +6641,7 @@ msgstr "친구 목록에 있는 친구ì—
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
+#: ../libgaim/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "암호화 시험"
 
@@ -2948,7 +6649,8 @@ msgstr "암호화 시험"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+#: ../libgaim/plugins/ciphertest.c:267
+#: ../libgaim/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "암호화 기능이 함께 제공되어 있는지 확인합니다."
 
@@ -2958,7 +6660,7 @@ msgstr "암호화 기능이 함께 ì œê³
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
+#: ../libgaim/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus 예제"
 
@@ -2966,8 +6668,8 @@ msgstr "DBus 예제"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
+#: ../libgaim/plugins/dbus-example.c:158
+#: ../libgaim/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus 플러그인 예제"
 
@@ -2977,7 +6679,7 @@ msgstr "DBus 플러그인 예제"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
+#: ../libgaim/plugins/filectl.c:248
 msgid "File Control"
 msgstr "파일 제어"
 
@@ -2985,50 +6687,59 @@ msgstr "파일 제어"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+#: ../libgaim/plugins/filectl.c:251
+#: ../libgaim/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "명령을 파일에 기술하여 제어할 수 있습니다."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+#: ../libgaim/plugins/idle.c:158
+#: ../libgaim/plugins/idle.c:216
 msgid "Minutes"
 msgstr "분"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+#: ../libgaim/plugins/idle.c:165
+#: ../libgaim/plugins/idle.c:198
+#: ../libgaim/plugins/idle.c:223
+#: ../libgaim/plugins/idle.c:315
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+#: ../libgaim/plugins/idle.c:166
+#: ../libgaim/plugins/idle.c:255
 msgid "Set Account Idle Time"
 msgstr "대기 시간 설정"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+#: ../libgaim/plugins/idle.c:169
+#: ../libgaim/plugins/idle.c:227
 msgid "_Set"
 msgstr "설정(_S)"
 
-#: ../libpurple/plugins/idle.c:184
+#: ../libgaim/plugins/idle.c:183
 msgid "None of your accounts are idle."
 msgstr "대기 중인 계정이 없습니다."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
+#: ../libgaim/plugins/idle.c:199
+#: ../libgaim/plugins/idle.c:259
 msgid "Unset Account Idle Time"
 msgstr "대기 시간 해제"
 
-#: ../libpurple/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:202
 msgid "_Unset"
 msgstr "해제(_U)"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+#: ../libgaim/plugins/idle.c:224
+#: ../libgaim/plugins/idle.c:263
 msgid "Set Idle Time for All Accounts"
 msgstr "모든 계정에 대해 대기 시간 설정"
 
-#: ../libpurple/plugins/idle.c:271
+#: ../libgaim/plugins/idle.c:268
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "대기 중인 모든 계정에 대해 대기 시간 해제"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
+#: ../libgaim/plugins/idle.c:317
+#: ../libgaim/plugins/idle.c:318
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "대기 중의 시간을 수동으로 설정할 수 있습니다."
 
@@ -3038,25 +6749,21 @@ msgstr "대기 중의 시간을 수동ìœ
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
+#: ../libgaim/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC 시험 클라이언트"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
+#: ../libgaim/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "클라이언트 측에서 IPC를 지원하는 시험용 플러그인입니다."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"클라이언트 측에서 IPC를 지원하는 시험용 플러그인입니다. 이것은 서버용 플러그"
-"인의 위치를 검출하여 등록된 명령을 호출합니다."
+#: ../libgaim/plugins/ipc-test-client.c:92
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "클라이언트 측에서 IPC를 지원하는 시험용 플러그인입니다. 이것은 서버용 플러그인의 위치를 검출하여 등록된 명령을 호출합니다."
 
 #. *< type
 #. *< ui_requirement
@@ -3064,179 +6771,120 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
+#: ../libgaim/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC 시험 서버"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
+#: ../libgaim/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "서버 측에서 IPC를 지원하는 시험용 플러그인입니다."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
+#: ../libgaim/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"서버 측에서 IPC를 지원하는 시험용 플러그인입니다. 이것은 IPC 명령을 등록합니"
-"다."
+msgstr "서버 측에서 IPC를 지원하는 시험용 플러그인입니다. 이것은 IPC 명령을 등록합니다."
 
-#: ../libpurple/plugins/joinpart.c:229
-msgid "Join/Part Hiding Configuration"
-msgstr "Join/Part Hiding 설정"
-
-#: ../libpurple/plugins/joinpart.c:233
-msgid "Minimum Room Size"
-msgstr ""
-
-#: ../libpurple/plugins/joinpart.c:239
-msgid "User Inactivity Timeout (in minutes)"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/joinpart.c:270
-msgid "Join/Part Hiding"
-msgstr "Join/Part Hiding"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../libpurple/plugins/joinpart.c:273
-msgid "Hides extraneous join/part messages."
-msgstr "외부 참가/부분 메시지를 안 보입니다."
-
-#. *  description
-#: ../libpurple/plugins/joinpart.c:275
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
-msgstr ""
-"큰 대화방에서 활성적으로 대화에 참여하고 있는 사람들을 제외한 사람들의 참가/"
-"부분 메시지를 안 보이게 합니다."
-
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:499
+#: ../libgaim/plugins/log_reader.c:497
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1554
+#: ../libgaim/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "사용자는 오프라인입니다."
 
-#: ../libpurple/plugins/log_reader.c:1560
+#: ../libgaim/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "자동 응답 전송:"
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:80
+#: ../libgaim/plugins/log_reader.c:1568
+#: ../libgaim/plugins/log_reader.c:1571
+#: ../libgaim/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s 님이 접속을 끊었습니다."
 
-#: ../libpurple/plugins/log_reader.c:1587
+#: ../libgaim/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
 msgstr "하나 이상의 메시지가 전송 불가능한 상태로 되어 있습니다."
 
-#: ../libpurple/plugins/log_reader.c:1597
+#: ../libgaim/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "서버가 접속을 끊었습니다."
 
-#: ../libpurple/plugins/log_reader.c:1605
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr ""
-"현재 접속되어 있지 않습니다. 로그인 할 때까지 메시지를 받을 수 없습니다."
+#: ../libgaim/plugins/log_reader.c:1603
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgstr "현재 접속되어 있지 않습니다. 로그인 할 때까지 메시지를 받을 수 없습니다."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libgaim/plugins/log_reader.c:1618
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "메시지의 최대 크기를 초과하였기 때문에 전송할 수 없었습니다."
 
-#: ../libpurple/plugins/log_reader.c:1625
+#: ../libgaim/plugins/log_reader.c:1623
 msgid "Message could not be sent."
 msgstr "메시지를 전송할 수 없었습니다."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2835
+#: ../libgaim/plugins/log_reader.c:1976
+#: ../libgaim/plugins/log_reader.c:2085
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2712
-#: ../libpurple/plugins/log_reader.c:2840
+#: ../libgaim/plugins/log_reader.c:1989
+#: ../libgaim/plugins/log_reader.c:2090
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2724
-#: ../libpurple/plugins/log_reader.c:2844
+#: ../libgaim/plugins/log_reader.c:2001
+#: ../libgaim/plugins/log_reader.c:2094
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2738
-#: ../libpurple/plugins/log_reader.c:2849
-msgid "QIP"
-msgstr ""
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2853
+#: ../libgaim/plugins/log_reader.c:2014
+#: ../libgaim/plugins/log_reader.c:2099
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2762
-#: ../libpurple/plugins/log_reader.c:2857
+#: ../libgaim/plugins/log_reader.c:2026
+#: ../libgaim/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2774
-#: ../libpurple/plugins/log_reader.c:2861
-msgid "aMSN"
-msgstr ""
-
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2817
+#: ../libgaim/plugins/log_reader.c:2067
 msgid "General Log Reading Configuration"
 msgstr "일반"
 
-#: ../libpurple/plugins/log_reader.c:2821
+#: ../libgaim/plugins/log_reader.c:2071
 msgid "Fast size calculations"
 msgstr "빠르게 크기 계산"
 
-#: ../libpurple/plugins/log_reader.c:2825
+#: ../libgaim/plugins/log_reader.c:2075
 msgid "Use name heuristics"
 msgstr "이름 형식의 heuristics 사용"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2831
+#: ../libgaim/plugins/log_reader.c:2081
 msgid "Log Directory"
 msgstr "로그 기록 폴더"
 
@@ -3246,39 +6894,34 @@ msgstr "로그 기록 폴더"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2890
+#: ../libgaim/plugins/log_reader.c:2126
 msgid "Log Reader"
 msgstr "Log Reader"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2894
+#: ../libgaim/plugins/log_reader.c:2130
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "다른 메시지 클라이언트의 로그를 로그 뷰어로 표시"
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2898
+#: ../libgaim/plugins/log_reader.c:2134
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
 msgstr ""
-"이 플러그인은 로그를 표시할 때 다른 메시지 클라이언트의 로그도 함께 표시 합니"
-"다. 현재 대응되는 클라이언트는 Adium, MSN Messenger, 그리고 Trillian 입니"
-"다.\n"
+"이 플러그인은 로그를 표시할 때 다른 메시지 클라이언트의 로그도 함께 표시 합니다. 현재 대응되는 클라이언트는 Adium, MSN Messenger, 그리고 Trillian 입니다.\n"
 "\n"
-"주의: 이 플러그인은 알파 버전이므로, 자주 오류가 발생될 수 있습니다. 이용에 "
-"따른 모든 책임은 사용자에게 있습니다."
+"주의: 이 플러그인은 알파 버전이므로, 자주 오류가 발생될 수 있습니다. 이용에 따른 모든 책임은 사용자에게 있습니다."
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
+#: ../libgaim/plugins/mono/loader/mono.c:213
 msgid "Mono Plugin Loader"
 msgstr "Mono 플러그인 로더"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
+#: ../libgaim/plugins/mono/loader/mono.c:215
+#: ../libgaim/plugins/mono/loader/mono.c:216
 msgid "Loads .NET plugins with Mono."
 msgstr "Mono 용의 .NET 플러그인을 불러들입니다."
 
@@ -3291,87 +6934,52 @@ msgstr "Mono 용의 .NET 플러그인을
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
+#: ../libgaim/plugins/newline.c:68
 msgid "New Line"
 msgstr "New Line"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
+#: ../libgaim/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr "표시한 메시지 앞에 개행 문자를 삽입합니다."
 
-#. *< summary
-#: ../libpurple/plugins/newline.c:71
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
-msgstr ""
-"메시지 앞에 개행 문자를 삽입하여, 대화 창의 아이디 아래에 메시지의 남는 부분"
-"을 표시하게 합니다."
+#. *  summary
+#: ../libgaim/plugins/newline.c:71
+msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
+msgstr "메시지 앞에 개행 문자를 삽입하여, 대화 창의 아이디 아래에 메시지의 남는 부분을 표시하게 합니다."
 
-#: ../libpurple/plugins/offlinemsg.c:23
+#: ../libgaim/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Offline Message Emulation"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+#: ../libgaim/plugins/offlinemsg.c:25
+#: ../libgaim/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "오프라인 사용자에게 보내지 못한 메시지를 저장합니다."
 
-#: ../libpurple/plugins/offlinemsg.c:95
-msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
-"pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"보내지 못한 남은 메시지를 저장합니다. \"친구 알림\" 창에서 편집 또는 삭제할 "
-"수 있습니다."
+#: ../libgaim/plugins/offlinemsg.c:95
+msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgstr "보내지 못한 남은 메시지를 저장합니다. \"친구 알림\" 창에서 편집 또는 삭제할 수 있습니다."
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libgaim/plugins/offlinemsg.c:152
 #, c-format
-msgid ""
-"\"%s\" is currently offline. Do you want to save the rest of the messages in "
-"a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
-"\"%s\" 님은 현재 오프라인 입니다. 전송하지 못한 남은 메시지를 저장하였다가, "
-"\"%s\" 님이 다시 로그온 했을 때 자동으로 재전송하시겠습니까?"
+msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
+msgstr "\"%s\" 님은 현재 오프라인 입니다. 전송하지 못한 남은 메시지를 저장하였다가, \"%s\" 님이 다시 로그온 했을 때 자동으로 재전송하시겠습니까?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
+#: ../libgaim/plugins/offlinemsg.c:156
 msgid "Offline Message"
 msgstr "오프라인 메시지"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libgaim/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "\"친구 알림\" 창에서 편집 및 삭제할 수 있습니다."
 
-#: ../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/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
-msgid "Yes"
-msgstr "예"
-
-#: ../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/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
-msgid "No"
-msgstr "아니오"
-
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libgaim/plugins/offlinemsg.c:187
 msgid "Save offline messages in pounce"
 msgstr "오프라인 시의 메시지 저장"
 
-#: ../libpurple/plugins/offlinemsg.c:197
+#: ../libgaim/plugins/offlinemsg.c:191
 msgid "Do not ask. Always save in pounce."
 msgstr "항상 저장"
 
@@ -3381,51 +6989,47 @@ msgstr "항상 저장"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
+#: ../libgaim/plugins/perl/perl.c:588
 msgid "Perl Plugin Loader"
 msgstr "Perl 플러그인 로더"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
+#: ../libgaim/plugins/perl/perl.c:590
+#: ../libgaim/plugins/perl/perl.c:591
 msgid "Provides support for loading perl plugins."
 msgstr "Perl 플러그인을 읽어들이는 기능을 제공합니다."
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libgaim/plugins/psychic.c:19
 msgid "Psychic Mode"
 msgstr "Psychic 모드"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libgaim/plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
 msgstr "수신한 대화를 Psychic 모드로 표시합니다."
 
-#: ../libpurple/plugins/psychic.c:22
-#, fuzzy
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"친구가 입력한 메시지를 대화 창에 직접 표시합니다. AIM, ICQ, Jabber, Sametime "
-"그리고 Yahoo 에서 동작합니다."
+#: ../libgaim/plugins/psychic.c:21
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr "친구가 입력한 메시지를 대화 창에 직접 표시합니다. AIM, ICQ, Jabber, Sametime 그리고 Yahoo 에서 동작합니다."
 
-#: ../libpurple/plugins/psychic.c:72
+#: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
 msgstr "포스에 의해 혼란스러운 기분이 됩니다..."
 
-#: ../libpurple/plugins/psychic.c:91
+#: ../libgaim/plugins/psychic.c:85
 msgid "Only enable for users on the buddy list"
 msgstr "친구 목록에 등록되어 있는 사용자만 허가"
 
-#: ../libpurple/plugins/psychic.c:96
+#: ../libgaim/plugins/psychic.c:90
 msgid "Disable when away"
 msgstr "자리 비움 시 사용 안 함"
 
-#: ../libpurple/plugins/psychic.c:100
+#: ../libgaim/plugins/psychic.c:94
 msgid "Display notification message in conversations"
 msgstr "대화 창 안에 알림 메시지도 표시"
 
-#: ../libpurple/plugins/psychic.c:105
+#: ../libgaim/plugins/psychic.c:99
 msgid "Raise psychic conversations"
 msgstr "psychic 대화를 맨 위에 표시"
 
@@ -3435,7 +7039,7 @@ msgstr "psychic 대화를 맨 위에 표
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libgaim/plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "신호 시험"
 
@@ -3443,8 +7047,8 @@ msgstr "신호 시험"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libgaim/plugins/signals-test.c:687
+#: ../libgaim/plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "모든 신호가 정상적으로 동작하고 있는지 시험합니다."
 
@@ -3454,7 +7058,7 @@ msgstr "모든 신호가 정상적으로
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
+#: ../libgaim/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "심플 플러그인"
 
@@ -3462,34 +7066,29 @@ msgstr "심플 플러그인"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+#: ../libgaim/plugins/simple.c:40
+#: ../libgaim/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "중요한 기능이 동작하고 있는지 시험합니다."
 
-#. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
-msgid "X.509 Certificates"
-msgstr "X.509 인증"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
-msgid "GNUTLS"
-msgstr "GNUTLS"
+#: ../libgaim/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
-msgid "Provides SSL support through GNUTLS."
-msgstr "GNUTLS를 이용한 SSL 기능을 제공합니다."
+#: ../libgaim/plugins/ssl/ssl.c:97
+#: ../libgaim/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "SSL 라이브러리 래퍼를 제공합니다."
 
 #. *< type
 #. *< ui_requirement
@@ -3497,18 +7096,18 @@ msgstr "GNUTLS를 이용한 SSL 기능ì
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
-msgid "NSS"
-msgstr "NSS"
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+msgid "GNUTLS"
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:819
-#: ../libpurple/plugins/ssl/ssl-nss.c:821
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Mozilla 가 제공하는 NSS 를 이용하여 SSL 기능을 제공합니다."
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS를 이용한 SSL 기능을 제공합니다."
 
 #. *< type
 #. *< ui_requirement
@@ -3516,56 +7115,57 @@ msgstr "Mozilla 가 제공하는 NSS 를
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../libgaim/plugins/ssl/ssl-nss.c:409
+msgid "NSS"
+msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "SSL 라이브러리 래퍼를 제공합니다."
+#: ../libgaim/plugins/ssl/ssl-nss.c:412
+#: ../libgaim/plugins/ssl/ssl-nss.c:414
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Mozilla 가 제공하는 NSS 를 이용하여 SSL 기능을 제공합니다."
 
-#: ../libpurple/plugins/statenotify.c:50
+#: ../libgaim/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s 님은 자리에 있습니다."
 
-#: ../libpurple/plugins/statenotify.c:52
+#: ../libgaim/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 님이 자리를 비웠습니다."
 
-#: ../libpurple/plugins/statenotify.c:62
+#: ../libgaim/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s 님이 대기 상태가 되었습니다."
 
-#: ../libpurple/plugins/statenotify.c:64
+#: ../libgaim/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s 님이 대기 상태에서 복귀했습니다."
 
-#: ../libpurple/plugins/statenotify.c:73
+#: ../libgaim/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s 님이 접속했습니다."
 
-#: ../libpurple/plugins/statenotify.c:91
+#: ../libgaim/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "알림 시기"
 
-#: ../libpurple/plugins/statenotify.c:94
+#: ../libgaim/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "친구가 자리 비움일 때(_A)"
 
-#: ../libpurple/plugins/statenotify.c:97
+#: ../libgaim/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "친구가 대기 중일 때(_I)"
 
-#: ../libpurple/plugins/statenotify.c:100
+#: ../libgaim/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "친구가 접속/접속 해제했을 때(_S)"
 
@@ -3575,7 +7175,7 @@ msgstr "친구가 접속/접속 í•´ì œí–
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libgaim/plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "Buddy State Notification"
 
@@ -3583,89 +7183,33 @@ msgstr "Buddy State Notification"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:151
-#: ../libpurple/plugins/statenotify.c:154
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"대화 상대가 자리 비움이거나, 대기 중에서 복귀 또는 자리에 있을 때 대화 창에 "
-"알립니다."
+#: ../libgaim/plugins/statenotify.c:145
+#: ../libgaim/plugins/statenotify.c:148
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "대화 상대가 자리 비움이거나, 대기 중에서 복귀 또는 자리에 있을 때 대화 창에 알립니다."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
+#: ../libgaim/plugins/tcl/tcl.c:413
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 플러그인 로더"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
+#: ../libgaim/plugins/tcl/tcl.c:415
+#: ../libgaim/plugins/tcl/tcl.c:416
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl 플러그인을 읽어들이는 기능을 제공합니다."
 
-#: ../libpurple/plugins/tcl/tcl.c:509
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"ActiveTCL 이 설치되어 있지 않은 것 같습니다. 이 플러그인을 사용하고자 하면, "
-"http://www.activestate.com 에 있는 ActiveTCL 을 설치해 주십시오.\n"
+#: ../libgaim/plugins/tcl/tcl.c:481
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "ActiveTCL 이 설치되어 있지 않은 것 같습니다. 이 플러그인을 사용하고자 하면, http://www.activestate.com 에 있는 ActiveTCL 을 설치해 주십시오.\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:107
-msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
-msgstr ""
-
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:124
+#: ../libgaim/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "수신한 메시지 접속을 확립할 수 없었습니다.\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:149
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
-"로컬 mDNS 서버를 사용한 접속을 확립할 수 없었습니다. 서버가 올바르게 작동되"
-"고 있습니까?"
+#: ../libgaim/protocols/bonjour/bonjour.c:146
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "로컬 mDNS 서버를 사용한 접속을 확립할 수 없었습니다. 서버가 올바르게 작동되고 있습니까?"
 
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:365
-#: ../libpurple/protocols/bonjour/bonjour.c:670
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
-msgid "First name"
-msgstr "이름"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:367
-#: ../libpurple/protocols/bonjour/bonjour.c:673
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
-msgid "Last name"
-msgstr "성"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:371
-#: ../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/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "이메일"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:374
-#: ../libpurple/protocols/bonjour/bonjour.c:679
-msgid "AIM Account"
-msgstr "AIM 계정"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:377
-#: ../libpurple/protocols/bonjour/bonjour.c:682
-#, fuzzy
-msgid "XMPP Account"
-msgstr "AIM 계정"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3676,416 +7220,410 @@ msgstr "AIM 계정"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:481
-#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libgaim/protocols/bonjour/bonjour.c:436
+#: ../libgaim/protocols/bonjour/bonjour.c:438
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 프로토콜 플러그인"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:624
-#, fuzzy
-msgid "Purple Person"
-msgstr "새 친구"
+#. Creating the user splits
+#: ../libgaim/protocols/bonjour/bonjour.c:578
+#: ../libgaim/protocols/silc/silc.c:931
+msgid "Hostname"
+msgstr "호스트명"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:676
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
+#. Creating the options for the protocol
+#: ../libgaim/protocols/bonjour/bonjour.c:582
+#: ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:807
+msgid "First name"
+msgstr "이름"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:585
+#: ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:812
+msgid "Last name"
+msgstr "성"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:588
+#: ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:797
+#: ../libgaim/protocols/silc/silc.c:695
+#: ../libgaim/protocols/silc/silc.c:935
 msgid "E-mail"
 msgstr "이메일"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
+#: ../libgaim/protocols/bonjour/bonjour.c:591
+msgid "AIM Account"
+msgstr "AIM 계정"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:594
+msgid "Jabber Account"
+msgstr "Jabber 계정"
+
+#: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libgaim/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 님이 대화 계정을 닫았습니다."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:662
-#: ../libpurple/protocols/bonjour/jabber.c:680
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "메시지를 보낼 수 없습니다. 대화를 시작할 수 없었습니다."
-
-#: ../libpurple/protocols/bonjour/jabber.c:585
+#: ../libgaim/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "소켓을 열 수 없습니다."
 
-#: ../libpurple/protocols/bonjour/jabber.c:593
+#: ../libgaim/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "소켓 옵션을 설정할 수 없습니다."
 
-#: ../libpurple/protocols/bonjour/jabber.c:617
+#: ../libgaim/protocols/bonjour/jabber.c:493
 msgid "Could not bind socket to port"
 msgstr "포트에 소켓을 할당할 수 없었습니다."
 
-#: ../libpurple/protocols/bonjour/jabber.c:625
+#: ../libgaim/protocols/bonjour/jabber.c:501
 msgid "Could not listen on socket"
 msgstr "소켓을 감시할 수 없었습니다."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1842
+#: ../libgaim/protocols/bonjour/jabber.c:594
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "메시지를 보낼 수 없습니다. 대화를 시작할 수 없었습니다."
+
+#: ../libgaim/protocols/gg/gg.c:76
+#: ../libgaim/proxy.c:1791
 msgid "Invalid proxy settings"
 msgstr "잘못된 프록시 설정"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1842
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
+#: ../libgaim/protocols/gg/gg.c:77
+#: ../libgaim/proxy.c:1791
+msgid "Either the host name or port number specified for your given proxy type is invalid."
 msgstr "지정한 프록시에 대한 호스트명 또는 포트 번호가 올바르지 않습니다."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
+#: ../libgaim/protocols/gg/gg.c:115
+#: ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "토큰 오류"
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
-#: ../libpurple/protocols/gg/gg.c:181
+#: ../libgaim/protocols/gg/gg.c:116
+#: ../libgaim/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "토큰을 취득할 수 없습니다.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libgaim/protocols/gg/gg.c:269
+#: ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "친구 목록 저장..."
 
-#: ../libpurple/protocols/gg/gg.c:270
+#: ../libgaim/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "친구 목록이 비어 있어 파일에는 아무 것도 기록되지 않았습니다."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
+#: ../libgaim/protocols/gg/gg.c:276
+#: ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "파일을 열 수 없었습니다."
 
-#: ../libpurple/protocols/gg/gg.c:289
+#: ../libgaim/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "친구 목록을 성공적으로 저장했습니다!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libgaim/protocols/gg/gg.c:307
+#: ../libgaim/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "친구 목록을 읽어들일 수 없었습니다."
 
-#: ../libpurple/protocols/gg/gg.c:324
+#: ../libgaim/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "친구 목록 읽기..."
 
-#: ../libpurple/protocols/gg/gg.c:325
+#: ../libgaim/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "친구 목록의 성공적으로 읽어들였습니다!"
 
-#: ../libpurple/protocols/gg/gg.c:336
+#: ../libgaim/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "친구 목록 저장..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+#: ../libgaim/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "등록 정보 항목을 입력해 주십시오."
 
-#: ../libpurple/protocols/gg/gg.c:389
+#: ../libgaim/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "비밀번호가 일치하지 않습니다."
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libgaim/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "새 계정을 등록할 수 없습니다. 오류가 발생했습니다.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
+#: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "새로운 Gadu-Gadu 계정을 등록했습니다."
 
-#: ../libpurple/protocols/gg/gg.c:412
+#: ../libgaim/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "등록이 성공적으로 완료되었습니다!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../libgaim/protocols/gg/gg.c:473
+#: ../libgaim/protocols/gg/gg.c:764
+#: ../libgaim/protocols/jabber/jabber.c:786
+#: ../libgaim/protocols/jabber/jabber.c:1352
 msgid "Password"
 msgstr "비밀번호"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libgaim/protocols/gg/gg.c:478
+#: ../libgaim/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "비밀번호 (재입력)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libgaim/protocols/gg/gg.c:483
+#: ../libgaim/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "현재의 토큰을 입력해 주십시오."
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libgaim/protocols/gg/gg.c:489
+#: ../libgaim/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "현재의 토큰"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libgaim/protocols/gg/gg.c:493
+#: ../libgaim/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "새로운 Gadu-Gadu 계정 등록"
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libgaim/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "다음의 빈 칸을 입력해 주십시오."
 
-#: ../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:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
-#: ../libpurple/protocols/qq/buddy_info.c:49
+#: ../libgaim/protocols/gg/gg.c:632
+#: ../libgaim/protocols/gg/gg.c:1039
+#: ../libgaim/protocols/gg/gg.c:1113
+#: ../libgaim/protocols/jabber/jabber.c:822
+#: ../libgaim/protocols/oscar/oscar.c:3764
+#: ../libgaim/protocols/oscar/oscar.c:3777
+#: ../libgaim/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "도시"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libgaim/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "생년"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1693
-#: ../libpurple/protocols/myspace/user.c:117
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
+#: ../libgaim/protocols/gg/gg.c:640
+#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:46
+#: ../libgaim/protocols/qq/qq.c:224
+#: ../libgaim/protocols/qq/qq.c:227
+#: ../libgaim/protocols/qq/qq.c:230
+#: ../libgaim/protocols/qq/qq.c:234
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "성별"
 
-#: ../libpurple/protocols/gg/gg.c:651
+#: ../libgaim/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "남/여"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
+#: ../libgaim/protocols/gg/gg.c:642
+#: ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:83
+#: ../libgaim/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "남"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libgaim/protocols/gg/gg.c:643
+#: ../libgaim/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/qq/buddy_info.c:84
+#: ../libgaim/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "ì—¬"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libgaim/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "온라인일 때 만"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libgaim/protocols/gg/gg.c:651
+#: ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "친구 찾기"
 
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libgaim/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "검색 조건을 입력해 주십시오."
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libgaim/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "다음의 빈 칸을 입력해 주십시오."
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libgaim/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "현재 사용하고 있는 비밀번호와 지정한 비밀번호가 일치하지 않았습니다."
 
-#: ../libpurple/protocols/gg/gg.c:727
+#: ../libgaim/protocols/gg/gg.c:716
 msgid "Unable to change password. Error occurred.\n"
 msgstr "비밀번호를 변경할 수 없습니다. 오류가 발생했습니다.\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
+#: ../libgaim/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Gadu-Gadu 계정의 비밀번호 변경"
 
-#: ../libpurple/protocols/gg/gg.c:737
+#: ../libgaim/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "비밀번호를 성공적으로 변경했습니다!"
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libgaim/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "현재의 비밀번호"
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libgaim/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "현재 사용하고 있는 비밀번호와 UIN 의 새 비밀번호를 입력해 주십시오:"
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libgaim/protocols/gg/gg.c:788
+#: ../libgaim/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu-Gadu 비밀번호 변경"
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libgaim/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "대화 선택: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libgaim/protocols/gg/gg.c:866
+#: ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "대화 추가..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2833
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5658
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "오프라인"
-
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2036
-#: ../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/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
-msgid "Available"
-msgstr "사용 가능"
-
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2824
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4562
-#: ../libpurple/protocols/oscar/oscar.c:5686
-#: ../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:3655
-#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1941
-#: ../pidgin/gtkstatusbox.c:1058
-#, c-format
-msgid "Away"
-msgstr "자리 비움"
-
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2714
-#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libgaim/protocols/gg/gg.c:1028
+#: ../libgaim/protocols/gg/gg.c:1104
+#: ../libgaim/protocols/oscar/oscar.c:2654
+#: ../libgaim/protocols/oscar/oscar.c:3693
 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:3725
-#: ../libpurple/protocols/silc/ops.c:990
-#: ../libpurple/protocols/silc10/ops.c:1024
+#: ../libgaim/protocols/gg/gg.c:1031
+#: ../libgaim/protocols/gg/gg.c:1107
+#: ../libgaim/protocols/jabber/buddy.c:1558
+#: ../libgaim/protocols/jabber/buddy.c:1734
+#: ../libgaim/protocols/oscar/oscar.c:3704
+#: ../libgaim/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "이름"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libgaim/protocols/gg/gg.c:1044
+#: ../libgaim/protocols/gg/gg.c:1116
 msgid "Birth Year"
 msgstr "생년"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3926
+#: ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/gg/gg.c:1167
+#: ../libgaim/protocols/oscar/oscar.c:3886
 msgid "Unable to display the search results."
 msgstr "검색 결과를 표시할 수 없습니다."
 
-#: ../libpurple/protocols/gg/gg.c:1171
+#: ../libgaim/protocols/gg/gg.c:1158
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 공개 폴더"
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libgaim/protocols/gg/gg.c:1159
 msgid "Search results"
 msgstr "검색 결과"
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libgaim/protocols/gg/gg.c:1202
 msgid "No matching users found"
 msgstr "일치하는 사용자를 찾지 못했습니다."
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libgaim/protocols/gg/gg.c:1203
 msgid "There are no users matching your search criteria."
 msgstr "검색 조건에 일치하는 사용자가 존재하지 않았습니다."
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libgaim/protocols/gg/gg.c:1297
+#: ../libgaim/protocols/gg/gg.c:1450
 msgid "Unable to read socket"
 msgstr "소켓을 읽을 수 없습니다."
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libgaim/protocols/gg/gg.c:1382
 msgid "Buddy list downloaded"
 msgstr "친구 목록을 다운로드 했습니다."
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libgaim/protocols/gg/gg.c:1383
 msgid "Your buddy list was downloaded from the server."
 msgstr "친구 목록을 서버로부터 다운로드 했습니다."
 
-#: ../libpurple/protocols/gg/gg.c:1403
+#: ../libgaim/protocols/gg/gg.c:1390
 msgid "Buddy list uploaded"
 msgstr "친구 목록을 업로드 했습니다."
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libgaim/protocols/gg/gg.c:1391
 msgid "Your buddy list was stored on the server."
 msgstr "친구 목록을 서버에 업로드 했습니다."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libgaim/protocols/gg/gg.c:1496
+#: ../libgaim/protocols/gg/gg.c:1727
 msgid "Connection failed."
 msgstr "접속에 실패했습니다."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:621
+#: ../libgaim/protocols/gg/gg.c:1633
+#: ../libgaim/protocols/msn/msn.c:563
 msgid "Blocked"
 msgstr "내가 거부됨"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libgaim/protocols/gg/gg.c:1656
 msgid "Add to chat"
 msgstr "대화에 추가"
 
-#: ../libpurple/protocols/gg/gg.c:1653
+#: ../libgaim/protocols/gg/gg.c:1665
 msgid "Unblock"
 msgstr "거부 안 함"
 
-#: ../libpurple/protocols/gg/gg.c:1657
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Block"
 msgstr "거부"
 
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libgaim/protocols/gg/gg.c:1686
 msgid "Chat _name:"
 msgstr "대화명(_N):"
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libgaim/protocols/gg/gg.c:1926
 msgid "Chat error"
 msgstr "대화 오류"
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libgaim/protocols/gg/gg.c:1927
 msgid "This chat name is already in use"
 msgstr "이 대화명은 이미 사용 중입니다."
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libgaim/protocols/gg/gg.c:2010
 msgid "Not connected to the server."
 msgstr "서버에 접속되어 있지 않습니다."
 
-#: ../libpurple/protocols/gg/gg.c:2021
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Find buddies..."
 msgstr "친구 찾기..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
+#: ../libgaim/protocols/gg/gg.c:2039
 msgid "Change password..."
 msgstr "비밀번호 변경..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libgaim/protocols/gg/gg.c:2045
 msgid "Upload buddylist to Server"
 msgstr "친구 목록 업로드"
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libgaim/protocols/gg/gg.c:2049
 msgid "Download buddylist from Server"
 msgstr "친구 목록 다운로드"
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libgaim/protocols/gg/gg.c:2053
 msgid "Delete buddylist from Server"
 msgstr "서버로부터 친구 목록 삭제"
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libgaim/protocols/gg/gg.c:2057
 msgid "Save buddylist to file..."
 msgstr "친구 목록 내보내기..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libgaim/protocols/gg/gg.c:2061
 msgid "Load buddylist from file..."
 msgstr "친구 목록 가져오기..."
 
@@ -4100,151 +7638,137 @@ msgstr "친구 목록 가져오기..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libgaim/protocols/gg/gg.c:2159
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 프로토콜 플러그인"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libgaim/protocols/gg/gg.c:2160
 msgid "Polish popular IM"
 msgstr "폴란드에서 인기있는 메신저입니다."
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libgaim/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 사용자"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libgaim/protocols/irc/cmds.c:43
+#: ../libgaim/protocols/silc/silc.c:1581
 #, c-format
 msgid "Unknown command: %s"
 msgstr "알 수 없는 명령: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libgaim/protocols/irc/cmds.c:505
+#: ../libgaim/protocols/jabber/chat.c:593
+#: ../libgaim/protocols/silc/silc.c:1289
 #, c-format
 msgid "current topic is: %s"
 msgstr "현재 주제: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libgaim/protocols/irc/cmds.c:509
+#: ../libgaim/protocols/jabber/chat.c:597
+#: ../libgaim/protocols/silc/silc.c:1293
 msgid "No topic is set"
 msgstr "주제가 설정되어 있지 않습니다."
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
+#: ../libgaim/protocols/irc/dcc_send.c:296
+#: ../libgaim/protocols/irc/dcc_send.c:337
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "파일 전송이 실패했습니다."
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
+#: ../libgaim/protocols/irc/dcc_send.c:297
+#: ../libgaim/protocols/irc/dcc_send.c:338
 msgid "Could not open a listening port."
 msgstr "감시 포트를 열 수 없었습니다."
 
-#: ../libpurple/protocols/irc/irc.c:79
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "Error displaying MOTD"
 msgstr "MOTD 표시 중에 오류가 발생했습니다."
 
-#: ../libpurple/protocols/irc/irc.c:79
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "No MOTD available"
 msgstr "MOTD 를 사용할 수 없습니다."
 
-#: ../libpurple/protocols/irc/irc.c:80
+#: ../libgaim/protocols/irc/irc.c:81
 msgid "There is no MOTD associated with this connection."
 msgstr "이 접속에 관련있는 MOTD 가 없습니다."
 
-#: ../libpurple/protocols/irc/irc.c:83
+#: ../libgaim/protocols/irc/irc.c:84
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 의 MOTD"
 
-#: ../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:2357
+#: ../libgaim/protocols/irc/irc.c:128
+#: ../libgaim/protocols/irc/irc.c:166
+#: ../libgaim/protocols/irc/irc.c:608
+#: ../libgaim/protocols/irc/irc.c:633
 msgid "Server has disconnected"
 msgstr "서버가 접속을 끊었습니다."
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: ../libgaim/protocols/irc/irc.c:259
 msgid "View MOTD"
 msgstr "MOTD 보기"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
+#: ../libgaim/protocols/irc/irc.c:271
+#: ../libgaim/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "채널(_C):"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libgaim/protocols/irc/irc.c:277
+#: ../libgaim/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "비밀번호(_P):"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libgaim/protocols/irc/irc.c:308
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 별명에 공백이 포함되어 있을 지도 모릅니다."
 
-#. 1. connect to server
-#. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:386
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2187
-#: ../libpurple/protocols/oscar/oscar.c:1290
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1732
-#: ../libpurple/protocols/yahoo/yahoo.c:2941
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
-msgid "Connecting"
-msgstr "접속 중입니다."
-
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+#: ../libgaim/protocols/irc/irc.c:337
+#: ../libgaim/protocols/jabber/jabber.c:582
+#: ../libgaim/protocols/jabber/jabber.c:927
 msgid "SSL support unavailable"
 msgstr "SSL 지원은 사용할 수 없습니다."
 
-#. 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/simple/simple.c:465
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libgaim/protocols/irc/irc.c:348
+#: ../libgaim/protocols/simple/simple.c:464
+#: ../libgaim/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
 msgstr "소켓을 생성하지 못했습니다."
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2470
-#: ../libpurple/protocols/oscar/oscar.c:1286
+#: ../libgaim/protocols/irc/irc.c:412
+#: ../libgaim/protocols/jabber/jabber.c:460
+#: ../libgaim/protocols/oscar/oscar.c:1263
 msgid "Couldn't connect to host"
 msgstr "호스트에 접속하지 못했습니다."
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2353
+#: ../libgaim/protocols/irc/irc.c:434
+#: ../libgaim/protocols/jabber/jabber.c:484
+msgid "Connection Failed"
+msgstr "접속에 실패했습니다."
+
+#: ../libgaim/protocols/irc/irc.c:437
+#: ../libgaim/protocols/jabber/jabber.c:487
+msgid "SSL Handshake Failed"
+msgstr "SSL 핸드쉐이크에 실패했습니다."
+
+#: ../libgaim/protocols/irc/irc.c:605
+#: ../libgaim/protocols/irc/irc.c:630
 msgid "Read error"
 msgstr "읽기 오류입니다."
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
+#: ../libgaim/protocols/irc/irc.c:769
+#: ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "사용자 수"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
+#: ../libgaim/protocols/irc/irc.c:772
+#: ../libgaim/protocols/sametime/sametime.c:3396
+#: ../libgaim/protocols/silc/chat.c:1424
+#: ../libgaim/protocols/silc/ops.c:1382
+#: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "주제"
 
@@ -4256,1985 +7780,1275 @@ msgstr "주제"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libgaim/protocols/irc/irc.c:903
 msgid "IRC Protocol Plugin"
 msgstr "IRC 프로토콜 플러그인"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libgaim/protocols/irc/irc.c:904
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC 프로토콜 플러그인 (Sucks Less)"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:6725
-#: ../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:1919
-#: ../libpurple/protocols/toc/toc.c:2327
+#: ../libgaim/protocols/irc/irc.c:923
+#: ../libgaim/protocols/irc/msgs.c:239
+#: ../libgaim/protocols/jabber/jabber.c:1984
+#: ../libgaim/protocols/msn/msn.c:2056
+#: ../libgaim/protocols/oscar/libaim.c:133
+#: ../libgaim/protocols/oscar/libicq.c:133
+#: ../libgaim/protocols/qq/qq.c:758
+#: ../libgaim/protocols/sametime/sametime.c:5727
+#: ../libgaim/protocols/silc/ops.c:1244
+#: ../libgaim/protocols/silc/ops.c:1347
+#: ../libgaim/protocols/simple/simple.c:1836
+#: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "서버"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:6728
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
-#: ../libpurple/protocols/toc/toc.c:2331
+#: ../libgaim/protocols/irc/irc.c:926
+#: ../libgaim/protocols/msn/msn.c:2061
+#: ../libgaim/protocols/oscar/libaim.c:136
+#: ../libgaim/protocols/oscar/libicq.c:136
+#: ../libgaim/protocols/qq/qq.c:761
+#: ../libgaim/protocols/sametime/sametime.c:5732
+#: ../libgaim/protocols/silc/silc.c:1856
+#: ../libgaim/protocols/toc/toc.c:2351
 msgid "Port"
 msgstr "포트 번호"
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libgaim/protocols/irc/irc.c:929
 msgid "Encodings"
 msgstr "인코딩"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
+#: ../libgaim/protocols/irc/irc.c:932
+#: ../libgaim/protocols/irc/msgs.c:232
+#: ../libgaim/protocols/jabber/jabber.c:782
+#: ../libgaim/protocols/silc/buddy.c:1532
+#: ../libgaim/protocols/silc/ops.c:1191
+#: ../libgaim/protocols/silc/ops.c:1194
+#: ../libgaim/protocols/silc/ops.c:1340
+#: ../libgaim/protocols/silc/ops.c:1343
+#: ../libgaim/protocols/silc/silc.c:929
 msgid "Username"
 msgstr "사용자명"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:920
+#: ../libgaim/protocols/irc/irc.c:935
+#: ../libgaim/protocols/irc/msgs.c:233
+#: ../libgaim/protocols/silc/silc.c:933
 msgid "Real name"
 msgstr "실명"
 
 #.
-#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:960
+#: ../libgaim/protocols/irc/irc.c:943
 msgid "Use SSL"
 msgstr "SSL 사용"
 
-#: ../libpurple/protocols/irc/msgs.c:187
+#: ../libgaim/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "모드 오류"
 
-#: ../libpurple/protocols/irc/msgs.c:198
+#: ../libgaim/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "%s 님에게 차단되었습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:199
+#: ../libgaim/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "차단되었습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:216
+#: ../libgaim/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "%s 을(를) 차단할 수 없습니다: 차단 목록이 다 찼습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libgaim/protocols/irc/msgs.c:217
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
+#: ../libgaim/protocols/irc/msgs.c:218
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3715
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
+#: ../libgaim/protocols/irc/msgs.c:219
+#: ../libgaim/protocols/oscar/oscar.c:3694
+#: ../libgaim/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "별명"
 
-#: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1268
-#: ../libpurple/protocols/silc10/ops.c:1272
+#: ../libgaim/protocols/irc/msgs.c:245
+#: ../libgaim/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "채널"
 
-#: ../libpurple/protocols/irc/msgs.c:334
+#: ../libgaim/protocols/irc/msgs.c:250
 msgid "Idle for"
 msgstr "대기 시간:"
 
-#: ../libpurple/protocols/irc/msgs.c:337
+#: ../libgaim/protocols/irc/msgs.c:253
 msgid "Online since"
 msgstr "입실 일시"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libgaim/protocols/irc/msgs.c:257
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>형용사 정의:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libgaim/protocols/irc/msgs.c:257
 msgid "Glorious"
 msgstr "Glorious"
 
-#: ../libpurple/protocols/irc/msgs.c:420
+#: ../libgaim/protocols/irc/msgs.c:333
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 님이 주제를 변경했습니다: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:422
+#: ../libgaim/protocols/irc/msgs.c:335
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 님이 주제를 지웠습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:430
+#: ../libgaim/protocols/irc/msgs.c:343
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 의 주제: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
+#: ../libgaim/protocols/irc/msgs.c:361
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "알 수 없는 메시지 '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libgaim/protocols/irc/msgs.c:362
 msgid "Unknown message"
 msgstr "알 수 없는 메시지"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libgaim/protocols/irc/msgs.c:362
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 서버가 받은 메시지를 이해하지 못했습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:470
+#: ../libgaim/protocols/irc/msgs.c:385
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 의 사용자 수: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:575
+#: ../libgaim/protocols/irc/msgs.c:515
 msgid "Time Response"
 msgstr "시간 응답"
 
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libgaim/protocols/irc/msgs.c:516
 msgid "The IRC server's local time is:"
 msgstr "IRC 서버의 로컬 시간:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
+#: ../libgaim/protocols/irc/msgs.c:527
 msgid "No such channel"
 msgstr "그런 채널이 없습니다."
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libgaim/protocols/irc/msgs.c:538
 msgid "no such channel"
 msgstr "그런 채널이 없습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:601
+#: ../libgaim/protocols/irc/msgs.c:541
 msgid "User is not logged in"
 msgstr "사용자는 접속 중이 아닙니다."
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libgaim/protocols/irc/msgs.c:546
 msgid "No such nick or channel"
 msgstr "그런 별명 또는 채널이 없습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:626
+#: ../libgaim/protocols/irc/msgs.c:566
 msgid "Could not send"
 msgstr "보낼 수 없었습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:682
+#: ../libgaim/protocols/irc/msgs.c:622
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "%s 에 참가하려면 초대할 필요가 있습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:683
+#: ../libgaim/protocols/irc/msgs.c:623
 msgid "Invitation only"
 msgstr "초대만"
 
-#: ../libpurple/protocols/irc/msgs.c:798
+#: ../libgaim/protocols/irc/msgs.c:732
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s 에게 차였습니다: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
-#: ../libpurple/protocols/silc10/ops.c:720
+#: ../libgaim/protocols/irc/msgs.c:737
+#: ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s (%s) 에게 차였습니다"
 
-#: ../libpurple/protocols/irc/msgs.c:826
+#: ../libgaim/protocols/irc/msgs.c:760
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "모드 (%s %s) by %s"
 
-#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
+#: ../libgaim/protocols/irc/msgs.c:845
+#: ../libgaim/protocols/irc/msgs.c:846
 msgid "Invalid nickname"
 msgstr "잘못된 별명"
 
-#: ../libpurple/protocols/irc/msgs.c:913
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"지정한 별명이 서버로부터 거부되었습니다. 잘못된 문자가 포함되어 있을 수 있습"
-"니다."
+#: ../libgaim/protocols/irc/msgs.c:847
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgstr "지정한 별명이 서버로부터 거부되었습니다. 잘못된 문자가 포함되어 있을 수 있습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:918
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"지정한 계정명이 서버로부터 거부되었습니다. 잘못된 문자가 포함되어 있을 수 있"
-"습니다."
+#: ../libgaim/protocols/irc/msgs.c:852
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgstr "지정한 계정명이 서버로부터 거부되었습니다. 잘못된 문자가 포함되어 있을 수 있습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libgaim/protocols/irc/msgs.c:891
 msgid "Cannot change nick"
 msgstr "별명을 변경할 수 없습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libgaim/protocols/irc/msgs.c:891
 msgid "Could not change nick"
 msgstr "별명을 변경할 수 없었습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:978
+#: ../libgaim/protocols/irc/msgs.c:912
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "채널 %s%s (으)로부터 이탈했습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:1020
+#: ../libgaim/protocols/irc/msgs.c:954
 msgid "Error: invalid PONG from server"
 msgstr "오류: 서버로부터의 잘못된 PONG 입니다."
 
-#: ../libpurple/protocols/irc/msgs.c:1022
+#: ../libgaim/protocols/irc/msgs.c:956
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 응답 -- Lag: %lu 초"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
-#, fuzzy, c-format
-msgid "Cannot join %s: Registration is required."
-msgstr "등록이 필요합니다."
+#: ../libgaim/protocols/irc/msgs.c:1037
+#, c-format
+msgid "Cannot join %s:"
+msgstr "%s 에 참가할 수 없습니다:"
 
-#: ../libpurple/protocols/irc/msgs.c:1114
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1038
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "채널에 참가할 수 없습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:1148
+#: ../libgaim/protocols/irc/msgs.c:1072
 msgid "Nick or channel is temporarily unavailable."
 msgstr "일시적으로 별명 또는 채널을 이용할 수 없습니다."
 
-#: ../libpurple/protocols/irc/msgs.c:1160
+#: ../libgaim/protocols/irc/msgs.c:1084
 #, c-format
 msgid "Wallops from %s"
 msgstr "%s 님으로부터의 wallops 입니다."
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libgaim/protocols/irc/parse.c:116
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;실행할 동작&gt;:  동작을 실행합니다."
 
-#: ../libpurple/protocols/irc/parse.c:123
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"away [메시지]:  자리 비움 메시지를 설정합니다. 또는 자리 비움으로부터 돌아온 "
-"것을 표시하기 위해 설정한 메시지를 해제합니다."
+#: ../libgaim/protocols/irc/parse.c:117
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "away [메시지]:  자리 비움 메시지를 설정합니다. 또는 자리 비움으로부터 돌아온 것을 표시하기 위해 설정한 메시지를 해제합니다."
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libgaim/protocols/irc/parse.c:118
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: 명령을 chanserv 로 전송합니다."
 
-#: ../libpurple/protocols/irc/parse.c:125
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;별명1&gt; [별명2] ...:  채널 조작권을 박탈합니다. 이 명령은 채널 조"
-"작권을 가지고 있어야 실행할 수 있습니다."
+#: ../libgaim/protocols/irc/parse.c:119
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;별명1&gt; [별명2] ...:  채널 조작권을 박탈합니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
 
-#: ../libpurple/protocols/irc/parse.c:126
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;별명1&gt; [별명2] ...:  채널 조작권을 박탈하고, 채널이 모더레이"
-"트 (+m) 된 경우에 발언하지 않도록 합니다. 이 명령은 채널 조작권을 가지고 있어"
-"야 실행할 수 있습니다."
+#: ../libgaim/protocols/irc/parse.c:120
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;별명1&gt; [별명2] ...:  채널 조작권을 박탈하고, 채널이 모더레이트 (+m) 된 경우에 발언하지 않도록 합니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
 
-#: ../libpurple/protocols/irc/parse.c:127
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;별명&gt; [대화실]:  지정한 채널 또는 현재의 채널로 초대합니다."
+#: ../libgaim/protocols/irc/parse.c:121
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;별명&gt; [대화실]:  지정한 채널 또는 현재의 채널로 초대합니다."
 
-#: ../libpurple/protocols/irc/parse.c:128
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;대화실1&gt;[,대화실2][,...] [키1[,키2][,...]]:  하나 이상의 채널을 지정"
-"하면, 필요에 따라 추가되어 각각의 채널 키를 제공합니다."
+#: ../libgaim/protocols/irc/parse.c:122
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;대화실1&gt;[,대화실2][,...] [키1[,키2][,...]]:  하나 이상의 채널을 지정하면, 필요에 따라 추가되어 각각의 채널 키를 제공합니다."
 
-#: ../libpurple/protocols/irc/parse.c:129
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;대화실1&gt;[,대화실2][,...] [키1[,키2][,...]]:  하나 이상의 채널을 "
-"지정하면, 필요에 따라 추가되어 각각의 채널 키를 제공합니다."
+#: ../libgaim/protocols/irc/parse.c:123
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;대화실1&gt;[,대화실2][,...] [키1[,키2][,...]]:  하나 이상의 채널을 지정하면, 필요에 따라 추가되어 각각의 채널 키를 제공합니다."
 
-#: ../libpurple/protocols/irc/parse.c:130
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;별명&gt; [메시지]:  채널로부터 퇴출시킵니다. 이 명령은 채널 조작권"
-"을 가지고 있어야 실행할 수 있습니다."
+#: ../libgaim/protocols/irc/parse.c:124
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;별명&gt; [메시지]:  채널로부터 퇴출시킵니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
 
-#: ../libpurple/protocols/irc/parse.c:131
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list:  네트워크 상의 대화실 목록을 표시합니다. <i>경고: 이것을 수행하면 접속"
-"을 끊는 서버가 있을 수 있습니다.</i>"
+#: ../libgaim/protocols/irc/parse.c:125
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list:  네트워크 상의 대화실 목록을 표시합니다. <i>경고: 이것을 수행하면 접속을 끊는 서버가 있을 수 있습니다.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libgaim/protocols/irc/parse.c:126
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;실행할 동작&gt;:  지정한 동작을 실행합니다."
 
-#: ../libpurple/protocols/irc/parse.c:133
+#: ../libgaim/protocols/irc/parse.c:127
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: 명령을 memoserv 로 전송합니다."
 
-#: ../libpurple/protocols/irc/parse.c:134
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;별명|채널&gt;:  채널 또는 사용자 모드를 설"
-"정/해제합니다."
+#: ../libgaim/protocols/irc/parse.c:128
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;별명|채널&gt;:  채널 또는 사용자 모드를 설정/해제합니다."
 
-#: ../libpurple/protocols/irc/parse.c:135
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;별명&gt; &lt;메시지&gt;:  어느 사용자에게 (채널과 별도로) 개인 메시지"
-"를 보냅니다."
+#: ../libgaim/protocols/irc/parse.c:129
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;별명&gt; &lt;메시지&gt;:  어느 사용자에게 (채널과 별도로) 개인 메시지를 보냅니다."
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libgaim/protocols/irc/parse.c:130
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [채널]:  채널에 현재 있는 사용자 목록을 표시합니다."
 
-#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2304
+#: ../libgaim/protocols/irc/parse.c:131
+#: ../libgaim/protocols/jabber/jabber.c:1788
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;새 별명&gt;:  별명을 변경합니다."
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libgaim/protocols/irc/parse.c:132
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: 명령을 nickserv 로 전송합니다."
 
-#: ../libpurple/protocols/irc/parse.c:139
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;별명1&gt; [별명2] ...:  채널 조작권을 부여합니다. 이 명령은 채널 조작"
-"권을 가지고 있어야 실행할 수 있습니다."
+#: ../libgaim/protocols/irc/parse.c:133
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;별명1&gt; [별명2] ...:  채널 조작권을 부여합니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
 
-#: ../libpurple/protocols/irc/parse.c:140
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;메시지&gt;:  이 명령이 무엇을 수행하는 지 모를 경우에는 아마도 "
-"사용할 일이 없을 것 입니다."
+#: ../libgaim/protocols/irc/parse.c:134
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;메시지&gt;:  이 명령이 무엇을 수행하는 지 모를 경우에는 아마도 사용할 일이 없을 것 입니다."
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libgaim/protocols/irc/parse.c:135
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: 명령을 operserv 로 전송합니다."
 
-#: ../libpurple/protocols/irc/parse.c:142
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [대화실] [메시지]:  현재의 채널 또는 지정한 채널로부터 메시지를 남기고 "
-"퇴장합니다."
+#: ../libgaim/protocols/irc/parse.c:136
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [대화실] [메시지]:  현재의 채널 또는 지정한 채널로부터 메시지를 남기고 퇴장합니다."
 
-#: ../libpurple/protocols/irc/parse.c:143
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [별명]:  사용자 (또는 사용자가 지정하지 않은 경우에는 서버) 와 어느 정"
-"도 지연이 있는지 질의합니다."
+#: ../libgaim/protocols/irc/parse.c:137
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [별명]:  사용자 (또는 사용자가 지정하지 않은 경우에는 서버) 와 어느 정도 지연이 있는지 질의합니다."
 
-#: ../libpurple/protocols/irc/parse.c:144
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;별명&gt; &lt;메시지&gt;:  어느 사용자에게 (채널과는 별도로) 개인 메"
-"시지를 보냅니다."
+#: ../libgaim/protocols/irc/parse.c:138
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;별명&gt; &lt;메시지&gt;:  어느 사용자에게 (채널과는 별도로) 개인 메시지를 보냅니다."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libgaim/protocols/irc/parse.c:139
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [메시지]:  메시지를 남기고 서버와의 접속을 끊습니다."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libgaim/protocols/irc/parse.c:140
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  서버에 저수준 명령을 보냅니다."
 
-#: ../libpurple/protocols/irc/parse.c:147
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;별명&gt; [메시지]:  대화실로부터 별명의 사람을 퇴출시킵니다. 이 명"
-"령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
+#: ../libgaim/protocols/irc/parse.c:141
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;별명&gt; [메시지]:  대화실로부터 별명의 사람을 퇴출시킵니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libgaim/protocols/irc/parse.c:142
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: IRC 서버의 현재 시각 (로컬 타임) 을 표시합니다."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libgaim/protocols/irc/parse.c:143
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [새 주제]:  채널 주제를 표시하거나 변경합니다."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libgaim/protocols/irc/parse.c:144
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  사용자 모드를 설정 또는 해제합니다."
 
-#: ../libpurple/protocols/irc/parse.c:151
+#: ../libgaim/protocols/irc/parse.c:145
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [별명]: 사용자에게 CTCP VERSION 요청을 보냅니다."
 
-#: ../libpurple/protocols/irc/parse.c:152
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;별명1&gt; [별명2] ...:  채널 음성 권한을 부여합니다. 이 명령은 채"
-"널 조작권을 가지고 있어야 실행할 수 있습니다."
+#: ../libgaim/protocols/irc/parse.c:146
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;별명1&gt; [별명2] ...:  채널 음성 권한을 부여합니다. 이 명령은 채널 조작권을 가지고 있어야 실행할 수 있습니다."
 
-#: ../libpurple/protocols/irc/parse.c:153
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;메시지&gt;:  이 명령이 무엇을 수행하는 지 모를 경우에는 아마도 사"
-"용할 일이 없을 것 입니다."
+#: ../libgaim/protocols/irc/parse.c:147
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;메시지&gt;:  이 명령이 무엇을 수행하는 지 모를 경우에는 아마도 사용할 일이 없을 것 입니다."
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libgaim/protocols/irc/parse.c:148
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [서버명] &lt;별명&gt;:  사용자 정보를 가져옵니다."
 
-#: ../libpurple/protocols/irc/parse.c:155
-#, fuzzy
-msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [서버명] &lt;별명&gt;:  사용자 정보를 가져옵니다."
-
-#: ../libpurple/protocols/irc/parse.c:520
+#: ../libgaim/protocols/irc/parse.c:442
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s (으)로부터의 응답 시간: %lu 초"
 
-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "CTCP PING reply"
 msgstr "CTCP PING 응답"
 
-#: ../libpurple/protocols/irc/parse.c:632
-#: ../libpurple/protocols/irc/parse.c:636 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
-#: ../libpurple/protocols/toc/toc.c:786
+#: ../libgaim/protocols/irc/parse.c:554
+#: ../libgaim/protocols/irc/parse.c:558
+#: ../libgaim/protocols/toc/toc.c:191
+#: ../libgaim/protocols/toc/toc.c:694
+#: ../libgaim/protocols/toc/toc.c:710
+#: ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "접속이 끊어졌습니다."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
-msgid "Unknown Error"
-msgstr "알 수 없는 오류"
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
-msgid "Ad-Hoc Command Failed"
-msgstr "명령을 사용할 수 없습니다."
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:176
-#, fuzzy
-msgid "execute"
-msgstr "예상치 못한 데이터"
-
-#: ../libpurple/protocols/jabber/auth.c:53
+#: ../libgaim/protocols/jabber/auth.c:49
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니"
-"다."
+msgstr "로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니다."
 
-#: ../libpurple/protocols/jabber/auth.c:116
+#: ../libgaim/protocols/jabber/auth.c:112
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "암호화 되어 있지 않은 스트림을 통한 문자열은 인증이 필요합니다."
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:510
-#, fuzzy, c-format
-msgid ""
-"%s requires plaintext authentication over an unencrypted connection.  Allow "
-"this and continue authentication?"
-msgstr ""
-"서버가 암호화 되어 있지 않은 스트림을 통한 문자열 인증을 요구하고 있습니다. "
-"이를 허가하고 인증을 계속 하시겠습니까?"
+#: ../libgaim/protocols/jabber/auth.c:232
+msgid "Server couldn't authenticate you without a password"
+msgstr "서버는 비밀번호가 없는 당신을 인증할 수 없었습니다."
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:512
-#: ../libpurple/protocols/jabber/auth.c:513
-#: ../libpurple/protocols/jabber/auth.c:610
-#: ../libpurple/protocols/jabber/auth.c:611
+#: ../libgaim/protocols/jabber/auth.c:235
+#: ../libgaim/protocols/jabber/auth.c:236
+#: ../libgaim/protocols/jabber/auth.c:404
+#: ../libgaim/protocols/jabber/auth.c:405
+#: ../libgaim/protocols/jabber/auth.c:486
+#: ../libgaim/protocols/jabber/auth.c:487
 msgid "Plaintext Authentication"
 msgstr "문자열 인증"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:535
-#: ../libpurple/protocols/jabber/auth.c:622
+#: ../libgaim/protocols/jabber/auth.c:237
+#: ../libgaim/protocols/jabber/auth.c:406
+#: ../libgaim/protocols/jabber/auth.c:488
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "서버가 암호화 되어 있지 않은 스트림을 통한 문자열 인증을 요구하고 있습니다. 이를 허가하고 인증을 계속 하시겠습니까?"
+
+#: ../libgaim/protocols/jabber/auth.c:243
+#: ../libgaim/protocols/jabber/auth.c:414
+#: ../libgaim/protocols/jabber/auth.c:496
 msgid "Server does not use any supported authentication method"
 msgstr "서버는 지원하고 있는 인증 방식을 이용하지 않습니다."
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:573
-#: ../libpurple/protocols/jabber/auth.c:788
-#: ../libpurple/protocols/jabber/auth.c:929
-#: ../libpurple/protocols/jabber/auth.c:954
-#: ../libpurple/protocols/jabber/auth.c:973
-#: ../libpurple/protocols/jabber/jabber.c:123
+#: ../libgaim/protocols/jabber/auth.c:327
+#: ../libgaim/protocols/jabber/auth.c:449
+#: ../libgaim/protocols/jabber/auth.c:617
+#: ../libgaim/protocols/jabber/auth.c:751
+#: ../libgaim/protocols/jabber/auth.c:776
+#: ../libgaim/protocols/jabber/auth.c:795
+#: ../libgaim/protocols/jabber/jabber.c:113
 msgid "Invalid response from server."
 msgstr "서버로부터의 응답이 잘못되었습니다."
 
-#: ../libpurple/protocols/jabber/auth.c:612
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"서버가 암호화 되어 있지 않은 스트림을 통한 문자열 인증을 요구하고 있습니다. "
-"이를 허가하고 인증을 계속 하시겠습니까?"
-
-#: ../libpurple/protocols/jabber/auth.c:809
-#: ../libpurple/protocols/jabber/auth.c:832
+#: ../libgaim/protocols/jabber/auth.c:638
 msgid "Invalid challenge from server"
 msgstr "서버로부터의 잘못된 challenge 입니다."
 
-#: ../libpurple/protocols/jabber/auth.c:904
+#: ../libgaim/protocols/jabber/auth.c:726
 msgid "SASL error"
 msgstr "SASL 오류"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1020
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:783
+#: ../libgaim/protocols/sametime/sametime.c:4148
+#: ../libgaim/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "전체 이름"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
-#: ../libpurple/protocols/silc/ops.c:998
-#: ../libpurple/protocols/silc10/ops.c:1032
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/buddy.c:796
+#: ../libgaim/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "성"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:800
 msgid "Given Name"
 msgstr "이름"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/jabber.c:842
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:852
 msgid "Street Address"
 msgstr "주소1"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:848
 msgid "Extended Address"
 msgstr "주소2"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libgaim/protocols/jabber/buddy.c:278
+#: ../libgaim/protocols/jabber/buddy.c:856
 msgid "Locality"
 msgstr "시/도"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:860
 msgid "Region"
 msgstr "구/군"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
+#: ../libgaim/protocols/jabber/buddy.c:280
+#: ../libgaim/protocols/jabber/buddy.c:864
 msgid "Postal Code"
 msgstr "우편번호"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:926
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:869
+#: ../libgaim/protocols/silc/silc.c:939
 msgid "Country"
 msgstr "êµ­ê°€"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:880
+#: ../libgaim/protocols/jabber/buddy.c:887
 msgid "Telephone"
 msgstr "ì „í™”"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:898
+#: ../libgaim/protocols/jabber/buddy.c:906
+#: ../libgaim/protocols/jabber/buddy.c:1564
+#: ../libgaim/protocols/silc/ops.c:1075
+#: ../libgaim/protocols/silc/util.c:553
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
+msgid "E-Mail"
+msgstr "이메일"
+
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:921
 msgid "Organization Name"
 msgstr "조직명"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:925
 msgid "Organization Unit"
 msgstr "부서"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
+#: ../libgaim/protocols/jabber/buddy.c:287
+#: ../libgaim/protocols/jabber/buddy.c:934
 msgid "Role"
 msgstr "직위"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1762
-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libgaim/protocols/jabber/buddy.c:288
+#: ../libgaim/protocols/jabber/buddy.c:817
+#: ../libgaim/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/oscar/oscar.c:3743
 msgid "Birthday"
 msgstr "생일"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3314
-#: ../pidgin/gtkprefs.c:739
-msgid "Description"
-msgstr "설명"
-
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
-#, fuzzy
-msgid "Edit XMPP vCard"
+#: ../libgaim/protocols/jabber/buddy.c:582
+#: ../libgaim/protocols/jabber/buddy.c:583
+msgid "Edit Jabber vCard"
 msgstr "Jabber vCard 편집"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
+#: ../libgaim/protocols/jabber/buddy.c:584
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "다음 항목은 모두 선택 사항입니다. 원하는 정보만 입력하십시오."
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
+#: ../libgaim/protocols/jabber/buddy.c:652
+#: ../libgaim/protocols/jabber/buddy.c:691
 msgid "Client"
 msgstr "클라이언트"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
+#: ../libgaim/protocols/jabber/buddy.c:656
+#: ../libgaim/protocols/jabber/buddy.c:695
 msgid "Operating System"
 msgstr "운영 체제"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
-msgid "Last Activity"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "폴더 정보 설정"
-
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
-msgid "Service Discovery Items"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "주소2"
-
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "대화 별칭"
-
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "디렉토리 정보가 없습니다."
-
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "명령 지정"
-
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
-msgid "PubSub Service"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
-msgid "Out of Band Data"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML 형식"
-
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "등록 오류"
-
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
-msgid "User Location"
-msgstr "위치"
-
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
-msgid "User Avatar"
-msgstr "사용자 검색"
-
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Buddy State Notification"
-
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
-msgid "Software Version"
-msgstr "지원되지 않는 버전"
-
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "ë°©í–¥"
-
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr "파일 전송"
-
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
-msgid "User Mood"
-msgstr "사용자 모드"
-
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
-msgid "User Activity"
-msgstr "사용자 제한"
-
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "기능"
-
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
-msgid "User Tune"
-msgstr "사용자명"
-
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "키 교환 첨부 IM"
-
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
-#, fuzzy
-msgid "Reachability Address"
-msgstr "이메일 주소"
-
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
-msgid "User Profile"
-msgstr "프로파일"
-
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
-#, fuzzy
-msgid "Jingle"
-msgstr "참가"
-
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
-msgid "Jingle Audio"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
-msgid "User Nickname"
-msgstr "사용자명"
-
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
-msgid "Jingle ICE UDP"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
-msgid "Jingle ICE TCP"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
-msgid "Jingle Video"
-msgstr "라이브 영상"
-
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
-msgid "Jingle DTMF"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
-msgid "Message Receipts"
-msgstr "메시지를 받았습니다."
-
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "공개 키 Babbleprint"
-
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
-msgid "User Chatting"
-msgstr "사용자 설정"
-
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
-#, fuzzy
-msgid "User Browsing"
-msgstr "사용자 모드"
-
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
-#, fuzzy
-msgid "User Gaming"
-msgstr "사용자명"
-
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
-#, fuzzy
-msgid "User Viewing"
-msgstr "사용자 제한"
-
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian 암호화"
-
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
-msgid "Entity Time"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
-msgid "Delayed Delivery"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
-msgid "Collaborative Data Objects"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
-msgid "File Repository and Sharing"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
-msgid "Hop Check"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2921
-msgid "Capabilities"
-msgstr "기능"
-
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
-#: ../libpurple/protocols/jabber/si.c:859
+#: ../libgaim/protocols/jabber/buddy.c:666
+#: ../libgaim/protocols/jabber/jabber.c:1987
 msgid "Resource"
 msgstr "자원"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libgaim/protocols/jabber/buddy.c:668
+#: ../libgaim/protocols/jabber/jabber.c:1226
+#: ../libgaim/protocols/jabber/jabber.c:1236
+#: ../libgaim/protocols/jabber/jabber.c:1246
+#: ../libgaim/protocols/jabber/jabber.c:1256
+#: ../libgaim/protocols/jabber/jabber.c:1266
 msgid "Priority"
 msgstr "우선 순위"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
+#: ../libgaim/protocols/jabber/buddy.c:804
+#: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "가운데 이름"
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
+#: ../libgaim/protocols/jabber/buddy.c:837
+#: ../libgaim/protocols/jabber/jabber.c:817
+#: ../libgaim/protocols/oscar/oscar.c:3763
+#: ../libgaim/protocols/oscar/oscar.c:3776
+#: ../libgaim/protocols/qq/buddy_info.c:56
+#: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "주소"
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
+#: ../libgaim/protocols/jabber/buddy.c:844
 msgid "P.O. Box"
 msgstr "사서함"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libgaim/protocols/jabber/buddy.c:958
 msgid "Photo"
 msgstr "사진"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libgaim/protocols/jabber/buddy.c:958
 msgid "Logo"
 msgstr "로고"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libgaim/protocols/jabber/buddy.c:1344
 msgid "Un-hide From"
 msgstr "이곳부터 보이기"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libgaim/protocols/jabber/buddy.c:1348
 msgid "Temporarily Hide From"
 msgstr "일반적으로 이곳부터 숨김"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libgaim/protocols/jabber/buddy.c:1356
 msgid "Cancel Presence Notification"
 msgstr "존재 알림을 멈춤"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libgaim/protocols/jabber/buddy.c:1363
 msgid "(Re-)Request authorization"
 msgstr "인증 재요구"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
+#: ../libgaim/protocols/jabber/buddy.c:1372
 msgid "Unsubscribe"
 msgstr "구독 취소"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
-#, fuzzy
-msgid "Log In"
-msgstr "접속 시간"
-
-#: ../libpurple/protocols/jabber/buddy.c:1992
-#, fuzzy
-msgid "Log Out"
-msgstr "대화를 로그에 기록"
-
-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libgaim/protocols/jabber/buddy.c:1405
+#: ../libgaim/protocols/jabber/jabber.c:1235
 msgid "Chatty"
 msgstr "Chatty"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libgaim/protocols/jabber/buddy.c:1409
+#: ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "장기 자리 비움"
 
+#: ../libpurple/status.c:159
+msgid "Extended away"
+msgstr "장기 자리 비움"
+
 #: ../libpurple/protocols/jabber/buddy.c:2044
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5862
+#: ../libpurple/protocols/oscar/oscar.c:5810
 #: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
 msgid "Do Not Disturb"
 msgstr "다른 용무 중"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/status.c:156
+#: ../pidgin/gtkstatusbox.c:1059
+msgid "Do not disturb"
+msgstr "다른 용무 중"
+
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2394
-#: ../libpurple/protocols/oscar/oscar.c:3726
+#: ../libgaim/protocols/jabber/buddy.c:1560
+#: ../libgaim/protocols/jabber/buddy.c:1739
+#: ../libgaim/protocols/oscar/oscar.c:3705
 msgid "Last Name"
 msgstr "성"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libgaim/protocols/jabber/buddy.c:1592
 msgid "The following are the results of your search"
 msgstr "검색 결과입니다."
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2322
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-"지정한 항목에 대한 검색 조건을 입력하여 연락처를 검색합니다. 주: 각 항목은 와"
-"일드카드를 사용한 검색(%)을 지원합니다."
+#: ../libgaim/protocols/jabber/buddy.c:1667
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "지정한 항목에 대한 검색 조건을 입력하여 연락처를 검색합니다. 주: 각 항목은 와일드카드를 사용한 검색(%)을 지원합니다."
 
-#: ../libpurple/protocols/jabber/buddy.c:2342
+#: ../libgaim/protocols/jabber/buddy.c:1687
 msgid "Directory Query Failed"
 msgstr "디렉토리 검색에 실패했습니다."
 
-#: ../libpurple/protocols/jabber/buddy.c:2343
+#: ../libgaim/protocols/jabber/buddy.c:1688
 msgid "Could not query the directory server."
 msgstr "디렉토리 서버를 검색하지 못했습니다."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2377
+#: ../libgaim/protocols/jabber/buddy.c:1722
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "서버 정보: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2384
-#, fuzzy
-msgid "Fill in one or more fields to search for any matching XMPP users."
+#: ../libgaim/protocols/jabber/buddy.c:1729
+msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Jabber 사용자를 검색하려면 하나 이상의 빈 칸을 입력하십시오."
 
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/novell/novell.c:1490
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/oscar/oscar.c:3738
+#: ../libgaim/protocols/jabber/buddy.c:1749
+#: ../libgaim/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/oscar/oscar.c:3708
+#: ../libgaim/protocols/oscar/oscar.c:3717
 msgid "E-Mail Address"
 msgstr "이메일 주소"
 
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2414
-#, fuzzy
-msgid "Search for XMPP users"
-msgstr "사용자 검색"
+#: ../libgaim/protocols/jabber/buddy.c:1758
+#: ../libgaim/protocols/jabber/buddy.c:1759
+msgid "Search for Jabber users"
+msgstr "Jabber 사용자 검색"
 
-#. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2415
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
-msgid "Search"
-msgstr "검색"
-
-#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
 msgstr "디렉토리가 잘못되었습니다."
 
-#: ../libpurple/protocols/jabber/buddy.c:2447
+#: ../libgaim/protocols/jabber/buddy.c:1790
 msgid "Enter a User Directory"
 msgstr "사용자 디렉토리를 입력해 주십시오."
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libgaim/protocols/jabber/buddy.c:1791
 msgid "Select a user directory to search"
 msgstr "검색할 사용자 디렉토리 선택"
 
-#: ../libpurple/protocols/jabber/buddy.c:2451
+#: ../libgaim/protocols/jabber/buddy.c:1794
 msgid "Search Directory"
 msgstr "검색할 디렉토리"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5346
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+#: ../libgaim/protocols/jabber/chat.c:41
+#: ../libgaim/protocols/oscar/oscar.c:5228
+#: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "대화실(_R):"
 
-#: ../libpurple/protocols/jabber/chat.c:47
+#: ../libgaim/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "서버(_S):"
 
-#: ../libpurple/protocols/jabber/chat.c:53
+#: ../libgaim/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "핸들(_H):"
 
-#: ../libpurple/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 은(는) 올바른 대화실명이 아닙니다."
 
-#: ../libpurple/protocols/jabber/chat.c:224
+#: ../libgaim/protocols/jabber/chat.c:226
 msgid "Invalid Room Name"
 msgstr "잘못된 대화실명"
 
-#: ../libpurple/protocols/jabber/chat.c:229
+#: ../libgaim/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 은(는) 올바른 서버명이 아닙니다."
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libgaim/protocols/jabber/chat.c:232
+#: ../libgaim/protocols/jabber/chat.c:233
 msgid "Invalid Server Name"
 msgstr "잘못된 서버명"
 
-#: ../libpurple/protocols/jabber/chat.c:235
+#: ../libgaim/protocols/jabber/chat.c:237
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 은(는) 올바른 룸핸들이 아닙니다."
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libgaim/protocols/jabber/chat.c:238
+#: ../libgaim/protocols/jabber/chat.c:239
 msgid "Invalid Room Handle"
 msgstr "잘못된 룸핸들"
 
-#: ../libpurple/protocols/jabber/chat.c:396
+#: ../libgaim/protocols/jabber/chat.c:398
 msgid "Configuration error"
 msgstr "설정 오류"
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
+#: ../libgaim/protocols/jabber/chat.c:407
+#: ../libgaim/protocols/jabber/chat.c:550
 msgid "Unable to configure"
 msgstr "설정할 수 없습니다."
 
-#: ../libpurple/protocols/jabber/chat.c:420
+#: ../libgaim/protocols/jabber/chat.c:422
 msgid "Room Configuration Error"
 msgstr "대화실 설정 오류"
 
-#: ../libpurple/protocols/jabber/chat.c:421
+#: ../libgaim/protocols/jabber/chat.c:423
 msgid "This room is not capable of being configured"
 msgstr "이 대화실은 설정할 수 없습니다."
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
+#: ../libgaim/protocols/jabber/chat.c:472
+#: ../libgaim/protocols/jabber/chat.c:541
 msgid "Registration error"
 msgstr "등록 오류"
 
-#: ../libpurple/protocols/jabber/chat.c:627
+#: ../libgaim/protocols/jabber/chat.c:629
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "non-MUC 대화실에서의 별명 변경은 지원하지 않고 있습니다."
 
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
-#: ../libpurple/protocols/silc10/ops.c:1451
+#: ../libgaim/protocols/jabber/chat.c:680
+#: ../libgaim/protocols/jabber/chat.c:691
+#: ../libgaim/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "대화실 목록 가져오기 중 오류"
 
-#: ../libpurple/protocols/jabber/chat.c:737
+#: ../libgaim/protocols/jabber/chat.c:739
 msgid "Invalid Server"
 msgstr "잘못된 서버명"
 
-#: ../libpurple/protocols/jabber/chat.c:781
+#: ../libgaim/protocols/jabber/chat.c:783
 msgid "Enter a Conference Server"
 msgstr "회의 서버 입력"
 
-#: ../libpurple/protocols/jabber/chat.c:782
+#: ../libgaim/protocols/jabber/chat.c:784
 msgid "Select a conference server to query"
 msgstr "질의할 회의 서버 선택"
 
-#: ../libpurple/protocols/jabber/chat.c:785
+#: ../libgaim/protocols/jabber/chat.c:787
 msgid "Find Rooms"
 msgstr "대화실 찾기"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
+#: ../libgaim/protocols/jabber/jabber.c:82
 msgid "Error initializing session"
 msgstr "세션 초기화 오류"
 
-#: ../libpurple/protocols/jabber/jabber.c:145
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
+#: ../libgaim/protocols/jabber/jabber.c:241
+#: ../libgaim/protocols/jabber/jabber.c:294
+#: ../libgaim/protocols/jabber/jabber.c:322
 msgid "Write error"
 msgstr "쓰기 오류"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libgaim/protocols/jabber/jabber.c:390
+#: ../libgaim/protocols/jabber/jabber.c:427
 msgid "Read Error"
 msgstr "읽기 오류"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2560
-#: ../libpurple/protocols/yahoo/yahoo.c:2592
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"서버와의 접속을 확립하지 못했습니다:\n"
-"%s"
-
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libgaim/protocols/jabber/jabber.c:504
 msgid "Unable to create socket"
 msgstr "소켓을 생성할 수 없습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
-#, fuzzy
-msgid "Invalid XMPP ID"
-msgstr "잘못된 ID"
+#: ../libgaim/protocols/jabber/jabber.c:552
+#: ../libgaim/protocols/jabber/jabber.c:895
+msgid "Invalid Jabber ID"
+msgstr "잘못된 Jabber ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
-msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 의 등록이 성공적으로 완료되었습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
-msgid "Registration to %s successful"
-msgstr "%s@%s 의 등록이 성공적으로 완료되었습니다."
-
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libgaim/protocols/jabber/jabber.c:625
+#: ../libgaim/protocols/jabber/jabber.c:626
 msgid "Registration Successful"
 msgstr "등록 완료"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
-msgid "Registration Failed"
-msgstr "등록 실패"
+#: ../libgaim/protocols/jabber/jabber.c:632
+#: ../libgaim/protocols/jabber/jabber.c:1501
+msgid "Unknown Error"
+msgstr "알 수 없는 오류"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
-msgid "Registration from %s successfully removed"
-msgstr "%s@%s 의 등록이 성공적으로 완료되었습니다."
-
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
-msgid "Unregistration Successful"
-msgstr "등록 완료"
-
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
-msgid "Unregistration Failed"
+#: ../libgaim/protocols/jabber/jabber.c:634
+#: ../libgaim/protocols/jabber/jabber.c:635
+msgid "Registration Failed"
 msgstr "등록 실패"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libgaim/protocols/jabber/jabber.c:750
+#: ../libgaim/protocols/jabber/jabber.c:751
 msgid "Already Registered"
 msgstr "이미 등록되어 있습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3805
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libgaim/protocols/jabber/jabber.c:827
+#: ../libgaim/protocols/oscar/oscar.c:3765
+#: ../libgaim/protocols/oscar/oscar.c:3778
 msgid "State"
 msgstr "주"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libgaim/protocols/jabber/jabber.c:832
 msgid "Postal code"
 msgstr "우편번호"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
+#: ../libgaim/protocols/jabber/jabber.c:837
+#: ../libgaim/protocols/silc/ops.c:1069
+#: ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "ì „í™”"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
+#: ../libgaim/protocols/jabber/jabber.c:847
 msgid "Date"
 msgstr "날짜"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
-msgid "Unregister"
-msgstr "등록"
-
-#: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
-msgid ""
-"Please fill out the information below to change your account registration."
-msgstr "새 계정을 등록하려면, 다음의 정보를 모두 입력해 주십시오."
-
-#: ../libpurple/protocols/jabber/jabber.c:997
+#: ../libgaim/protocols/jabber/jabber.c:855
 msgid "Please fill out the information below to register your new account."
 msgstr "새 계정을 등록하려면, 다음의 정보를 모두 입력해 주십시오."
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
-#, fuzzy
-msgid "Register New XMPP Account"
+#: ../libgaim/protocols/jabber/jabber.c:858
+#: ../libgaim/protocols/jabber/jabber.c:859
+msgid "Register New Jabber Account"
 msgstr "새 Jabber 계정 등록"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
-msgid "Register"
-msgstr "등록"
-
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
-msgid "Change Account Registration at %s"
-msgstr "%s 의 사용자 정보 변경"
-
-#: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
-msgid "Register New Account at %s"
-msgstr "새 Jabber 계정 등록"
-
-#: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
-msgid "Change Registration"
-msgstr "다음 상태로 변경(_S):"
-
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
-msgid "Error unregistering account"
-msgstr "계정 정보 변경 오류"
-
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
-#, fuzzy
-msgid "Account successfully unregistered"
-msgstr "Qun 생성이 성공적으로 완료했습니다."
-
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
 msgstr "스트림 초기화 중"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
-msgid "Initializing SSL/TLS"
-msgstr "스트림 초기화 중"
-
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:392
+#: ../libgaim/protocols/jabber/jabber.c:1030
+#: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "인증 중"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libgaim/protocols/jabber/jabber.c:1039
 msgid "Re-initializing Stream"
 msgstr "스트림 재초기화 중"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5656
+#: ../libgaim/protocols/jabber/jabber.c:1109
+#: ../libgaim/protocols/jabber/jabber.c:1479
+#: ../libgaim/protocols/jabber/jabber.c:1520
+#: ../libgaim/protocols/jabber/jabber.c:1554
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:5549
 msgid "Not Authorized"
 msgstr "인증되어 있지 않습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libgaim/protocols/jabber/jabber.c:1151
 msgid "Both"
 msgstr "둘 다"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#: ../libgaim/protocols/jabber/jabber.c:1153
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
-msgid "From"
-msgstr "보낸 사람"
-
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libgaim/protocols/jabber/jabber.c:1158
 msgid "To"
 msgstr "To"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#: ../libgaim/protocols/jabber/jabber.c:1160
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
-msgid "None"
-msgstr "없음"
-
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libgaim/protocols/jabber/jabber.c:1165
 msgid "Subscription"
 msgstr "구독"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "기분"
-
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
-msgid "Mood Text"
-msgstr "혈액형"
-
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
-msgid "Tune Artist"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
-msgid "Tune Title"
-msgstr "제목"
-
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
-msgid "Tune Album"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
-msgid "Tune Genre"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
-msgid "Tune Comment"
-msgstr "친구의 코멘트"
-
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
-msgid "Tune Track"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
-msgid "Tune Time"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
-msgid "Tune Year"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
-msgid "Tune URL"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "허가"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libgaim/protocols/jabber/jabber.c:1295
 msgid "Password Changed"
 msgstr "비밀번호 변경"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libgaim/protocols/jabber/jabber.c:1296
 msgid "Your password has been changed."
 msgstr "비밀번호가 변경되었습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libgaim/protocols/jabber/jabber.c:1300
+#: ../libgaim/protocols/jabber/jabber.c:1301
 msgid "Error changing password"
 msgstr "비밀번호 변경 오류"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
+#: ../libgaim/protocols/jabber/jabber.c:1357
 msgid "Password (again)"
 msgstr "비밀번호 (재확인)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
-#, fuzzy
-msgid "Change XMPP Password"
-msgstr "비밀번호 변경"
+#: ../libgaim/protocols/jabber/jabber.c:1362
+#: ../libgaim/protocols/jabber/jabber.c:1363
+msgid "Change Jabber Password"
+msgstr "Jabber 비밀번호 변경"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
 msgstr "새 비밀번호를 입력해 주십시오."
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6442
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../libgaim/protocols/jabber/jabber.c:1373
+#: ../libgaim/protocols/oscar/oscar.c:6355
+#: ../libgaim/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "사용자 정보 설정..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6453
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libgaim/protocols/jabber/jabber.c:1378
+#: ../libgaim/protocols/oscar/oscar.c:6366
+#: ../libgaim/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "비밀번호 변경..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libgaim/protocols/jabber/jabber.c:1383
 msgid "Search for Users..."
 msgstr "사용자 검색..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
+#: ../libgaim/protocols/jabber/jabber.c:1459
 msgid "Bad Request"
 msgstr "잘못된 요구입니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libgaim/protocols/jabber/jabber.c:1461
 msgid "Conflict"
 msgstr "충돌하고 있습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libgaim/protocols/jabber/jabber.c:1463
 msgid "Feature Not Implemented"
 msgstr "아직 지원되지 않습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libgaim/protocols/jabber/jabber.c:1465
 msgid "Forbidden"
 msgstr "금지됨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libgaim/protocols/jabber/jabber.c:1467
 msgid "Gone"
 msgstr "다운됨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libgaim/protocols/jabber/jabber.c:1469
+#: ../libgaim/protocols/jabber/jabber.c:1544
 msgid "Internal Server Error"
 msgstr "서버 내부 오류"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libgaim/protocols/jabber/jabber.c:1471
 msgid "Item Not Found"
 msgstr "항목을 찾을 수 없습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
-#, fuzzy
-msgid "Malformed XMPP ID"
+#: ../libgaim/protocols/jabber/jabber.c:1473
+msgid "Malformed Jabber ID"
 msgstr "잘못된 Jabber ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
 msgstr "수신할 수 없습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libgaim/protocols/jabber/jabber.c:1477
 msgid "Not Allowed"
 msgstr "허가되지 않았습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libgaim/protocols/jabber/jabber.c:1481
 msgid "Payment Required"
 msgstr "유료입니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libgaim/protocols/jabber/jabber.c:1483
 msgid "Recipient Unavailable"
 msgstr "수신자가 없습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libgaim/protocols/jabber/jabber.c:1487
 msgid "Registration Required"
 msgstr "등록이 필요합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libgaim/protocols/jabber/jabber.c:1489
 msgid "Remote Server Not Found"
 msgstr "리모트 서버를 찾을 수 없습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libgaim/protocols/jabber/jabber.c:1491
 msgid "Remote Server Timeout"
 msgstr "리모트 서버 시간이 초과되었습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libgaim/protocols/jabber/jabber.c:1493
 msgid "Server Overloaded"
 msgstr "서버 오버로드입니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libgaim/protocols/jabber/jabber.c:1495
 msgid "Service Unavailable"
 msgstr "서비스를 이용할 수 없습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libgaim/protocols/jabber/jabber.c:1497
 msgid "Subscription Required"
 msgstr "구독 신청이 필요합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libgaim/protocols/jabber/jabber.c:1499
 msgid "Unexpected Request"
 msgstr "예상치 못한 요청입니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libgaim/protocols/jabber/jabber.c:1506
 msgid "Authorization Aborted"
 msgstr "인증이 거부되었습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libgaim/protocols/jabber/jabber.c:1508
 msgid "Incorrect encoding in authorization"
 msgstr "인증에서 잘못된 인코딩입니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libgaim/protocols/jabber/jabber.c:1511
 msgid "Invalid authzid"
 msgstr "잘못된 authzid 입니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libgaim/protocols/jabber/jabber.c:1514
 msgid "Invalid Authorization Mechanism"
 msgstr "잘못된 인증 방식입니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libgaim/protocols/jabber/jabber.c:1517
 msgid "Authorization mechanism too weak"
 msgstr "인증 방식이 너무 취약합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libgaim/protocols/jabber/jabber.c:1522
 msgid "Temporary Authentication Failure"
 msgstr "임시적인 인증에 실패했습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libgaim/protocols/jabber/jabber.c:1525
 msgid "Authentication Failure"
 msgstr "인증에 실패했습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libgaim/protocols/jabber/jabber.c:1529
 msgid "Bad Format"
 msgstr "잘못된 형식입니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libgaim/protocols/jabber/jabber.c:1531
 msgid "Bad Namespace Prefix"
 msgstr "잘못된 이름 공간의 접두사입니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libgaim/protocols/jabber/jabber.c:1534
 msgid "Resource Conflict"
 msgstr "자원 충돌"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
-#: ../libpurple/protocols/silc10/ops.c:1720
+#: ../libgaim/protocols/jabber/jabber.c:1536
+#: ../libgaim/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "접속 시간이 초과되었습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libgaim/protocols/jabber/jabber.c:1538
 msgid "Host Gone"
 msgstr "호스트가 다운되었습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libgaim/protocols/jabber/jabber.c:1540
 msgid "Host Unknown"
 msgstr "알 수 없는 호스트입니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libgaim/protocols/jabber/jabber.c:1542
 msgid "Improper Addressing"
 msgstr "적절하지 않은 주소 설정"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libgaim/protocols/jabber/jabber.c:1546
 msgid "Invalid ID"
 msgstr "잘못된 ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libgaim/protocols/jabber/jabber.c:1548
 msgid "Invalid Namespace"
 msgstr "잘못된 이름 공간"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libgaim/protocols/jabber/jabber.c:1550
 msgid "Invalid XML"
 msgstr "잘못된 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libgaim/protocols/jabber/jabber.c:1552
 msgid "Non-matching Hosts"
 msgstr "일치하지 않는 호스트"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libgaim/protocols/jabber/jabber.c:1556
 msgid "Policy Violation"
 msgstr "정책 위반"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libgaim/protocols/jabber/jabber.c:1558
 msgid "Remote Connection Failed"
 msgstr "리모트 접속이 끊어졌습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libgaim/protocols/jabber/jabber.c:1560
 msgid "Resource Constraint"
 msgstr "자원 제한"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libgaim/protocols/jabber/jabber.c:1562
 msgid "Restricted XML"
 msgstr "제한된 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libgaim/protocols/jabber/jabber.c:1564
 msgid "See Other Host"
 msgstr "다른 호스트 표시"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libgaim/protocols/jabber/jabber.c:1566
 msgid "System Shutdown"
 msgstr "시스템 끄기"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libgaim/protocols/jabber/jabber.c:1568
 msgid "Undefined Condition"
 msgstr "정의되지 않은 조건"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libgaim/protocols/jabber/jabber.c:1570
 msgid "Unsupported Encoding"
 msgstr "지원되지 않는 인코딩"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libgaim/protocols/jabber/jabber.c:1572
 msgid "Unsupported Stanza Type"
 msgstr "지원되지 않는 Stanza 형식"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libgaim/protocols/jabber/jabber.c:1574
 msgid "Unsupported Version"
 msgstr "지원되지 않는 버전"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libgaim/protocols/jabber/jabber.c:1576
 msgid "XML Not Well Formed"
 msgstr "Well Formed XML 이 아닙니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libgaim/protocols/jabber/jabber.c:1578
 msgid "Stream Error"
 msgstr "스트림 오류"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libgaim/protocols/jabber/jabber.c:1645
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "사용자 %s 님을 차단할 수 없습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#: ../libgaim/protocols/jabber/jabber.c:1665
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "알 수 없는 회원: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#: ../libgaim/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "사용자 %s 님을 \"%s\" (으)로서 친구에 추가할 수 없습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
+#: ../libgaim/protocols/jabber/jabber.c:1689
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "알 수 없는 역할: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#: ../libgaim/protocols/jabber/jabber.c:1696
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "사용자에게 역할 \"%s\" 을(를) 설정할 수 없습니다: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
+#: ../libgaim/protocols/jabber/jabber.c:1749
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "사용자 %s 님을 차단할 수 없습니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
-msgid "Unable to ping user %s"
-msgstr "사용자 %s 님을 차단할 수 없습니다."
-
-#: ../libpurple/protocols/jabber/jabber.c:2203
-#: ../libpurple/protocols/jabber/jabber.c:2214
-#, c-format
-msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2209
-#, c-format
-msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2240
-#, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr ""
-"%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
-
-#: ../libpurple/protocols/jabber/jabber.c:2262
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, fuzzy
-msgid "Buzz"
-msgstr "버저!!"
-
-#: ../libpurple/protocols/jabber/jabber.c:2263
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s 님이 나 [%s] 을(를) 추가했습니다."
-
-#: ../libpurple/protocols/jabber/jabber.c:2264
-#: ../libpurple/protocols/yahoo/yahoo.c:4123
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2296
+#: ../libgaim/protocols/jabber/jabber.c:1780
 msgid "config:  Configure a chat room."
 msgstr "config:  대화실을 설정합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2300
+#: ../libgaim/protocols/jabber/jabber.c:1784
 msgid "configure:  Configure a chat room."
 msgstr "configure:  대화실을 설정합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libgaim/protocols/jabber/jabber.c:1793
 msgid "part [room]:  Leave the room."
 msgstr "part [대화실]:  대화실로부터 나갑니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2314
+#: ../libgaim/protocols/jabber/jabber.c:1798
 msgid "register:  Register with a chat room."
 msgstr "register:  대화실을 등록합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2320
+#: ../libgaim/protocols/jabber/jabber.c:1804
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [새 주제]:  주제를 표시 또는 변경합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2326
+#: ../libgaim/protocols/jabber/jabber.c:1810
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;사용자&gt; [대화실]:  지정한 대화실로부터 사용자를 차단합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2332
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-"affiliate &lt;사용자&gt; &lt;owner|admin|member|outcast|none&gt;: 사용자 관계"
-"를 설정합니다."
+#: ../libgaim/protocols/jabber/jabber.c:1816
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+msgstr "affiliate &lt;사용자&gt; &lt;owner|admin|member|outcast|none&gt;: 사용자 관계를 설정합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2338
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-"role &lt;사용자&gt; &lt;moderator|participant|visitor|none&gt;: 대화실에서 역"
-"할을 설정합니다."
+#: ../libgaim/protocols/jabber/jabber.c:1822
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;사용자&gt; &lt;moderator|participant|visitor|none&gt;: 대화실에서 역할을 설정합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2344
+#: ../libgaim/protocols/jabber/jabber.c:1828
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;사용자&gt; [메시지]:  사용자를 대화실로 초대합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2350
+#: ../libgaim/protocols/jabber/jabber.c:1834
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;대화실&gt; [서버]:  지정한 서버의 대화에 참가합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2356
+#: ../libgaim/protocols/jabber/jabber.c:1840
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;사용자&gt; [대화실]:  지정한 서버를 대화실로부터 차단합니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2361
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr ""
-"msg &lt;사용자&gt; &lt;메시지&gt;:  다른 사용자에게 개인적인 메시지를 보냅니"
-"다."
+#: ../libgaim/protocols/jabber/jabber.c:1845
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;사용자&gt; &lt;메시지&gt;:  다른 사용자에게 개인적인 메시지를 보냅니다."
 
-#: ../libpurple/protocols/jabber/jabber.c:2367
-msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2372
-#: ../libpurple/protocols/yahoo/yahoo.c:4147
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: 사용자에게 부저음 울림"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6245,916 +9059,709 @@ msgstr "buzz: 사용자에게 부저음 
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
-#, fuzzy
-msgid "XMPP Protocol Plugin"
-msgstr "MSN 프로토콜 플러그인"
+#: ../libgaim/protocols/jabber/jabber.c:1962
+#: ../libgaim/protocols/jabber/jabber.c:1964
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 플러그인 프로토콜"
 
-#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
-#, fuzzy
-msgid "Domain"
-msgstr "루마니아어"
-
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-msgid "Require SSL/TLS"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
 msgstr "구 SSL (포트 번호: 5223) 을 강제적으로 사용"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#: ../libgaim/protocols/jabber/jabber.c:1995
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "암호화 되어 있지 않은 스트림을 통한 문자열 인증 허가"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3279
-#: ../libpurple/protocols/simple/simple.c:1925
+#: ../libgaim/protocols/jabber/jabber.c:2000
+#: ../libgaim/protocols/simple/simple.c:1842
 msgid "Connect port"
 msgstr "접속할 포트 번호"
 
-#. TODO: default to automatically try different ports. Make the user be
-#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3276
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libgaim/protocols/jabber/jabber.c:2004
+#: ../libgaim/protocols/silc/silc.c:1852
 msgid "Connect server"
 msgstr "서버에 접속"
 
-#: ../libpurple/protocols/jabber/message.c:106
-#, fuzzy, c-format
-msgid "%s has left the conversation."
-msgstr "%s 님이 대화 계정을 닫았습니다."
-
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libgaim/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "%s 님으로부터의 메시지"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libgaim/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 은(는) 주제를 설정했습니다: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libgaim/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "주제: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libgaim/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "%s 님에게의 메시지 전송 실패: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
-#, fuzzy
-msgid "XMPP Message Error"
+#: ../libgaim/protocols/jabber/message.c:236
+msgid "Jabber Message Error"
 msgstr "Jabber 메시지 오류"
 
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libgaim/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
 msgstr " (코드 %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libgaim/protocols/jabber/parser.c:192
 msgid "XML Parse error"
 msgstr "XML 해석 오류"
 
-#: ../libpurple/protocols/jabber/presence.c:423
+#: ../libgaim/protocols/jabber/presence.c:280
 msgid "Unknown Error in presence"
 msgstr "알 수 없는 오류가 발생했습니다."
 
-#: ../libpurple/protocols/jabber/presence.c:504
-#: ../libpurple/protocols/jabber/presence.c:505
+#: ../libgaim/protocols/jabber/presence.c:354
+#: ../libgaim/protocols/jabber/presence.c:355
 msgid "Create New Room"
 msgstr "새 대화실 만들기"
 
-#: ../libpurple/protocols/jabber/presence.c:506
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"새 대화실을 생성합니다. 대화실을 설정하시겠습니까? 아니면 기본값을 적용하시겠"
-"습니까?"
+#: ../libgaim/protocols/jabber/presence.c:356
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "새 대화실을 생성합니다. 대화실을 설정하시겠습니까? 아니면 기본값을 적용하시겠습니까?"
 
-#: ../libpurple/protocols/jabber/presence.c:512
+#: ../libgaim/protocols/jabber/presence.c:359
 msgid "_Configure Room"
 msgstr "대화실 설정(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:513
+#: ../libgaim/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "기본값 적용(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:555
+#: ../libgaim/protocols/jabber/presence.c:399
 #, c-format
 msgid "Error in chat %s"
 msgstr "대화 %s 에서 오류"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libgaim/protocols/jabber/presence.c:402
 #, c-format
 msgid "Error joining chat %s"
 msgstr "대화 %s 에 참가하는 중 오류"
 
-#: ../libpurple/protocols/jabber/si.c:775
+#: ../libgaim/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-"%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
+msgstr "%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
 
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
+#: ../libgaim/protocols/jabber/si.c:766
+#: ../libgaim/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "파일 전송 실패"
 
-#: ../libpurple/protocols/jabber/si.c:838
-#, fuzzy, c-format
-msgid "Unable to send file to %s, invalid JID"
-msgstr "%s 님에게 메시지를 보낼 수 없습니다."
-
-#: ../libpurple/protocols/jabber/si.c:840
-#, fuzzy, c-format
-msgid "Unable to send file to %s, user is not online"
-msgstr ""
-"%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
-
-#: ../libpurple/protocols/jabber/si.c:842
-#, fuzzy, c-format
-msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr ""
-"%s 님에게 파일을 전송하지 못했습니다. 사용자는 파일 전송을 지원하지 않습니다."
-
-#: ../libpurple/protocols/jabber/si.c:857
+#: ../libgaim/protocols/msn/dialog.c:110
 #, c-format
-msgid "Please select which resource of %s you would like to send a file to"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/si.c:873
-#, fuzzy
-msgid "Select a Resource"
-msgstr "파일 선택"
-
-#: ../libpurple/protocols/jabber/usermood.c:197
-#: ../libpurple/protocols/jabber/usermood.c:198
-#, fuzzy
-msgid "Edit User Mood"
-msgstr "사용자 모드"
-
-#: ../libpurple/protocols/jabber/usermood.c:199
-msgid "Please select your mood from the list."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usermood.c:201
-#: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
-msgid "Set"
-msgstr "설정(_S)"
-
-#: ../libpurple/protocols/jabber/usermood.c:209
-#, fuzzy
-msgid "Set Mood..."
-msgstr "메시지 보내기..."
-
-#: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
-msgid "Set User Nickname"
-msgstr "사용자 제한 설정"
-
-#: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
-msgid "Please specify a new nickname for you."
-msgstr "%s 님의 새 이름을 입력해 주십시오."
-
-#: ../libpurple/protocols/jabber/usernick.c:77
-msgid ""
-"This information is visible to all contacts on your contact list, so choose "
-"something appropriate."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usernick.c:100
-#, fuzzy
-msgid "Set Nickname..."
-msgstr "별명"
-
-#: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
-msgid "Actions"
-msgstr "알림을 받은 후 동작"
-
-#: ../libpurple/protocols/jabber/xdata.c:380
-#, fuzzy
-msgid "Select an action"
-msgstr "파일 선택"
-
-#: ../libpurple/protocols/msn/contact.c:188
-#, fuzzy
-msgid "Unable to connect to contact server"
-msgstr "서버에 접속할 수 없습니다."
-
-#: ../libpurple/protocols/msn/contact.c:948
-#, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Notes 주소록 선택"
-
-#: ../libpurple/protocols/msn/dialog.c:118
-#, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "%s (%s) 에서 친구 목록의 동기가 발생했습니다."
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libgaim/protocols/msn/dialog.c:116
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"로컬 친구 목록에 기록되어 있는 %s 님은 그룹 \"%s\" 에 소속되어 있으나, 서버 "
-"상의 목록에서는 그렇게 되어 있지 않습니다. 서버 상의 목록에 그 친구를 추가하"
-"시겠습니까?"
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "로컬 친구 목록에 기록되어 있는 %s 님은 그룹 \"%s\" 에 소속되어 있으나, 서버 상의 목록에서는 그렇게 되어 있지 않습니다. 서버 상의 목록에 그 친구를 추가하시겠습니까?"
 
-#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libgaim/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 "
-"to be added?"
-msgstr ""
-"로컬 친구 목록에 기술되어 있는 %s 님은 서버 상의 목록에 존재하지 않습니다. 서"
-"버 상의 목록에 그 친구를 추가하시겠습니까?"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "로컬 친구 목록에 기술되어 있는 %s 님은 서버 상의 목록에 존재하지 않습니다. 서버 상의 목록에 그 친구를 추가하시겠습니까?"
 
-#: ../libpurple/protocols/msn/error.c:36
-#, c-format
+#: ../libgaim/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "메시지를 해독할 수 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:41
-#, c-format
+#: ../libgaim/protocols/msn/error.c:38
 msgid "Syntax Error (probably a client bug)"
 msgstr "문법 오류 (아마 클라이언트의 버그일 수 있습니다.)"
 
-#: ../libpurple/protocols/msn/error.c:46
-#, c-format
+#: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
 msgstr "이메일 주소가 잘못되었습니다."
 
-#: ../libpurple/protocols/msn/error.c:49
-#, c-format
+#: ../libgaim/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "사용자가 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:53
-#, c-format
+#: ../libgaim/protocols/msn/error.c:49
 msgid "Fully qualified domain name missing"
 msgstr "FQDN (Fully Qualified Domain Name) 이 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:56
-#, c-format
+#: ../libgaim/protocols/msn/error.c:52
 msgid "Already logged in"
 msgstr "이미 로그인되어 있습니다."
 
-#: ../libpurple/protocols/msn/error.c:59
-#, c-format
+#: ../libgaim/protocols/msn/error.c:55
 msgid "Invalid screen name"
 msgstr "잘못된 아이디입니다."
 
-#: ../libpurple/protocols/msn/error.c:62
-#, c-format
+#: ../libgaim/protocols/msn/error.c:58
 msgid "Invalid friendly name"
 msgstr "잘못된 공개명입니다."
 
-#: ../libpurple/protocols/msn/error.c:65
-#, c-format
+#: ../libgaim/protocols/msn/error.c:61
 msgid "List full"
 msgstr "목록이 가득 찼습니다."
 
-#: ../libpurple/protocols/msn/error.c:68
-#, c-format
+#: ../libgaim/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "이미 거기에 있습니다."
 
-#: ../libpurple/protocols/msn/error.c:72
-#, c-format
+#: ../libgaim/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "목록에 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
+#: ../libgaim/protocols/msn/error.c:70
+#: ../libgaim/protocols/zephyr/zephyr.c:757
 msgid "User is offline"
 msgstr "사용자는 오프라인입니다."
 
-#: ../libpurple/protocols/msn/error.c:78
-#, c-format
+#: ../libgaim/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "이미 그 모드입니다."
 
-#: ../libpurple/protocols/msn/error.c:82
-#, c-format
+#: ../libgaim/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "이미 목록의 반대편에 있습니다."
 
-#: ../libpurple/protocols/msn/error.c:86
-#, c-format
+#: ../libgaim/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "그룹이 너무 많습니다."
 
-#: ../libpurple/protocols/msn/error.c:89
-#, c-format
+#: ../libgaim/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "잘못된 그룹명입니다."
 
-#: ../libpurple/protocols/msn/error.c:92
-#, c-format
+#: ../libgaim/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "사용자가 그룹에 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:95
-#, c-format
+#: ../libgaim/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "그룹명이 너무 깁니다."
 
-#: ../libpurple/protocols/msn/error.c:98
-#, c-format
+#: ../libgaim/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "그룹 0 은 삭제할 수 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:103
-#, c-format
+#: ../libgaim/protocols/msn/error.c:95
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "존재하지 않는 그룹에 사용자를 추가하려고 했습니다."
 
-#: ../libpurple/protocols/msn/error.c:107
-#, c-format
+#: ../libgaim/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Switchboard 에 실패했습니다."
 
-#: ../libpurple/protocols/msn/error.c:111
-#, c-format
+#: ../libgaim/protocols/msn/error.c:102
 msgid "Notify transfer failed"
 msgstr "알림 전송에 실패했습니다."
 
-#: ../libpurple/protocols/msn/error.c:116
-#, c-format
+#: ../libgaim/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "필요한 파일이 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:120
-#, c-format
+#: ../libgaim/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "FND 에 너무 많이 히트했습니다."
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
+#: ../libgaim/protocols/msn/error.c:112
+#: ../libgaim/protocols/oscar/oscar.c:118
 msgid "Not logged in"
 msgstr "로그인되어 있지 않습니다."
 
-#: ../libpurple/protocols/msn/error.c:128
-#, c-format
+#: ../libgaim/protocols/msn/error.c:116
 msgid "Service temporarily unavailable"
 msgstr "일시적으로 서비스를 사용할 수 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:131
-#, c-format
+#: ../libgaim/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "데이터베이스 서버 오류"
 
-#: ../libpurple/protocols/msn/error.c:135
-#, c-format
+#: ../libgaim/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "명령을 사용할 수 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:139
-#, c-format
+#: ../libgaim/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "파일 조작 오류"
 
-#: ../libpurple/protocols/msn/error.c:143
-#, c-format
+#: ../libgaim/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "메모리 할당 오류"
 
-#: ../libpurple/protocols/msn/error.c:147
-#, c-format
+#: ../libgaim/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "잘못된 CHL 값이 서버에 전송되었습니다."
 
-#: ../libpurple/protocols/msn/error.c:152
-#, c-format
+#: ../libgaim/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "서버 바쁨"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
-#, c-format
+#: ../libgaim/protocols/msn/error.c:138
+#: ../libgaim/protocols/msn/error.c:151
+#: ../libgaim/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "서버를 이용할 수 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:158
-#, c-format
+#: ../libgaim/protocols/msn/error.c:141
 msgid "Peer notification server down"
 msgstr "Peer 알림 서버가 다운되었습니다."
 
-#: ../libpurple/protocols/msn/error.c:162
-#, c-format
+#: ../libgaim/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "데이터베이스 접속 오류"
 
-#: ../libpurple/protocols/msn/error.c:167
-#, c-format
+#: ../libgaim/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "서버가 다운되고 있습니다."
 
-#: ../libpurple/protocols/msn/error.c:174
-#, c-format
+#: ../libgaim/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "접속 생성 중 오류"
 
-#: ../libpurple/protocols/msn/error.c:179
-#, c-format
+#: ../libgaim/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 인수가 알 수 없거나 허가되지 않았습니다."
 
-#: ../libpurple/protocols/msn/error.c:183
-#, c-format
+#: ../libgaim/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "기록할 수 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:186
-#, c-format
+#: ../libgaim/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "세션의 부하가 초과되었습니다."
 
-#: ../libpurple/protocols/msn/error.c:190
-#, c-format
+#: ../libgaim/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "사용자가 너무 활동적입니다."
 
-#: ../libpurple/protocols/msn/error.c:193
-#, c-format
+#: ../libgaim/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "세션이 너무 많습니다."
 
-#: ../libpurple/protocols/msn/error.c:196
-#, c-format
+#: ../libgaim/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "패스포트가 인증되어 있지 않습니다."
 
-#: ../libpurple/protocols/msn/error.c:199
-#, c-format
+#: ../libgaim/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "잘못된 친구 파일"
 
-#: ../libpurple/protocols/msn/error.c:203
-#, c-format
+#: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "예상치 못한 데이터"
 
-#: ../libpurple/protocols/msn/error.c:209
-#, c-format
+#: ../libgaim/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "공개명이 너무 짧습니다."
 
-#: ../libpurple/protocols/msn/error.c:218
-#, c-format
+#: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "서버가 너무 바쁩니다."
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1383
-#: ../libpurple/protocols/silc/silc.c:233
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1390
-#, c-format
+#: ../libgaim/protocols/msn/error.c:198
+#: ../libgaim/protocols/oscar/oscar.c:1355
+#: ../libgaim/protocols/silc/ops.c:1718
+#: ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/proxy.c:1340
 msgid "Authentication failed"
 msgstr "인증에 실패했습니다."
 
-#: ../libpurple/protocols/msn/error.c:225
-#, c-format
+#: ../libgaim/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "오프라인일 때에는 허가되지 않았습니다."
 
-#: ../libpurple/protocols/msn/error.c:233
-#, c-format
+#: ../libgaim/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "새 사용자를 접수할 수 없습니다."
 
-#: ../libpurple/protocols/msn/error.c:237
-#, c-format
+#: ../libgaim/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "부모의 승인이 없는 어린이 패스포트입니다."
 
-#: ../libpurple/protocols/msn/error.c:241
-#, c-format
+#: ../libgaim/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "아직 패스포트 계정은 확인되지 않았습니다."
 
-#: ../libpurple/protocols/msn/error.c:244
-#, c-format
+#: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "잘못된 티켓"
 
-#: ../libpurple/protocols/msn/error.c:249
+#: ../libgaim/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "알 수 없는 오류 코드 %d"
 
-#: ../libpurple/protocols/msn/error.c:263
+#: ../libgaim/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 오류: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
-msgid "Nudge"
-msgstr ""
+#: ../libgaim/protocols/msn/msn.c:111
+msgid "You have just sent a Nudge!"
+msgstr "지금 신호를 전송했습니다!"
 
-#: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
-msgid "%s has nudged you!"
-msgstr "%s 님이 나 [%s] 을(를) 추가했습니다."
-
-#: ../libpurple/protocols/msn/msn.c:132
-#, c-format
-msgid "Nudging %s..."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:174
+#: ../libgaim/protocols/msn/msn.c:136
 msgid "Your new MSN friendly name is too long."
 msgstr "새 MSN 의 공개명이 너무 깁니다."
 
-#: ../libpurple/protocols/msn/msn.c:285
+#: ../libgaim/protocols/msn/msn.c:244
 msgid "Set your friendly name."
 msgstr "공개명을 설정해 주십시오."
 
-#: ../libpurple/protocols/msn/msn.c:286
+#: ../libgaim/protocols/msn/msn.c:245
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "MSN 의 다른 친구가 나를 볼 때 표시되는 이름입니다."
 
-#: ../libpurple/protocols/msn/msn.c:304
+#: ../libgaim/protocols/msn/msn.c:261
 msgid "Set your home phone number."
 msgstr "자택 전화번호를 설정해 주십시오."
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libgaim/protocols/msn/msn.c:276
 msgid "Set your work phone number."
 msgstr "직장 전화번호를 설정해 주십시오."
 
-#: ../libpurple/protocols/msn/msn.c:338
+#: ../libgaim/protocols/msn/msn.c:291
 msgid "Set your mobile phone number."
 msgstr "휴대 전화번호를 설정해 주십시오."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libgaim/protocols/msn/msn.c:304
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN 모바일 호출을 허가하시겠습니까?"
 
-#: ../libpurple/protocols/msn/msn.c:354
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"친구가 휴대 전화 등의 휴대용 기기에 MSN 모바일 호출을 전송하는 것을 허가하시"
-"겠습니까?"
+#: ../libgaim/protocols/msn/msn.c:305
+msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
+msgstr "친구가 휴대 전화 등의 휴대용 기기에 MSN 모바일 호출을 전송하는 것을 허가하시겠습니까?"
 
-#: ../libpurple/protocols/msn/msn.c:360
+#: ../libgaim/protocols/msn/msn.c:309
 msgid "Allow"
 msgstr "허가"
 
-#: ../libpurple/protocols/msn/msn.c:361
+#: ../libgaim/protocols/msn/msn.c:310
 msgid "Disallow"
 msgstr "허가하지 않음"
 
-#: ../libpurple/protocols/msn/msn.c:377
+#: ../libgaim/protocols/msn/msn.c:326
 msgid "This Hotmail account may not be active."
 msgstr "이 Hotmail 계정은 사용 불가능한 것 같습니다."
 
-#: ../libpurple/protocols/msn/msn.c:403
+#: ../libgaim/protocols/msn/msn.c:352
 msgid "Send a mobile message."
 msgstr "모바일 메시지를 전송합니다."
 
-#: ../libpurple/protocols/msn/msn.c:405
+#: ../libgaim/protocols/msn/msn.c:354
 msgid "Page"
 msgstr "호출"
 
-#: ../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 "현재의 토큰"
+#: ../libgaim/protocols/msn/msn.c:553
+msgid "Has you"
+msgstr "내가 등록됨"
 
-#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3763
+#: ../libgaim/protocols/msn/msn.c:583
+#: ../libgaim/protocols/msn/state.c:33
+#: ../libgaim/protocols/yahoo/yahoo.c:2856
+#: ../libgaim/protocols/yahoo/yahoo.c:3460
 msgid "Be Right Back"
 msgstr "곧 돌아옵니다."
 
-#: ../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/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:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libgaim/protocols/msn/msn.c:587
+#: ../libgaim/protocols/msn/state.c:31
+#: ../libgaim/protocols/novell/novell.c:2857
+#: ../libgaim/protocols/novell/novell.c:2987
+#: ../libgaim/protocols/silc/buddy.c:1473
+#: ../libgaim/protocols/silc/silc.c:53
+#: ../libgaim/protocols/yahoo/yahoo.c:2858
+#: ../libgaim/protocols/yahoo/yahoo.c:3463
 msgid "Busy"
 msgstr "다른 용무 중입니다."
 
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
+#: ../libgaim/protocols/msn/msn.c:591
+#: ../libgaim/protocols/yahoo/yahoo.c:2866
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "On the Phone"
 msgstr "전화 중입니다."
 
-#: ../libpurple/protocols/msn/msn.c:666
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
+#: ../libgaim/protocols/msn/msn.c:595
+#: ../libgaim/protocols/yahoo/yahoo.c:2870
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "Out to Lunch"
 msgstr "점심 식사 중입니다."
 
-#: ../libpurple/protocols/msn/msn.c:697
+#: ../libgaim/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "공개명 설정..."
 
-#: ../libpurple/protocols/msn/msn.c:702
+#: ../libgaim/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "자택 전화번호 설정..."
 
-#: ../libpurple/protocols/msn/msn.c:706
+#: ../libgaim/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "직장 전화번호 설정..."
 
-#: ../libpurple/protocols/msn/msn.c:710
+#: ../libgaim/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "휴대 전화번호 설정..."
 
-#: ../libpurple/protocols/msn/msn.c:716
+#: ../libgaim/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "휴대용 기기 사용/사용 안 함..."
 
-#: ../libpurple/protocols/msn/msn.c:721
+#: ../libgaim/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "무선 호출 허가/허가 안 함..."
 
-#: ../libpurple/protocols/msn/msn.c:732
+#: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail의 받은 편지함 열기"
 
-#: ../libpurple/protocols/msn/msn.c:756
+#: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
 msgstr "휴대용 기기에 전송"
 
-#: ../libpurple/protocols/msn/msn.c:766
-#: ../libpurple/protocols/novell/novell.c:3413
+#: ../libgaim/protocols/msn/msn.c:687
+#: ../libgaim/protocols/novell/novell.c:3443
 msgid "Initiate _Chat"
 msgstr "대화 시작(_C)"
 
-#: ../libpurple/protocols/msn/msn.c:804
+#: ../libgaim/protocols/msn/msn.c:725
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr ""
-"MSN 에서는 SSL 지원이 필요합니다. 지원하는 SSL 라이브러리를 설치해 주십시오."
+msgstr "MSN 에서는 SSL 지원이 필요합니다. 지원하는 SSL 라이브러리를 설치해 주십시오."
 
-#: ../libpurple/protocols/msn/msn.c:832
+#: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
 msgstr "서버 접속에 실패했습니다."
 
-#: ../libpurple/protocols/msn/msn.c:1619 ../libpurple/protocols/msn/msn.c:1962
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
+#: ../libgaim/protocols/msn/msn.c:1461
+#: ../libgaim/protocols/msn/msn.c:1806
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "프로파일을 가져오는 중 오류"
 
-#: ../libpurple/protocols/msn/msn.c:1685 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
-msgid "General"
-msgstr "일반"
-
-#: ../libpurple/protocols/msn/msn.c:1692
-#: ../libpurple/protocols/myspace/user.c:113
-#: ../libpurple/protocols/oscar/oscar.c:3770
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
+#: ../libgaim/protocols/msn/msn.c:1539
+#: ../libgaim/protocols/oscar/oscar.c:3749
+#: ../libgaim/protocols/qq/buddy_info.c:45
+#: ../libgaim/protocols/qq/qq.c:219
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "ì—°ë ¹"
 
-#: ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
+#: ../libgaim/protocols/msn/msn.c:1541
+#: ../libgaim/protocols/qq/buddy_info.c:51
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "직업"
 
-#: ../libpurple/protocols/msn/msn.c:1695
-#: ../libpurple/protocols/myspace/user.c:121
-#: ../libpurple/protocols/novell/novell.c:1480
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
+#: ../libgaim/protocols/msn/msn.c:1542
+#: ../libgaim/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
+#: ../libgaim/protocols/zephyr/zephyr.c:799
+#: ../libgaim/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "위치"
 
-#: ../libpurple/protocols/msn/msn.c:1700 ../libpurple/protocols/msn/msn.c:1892
-#: ../libpurple/protocols/msn/msn.c:1898 ../libpurple/protocols/msn/msn.c:1905
+#: ../libgaim/protocols/msn/msn.c:1547
+#: ../libgaim/protocols/msn/msn.c:1739
+#: ../libgaim/protocols/msn/msn.c:1745
+#: ../libgaim/protocols/msn/msn.c:1752
 msgid "Hobbies and Interests"
 msgstr "취미와 관심 분야"
 
-#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msn/msn.c:1832 ../libpurple/protocols/msn/msn.c:1839
-#: ../libpurple/protocols/msn/msn.c:1847 ../libpurple/protocols/msn/msn.c:1854
+#: ../libgaim/protocols/msn/msn.c:1553
+#: ../libgaim/protocols/msn/msn.c:1673
+#: ../libgaim/protocols/msn/msn.c:1679
+#: ../libgaim/protocols/msn/msn.c:1686
+#: ../libgaim/protocols/msn/msn.c:1694
+#: ../libgaim/protocols/msn/msn.c:1701
 msgid "A Little About Me"
 msgstr "간단 소개"
 
-#: ../libpurple/protocols/msn/msn.c:1723
+#: ../libgaim/protocols/msn/msn.c:1570
 msgid "Social"
 msgstr "파티"
 
-#: ../libpurple/protocols/msn/msn.c:1725
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
+#: ../libgaim/protocols/msn/msn.c:1572
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "기혼/미혼"
 
-#: ../libpurple/protocols/msn/msn.c:1726
+#: ../libgaim/protocols/msn/msn.c:1573
 msgid "Interests"
 msgstr "취미"
 
-#: ../libpurple/protocols/msn/msn.c:1727
+#: ../libgaim/protocols/msn/msn.c:1574
 msgid "Pets"
 msgstr "애완동물"
 
-#: ../libpurple/protocols/msn/msn.c:1728
+#: ../libgaim/protocols/msn/msn.c:1575
 msgid "Hometown"
 msgstr "출신지"
 
-#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libgaim/protocols/msn/msn.c:1576
 msgid "Places Lived"
 msgstr "현주소"
 
-#: ../libpurple/protocols/msn/msn.c:1730
+#: ../libgaim/protocols/msn/msn.c:1577
 msgid "Fashion"
 msgstr "패션"
 
-#: ../libpurple/protocols/msn/msn.c:1731
+#: ../libgaim/protocols/msn/msn.c:1578
 msgid "Humor"
 msgstr "유머"
 
-#: ../libpurple/protocols/msn/msn.c:1732
+#: ../libgaim/protocols/msn/msn.c:1579
 msgid "Music"
 msgstr "음악"
 
-#: ../libpurple/protocols/msn/msn.c:1733 ../libpurple/protocols/msn/msn.c:1914
-#: ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
+#: ../libgaim/protocols/msn/msn.c:1580
+#: ../libgaim/protocols/msn/msn.c:1761
+#: ../libgaim/protocols/msn/msn.c:1767
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "좌우명"
 
-#: ../libpurple/protocols/msn/msn.c:1750
+#: ../libgaim/protocols/msn/msn.c:1597
 msgid "Contact Info"
 msgstr "연락처 정보"
 
-#: ../libpurple/protocols/msn/msn.c:1751
+#: ../libgaim/protocols/msn/msn.c:1598
 msgid "Personal"
 msgstr "개인"
 
-#: ../libpurple/protocols/msn/msn.c:1754
+#: ../libgaim/protocols/msn/msn.c:1601
 msgid "Significant Other"
 msgstr "소중한 사람"
 
-#: ../libpurple/protocols/msn/msn.c:1755
+#: ../libgaim/protocols/msn/msn.c:1602
 msgid "Home Phone"
 msgstr "자택 전화"
 
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libgaim/protocols/msn/msn.c:1603
 msgid "Home Phone 2"
 msgstr "자택 전화 2"
 
-#: ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libgaim/protocols/msn/msn.c:1604
+#: ../libgaim/protocols/oscar/oscar.c:3768
 msgid "Home Address"
 msgstr "자택 주소"
 
-#: ../libpurple/protocols/msn/msn.c:1758
+#: ../libgaim/protocols/msn/msn.c:1605
 msgid "Personal Mobile"
 msgstr "개인 휴대 기기"
 
-#: ../libpurple/protocols/msn/msn.c:1759
+#: ../libgaim/protocols/msn/msn.c:1606
 msgid "Home Fax"
 msgstr "자택 팩스"
 
-#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libgaim/protocols/msn/msn.c:1607
 msgid "Personal E-Mail"
 msgstr "개인 이메일"
 
-#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libgaim/protocols/msn/msn.c:1608
 msgid "Personal IM"
 msgstr "개인 메신저"
 
-#: ../libpurple/protocols/msn/msn.c:1763
+#: ../libgaim/protocols/msn/msn.c:1610
 msgid "Anniversary"
 msgstr "기념일"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1779
+#: ../libgaim/protocols/msn/msn.c:1626
 msgid "Work"
 msgstr "직종"
 
-#: ../libpurple/protocols/msn/msn.c:1781
-#: ../libpurple/protocols/silc/ops.c:1010
-#: ../libpurple/protocols/silc10/ops.c:1044
+#: ../libgaim/protocols/msn/msn.c:1628
+#: ../libgaim/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "직위"
 
-#: ../libpurple/protocols/msn/msn.c:1782
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libgaim/protocols/msn/msn.c:1629
+#: ../libgaim/protocols/oscar/oscar.c:3789
 msgid "Company"
 msgstr "회사"
 
-#: ../libpurple/protocols/msn/msn.c:1783
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libgaim/protocols/msn/msn.c:1630
+#: ../libgaim/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "부서"
 
-#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libgaim/protocols/msn/msn.c:1631
 msgid "Profession"
 msgstr "직업"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libgaim/protocols/msn/msn.c:1632
 msgid "Work Phone"
 msgstr "회사 전화"
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libgaim/protocols/msn/msn.c:1633
 msgid "Work Phone 2"
 msgstr "회사 전화 2"
 
-#: ../libpurple/protocols/msn/msn.c:1787
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libgaim/protocols/msn/msn.c:1634
+#: ../libgaim/protocols/oscar/oscar.c:3781
 msgid "Work Address"
 msgstr "회사 주소"
 
-#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libgaim/protocols/msn/msn.c:1635
 msgid "Work Mobile"
 msgstr "업무 휴대 기기"
 
-#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libgaim/protocols/msn/msn.c:1636
 msgid "Work Pager"
 msgstr "회사 호출기"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libgaim/protocols/msn/msn.c:1637
 msgid "Work Fax"
 msgstr "회사 팩스"
 
-#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libgaim/protocols/msn/msn.c:1638
 msgid "Work E-Mail"
 msgstr "회사 이메일"
 
-#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libgaim/protocols/msn/msn.c:1639
 msgid "Work IM"
 msgstr "회사 메신저"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libgaim/protocols/msn/msn.c:1640
 msgid "Start Date"
 msgstr "시작 일자"
 
-#: ../libpurple/protocols/msn/msn.c:1863 ../libpurple/protocols/msn/msn.c:1869
-#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
+#: ../libgaim/protocols/msn/msn.c:1710
+#: ../libgaim/protocols/msn/msn.c:1716
+#: ../libgaim/protocols/msn/msn.c:1723
+#: ../libgaim/protocols/msn/msn.c:1730
 msgid "Favorite Things"
 msgstr "좋아하는 것"
 
-#: ../libpurple/protocols/msn/msn.c:1928
+#: ../libgaim/protocols/msn/msn.c:1775
 msgid "Last Updated"
 msgstr "마지막 갱신일"
 
-#: ../libpurple/protocols/msn/msn.c:1939
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
-#: ../libpurple/protocols/silc10/ops.c:1060
+#: ../libgaim/protocols/msn/msn.c:1786
+#: ../libgaim/protocols/qq/buddy_info.c:60
+#: ../libgaim/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "홈페이지"
 
-#: ../libpurple/protocols/msn/msn.c:1963
+#: ../libgaim/protocols/msn/msn.c:1807
 msgid "The user has not created a public profile."
 msgstr "이 사용자는 프로파일을 공개하지 않았습니다."
 
-#: ../libpurple/protocols/msn/msn.c:1964
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"그 사용자의 프로파일을 찾을 수 없다고 MSN 이 보고했습니다. 이것은 그 사용자"
-"가 존재하지 않거나 혹은 공개하지 않았기 때문입니다."
+#: ../libgaim/protocols/msn/msn.c:1808
+msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
+msgstr "그 사용자의 프로파일을 찾을 수 없다고 MSN 이 보고했습니다. 이것은 그 사용자가 존재하지 않거나 혹은 공개하지 않았기 때문입니다."
 
-#: ../libpurple/protocols/msn/msn.c:1968
-msgid ""
-"Could not find any information in the user's profile. The user most likely "
-"does not exist."
-msgstr ""
-"사용자 프로파일로부터 정보를 가져오지 못했습니다. 그 사용자는 존재하지 않는 "
-"것 같습니다."
+#: ../libgaim/protocols/msn/msn.c:1812
+msgid "Could not find any information in the user's profile. The user most likely does not exist."
+msgstr "사용자 프로파일로부터 정보를 가져오지 못했습니다. 그 사용자는 존재하지 않는 것 같습니다."
 
-#: ../libpurple/protocols/msn/msn.c:1976
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
+#: ../libgaim/protocols/msn/msn.c:1820
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "프로파일 URL"
 
@@ -7168,163 +9775,124 @@ msgstr "프로파일 URL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2263 ../libpurple/protocols/msn/msn.c:2265
-#, fuzzy
-msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Novell GroupWise 메신저 프로토콜 플러그인"
+#: ../libgaim/protocols/msn/msn.c:2035
+#: ../libgaim/protocols/msn/msn.c:2037
+msgid "MSN Protocol Plugin"
+msgstr "MSN 프로토콜 플러그인"
 
-#: ../libpurple/protocols/msn/msn.c:2300
+#: ../libgaim/protocols/msn/msn.c:2065
 msgid "Use HTTP Method"
 msgstr "HTTP 방식 이용"
 
-#: ../libpurple/protocols/msn/msn.c:2305
-msgid "HTTP Method Server"
-msgstr "HTTP 방식 서버"
-
-#: ../libpurple/protocols/msn/msn.c:2310
+#: ../libgaim/protocols/msn/msn.c:2070
 msgid "Show custom smileys"
 msgstr "사용자 이모티콘 표시"
 
-#: ../libpurple/protocols/msn/msn.c:2318
+#: ../libgaim/protocols/msn/msn.c:2078
 msgid "nudge: nudge a user to get their attention"
 msgstr "신호: 사용자를 향해 경고음 발생"
 
-#: ../libpurple/protocols/msn/nexus.c:137
-msgid "Windows Live ID authentication:Unable to connect"
-msgstr "Windows Live ID 인증: 연결할 수 없음"
+#: ../libgaim/protocols/msn/nexus.c:146
+#: ../libgaim/protocols/msn/servconn.c:133
+#: ../libgaim/protocols/qq/qq_proxy.c:242
+#: ../libgaim/protocols/qq/qq_proxy.c:321
+#: ../libgaim/protocols/qq/qq_proxy.c:366
+#: ../libgaim/protocols/qq/qq_proxy.c:399
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+msgid "Unable to connect"
+msgstr "접속할 수 없습니다."
 
-#: ../libpurple/protocols/msn/nexus.c:275
-msgid "Windows Live ID authentication Failed"
-msgstr "Windows Live ID 인증 실패"
-
-#: ../libpurple/protocols/msn/notification.c:185
+#: ../libgaim/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 은(는) 올바은 그룹이 아닙니다."
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:933
-#: ../libpurple/protocols/msn/session.c:371
+#: ../libgaim/protocols/msn/notification.c:184
+#: ../libgaim/protocols/msn/notification.c:532
+#: ../libgaim/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "알 수 없는 오류입니다."
 
-#: ../libpurple/protocols/msn/notification.c:194
+#: ../libgaim/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s (%3$s) 의 %1$s"
 
-#: ../libpurple/protocols/msn/notification.c:511
+#: ../libgaim/protocols/msn/notification.c:498
 #, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s 님이 신호를 보내고 싶어 합니다!"
-
-#: ../libpurple/protocols/msn/notification.c:838
-#, fuzzy, c-format
-msgid "Unknown error (%d)"
-msgstr "알 수 없는 오류"
-
-#: ../libpurple/protocols/msn/notification.c:839
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "사용자를 추가할 수 없습니다."
-
-#: ../libpurple/protocols/msn/notification.c:899
-#, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "%s (%s) 사용자를 추가할 수 없습니다."
 
-#: ../libpurple/protocols/msn/notification.c:903
+#: ../libgaim/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "%s (%s) 사용자를 차단할 수 없습니다."
 
-#: ../libpurple/protocols/msn/notification.c:907
+#: ../libgaim/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "%s (%s) 사용자를 허가할 수 없습니다."
 
-#: ../libpurple/protocols/msn/notification.c:915
+#: ../libgaim/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "친구 목록이 가득 차서, %s 님을 추가할 수 없었습니다."
 
-#: ../libpurple/protocols/msn/notification.c:924
+#: ../libgaim/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 님의 패스포트 계정이 올바르지 않습니다."
 
-#: ../libpurple/protocols/msn/notification.c:929
+#: ../libgaim/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "서비스를 일시적으로 이용할 수 없습니다."
 
-#: ../libpurple/protocols/msn/notification.c:1265
+#: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "그룹명을 변경할 수 없습니다."
 
-#: ../libpurple/protocols/msn/notification.c:1320
+#: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "그룹을 삭제할 수 없습니다."
 
-#: ../libpurple/protocols/msn/notification.c:1934
+#: ../libgaim/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"MSN 서비스가 유지보수를 위해 %d 분간 정지하고 있습니다. 자동으로 접속이 끊길 "
-"예정이므로, 지금 수행되고 있는 대화를 종료해 주십시오.\n"
+"MSN 서비스가 유지보수를 위해 %d 분간 정지하고 있습니다. 자동으로 접속이 끊길 예정이므로, 지금 수행되고 있는 대화를 종료해 주십시오.\n"
 "\n"
 "유지보수가 완료되면 다시 접속이 가능합니다."
 msgstr[1] ""
-"MSN 서비스가 유지보수를 위해 %d 분간 정지하고 있습니다. 자동으로 접속이 끊길 "
-"예정이므로, 지금 수행되고 있는 대화를 종료해 주십시오.\n"
+"MSN 서비스가 유지보수를 위해 %d 분간 정지하고 있습니다. 자동으로 접속이 끊길 예정이므로, 지금 수행되고 있는 대화를 종료해 주십시오.\n"
 "\n"
 "유지보수가 완료되면 다시 접속이 가능합니다."
 
-#: ../libpurple/protocols/msn/oim.c:141
-#, fuzzy
-msgid "Unable to connect to OIM server"
-msgstr "서버에 접속할 수 없습니다."
-
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:324
-#: ../libpurple/protocols/qq/qq_proxy.c:369
-#: ../libpurple/protocols/qq/qq_proxy.c:402
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "접속할 수 없습니다."
-
-#: ../libpurple/protocols/msn/servconn.c:137
+#: ../libgaim/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "쓰는 중 오류"
 
-#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libgaim/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "읽는 중 오류"
 
-#: ../libpurple/protocols/msn/servconn.c:146
+#: ../libgaim/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7333,850 +9901,394 @@ msgstr ""
 "서버 %s 에서 접속 오류:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:338
+#: ../libgaim/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "서버는 이 프로토콜을 지원하지 않습니다."
 
-#: ../libpurple/protocols/msn/session.c:342
+#: ../libgaim/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "HTTP 해석 중 오류가 발생했습니다."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:207
+#: ../libgaim/protocols/msn/session.c:307
+#: ../libgaim/protocols/oscar/oscar.c:3467
+#: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "다른 장소로부터 접속되어 있습니다."
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libgaim/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr ""
-"MSN 서버가 일시적으로 이용할 수 없게 되었습니다. 잠시 후 다시 시도해 보시기 "
-"바랍니다."
+msgstr "MSN 서버가 일시적으로 이용할 수 없게 되었습니다. 잠시 후 다시 시도해 보시기 바랍니다."
 
-#: ../libpurple/protocols/msn/session.c:356
+#: ../libgaim/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 서버가 일시적으로 다운되어 있습니다."
 
-#: ../libpurple/protocols/msn/session.c:361
+#: ../libgaim/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "인증할 수 없습니다: %s"
 
-#: ../libpurple/protocols/msn/session.c:366
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-"사용 중인 MSN 친구 목록이 일시적으로 사용할수 없게 되었습니다. 잠시 후 다시 "
-"시도해 보시기 바랍니다."
+#: ../libgaim/protocols/msn/session.c:324
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr "사용 중인 MSN 친구 목록이 일시적으로 사용할수 없게 되었습니다. 잠시 후 다시 시도해 보시기 바랍니다."
 
-#: ../libpurple/protocols/msn/session.c:387
-#: ../libpurple/protocols/msn/session.c:389
+#: ../libgaim/protocols/msn/session.c:345
+#: ../libgaim/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "통신에 접속 중입니다."
 
-#: ../libpurple/protocols/msn/session.c:390
+#: ../libgaim/protocols/msn/session.c:346
+msgid "Transferring"
+msgstr "전송 중 입니다."
+
+#: ../libgaim/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "인증 시작 중입니다."
 
-#: ../libpurple/protocols/msn/session.c:391
+#: ../libgaim/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "쿠키를 가져오는 중입니다."
 
-#: ../libpurple/protocols/msn/session.c:393
+#: ../libgaim/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "쿠키를 보내는 중입니다."
 
-#: ../libpurple/protocols/msn/session.c:394
+#: ../libgaim/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "친구 목록을 수신하고 있습니다."
 
-#: ../libpurple/protocols/msn/state.c:34
+#: ../libgaim/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "컴퓨터로부터 떨어져 있습니다."
 
-#: ../libpurple/protocols/msn/state.c:35
+#: ../libgaim/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "전화 중입니다."
 
-#: ../libpurple/protocols/msn/state.c:36
+#: ../libgaim/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "점심 식사 중입니다."
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libgaim/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "시간이 초과되어 메시지를 보내지 못했습니다:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libgaim/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "숨김 상태에서는 메시지를 보낼 수 없습니다:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libgaim/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "받는 사람이 오프라인이므로 메시지를 보내지 못했습니다:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libgaim/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "접속 오류로 인해 메시지를 보내지 못했습니다:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libgaim/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "전송 시간이 너무 빨라서 메시지를 보내지 못했습니다:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
-
-#: ../libpurple/protocols/msn/switchboard.c:431
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+#: ../libgaim/protocols/msn/switchboard.c:424
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "교환 기관의 접속 오류로 인해 메시지를 보내지 못했습니다:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libgaim/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "알 수 없는 오류로 인해 메시지를 보내지 못했습니다:"
 
-#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libgaim/protocols/msn/switchboard.c:956
 #, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s 님이 신호를 보내고 싶어 합니다!"
+
+#: ../libgaim/protocols/msn/userlist.c:250
+#, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s 님은 나를 친구 목록에 추가했습니다."
 
-#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libgaim/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 님은 나를 친구 목록에서 삭제했습니다."
 
-#. 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
+#: ../libgaim/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" 님을 추가할 수 없습니다."
 
-#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libgaim/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr "지정한 아이디가 잘못되었습니다."
 
-#: ../libpurple/protocols/myspace/myspace.c:111
-#, fuzzy
-msgid "Missing Cipher"
-msgstr "암호"
-
-#: ../libpurple/protocols/myspace/myspace.c:112
-msgid "The RC4 cipher could not be found"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:113
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr ""
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1806
-msgid "MySpaceIM Error"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:350
-#, fuzzy
-msgid "Reading challenge"
-msgstr "읽는 중 오류"
-
-#: ../libpurple/protocols/myspace/myspace.c:356
-#, fuzzy
-msgid "Unexpected challenge length from server"
-msgstr "서버로부터의 잘못된 challenge 입니다."
-
-#: ../libpurple/protocols/myspace/myspace.c:360
-#, fuzzy
-msgid "Logging in"
-msgstr "로그 기록"
-
-#: ../libpurple/protocols/myspace/myspace.c:1289
-#, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
-
-#. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1331
-#, fuzzy
-msgid "New mail messages"
-msgstr "메시지 보내기(_M)"
-
-#: ../libpurple/protocols/myspace/myspace.c:1332
-msgid "New blog comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1333
-msgid "New profile comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1334
-msgid "New friend requests!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1335
-msgid "New picture comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1363
-msgid "MySpace"
-msgstr ""
-
-#. 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:1546
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "접속되었습니다."
-
-#: ../libpurple/protocols/myspace/myspace.c:1557
-#: ../libpurple/protocols/myspace/myspace.c:1559
-#, fuzzy
-msgid "No username set"
-msgstr "이름 없음"
-
-#: ../libpurple/protocols/myspace/myspace.c:1558
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1785
-#, fuzzy, c-format
-msgid "Protocol error, code %d: %s"
-msgstr "프로세스가 오류 코드 %d 을(를) 반환했습니다."
-
-#: ../libpurple/protocols/myspace/myspace.c:1977
-#: ../libpurple/protocols/myspace/myspace.c:2011
-#, fuzzy
-msgid "Failed to add buddy"
-msgstr "대화 중인 친구에게 참가할 수 없습니다."
-
-#: ../libpurple/protocols/myspace/myspace.c:1977
-#, fuzzy
-msgid "'addbuddy' command failed."
-msgstr "친구 목록 가져오기..."
-
-#: ../libpurple/protocols/myspace/myspace.c:2011
-#: ../libpurple/protocols/myspace/myspace.c:2248
-#, fuzzy
-msgid "persist command failed"
-msgstr "Switchboard 에 실패했습니다."
-
-#: ../libpurple/protocols/myspace/myspace.c:2116
-#, c-format
-msgid "No such user: %s"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2117
-#, fuzzy
-msgid "User lookup"
-msgstr "사용자실"
-
-#: ../libpurple/protocols/myspace/myspace.c:2229
-#: ../libpurple/protocols/myspace/myspace.c:2248
-#: ../libpurple/protocols/myspace/myspace.c:2270
-#, fuzzy
-msgid "Failed to remove buddy"
-msgstr "대화 중인 친구에게 참가할 수 없습니다."
-
-#: ../libpurple/protocols/myspace/myspace.c:2229
-msgid "'delbuddy' command failed"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2270
-#, fuzzy
-msgid "blocklist command failed"
-msgstr "Switchboard 에 실패했습니다."
-
-#: ../libpurple/protocols/myspace/myspace.c:2316
-#, fuzzy
-msgid "Invalid input condition"
-msgstr "최종 접속 조정 중"
-
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2334
-#: ../libpurple/protocols/myspace/myspace.c:2365
-#, fuzzy
-msgid "Read buffer full"
-msgstr "큐가 다 찼습니다."
-
-#: ../libpurple/protocols/myspace/myspace.c:2403
-#, fuzzy
-msgid "Unparseable message"
-msgstr "메시지를 해독할 수 없습니다."
-
-#: ../libpurple/protocols/myspace/myspace.c:2472
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "호스트에 접속하지 못했습니다."
-
-#: ../libpurple/protocols/myspace/myspace.c:2643
-#, fuzzy
-msgid "IM Friends"
-msgstr "메시지 창(_I)"
-
-#: ../libpurple/protocols/myspace/myspace.c:2743
-#, c-format
-msgid ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2744
-#, fuzzy
-msgid "Add contacts from server"
-msgstr "서버로부터의 응답이 잘못되었습니다."
-
-#: ../libpurple/protocols/myspace/myspace.c:2796
-#: ../libpurple/protocols/myspace/myspace.c:2861
-msgid "Add friends from MySpace.com"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2797
-#, fuzzy
-msgid "Importing friends failed"
-msgstr "잘못된 친구 파일"
-
-#. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2853
-#, fuzzy
-msgid "Find people..."
-msgstr "친구 찾기..."
-
-#: ../libpurple/protocols/myspace/myspace.c:2856
-#, fuzzy
-msgid "Change IM name..."
-msgstr "비밀번호 변경..."
-
-#: ../libpurple/protocols/myspace/myspace.c:3158
-msgid "myim URL handler"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3159
-msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3160
-msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3283
-msgid "Show display name in status text"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3286
-msgid "Show headline in status text"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3291
-#, fuzzy
-msgid "Send emoticons"
-msgstr "소리 설정"
-
-#: ../libpurple/protocols/myspace/myspace.c:3296
-msgid "Screen resolution (dots per inch)"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3299
-msgid "Base font size (points)"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "사용자"
-
-#: ../libpurple/protocols/myspace/user.c:104
-#: ../libpurple/protocols/oscar/oscar.c:2979
-msgid "Profile"
-msgstr "프로파일"
-
-#: ../libpurple/protocols/myspace/user.c:126
-#, fuzzy
-msgid "Headline"
-msgstr "핸들(_H):"
-
-#: ../libpurple/protocols/myspace/user.c:131
-#, fuzzy
-msgid "Song"
-msgstr "소리"
-
-#: ../libpurple/protocols/myspace/user.c:139
-msgid "Total Friends"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/user.c:157
-#, fuzzy
-msgid "Client Version"
-msgstr "대화 창을 닫습니다."
-
-#. TODO: icons for each zap
-#. Lots of comments for translators:
-#. Zap means "to strike suddenly and forcefully as if with a
-#. * projectile or weapon."  This term often has an electrical
-#. * connotation, for example, "he was zapped by electricity when
-#. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:51
-#: ../libpurple/protocols/myspace/zap.c:214
-msgid "Zap"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:51
-#, fuzzy, c-format
-msgid "%s has zapped you!"
-msgstr "%s 님이 나 [%s] 을(를) 추가했습니다."
-
-#: ../libpurple/protocols/myspace/zap.c:51
-#, c-format
-msgid "Zapping %s..."
-msgstr ""
-
-#. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:54
-msgid "Whack"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:54
-#, fuzzy, c-format
-msgid "%s has whacked you!"
-msgstr "%s 님이 나 [%s] 을(를) 추가했습니다."
-
-#: ../libpurple/protocols/myspace/zap.c:54
-#, c-format
-msgid "Whacking %s..."
-msgstr ""
-
-#. Torch means "to set on fire."  Don't worry, this doesn't
-#. * make a whole lot of sense in English, either.  Feel free
-#. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:59
-#, fuzzy
-msgid "Torch"
-msgstr "주제"
-
-#: ../libpurple/protocols/myspace/zap.c:59
-#, fuzzy, c-format
-msgid "%s has torched you!"
-msgstr "사용자는 나를 차단했습니다."
-
-#: ../libpurple/protocols/myspace/zap.c:59
-#, c-format
-msgid "Torching %s..."
-msgstr ""
-
-#. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
-msgid "Smooch"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:62
-#, fuzzy, c-format
-msgid "%s has smooched you!"
-msgstr "%s 님이 접속했습니다."
-
-#: ../libpurple/protocols/myspace/zap.c:62
-#, c-format
-msgid "Smooching %s..."
-msgstr ""
-
-#. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:65
-msgid "Hug"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:65
-#, fuzzy, c-format
-msgid "%s has hugged you!"
-msgstr "%s 님이 접속했습니다."
-
-#: ../libpurple/protocols/myspace/zap.c:65
-#, c-format
-msgid "Hugging %s..."
-msgstr ""
-
-#. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:68
-#, fuzzy
-msgid "Slap"
-msgstr "슬로바키아어"
-
-#: ../libpurple/protocols/myspace/zap.c:68
-#, fuzzy, c-format
-msgid "%s has slapped you!"
-msgstr "%s 님이 나 [%s] 을(를) 추가했습니다."
-
-#: ../libpurple/protocols/myspace/zap.c:68
-#, c-format
-msgid "Slapping %s..."
-msgstr ""
-
-#. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:71
-#, fuzzy
-msgid "Goose"
-msgstr "다운됨"
-
-#: ../libpurple/protocols/myspace/zap.c:71
-#, fuzzy, c-format
-msgid "%s has goosed you!"
-msgstr "%s 님이 자리를 비웠습니다."
-
-#: ../libpurple/protocols/myspace/zap.c:71
-#, fuzzy, c-format
-msgid "Goosing %s..."
-msgstr "%s 검색 중"
-
-#. A high-five is when two people's hands slap each other
-#. * in the air above their heads.  It is done to celebrate
-#. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:76
-msgid "High-five"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:76
-#, fuzzy, c-format
-msgid "%s has high-fived you!"
-msgstr "%s 님이 접속했습니다."
-
-#: ../libpurple/protocols/myspace/zap.c:76
-#, c-format
-msgid "High-fiving %s..."
-msgstr ""
-
-#. We're not entirely sure what the MySpace people mean by
-#. * this... but we think it's the equivalent of "prank."  Or, for
-#. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:81
-msgid "Punk"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:81
-#, fuzzy, c-format
-msgid "%s has punk'd you!"
-msgstr "%s 님이 접속했습니다."
-
-#: ../libpurple/protocols/myspace/zap.c:81
-#, c-format
-msgid "Punking %s..."
-msgstr ""
-
-#. Raspberry is a slang term for the vibrating sound made
-#. * when you stick your tongue out of your mouth with your
-#. * lips closed and blow.  It is typically done when
-#. * gloating or bragging.  Nowadays it's a pretty silly
-#. * gesture, so it does not carry a harsh negative
-#. * connotation.  It is generally used in a playful tone
-#. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:90
-msgid "Raspberry"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:90
-#, fuzzy, c-format
-msgid "%s has raspberried you!"
-msgstr "%s 님이 접속했습니다."
-
-#: ../libpurple/protocols/myspace/zap.c:90
-#, c-format
-msgid "Raspberrying %s..."
-msgstr ""
-
-#: ../libpurple/protocols/novell/nmuser.c:1864
+#: ../libgaim/protocols/novell/nmuser.c:1879
 msgid "Required parameters not passed in"
 msgstr "필요한 인수가 전달되지 못했습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
+#: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Unable to write to network"
 msgstr "네트워크에 쓸 수 없습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
+#: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Unable to read from network"
 msgstr "네트워크로부터 읽을 수 없습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
+#: ../libgaim/protocols/novell/nmuser.c:1888
 msgid "Error communicating with server"
 msgstr "서버와 통신하는 중 오류가 발생했습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
+#: ../libgaim/protocols/novell/nmuser.c:1892
 msgid "Conference not found"
 msgstr "회의를 찾을 수 없습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
+#: ../libgaim/protocols/novell/nmuser.c:1895
 msgid "Conference does not exist"
 msgstr "회의가 존재하지 않습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libgaim/protocols/novell/nmuser.c:1899
 msgid "A folder with that name already exists"
 msgstr "같은 이름의 폴더가 이미 존재합니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libgaim/protocols/novell/nmuser.c:1902
 msgid "Not supported"
 msgstr "지원되지 않습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libgaim/protocols/novell/nmuser.c:1906
 msgid "Password has expired"
 msgstr "비밀번호 유효기간이 만료되었습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libgaim/protocols/novell/nmuser.c:1909
 msgid "Incorrect password"
 msgstr "비밀번호가 틀립니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
+#: ../libgaim/protocols/novell/nmuser.c:1912
 msgid "User not found"
 msgstr "사용자를 찾을 수 없습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
+#: ../libgaim/protocols/novell/nmuser.c:1915
 msgid "Account has been disabled"
 msgstr "계정이 사용이 금지되었습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
+#: ../libgaim/protocols/novell/nmuser.c:1918
 msgid "The server could not access the directory"
 msgstr "서버가 디렉토리에 접근하지 못했습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
+#: ../libgaim/protocols/novell/nmuser.c:1921
 msgid "Your system administrator has disabled this operation"
 msgstr "시스템 관리자가 이 조작을 금지시켰습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
+#: ../libgaim/protocols/novell/nmuser.c:1924
 msgid "The server is unavailable; try again later"
 msgstr "서버를 이용할 수 없습니다; 잠시 후에 다시 시도해 보십시오."
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
+#: ../libgaim/protocols/novell/nmuser.c:1927
 msgid "Cannot add a contact to the same folder twice"
 msgstr "같은 폴더에 연락처를 두 번 추가할 수 없습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
+#: ../libgaim/protocols/novell/nmuser.c:1930
 msgid "Cannot add yourself"
 msgstr "나 자신은 추가할 수 없습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
+#: ../libgaim/protocols/novell/nmuser.c:1933
 msgid "Master archive is misconfigured"
 msgstr "Master archive 설정이 틀렸습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
+#: ../libgaim/protocols/novell/nmuser.c:1937
 msgid "Incorrect screen name or password"
 msgstr "아이디 또는 비밀번호가 틀립니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
+#: ../libgaim/protocols/novell/nmuser.c:1940
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "입력한 아이디의 호스트를 인식할 수 없었습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
-msgstr ""
-"틀린 비밀번호가 여러 번 입력되었기 때문에, 사용 중인 계정을 금지시킵니다."
+#: ../libgaim/protocols/novell/nmuser.c:1943
+msgid "Your account has been disabled because too many incorrect passwords were entered"
+msgstr "틀린 비밀번호가 여러 번 입력되었기 때문에, 사용 중인 계정을 금지시킵니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
+#: ../libgaim/protocols/novell/nmuser.c:1946
 msgid "You cannot add the same person twice to a conversation"
 msgstr "동일 인물은 대화에 두 번 추가할 수 없습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
+#: ../libgaim/protocols/novell/nmuser.c:1950
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "연락 가능한 수의 최대값에 도달했습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
+#: ../libgaim/protocols/novell/nmuser.c:1953
 msgid "You have entered an incorrect screen name"
 msgstr "잘못된 아이디를 입력했습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
+#: ../libgaim/protocols/novell/nmuser.c:1956
 msgid "An error occurred while updating the directory"
 msgstr "폴더를 갱신하는 중 오류가 발생했습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
+#: ../libgaim/protocols/novell/nmuser.c:1959
 msgid "Incompatible protocol version"
 msgstr "호환되지 않는 버전의 프로토콜"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
+#: ../libgaim/protocols/novell/nmuser.c:1962
 msgid "The user has blocked you"
 msgstr "사용자는 나를 차단했습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+#: ../libgaim/protocols/novell/nmuser.c:1965
+msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "이 평가판에서는 한번에 10 사용자 이상은 로그인 할 수 없습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
+#: ../libgaim/protocols/novell/nmuser.c:1968
 msgid "The user is either offline or you are blocked"
 msgstr "사용자는 오프라인 또는 차단되어 있습니다."
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
+#: ../libgaim/protocols/novell/nmuser.c:1971
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "알 수 없는 오류: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
+#: ../libgaim/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "로그인에 실패했습니다. (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:249
+#: ../libgaim/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr ""
-"메시지를 보낼 수 없습니다. 사용자의 상세 정보를 가져오지 못했습니다. (%s)。"
+msgstr "메시지를 보낼 수 없습니다. 사용자의 상세 정보를 가져오지 못했습니다. (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:398
+#: ../libgaim/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "%s 님을 친구 목록 (%s) 에 추가할 수 없습니다."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:424
+#: ../libgaim/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "메시지 (%s) 을(를) 보낼 수 없습니다."
 
-#: ../libpurple/protocols/novell/novell.c:495
-#: ../libpurple/protocols/novell/novell.c:987
+#: ../libgaim/protocols/novell/novell.c:493
+#: ../libgaim/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "사용자 (%s) 을(를) 초대할 수 없습니다."
 
-#: ../libpurple/protocols/novell/novell.c:534
+#: ../libgaim/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "%s 메시지를 전송할 수 없습니다. 회의 (%s) 을(를) 작성할 수 없었습니다."
 
-#: ../libpurple/protocols/novell/novell.c:539
+#: ../libgaim/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "메시지를 전송할 수 없습니다. 회의 (%s) 을(를) 작성할 수 없었습니다."
 
-#: ../libpurple/protocols/novell/novell.c:586
+#: ../libgaim/protocols/novell/novell.c:584
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"사용자 %s 을(를) 서버쪽 목록에 있는 폴더 %s (으)로 이동할 수 없습니다. 폴더 "
-"생성 오류입니다 (%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "사용자 %s 을(를) 서버쪽 목록에 있는 폴더 %s (으)로 이동할 수 없습니다. 폴더 생성 오류입니다 (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:634
+#: ../libgaim/protocols/novell/novell.c:632
 #, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"%s 을(를) 친구 목록에 추가할 수 없습니다. 서버쪽 목록 (%s) 의 폴더 생성 오류"
-"입니다."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "%s 을(를) 친구 목록에 추가할 수 없습니다. 서버쪽 목록 (%s) 의 폴더 생성 오류입니다."
 
-#: ../libpurple/protocols/novell/novell.c:707
+#: ../libgaim/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "사용자 %s (%s) 님의 상세 정보를 가져오지 못했습니다."
 
-#: ../libpurple/protocols/novell/novell.c:753
-#: ../libpurple/protocols/novell/novell.c:899
+#: ../libgaim/protocols/novell/novell.c:751
+#: ../libgaim/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "사용자를 친구 목록 (%s) 에 추가할 수 없습니다."
 
-#: ../libpurple/protocols/novell/novell.c:800
+#: ../libgaim/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "%s 님을 거부 목록 (%s) 에 추가할 수 없습니다."
 
-#: ../libpurple/protocols/novell/novell.c:853
+#: ../libgaim/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "%s 님을 허가 목록 (%s) 에 추가할 수 없습니다."
 
-#: ../libpurple/protocols/novell/novell.c:921
+#: ../libgaim/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "%s 님을 개인 목록 (%s) (으)로부터 삭제할 수 없습니다."
 
-#: ../libpurple/protocols/novell/novell.c:944
-#: ../libpurple/protocols/novell/novell.c:1649
+#: ../libgaim/protocols/novell/novell.c:942
+#: ../libgaim/protocols/novell/novell.c:1650
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "서버쪽 개인 설정 (%s) 을(를) 변경할 수 없습니다."
 
-#: ../libpurple/protocols/novell/novell.c:1014
+#: ../libgaim/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "회의 (%s) 을(를) 생성할 수 없습니다."
 
-#: ../libpurple/protocols/novell/novell.c:1123
-#: ../libpurple/protocols/novell/novell.c:1694
+#: ../libgaim/protocols/novell/novell.c:1121
+#: ../libgaim/protocols/novell/novell.c:1695
 msgid "Error communicating with server. Closing connection."
 msgstr "서버와의 통신 중 오류입니다. 접속을 끊었습니다."
 
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "전화번호"
 
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libgaim/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "개인 제목"
 
-#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1504
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libgaim/protocols/novell/novell.c:1505
+#: ../libgaim/protocols/sametime/sametime.c:4142
 msgid "User ID"
 msgstr "사용자 ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. purple_notify_user_info_add_pair(user_info, tag, value);
+#. gaim_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1517
+#: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "전체 이름"
 
-#: ../libpurple/protocols/novell/novell.c:1639
+#: ../libgaim/protocols/novell/novell.c:1640
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 회의 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1670
+#: ../libgaim/protocols/novell/novell.c:1671
 msgid "Unable to make SSL connection to server."
 msgstr "서버에 SSL 접속을 할 수 없습니다."
 
-#: ../libpurple/protocols/novell/novell.c:1722
+#: ../libgaim/protocols/novell/novell.c:1723
 msgid "Authenticating..."
 msgstr "인증 중..."
 
-#: ../libpurple/protocols/novell/novell.c:1734
+#: ../libgaim/protocols/novell/novell.c:1735
 msgid "Unable to connect to server."
 msgstr "서버에 접속할 수 없습니다."
 
-#: ../libpurple/protocols/novell/novell.c:1737
+#: ../libgaim/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "응답을 기다리고 있습니다..."
 
-#: ../libpurple/protocols/novell/novell.c:1872
+#: ../libgaim/protocols/novell/novell.c:1873
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s 님이 대화 창으로 초대되어 있습니다."
 
-#: ../libpurple/protocols/novell/novell.c:1900
+#: ../libgaim/protocols/novell/novell.c:1901
 msgid "Invitation to Conversation"
 msgstr "회의 초대"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libgaim/protocols/novell/novell.c:1902
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8187,38 +10299,33 @@ msgstr ""
 "\n"
 "연락처: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1903
+#: ../libgaim/protocols/novell/novell.c:1904
 msgid "Would you like to join the conversation?"
 msgstr "회의에 참석하시겠습니까?"
 
-#: ../libpurple/protocols/novell/novell.c:2017
+#. we don't want to reconnect in this case
+#: ../libgaim/protocols/novell/novell.c:2013
 msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"다른 워크스테이션으로부터 로그인 되어 있기 때문에, 강제적으로 로그아웃 되었습"
-"니다."
+msgstr "다른 워크스테이션으로부터 로그인 되어 있기 때문에, 강제적으로 로그아웃 되었습니다."
 
-#: ../libpurple/protocols/novell/novell.c:2074
+#: ../libgaim/protocols/novell/novell.c:2070
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 님은 오프라인이기 때문에, 전송한 메시지를 받지 못했습니다."
 
 #. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
+#. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2172
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+#: ../libgaim/protocols/novell/novell.c:2168
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
 msgstr "서버에 접속할 수 없습니다. 접속할 서버의 주소를 입력해 주십시오."
 
-#: ../libpurple/protocols/novell/novell.c:2200
+#: ../libgaim/protocols/novell/novell.c:2196
 msgid "Error. SSL support is not installed."
 msgstr "오류입니다. SSL 지원이 설치되어 있지 않습니다."
 
-#: ../libpurple/protocols/novell/novell.c:2509
-#, c-format
+#: ../libgaim/protocols/novell/novell.c:2505
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "이 회의는 폐회되었습니다. 메시지를 전송할 수 없습니다."
 
@@ -8232,33 +10339,39 @@ msgstr "이 회의는 폐회되었습니
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3523
-#: ../libpurple/protocols/novell/novell.c:3525
+#: ../libgaim/protocols/novell/novell.c:3548
+#: ../libgaim/protocols/novell/novell.c:3550
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise 메신저 프로토콜 플러그인"
 
-#: ../libpurple/protocols/novell/novell.c:3550
+#: ../libgaim/protocols/novell/novell.c:3569
 msgid "Server address"
 msgstr "서버 주소"
 
-#: ../libpurple/protocols/novell/novell.c:3554
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server port"
 msgstr "서버 포트"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2471
-#: ../libpurple/protocols/yahoo/yahoo.c:2638
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1126 ../libpurple/proxy.c:1235
-#: ../libpurple/proxy.c:1335 ../libpurple/proxy.c:1463
+#: ../libgaim/protocols/oscar/flap_connection.c:379
+#: ../libgaim/protocols/yahoo/yahoo.c:2263
+#: ../libgaim/protocols/yahoo/yahoo.c:2421
+#: ../libgaim/protocols/yahoo/ycht.c:481
+#: ../libgaim/proxy.c:566
+#: ../libgaim/proxy.c:1074
+#: ../libgaim/proxy.c:1185
+#: ../libgaim/proxy.c:1285
+#: ../libgaim/proxy.c:1413
 msgid "Server closed the connection."
 msgstr "서버가 접속을 닫았습니다."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2465
-#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1138 ../libpurple/proxy.c:1247
-#: ../libpurple/proxy.c:1347 ../libpurple/proxy.c:1475
+#: ../libgaim/protocols/oscar/flap_connection.c:381
+#: ../libgaim/protocols/yahoo/yahoo.c:2257
+#: ../libgaim/protocols/yahoo/yahoo.c:2415
+#: ../libgaim/proxy.c:578
+#: ../libgaim/proxy.c:1086
+#: ../libgaim/proxy.c:1197
+#: ../libgaim/proxy.c:1297
+#: ../libgaim/proxy.c:1425
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8267,13 +10380,24 @@ msgstr ""
 "서버와의 접속에 실패했습니다:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/proxy.c:1155 ../libpurple/proxy.c:1260
-#: ../libpurple/proxy.c:1359 ../libpurple/proxy.c:1431
-#: ../libpurple/proxy.c:1488
+#: ../libgaim/protocols/oscar/flap_connection.c:384
+#: ../libgaim/proxy.c:1103
+#: ../libgaim/proxy.c:1210
+#: ../libgaim/proxy.c:1309
+#: ../libgaim/proxy.c:1381
+#: ../libgaim/proxy.c:1438
 msgid "Received invalid data on connection with server."
 msgstr "서버와 접속하는 동안에 잘못된 데이터를 받았습니다."
 
+#: ../libgaim/protocols/oscar/flap_connection.c:386
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"서버와의 접속을 확립하지 못했습니다:\n"
+"%s"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8284,11 +10408,19 @@ msgstr "서버와 접속하는 동안에
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
+#: ../libgaim/protocols/oscar/libaim.c:112
+#: ../libgaim/protocols/oscar/libaim.c:114
 msgid "AIM Protocol Plugin"
 msgstr "AIM 프로토콜 플러그인"
 
+#: ../libgaim/protocols/oscar/libaim.c:140
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"파일 전송은 항상 AIM/ICQ 프록시 서버 이용\n"
+"(속도는 느리지만, IP 주소가 노출되지 않습니다.)"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8299,318 +10431,280 @@ msgstr "AIM 프로토콜 플러그인"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
+#: ../libgaim/protocols/oscar/libicq.c:112
+#: ../libgaim/protocols/oscar/libicq.c:114
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ 프로토콜 플러그인"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libgaim/protocols/oscar/libicq.c:139
+#: ../libgaim/protocols/yahoo/yahoo.c:3945
+#: ../libgaim/protocols/zephyr/zephyr.c:2985
 msgid "Encoding"
 msgstr "인코딩"
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libgaim/protocols/oscar/libicq.c:143
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"파일 전송은 항상 ICQ 프록시 서버 이용\n"
+"(속도는 느리지만, IP 주소가 노출되지 않습니다.)"
+
+#: ../libgaim/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "리모트 사용자가 접속을 끊었습니다."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libgaim/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "리모트 사용자가 내 요구를 거절했습니다."
 
-#: ../libpurple/protocols/oscar/odc.c:46
+#: ../libgaim/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "리모트 사용자와 접속이 끊어졌습니다:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libgaim/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "리모트 사용자의 접속에서 잘못된 데이터를 받았습니다."
 
-#: ../libpurple/protocols/oscar/odc.c:51
+#: ../libgaim/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "리모트 사용자와의 접속을 확립하지 못했습니다."
 
-#: ../libpurple/protocols/oscar/odc.c:562
+#: ../libgaim/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Direct IM 을 확립했습니다."
 
-#: ../libpurple/protocols/oscar/odc.c:600
+#: ../libgaim/protocols/oscar/oft.c:657
 #, c-format
-msgid ""
-"%s tried to send you a %s file, but we only allow files up to %s over Direct "
-"IM.  Try using file transfer instead.\n"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oft.c:656
-#, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "파일 %s 은(는) %s 입니다. (%s 의 최대 크기를 초과했습니다.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../libgaim/protocols/oscar/oscar.c:114
 msgid "Invalid error"
 msgstr "잘못된 오류"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libgaim/protocols/oscar/oscar.c:115
 msgid "Invalid SNAC"
 msgstr "잘못된 SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libgaim/protocols/oscar/oscar.c:116
 msgid "Rate to host"
 msgstr "호스트 속도"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libgaim/protocols/oscar/oscar.c:117
 msgid "Rate to client"
 msgstr "클라이언트 속도"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libgaim/protocols/oscar/oscar.c:119
 msgid "Service unavailable"
 msgstr "서비스를 이용할 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libgaim/protocols/oscar/oscar.c:120
 msgid "Service not defined"
 msgstr "서비스가 정의되어 있지 않습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libgaim/protocols/oscar/oscar.c:121
 msgid "Obsolete SNAC"
 msgstr "구형 SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libgaim/protocols/oscar/oscar.c:122
 msgid "Not supported by host"
 msgstr "호스트에서 지원하지 않습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libgaim/protocols/oscar/oscar.c:123
 msgid "Not supported by client"
 msgstr "클라이언트에서 지원하지 않습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libgaim/protocols/oscar/oscar.c:124
 msgid "Refused by client"
 msgstr "클라이언트에서 거부되었습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:127
+#: ../libgaim/protocols/oscar/oscar.c:125
 msgid "Reply too big"
 msgstr "회신이 너무 큽니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:128
+#: ../libgaim/protocols/oscar/oscar.c:126
 msgid "Responses lost"
 msgstr "응답이 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:129
+#: ../libgaim/protocols/oscar/oscar.c:127
 msgid "Request denied"
 msgstr "요청이 거부되었습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: ../libgaim/protocols/oscar/oscar.c:128
 msgid "Busted SNAC payload"
 msgstr "SNAC payload 가 파괴되었습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libgaim/protocols/oscar/oscar.c:129
 msgid "Insufficient rights"
 msgstr "불충분한 요구입니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libgaim/protocols/oscar/oscar.c:130
 msgid "In local permit/deny"
 msgstr "로컬 허가/거부"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
+#: ../libgaim/protocols/oscar/oscar.c:131
 msgid "Too evil (sender)"
 msgstr "악성 (보낸 사람)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
+#: ../libgaim/protocols/oscar/oscar.c:132
 msgid "Too evil (receiver)"
 msgstr "악성 (받는 사람)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
+#: ../libgaim/protocols/oscar/oscar.c:133
 msgid "User temporarily unavailable"
 msgstr "사용자가 일시적으로 사용 불가능 상태입니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:136
+#: ../libgaim/protocols/oscar/oscar.c:134
 msgid "No match"
 msgstr "일치하지 않습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:137
+#: ../libgaim/protocols/oscar/oscar.c:135
 msgid "List overflow"
 msgstr "목록 오버플로어"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: ../libgaim/protocols/oscar/oscar.c:136
 msgid "Request ambiguous"
 msgstr "요구가 모호합니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libgaim/protocols/oscar/oscar.c:137
 msgid "Queue full"
 msgstr "큐가 다 찼습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:140
+#: ../libgaim/protocols/oscar/oscar.c:138
 msgid "Not while on AOL"
 msgstr "AOL 사용 중에는 불가능합니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:348
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking with "
-"is probably using a different encoding than expected.  If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-"(이 메시지를 받을 때 오류가 발생했습니다. 대화 중인 친구는 아마도 다른 인코딩"
-"을 사용하고 있는 것 같습니다. 상대가 사용하고 있는 인코딩을 알고 있으면, 계"
-"정 창의 고급 설정에서 이를 지정해 주십시오.)"
+#: ../libgaim/protocols/oscar/oscar.c:327
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "(이 메시지를 받을 때 오류가 발생했습니다. 대화 중인 친구는 아마도 다른 인코딩을 사용하고 있는 것 같습니다. 상대가 사용하고 있는 인코딩을 알고 있으면, 계정 창의 고급 설정에서 이를 지정해 주십시오.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libgaim/protocols/oscar/oscar.c:436
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(이 메시지를 받을 때 오류가 발생했습니다. %s 님과는 상이한 인코딩으로 대화하"
-"고 있거나 혹은 %s 님이 비정상 클라이언트를 사용하고 있는 것 같습니다.)"
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+msgstr "(이 메시지를 받을 때 오류가 발생했습니다. %s 님과는 상이한 인코딩으로 대화하고 있거나 혹은 %s 님이 비정상 클라이언트를 사용하고 있는 것 같습니다.)"
 
-#. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2391
-#: ../pidgin/gtkutils.c:2421
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
-msgid "Buddy Icon"
-msgstr "친구 아이콘"
-
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libgaim/protocols/oscar/oscar.c:621
 msgid "Voice"
 msgstr "음성"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libgaim/protocols/oscar/oscar.c:624
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
+#: ../libgaim/protocols/oscar/oscar.c:627
+#: ../libgaim/protocols/silc/silc.c:693
+#: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "대화"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6064
+#: ../libgaim/protocols/oscar/oscar.c:630
+#: ../libgaim/protocols/oscar/oscar.c:5959
 msgid "Get File"
 msgstr "파일 가져오기"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Games"
 msgstr "게임"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "Add-Ins"
 msgstr "추가"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Send Buddy List"
 msgstr "친구 목록 보내기"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libgaim/protocols/oscar/oscar.c:646
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct 접속"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libgaim/protocols/oscar/oscar.c:649
 msgid "AP User"
 msgstr "AP 사용자"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libgaim/protocols/oscar/oscar.c:652
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libgaim/protocols/oscar/oscar.c:655
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libgaim/protocols/oscar/oscar.c:658
 msgid "ICQ Server Relay"
 msgstr "ICQ 서버 중계"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libgaim/protocols/oscar/oscar.c:661
 msgid "Old ICQ UTF8"
 msgstr "구형 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libgaim/protocols/oscar/oscar.c:664
 msgid "Trillian Encryption"
 msgstr "Trillian 암호화"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libgaim/protocols/oscar/oscar.c:667
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libgaim/protocols/oscar/oscar.c:670
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libgaim/protocols/oscar/oscar.c:673
 msgid "Security Enabled"
 msgstr "보안 사용"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libgaim/protocols/oscar/oscar.c:676
 msgid "Video Chat"
 msgstr "영상 대화"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libgaim/protocols/oscar/oscar.c:680
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libgaim/protocols/oscar/oscar.c:683
 msgid "Live Video"
 msgstr "라이브 영상"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libgaim/protocols/oscar/oscar.c:686
 msgid "Camera"
 msgstr "카메라"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#, c-format
+#: ../libgaim/protocols/oscar/oscar.c:704
+#: ../libgaim/protocols/oscar/oscar.c:5735
 msgid "Free For Chat"
 msgstr "대화할 수 있습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5869
-#, c-format
+#: ../libgaim/protocols/oscar/oscar.c:708
+#: ../libgaim/protocols/oscar/oscar.c:5767
 msgid "Not Available"
 msgstr "사용 불가"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5855
-#, c-format
+#: ../libgaim/protocols/oscar/oscar.c:710
+#: ../libgaim/protocols/oscar/oscar.c:5753
 msgid "Occupied"
 msgstr "사용 중입니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
+#: ../libgaim/protocols/oscar/oscar.c:714
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
-#, c-format
-msgid "Invisible"
-msgstr "숨김 상태"
-
-#: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
+#: ../libgaim/protocols/oscar/oscar.c:718
 msgid "Online"
 msgstr "온라인"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3722
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
-msgid "IP Address"
-msgstr "IP 주소"
-
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libgaim/protocols/oscar/oscar.c:824
+#: ../libgaim/protocols/oscar/oscar.c:2852
 msgid "Warning Level"
 msgstr "경고 수준"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libgaim/protocols/oscar/oscar.c:834
 msgid "Buddy Comment"
 msgstr "친구의 코멘트"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libgaim/protocols/oscar/oscar.c:974
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8619,7 +10713,7 @@ msgstr ""
 "인증 서버에 접속할 수 없었습니다:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libgaim/protocols/oscar/oscar.c:982
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8628,172 +10722,159 @@ msgstr ""
 "BOS 서버에 접속할 수 없었습니다:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libgaim/protocols/oscar/oscar.c:1022
 msgid "Screen name sent"
 msgstr "아이디를 보냈습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libgaim/protocols/oscar/oscar.c:1027
 msgid "Connection established, cookie sent"
 msgstr "접속 완료. 쿠키를 보냈습니다."
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libgaim/protocols/oscar/oscar.c:1056
 msgid "Finalizing connection"
 msgstr "최종 접속 조정 중"
 
-#: ../libpurple/protocols/oscar/oscar.c:1262
-#, fuzzy, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"로그인 할 수 없습니다: 아이디가 틀렸기 때문에 %s (으)로서 접속할 수 없었습니"
-"다. 아이디의 앞 부분은 문자, 문자와 숫자와 공백 또는 숫자만이 가능합니다."
+#: ../libgaim/protocols/oscar/oscar.c:1240
+#, c-format
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "로그인 할 수 없습니다: 아이디가 틀렸기 때문에 %s (으)로서 접속할 수 없었습니다. 아이디의 앞 부분은 문자, 문자와 숫자와 공백 또는 숫자만이 가능합니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
-#: ../libpurple/protocols/yahoo/yahoo.c:2107
+#: ../libgaim/protocols/oscar/oscar.c:1325
+#: ../libgaim/protocols/yahoo/yahoo.c:1900
 msgid "Invalid screen name."
 msgstr "잘못된 아이디입니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:1355
-#: ../libpurple/protocols/qq/login_logout.c:503
-#: ../libpurple/protocols/simple/simple.c:1048
-#: ../libpurple/protocols/yahoo/yahoo.c:2128
+#: ../libgaim/protocols/oscar/oscar.c:1332
+#: ../libgaim/protocols/qq/login_logout.c:483
+#: ../libgaim/protocols/simple/simple.c:1035
+#: ../libgaim/protocols/yahoo/yahoo.c:1923
 msgid "Incorrect password."
 msgstr "비밀번호가 틀립니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#: ../libgaim/protocols/oscar/oscar.c:1337
 msgid "Your account is currently suspended."
 msgstr "사용 중인 계정은 현재 정지 중입니다."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libgaim/protocols/oscar/oscar.c:1341
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 인스턴트 메신저 서비스는 일시적으로 이용할 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:1369
-#: ../libpurple/protocols/oscar/oscar.c:1380
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"접속과 해제를 반복 수행했습니다. 10분 정도 후 다시 시도해 보시기 바랍니다. 이"
-"대로 계속하면 더 오래 기다려야 합니다."
+#: ../libgaim/protocols/oscar/oscar.c:1346
+msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
+msgstr "접속과 해제를 반복 수행했습니다. 10분 정도 후 다시 시도해 보시기 바랍니다. 이대로 계속하면 더 오래 기다려야 합니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:1374
+#: ../libgaim/protocols/oscar/oscar.c:1351
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "클라이언트 버전이 너무 오래 되었습니다. %s (으)로 업그레이드 하십시오."
 
-#: ../libpurple/protocols/oscar/oscar.c:1413
+#: ../libgaim/protocols/oscar/oscar.c:1386
 msgid "Could Not Connect"
 msgstr "접속할 수 없었습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:1417
+#: ../libgaim/protocols/oscar/oscar.c:1391
 msgid "Received authorization"
 msgstr "인증을 받았습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libgaim/protocols/oscar/oscar.c:1414
 msgid "The SecurID key entered is invalid."
 msgstr "입력한 보안 ID 키는 잘못되었습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libgaim/protocols/oscar/oscar.c:1428
 msgid "Enter SecurID"
 msgstr "보안 ID 입력"
 
-#: ../libpurple/protocols/oscar/oscar.c:1453
+#: ../libgaim/protocols/oscar/oscar.c:1429
 msgid "Enter the 6 digit number from the digital display."
 msgstr "디지털 표시 방식으로 6자리의 숫자를 입력해 주십시오."
 
 #. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1455
-#: ../libpurple/protocols/oscar/oscar.c:2247
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:5939
-#: ../libpurple/protocols/oscar/oscar.c:6220 ../libpurple/request.h:1388
+#: ../libgaim/protocols/oscar/oscar.c:1431
+#: ../libgaim/protocols/oscar/oscar.c:2233
+#: ../libgaim/protocols/oscar/oscar.c:2279
+#: ../libgaim/protocols/oscar/oscar.c:5837
+#: ../libgaim/protocols/oscar/oscar.c:6067
+#: ../libgaim/protocols/oscar/oscar.c:6123
+#: ../libgaim/request.h:1350
 msgid "_OK"
 msgstr "확인(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libgaim/protocols/oscar/oscar.c:1469
+#: ../libgaim/protocols/oscar/oscar.c:1512
 #, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"곧 접속이 끊깁니다. 이것이 수정되면 TOC 를 사용합니다. 갱신을 위해 %s 을(를) "
-"선택하십시오."
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "곧 접속이 끊깁니다. 이것이 수정되면 TOC 를 사용합니다. 갱신을 위해 %s 을(를) 선택하십시오."
 
-#: ../libpurple/protocols/oscar/oscar.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:1540
+#: ../libgaim/protocols/oscar/oscar.c:1472
+#: ../libgaim/protocols/oscar/oscar.c:1515
 msgid "Unable to get a valid AIM login hash."
 msgstr "올바른 AIM 로그인 hash를 가져올 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libgaim/protocols/oscar/oscar.c:1601
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "곧 접속이 끊깁니다. 갱신을 위해 %s 을(를) 선택하십시오."
 
-#: ../libpurple/protocols/oscar/oscar.c:1628
+#: ../libgaim/protocols/oscar/oscar.c:1604
 msgid "Unable to get a valid login hash."
 msgstr "올바른 로그인 hash를 가져올 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:1658
+#: ../libgaim/protocols/oscar/oscar.c:1630
 msgid "Password sent"
 msgstr "비밀번호 전송 중"
 
-#: ../libpurple/protocols/oscar/oscar.c:1714
+#: ../libgaim/protocols/oscar/oscar.c:1686
 msgid "Unable to initialize connection"
 msgstr "새로운 접속을 열 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:2205
+#: ../libgaim/protocols/oscar/oscar.c:2203
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "제가 당신을 친구 목록에 추가할 수 있도록 승인해 주십시오."
 
-#: ../libpurple/protocols/oscar/oscar.c:2245
+#: ../libgaim/protocols/oscar/oscar.c:2231
 msgid "Authorization Request Message:"
 msgstr "승인 요구 메시지:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2246
+#: ../libgaim/protocols/oscar/oscar.c:2232
 msgid "Please authorize me!"
 msgstr "저를 승인해 주세요!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2295
-#: ../libpurple/protocols/oscar/oscar.c:2422
-#: ../libpurple/protocols/oscar/oscar.c:5315
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libgaim/protocols/oscar/oscar.c:2271
+#: ../libgaim/protocols/oscar/oscar.c:2278
+#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libgaim/protocols/oscar/oscar.c:5197
+#: ../libgaim/protocols/yahoo/yahoo.c:959
 msgid "No reason given."
 msgstr "이유를 알 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libgaim/protocols/oscar/oscar.c:2277
 msgid "Authorization Denied Message:"
 msgstr "승인 거부 메시지:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libgaim/protocols/oscar/oscar.c:2404
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "사용자 %u 님이 다음 이유로 친구 목록에의 추가 요구를 거부했습니다:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libgaim/protocols/oscar/oscar.c:2405
 msgid "ICQ authorization denied."
 msgstr "ICQ 인증이 거부되었습니다."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2430
+#: ../libgaim/protocols/oscar/oscar.c:2412
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "사용자 %u 님이 내 친구 목록에의 추가 요구를 승인했습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:2438
+#: ../libgaim/protocols/oscar/oscar.c:2420
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8806,7 +10887,7 @@ msgstr ""
 "보낸 사람: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2446
+#: ../libgaim/protocols/oscar/oscar.c:2428
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8819,7 +10900,7 @@ msgstr ""
 "보낸 사람: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2454
+#: ../libgaim/protocols/oscar/oscar.c:2436
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8832,1023 +10913,956 @@ msgstr ""
 "메시지는:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475
+#: ../libgaim/protocols/oscar/oscar.c:2457
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 사용자 %u 님이 나에게 친구 목록을 보내고 있습니다: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481
+#: ../libgaim/protocols/oscar/oscar.c:2463
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "이 상대를 친구 목록에 추가하시겠습니까?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2486 ../pidgin/gtkroomlist.c:309
-msgid "_Add"
-msgstr "추가(_A)"
-
-#: ../libpurple/protocols/oscar/oscar.c:2487
+#: ../libgaim/protocols/oscar/oscar.c:2467
 msgid "_Decline"
 msgstr "ê±°ì ˆ(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libgaim/protocols/oscar/oscar.c:2551
 #, 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] ""
-"%2$s 님으로부터의 %1$hu 개의 메시지는 타당하지 않아 받지 못했습니다."
-msgstr[1] ""
-"%2$s 님으로부터의 %1$hu 개의 메시지는 타당하지 않아 받지 못했습니다."
+msgstr[0] "%2$s 님으로부터의 %1$hu 개의 메시지는 타당하지 않아 받지 못했습니다."
+msgstr[1] "%2$s 님으로부터의 %1$hu 개의 메시지는 타당하지 않아 받지 못했습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:2620
+#: ../libgaim/protocols/oscar/oscar.c:2560
 #, 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] "%2$s 님으로부터의 %1$hu개의 메시지는 너무 커서 받지 못했습니다."
 msgstr[1] "%2$s 님으로부터의 %1$hu개의 메시지는 너무 커서 받지 못했습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:2629
+#: ../libgaim/protocols/oscar/oscar.c:2569
 #, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] ""
-"속도 제한을 상회하여, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
-msgstr[1] ""
-"속도 제한을 상회하여, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] "속도 제한을 상회하여, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+msgstr[1] "속도 제한을 상회하여, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:2638
+#: ../libgaim/protocols/oscar/oscar.c:2578
 #, 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] ""
-"유해한 상대방이어서, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
-msgstr[1] ""
-"유해한 상대방이어서, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+msgstr[0] "유해한 상대방이어서, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+msgstr[1] "유해한 상대방이어서, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:2647
+#: ../libgaim/protocols/oscar/oscar.c:2587
 #, 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] "유해한 자신이어서, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
 msgstr[1] "유해한 자신이어서, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libgaim/protocols/oscar/oscar.c:2596
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
-msgstr[0] ""
-"원인은 알 수 없지만, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
-msgstr[1] ""
-"원인은 알 수 없지만, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+msgstr[0] "원인은 알 수 없지만, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
+msgstr[1] "원인은 알 수 없지만, %2$s 님으로부터의 %1$hu개의 메시지를 못했습니다."
 
+#: ../libgaim/protocols/oscar/oscar.c:2718
+#, c-format
+msgid "SNAC threw error: %s\n"
+msgstr "SNAC threw 오류: %s\n"
+
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libgaim/protocols/oscar/oscar.c:2758
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "메시지를 보낼 수 없습니다: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2811
-#: ../libpurple/protocols/oscar/oscar.c:2816
-#: ../libpurple/protocols/oscar/oscar.c:2880
+#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libgaim/protocols/oscar/oscar.c:2763
+#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libgaim/protocols/oscar/oscar.c:2829
 msgid "Unknown reason."
 msgstr "원인을 알 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:2814
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libgaim/protocols/oscar/oscar.c:2761
+#: ../libgaim/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "%s 님에게 메시지를 보낼 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:2880
+#: ../libgaim/protocols/oscar/oscar.c:2825
 #, c-format
 msgid "User information not available: %s"
 msgstr "사용자 정보를 이용할 수 없습니다: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libgaim/protocols/oscar/oscar.c:2828
+#, c-format
+msgid "User information for %s unavailable:"
+msgstr "%s 사용자 정보를 이용할 수 없습니다:"
+
+#: ../libgaim/protocols/oscar/oscar.c:2857
 msgid "Online Since"
 msgstr "접속한 일시"
 
-#: ../libpurple/protocols/oscar/oscar.c:2916
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
+#: ../libgaim/protocols/oscar/oscar.c:2862
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "멤버가 된 일시"
 
-#: ../libpurple/protocols/oscar/oscar.c:2951
+#: ../libgaim/protocols/oscar/oscar.c:2867
+msgid "Capabilities"
+msgstr "기능"
+
+#: ../libgaim/protocols/oscar/oscar.c:2885
 msgid "Available Message"
 msgstr "가능한 메시지"
 
-#: ../libpurple/protocols/oscar/oscar.c:3059
+#: ../libgaim/protocols/oscar/oscar.c:2911
+msgid "Profile"
+msgstr "프로파일"
+
+#: ../libgaim/protocols/oscar/oscar.c:2988
 msgid "Your AIM connection may be lost."
 msgstr "AIM 으로의 접속이 끊어진 것 같습니다."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3247
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[메시지에 잘못된 문자가 포함되어 있기 때문에, 이 사용자로부터의 메시지를 표시"
-"할 수 없습니다.]"
+#: ../libgaim/protocols/oscar/oscar.c:3175
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
+msgstr "[메시지에 잘못된 문자가 포함되어 있기 때문에, 이 사용자로부터의 메시지를 표시할 수 없습니다.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3411
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"속도 제한을 초과했기 때문에, 마지막 조작은 실행할 수 없었습니다. 10초 정도 후"
-"에 다시 시도해 보시기 바랍니다."
+#: ../libgaim/protocols/oscar/oscar.c:3396
+msgid "Rate limiting error."
+msgstr "속도 제한 오류입니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:3494
-#: ../libpurple/protocols/toc/toc.c:977
+#: ../libgaim/protocols/oscar/oscar.c:3397
+msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
+msgstr "속도 제한을 초과했기 때문에, 마지막 조작은 실행할 수 없었습니다. 10초 정도 후에 다시 시도해 보시기 바랍니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3469
+msgid "You have been signed off for an unknown reason."
+msgstr "원인은 알 수 없지만, 접속이 끊어졌습니다."
+
+#: ../libgaim/protocols/oscar/oscar.c:3482
+#: ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "대화실 %s (으)로부터 접속이 끊어졌습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:3744
-#: ../libpurple/protocols/silc/util.c:585
-#: ../libpurple/protocols/silc10/util.c:581
+#: ../libgaim/protocols/oscar/oscar.c:3723
+#: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "휴대 전화"
 
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libgaim/protocols/oscar/oscar.c:3753
 msgid "Personal Web Page"
 msgstr "개인 웹페이지"
 
-#: ../libpurple/protocols/oscar/oscar.c:3798
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#: ../libgaim/protocols/oscar/oscar.c:3758
+#: ../libgaim/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "추가 정보"
 
-#: ../libpurple/protocols/oscar/oscar.c:3806
-#: ../libpurple/protocols/oscar/oscar.c:3819
+#: ../libgaim/protocols/oscar/oscar.c:3766
+#: ../libgaim/protocols/oscar/oscar.c:3779
 msgid "Zip Code"
 msgstr "우편 번호"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libgaim/protocols/oscar/oscar.c:3790
 msgid "Division"
 msgstr "소속"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
+#: ../libgaim/protocols/oscar/oscar.c:3791
 msgid "Position"
 msgstr "직위"
 
-#: ../libpurple/protocols/oscar/oscar.c:3833
+#: ../libgaim/protocols/oscar/oscar.c:3793
 msgid "Web Page"
 msgstr "웹페이지"
 
-#: ../libpurple/protocols/oscar/oscar.c:3836
+#: ../libgaim/protocols/oscar/oscar.c:3796
 msgid "Work Information"
 msgstr "직업"
 
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libgaim/protocols/oscar/oscar.c:3852
 msgid "Pop-Up Message"
 msgstr "팝업 메시지"
 
-#: ../libpurple/protocols/oscar/oscar.c:3932
+#: ../libgaim/protocols/oscar/oscar.c:3892
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "다음의 아이디는 %s 에 연관되어 있습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libgaim/protocols/oscar/oscar.c:3897
 msgid "Screen name"
 msgstr "아이디"
 
-#: ../libpurple/protocols/oscar/oscar.c:3963
+#: ../libgaim/protocols/oscar/oscar.c:3923
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "이메일 주소 %s 에 대한 결과를 찾을 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:3984
+#: ../libgaim/protocols/oscar/oscar.c:3944
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s 님을 확인하기 위해 질의 메일을 수신해 주십시오."
 
-#: ../libpurple/protocols/oscar/oscar.c:3986
+#: ../libgaim/protocols/oscar/oscar.c:3946
 msgid "Account Confirmation Requested"
 msgstr "계정 인증을 요구했습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
-#, c-format
+#: ../libgaim/protocols/oscar/oscar.c:3977
 msgid "Error Changing Account Info"
 msgstr "계정 정보 변경 오류"
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libgaim/protocols/oscar/oscar.c:3980
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
 msgstr "오류 0x%04x: 요구된 아이디가 원본과 상이하여 조형할 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libgaim/protocols/oscar/oscar.c:3983
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "오류 0x%04x: 요구된 아이디가 상이하여 조형할 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4026
+#: ../libgaim/protocols/oscar/oscar.c:3986
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
 msgstr "오류 0x%04x: 요구된 아이디가 너무 길어 조형할 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4029
+#: ../libgaim/protocols/oscar/oscar.c:3989
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"오류 0x%04x: 이 아이디에 대해 이미 요구가 있었기 때문에 이메일 주소를 변경할 "
-"수 없습니다."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgstr "오류 0x%04x: 이 아이디에 대해 이미 요구가 있었기 때문에 이메일 주소를 변경할 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4032
+#: ../libgaim/protocols/oscar/oscar.c:3992
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"오류 0x%04x: 많은 아이디에 할당되어 있기 때문에, 이 이메일 주소로는 변경할 "
-"수 없습니다."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgstr "오류 0x%04x: 많은 아이디에 할당되어 있기 때문에, 이 이메일 주소로는 변경할 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libgaim/protocols/oscar/oscar.c:3995
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
-msgstr ""
-"오류 0x%04x: 이 주소가 상이하기 때문에, 이 이메일 주소로는 변경할 수 없습니"
-"다."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgstr "오류 0x%04x: 이 주소가 상이하기 때문에, 이 이메일 주소로는 변경할 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4038
+#: ../libgaim/protocols/oscar/oscar.c:3998
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "오류 0x%04x: 원인을 알 수 없는 오류입니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4048
+#: ../libgaim/protocols/oscar/oscar.c:4008
 #, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "%s 님의 이메일 주소는 %s 입니다."
+msgid ""
+"Your screen name is currently formatted as follows:\n"
+"%s"
+msgstr ""
+"내 아이디는 현재 다음과 같이 조형되어 있습니다:\n"
+"%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4050
+#: ../libgaim/protocols/oscar/oscar.c:4009
+#: ../libgaim/protocols/oscar/oscar.c:4016
 msgid "Account Info"
 msgstr "계정 정보"
 
-#: ../libpurple/protocols/oscar/oscar.c:4233
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-"IM 이미지가 전송되지 않았습니다. IM 이미지를 전송하려면 직접 연결로 해 주십시"
-"오."
+#: ../libgaim/protocols/oscar/oscar.c:4014
+#, c-format
+msgid "The e-mail address for %s is %s"
+msgstr "%s 님의 이메일 주소는 %s 입니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libgaim/protocols/oscar/oscar.c:4189
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "IM 이미지가 전송되지 않았습니다. IM 이미지를 전송하려면 직접 연결로 해 주십시오."
+
+#: ../libgaim/protocols/oscar/oscar.c:4441
 msgid "Unable to set AIM profile."
 msgstr "AIM 프로파일을 설정하지 못했습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4505
-msgid ""
-"You have probably requested to set your profile before the login procedure "
-"completed.  Your profile remains unset; try setting it again when you are "
-"fully connected."
-msgstr ""
-"로그인 수속이 완료되기 전에 사용자 프로파일을 설정하려고 하는 것 같습니다. "
-"내 프로파일은 설정되지 않은 상태로 남아 있습니다. 접속이 완료되면 재시도해 주"
-"십시오."
+#: ../libgaim/protocols/oscar/oscar.c:4442
+msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
+msgstr "로그인 수속이 완료되기 전에 사용자 프로파일을 설정하려고 하는 것 같습니다. 내 프로파일은 설정되지 않은 상태로 남아 있습니다. 접속이 완료되면 재시도해 주십시오."
 
-#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "프로파일 길이가 최대값 %d 바이트를 초과하여 일부가 잘렸습니다."
 msgstr[1] "프로파일 길이가 최대값 %d 바이트를 초과하여 일부가 잘렸습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4524
+#: ../libgaim/protocols/oscar/oscar.c:4461
 msgid "Profile too long."
 msgstr "프로파일이 너무 깁니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4569
+#: ../libpurple/protocols/oscar/oscar.c:4554
 #, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
-msgstr[0] ""
-"자리 비움 메시지 길이가 최대값 %d 바이트를 초과하여 일부가 잘렸습니다."
-msgstr[1] ""
-"자리 비움 메시지 길이가 최대값 %d 바이트를 초과하여 일부가 잘렸습니다."
+msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
+msgstr[0] "자리 비움 메시지 길이가 최대값 %d 바이트를 초과하여 일부가 잘렸습니다."
+msgstr[1] "자리 비움 메시지 길이가 최대값 %d 바이트를 초과하여 일부가 잘렸습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4574
+#: ../libgaim/protocols/oscar/oscar.c:4510
 msgid "Away message too long."
 msgstr "자리 비움 메시지가 너무 깁니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4647
-#, fuzzy, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"아이디가 상이하기 때문에, 친구 %s 을(를) 추가할 수 없었습니다. 아이디의 앞 부"
-"분은 문자, 문자와 숫자와 공백만 또는 숫자만이 가능합니다."
+#: ../libgaim/protocols/oscar/oscar.c:4579
+#, c-format
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "아이디가 상이하기 때문에, 친구 %s 을(를) 추가할 수 없었습니다. 아이디의 앞 부분은 문자, 문자와 숫자와 공백만 또는 숫자만이 가능합니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4649
-#: ../libpurple/protocols/oscar/oscar.c:5101
-#: ../libpurple/protocols/oscar/oscar.c:5116
+#: ../libgaim/protocols/oscar/oscar.c:4581
+#: ../libgaim/protocols/oscar/oscar.c:5004
+#: ../libgaim/protocols/oscar/oscar.c:5018
 msgid "Unable To Add"
 msgstr "추가할 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4768
+#: ../libgaim/protocols/oscar/oscar.c:4685
 msgid "Unable To Retrieve Buddy List"
 msgstr "친구 목록을 가져올 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4769
-msgid ""
-"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
-msgstr ""
-"일시적으로 AIM 서버로부터 친구 목록을 가져올 수 없었습니다. 친구 목록이 유실"
-"된 것은 아닙니다. 아마도 몇 시간 후에는 이용이 가능할 것으로 예상합니다."
+#: ../libgaim/protocols/oscar/oscar.c:4686
+msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few hours."
+msgstr "일시적으로 AIM 서버로부터 친구 목록을 가져올 수 없었습니다. 친구 목록이 유실된 것은 아닙니다. 아마도 몇 시간 후에는 이용이 가능할 것으로 예상합니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:4951
-#: ../libpurple/protocols/oscar/oscar.c:4953
-#: ../libpurple/protocols/oscar/oscar.c:5181
-#: ../libpurple/protocols/oscar/oscar.c:5182
-#: ../libpurple/protocols/oscar/oscar.c:5187
+#: ../libgaim/protocols/oscar/oscar.c:4890
+#: ../libgaim/protocols/oscar/oscar.c:4891
+#: ../libgaim/protocols/oscar/oscar.c:4896
+#: ../libgaim/protocols/oscar/oscar.c:5072
+#: ../libgaim/protocols/oscar/oscar.c:5073
+#: ../libgaim/protocols/oscar/oscar.c:5078
 msgid "Orphans"
 msgstr "ê³ ì•„"
 
-#: ../libpurple/protocols/oscar/oscar.c:5099
+#: ../libgaim/protocols/oscar/oscar.c:5002
 #, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"치구 %s 님을 추가할 수 없었습니다. 친구 수가 너무 많습니다. 한 명을 삭제한 "
-"후, 재시도 해 보시기 바랍니다."
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "치구 %s 님을 추가할 수 없었습니다. 친구 수가 너무 많습니다. 한 명을 삭제한 후, 재시도 해 보시기 바랍니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:5099
-#: ../libpurple/protocols/oscar/oscar.c:5114
+#: ../libgaim/protocols/oscar/oscar.c:5002
+#: ../libgaim/protocols/oscar/oscar.c:5016
 msgid "(no name)"
 msgstr "(이름 없음)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5113
-#, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr "알 수 없는 이유로 명령 적용에 실패했습니다."
+#: ../libgaim/protocols/oscar/oscar.c:5016
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
+msgstr "알 수 없는 이유에 의해 친구 %s 을(를) 추가할 수 없었습니다. 일반적인 문제로서는, 친구 목록에 추가 가능한 친구 수를 초과한 경우일 수 있습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:5230
+#: ../libgaim/protocols/oscar/oscar.c:5109
 #, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr ""
-"사용자 %s 님이 나를 친구 목록에 추가하는 것을 허가했습니다. 그들을 추가하시겠"
-"습니까?"
+msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
+msgstr "사용자 %s 님이 나를 친구 목록에 추가하는 것을 허가했습니다. 그들을 추가하시겠습니까?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libgaim/protocols/oscar/oscar.c:5115
 msgid "Authorization Given"
 msgstr "승인을 받았습니다."
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libgaim/protocols/oscar/oscar.c:5193
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "사용자 %s 님은 친구 목록 추가에 대한 내 요구를 승인했습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:5312
+#: ../libgaim/protocols/oscar/oscar.c:5194
 msgid "Authorization Granted"
 msgstr "승인을 받았습니다."
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5315
+#: ../libgaim/protocols/oscar/oscar.c:5197
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "사용자 %s 님은 다음의 이유로 친구 목록 추가에 대한 내 요구를 거부했습니다.:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5316
+#: ../libgaim/protocols/oscar/oscar.c:5198
 msgid "Authorization Denied"
 msgstr "인증이 거부되었습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:5352
-#: ../libpurple/protocols/toc/toc.c:1371
+#: ../libgaim/protocols/oscar/oscar.c:5234
+#: ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "교환(_E):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5392
+#: ../libgaim/protocols/oscar/oscar.c:5274
 msgid "Invalid chat name specified."
 msgstr "잘못된 대화명이 지정되었습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:5461
+#: ../libgaim/protocols/oscar/oscar.c:5344
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"IM 이미지가 전송되지 못했습니다. AIM 대화로는 IM 이미지를 보낼 수 없습니다."
+msgstr "IM 이미지가 전송되지 못했습니다. AIM 대화로는 IM 이미지를 보낼 수 없습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:5623
-#: ../libpurple/protocols/oscar/oscar.c:5628
+#: ../libgaim/protocols/oscar/oscar.c:5516
+#: ../libgaim/protocols/oscar/oscar.c:5521
 msgid "Away Message"
 msgstr "자리 비움 메시지"
 
-#: ../libpurple/protocols/oscar/oscar.c:5628
+#: ../libgaim/protocols/oscar/oscar.c:5521
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(가져오는 중)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5828
-msgid "iTunes Music Store Link"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libgaim/protocols/oscar/oscar.c:5834
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 님에 대한 친구 코멘트"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libgaim/protocols/oscar/oscar.c:5835
 msgid "Buddy Comment:"
 msgstr "친구 코멘트:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5984
+#: ../libgaim/protocols/oscar/oscar.c:5881
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s 을(를) 이용한 Direct IM 접속의 시작을 선택했습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:5988
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
-msgstr ""
-"이유는, 내 IP 주소를 표시하게 되기 때문입니다. 이는 개인 정보에 관한 위험성"
-"이 커집니다. 계속 하시겠습니까?"
+#: ../libgaim/protocols/oscar/oscar.c:5885
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "이유는, 내 IP 주소를 표시하게 되기 때문입니다. 이는 개인 정보에 관한 위험성이 커집니다. 계속 하시겠습니까?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5994
-#: ../libpurple/protocols/oscar/peer.c:1047
+#: ../libgaim/protocols/oscar/oscar.c:5889
 msgid "C_onnect"
 msgstr "접속(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6029
+#: ../libgaim/protocols/oscar/oscar.c:5924
 msgid "Get AIM Info"
 msgstr "AIM 정보 가져오기"
 
-#: ../libpurple/protocols/oscar/oscar.c:6035
+#: ../libgaim/protocols/oscar/oscar.c:5930
 msgid "Edit Buddy Comment"
 msgstr "친구 코멘트 편집"
 
-#: ../libpurple/protocols/oscar/oscar.c:6043
+#: ../libgaim/protocols/oscar/oscar.c:5938
 msgid "Get Status Msg"
 msgstr "상태 메시지 가져오기"
 
-#: ../libpurple/protocols/oscar/oscar.c:6056
+#: ../libgaim/protocols/oscar/oscar.c:5951
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libgaim/protocols/oscar/oscar.c:5973
 msgid "Re-request Authorization"
 msgstr "승인 재요청"
 
-#: ../libpurple/protocols/oscar/oscar.c:6137
+#: ../libgaim/protocols/oscar/oscar.c:6032
 msgid "Require authorization"
 msgstr "승인이 필요합니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:6140
+#: ../libgaim/protocols/oscar/oscar.c:6035
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web aware (이것을 사용하면 스팸을 수신하게 됩니다!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libgaim/protocols/oscar/oscar.c:6040
 msgid "ICQ Privacy Options"
 msgstr "ICQ 개인 설정"
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libgaim/protocols/oscar/oscar.c:6057
 msgid "The new formatting is invalid."
 msgstr "새 서식이 잘못되었습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:6165
+#: ../libgaim/protocols/oscar/oscar.c:6058
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "아이디의 서식은 대문자와 공백 문자만 변경할 수 있습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:6218
+#: ../libgaim/protocols/oscar/oscar.c:6065
+msgid "New screen name formatting:"
+msgstr "새 아이디 서식:"
+
+#: ../libgaim/protocols/oscar/oscar.c:6121
 msgid "Change Address To:"
 msgstr "변경할 주소:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6264
+#: ../libgaim/protocols/oscar/oscar.c:6166
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>승인을 기다리고 있지 않습니다.</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6267
+#: ../libgaim/protocols/oscar/oscar.c:6169
 msgid "You are awaiting authorization from the following buddies"
 msgstr "다음 친구로부터의 승인을 기다리고 있습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:6268
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"오른쪽 클릭하여 \"승인 재요청\" 을 선택하면, 이들의 친구로부터 인증을 재요청"
-"할 수 있습니다."
+#: ../libgaim/protocols/oscar/oscar.c:6170
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "오른쪽 클릭하여 \"승인 재요청\" 을 선택하면, 이들의 친구로부터 인증을 재요청할 수 있습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:6285
+#: ../libgaim/protocols/oscar/oscar.c:6187
 msgid "Find Buddy by E-Mail"
 msgstr "이메일로부터 친구 찾기"
 
-#: ../libpurple/protocols/oscar/oscar.c:6286
+#: ../libgaim/protocols/oscar/oscar.c:6188
 msgid "Search for a buddy by e-mail address"
 msgstr "이메일 주소로부터 친구를 찾습니다."
 
-#: ../libpurple/protocols/oscar/oscar.c:6287
+#: ../libgaim/protocols/oscar/oscar.c:6189
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "검색할 친구의 이메일 주소를 입력해 주십시오."
 
-#: ../libpurple/protocols/oscar/oscar.c:6290
+#: ../libgaim/protocols/oscar/oscar.c:6192
 msgid "_Search"
 msgstr "검색(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6448
+#: ../libgaim/protocols/oscar/oscar.c:6361
 msgid "Set User Info (URL)..."
 msgstr "사용자 정보 설정(URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6459
+#: ../libgaim/protocols/oscar/oscar.c:6372
 msgid "Change Password (URL)"
 msgstr "비밀번호 변경 (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6463
+#: ../libgaim/protocols/oscar/oscar.c:6376
 msgid "Configure IM Forwarding (URL)"
 msgstr "IM 포워딩 (URL) 설정"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libgaim/protocols/oscar/oscar.c:6386
 msgid "Set Privacy Options..."
 msgstr "개인 설정 추가..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6480
+#: ../libgaim/protocols/oscar/oscar.c:6393
+msgid "Format Screen Name..."
+msgstr "아이디 서식..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6397
 msgid "Confirm Account"
 msgstr "계정 확인"
 
-#: ../libpurple/protocols/oscar/oscar.c:6484
+#: ../libgaim/protocols/oscar/oscar.c:6401
 msgid "Display Currently Registered E-Mail Address"
 msgstr "현재 등록되어 있는 이메일 주소 표시"
 
-#: ../libpurple/protocols/oscar/oscar.c:6488
+#: ../libgaim/protocols/oscar/oscar.c:6405
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "현재 등록되어 있는 이메일 주소 변경..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6495
+#: ../libgaim/protocols/oscar/oscar.c:6412
 msgid "Show Buddies Awaiting Authorization"
 msgstr "승인을 기다리는 친구 표시"
 
-#: ../libpurple/protocols/oscar/oscar.c:6501
+#: ../libgaim/protocols/oscar/oscar.c:6418
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "이메일로 친구 검색..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6506
+#: ../libgaim/protocols/oscar/oscar.c:6423
 msgid "Search for Buddy by Information"
 msgstr "정보로 친구 검색..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6574
+#: ../libgaim/protocols/oscar/oscar.c:6491
 msgid "Use recent buddies group"
 msgstr "현재의 그룹 이용"
 
-#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libgaim/protocols/oscar/oscar.c:6494
 msgid "Show how long you have been idle"
 msgstr "대기 중 시간 표시"
 
-#: ../libpurple/protocols/oscar/oscar.c:6732
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"파일 전송은 항상 ICQ 프록시 서버 이용\n"
-"(속도는 느리지만, IP 주소가 노출되지 않습니다.)"
-
-#: ../libpurple/protocols/oscar/peer.c:699
+#: ../libgaim/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Direct IM 으로 %s 은(는) %s:%hu 에게 질의가 들어와 있습니다."
 
-#: ../libpurple/protocols/oscar/peer.c:784
+#: ../libgaim/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s:%hu (으)로 연락처를 시험하고 있습니다."
 
-#: ../libpurple/protocols/oscar/peer.c:858
-#, c-format
+#: ../libgaim/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
 msgstr "프록시 서버를 통해 연락처를 시험하고 있습니다."
 
-#: ../libpurple/protocols/oscar/peer.c:1035
+#: ../libgaim/protocols/oscar/peer.c:1010
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 은(는) 직접 %s 에 접속하도록 요구했습니다."
 
-#: ../libpurple/protocols/oscar/peer.c:1039
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"이를 수행하기 위해서는 2대의 컴퓨터를 직접 연결해야 하며, IM 이미지에 필요합"
-"니다. IP 주소가 노출되기 때문에, 개인에 대한 위험 사고가 발생할 수도 있습니"
-"다."
+#: ../libgaim/protocols/oscar/peer.c:1014
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "이를 수행하기 위해서는 2대의 컴퓨터를 직접 연결해야 하며, IM 이미지에 필요합니다. IP 주소가 노출되기 때문에, 개인에 대한 위험 사고가 발생할 수도 있습니다."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
+#: ../libgaim/protocols/oscar/peer.c:1020
+msgid "_Connect"
+msgstr "접속(_C)"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "주요 정보"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
+#: ../libgaim/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "개인 정보"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
+#: ../libgaim/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "QQ 번호"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
+#: ../libgaim/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "국가/지역"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
+#: ../libgaim/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "시/도"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
+#: ../libgaim/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "별자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
+#: ../libgaim/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "십이간지"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
+#: ../libgaim/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "혈액형"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
+#: ../libgaim/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "학력"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
+#: ../libgaim/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "이메일"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
+#: ../libgaim/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "우편번호"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
+#: ../libgaim/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "휴대 전화"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
+#: ../libgaim/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "전화 번호"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
+#: ../libgaim/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "물병자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
+#: ../libgaim/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "물고기자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
+#: ../libgaim/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "양치기자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
+#: ../libgaim/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "목동자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: ../libgaim/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "쌍동이자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: ../libgaim/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "게자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: ../libgaim/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "사자자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: ../libgaim/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "처녀자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: ../libgaim/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "천칭자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
+#: ../libgaim/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "전갈자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
+#: ../libgaim/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "궁수자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
+#: ../libgaim/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "양자리"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: ../libgaim/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "자(쥐)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: ../libgaim/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "축(소)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: ../libgaim/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "인(호랑이)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: ../libgaim/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "묘(토끼)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: ../libgaim/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "진(용)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: ../libgaim/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "사(뱀)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: ../libgaim/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "오(말)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: ../libgaim/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "미(양)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: ../libgaim/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "신(원숭이)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
+#: ../libgaim/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "유(닭)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
+#: ../libgaim/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "술(개)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
+#: ../libgaim/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "해(돼지)"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
+#: ../libgaim/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "기타"
 
-#: ../libpurple/protocols/qq/buddy_info.c:522
-#: ../libpurple/protocols/qq/buddy_info.c:523
+#: ../libgaim/protocols/qq/buddy_info.c:481
+#: ../libgaim/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
 msgstr "정보 변경"
 
-#: ../libpurple/protocols/qq/buddy_info.c:524
+#: ../libgaim/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "정보 갱신"
 
-#: ../libpurple/protocols/qq/buddy_info.c:548
+#: ../libgaim/protocols/qq/buddy_info.c:506
 msgid "Your information has been updated"
 msgstr "정보를 변경했습니다."
 
-#: ../libpurple/protocols/qq/buddy_info.c:601
-#, c-format
-msgid ""
-"Setting custom faces is not currently supported. Please choose an image from "
-"%s."
-msgstr ""
-"사용자 이모티콘을 설정은 현재 지원되지 않고 있습니다. 다음으로부터 이미지를 "
-"선택해 주십시오: %s."
+#: ../libgaim/protocols/qq/buddy_info.c:565
+msgid "Setting custom faces is not currently supported. Please choose an image from %s."
+msgstr "사용자 이모티콘을 설정은 현재 지원되지 않고 있습니다. 다음으로부터 이미지를 선택해 주십시오: %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
+#: ../libgaim/protocols/qq/buddy_info.c:582
+#: ../libgaim/protocols/qq/buddy_info.c:595
 msgid "Invalid QQ Face"
 msgstr "잘못된 QQ 이모티콘입니다."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libgaim/protocols/qq/buddy_opt.c:207
+#: ../libgaim/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "%d 개의 요구를 거부했습니다."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+#: ../libgaim/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "이유를 입력해 주십시오:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/buddy_opt.c:210
 msgid "Reject request"
 msgstr "요구 거부"
 
-#. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
+#: ../libgaim/protocols/qq/buddy_opt.c:211
+#: ../libgaim/protocols/qq/group_opt.c:139
 msgid "Sorry, you are not my type..."
 msgstr "죄송합니다, 제 스타일이 아닙니다..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
-#, fuzzy
-msgid "Add buddy with auth request failed"
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/group_im.c:136
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85
+#: ../libgaim/protocols/qq/sys_msg.c:228
+msgid "Reject"
+msgstr "거부"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:272
+msgid "Add buddy with auth request fails"
 msgstr "인증 첨부 친구의 추가에 실패했습니다."
 
-#. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
+#: ../libgaim/protocols/qq/buddy_opt.c:303
 msgid "You have successfully removed a buddy"
 msgstr "친구를 삭제했습니다."
 
-#. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
-#, fuzzy
-msgid "You have successfully removed yourself from your friend's buddy list"
+#: ../libgaim/protocols/qq/buddy_opt.c:331
+msgid "You have successfully removed yourself from a buddy"
 msgstr "친구 목록으로부터 나 자신을 삭제했습니다."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libgaim/protocols/qq/buddy_opt.c:395
 #, c-format
 msgid "User %d needs authentication"
 msgstr "사용자 %d 님은 인증이 필요합니다."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "이곳에 요청 사항을 입력하십시오."
 
-#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
+#: ../libgaim/protocols/qq/buddy_opt.c:398
+#: ../libgaim/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "제 친구가 되어 주시지 않겠습니까?"
 
-#. multiline
-#. masked
-#. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libgaim/protocols/qq/buddy_opt.c:399
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_opt.c:140
 msgid "Send"
 msgstr "보내기"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
-#, fuzzy, c-format
-msgid "You have added %d to buddy list"
+#: ../libgaim/protocols/qq/buddy_opt.c:406
+#, c-format
+msgid "You have added %d in buddy list"
 msgstr "%d 님을 친구 목록에 추가했습니다."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
+#: ../libgaim/protocols/qq/buddy_opt.c:503
 msgid "QQid Error"
 msgstr "QQid 오류"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
+#: ../libgaim/protocols/qq/buddy_opt.c:504
 msgid "Invalid QQid"
 msgstr "잘못된 QQid 입니다."
 
-#: ../libpurple/protocols/qq/group.c:65
+#: ../libgaim/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
+#: ../libgaim/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "그룹 ID"
 
-#: ../libpurple/protocols/qq/group.c:100
+#: ../libgaim/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "작성자"
 
-#: ../libpurple/protocols/qq/group.c:103
+#: ../libgaim/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "그룹 설명"
 
-#: ../libpurple/protocols/qq/group.c:109
+#: ../libgaim/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "인증"
 
-#: ../libpurple/protocols/qq/group.c:119
+#: ../libgaim/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
-#, fuzzy
-msgid "Please enter external group ID"
+#: ../libgaim/protocols/qq/group.c:120
+msgid "Please input external group ID"
 msgstr "외부 그룹 ID를 입력해 주십시오."
 
-#: ../libpurple/protocols/qq/group.c:121
+#: ../libgaim/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "영구적으로 사용 가능한 QQ 그룹만을 검색할 수 있습니다.\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
-#, fuzzy, c-format
-msgid "User %d requested to join group %d"
+#: ../libgaim/protocols/qq/group_im.c:122
+#, c-format
+msgid "User %d applied to join group %d"
 msgstr "사용자 %d 님이 그룹 %d 에 참가했습니다."
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
+#: ../libgaim/protocols/qq/group_im.c:123
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/sys_msg.c:180
 #, c-format
 msgid "Reason: %s"
 msgstr "이유: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libgaim/protocols/qq/group_im.c:130
+#: ../libgaim/protocols/qq/group_im.c:174
+#: ../libgaim/protocols/qq/group_im.c:214
+#: ../libgaim/protocols/qq/group_im.c:249
+#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libgaim/protocols/qq/group_join.c:355
+#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libgaim/protocols/qq/group_opt.c:386
 msgid "QQ Qun Operation"
 msgstr "QQ Qun ì¡°ìž‘"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
+#: ../libgaim/protocols/qq/group_im.c:133
+#: ../libgaim/protocols/qq/group_opt.c:127
+#: ../libgaim/protocols/qq/sys_msg.c:87
+#: ../libgaim/protocols/qq/sys_msg.c:230
 msgid "Approve"
 msgstr "인증"
 
-#: ../libpurple/protocols/qq/group_im.c:180
-#, fuzzy, c-format
-msgid "Your request to join group %d has been rejected by admin %d"
+#: ../libgaim/protocols/qq/group_im.c:171
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
 msgstr "그룹 %d 에의 내 참가 요구가 관리자 %d 에 의해 거부되었습니다."
 
-#: ../libpurple/protocols/qq/group_im.c:221
-#, fuzzy, c-format
-msgid "Your request to join group %d has been approved by admin %d"
+#: ../libgaim/protocols/qq/group_im.c:212
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
 msgstr "그룹 %d 에의 내 참가 요구가 관리자 %d 에 의해 승인되었습니다."
 
-#: ../libpurple/protocols/qq/group_im.c:257
-#, fuzzy, c-format
-msgid "You [%d] have left group \"%d\""
+#: ../libgaim/protocols/qq/group_im.c:248
+#, c-format
+msgid "You [%d] has exit group \"%d\""
 msgstr "나 [%d] 은(는) 그룹 \"%d\" (으)로부터 퇴거했습니다."
 
-#: ../libpurple/protocols/qq/group_im.c:291
-#, fuzzy, c-format
-msgid "You [%d] have been added to group \"%d\""
+#: ../libgaim/protocols/qq/group_im.c:282
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
 msgstr "나 [%d] 은(는) 그룹 \"%d\" 에 추가되었습니다."
 
-#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libgaim/protocols/qq/group_im.c:283
 msgid "This group has been added to your buddy list"
 msgstr "이 그룹은 친구 목록에 추가되어 있습니다."
 
-#: ../libpurple/protocols/qq/group_internal.c:41
-#, fuzzy
-msgid "I am not a member"
+#: ../libgaim/protocols/qq/group_internal.c:41
+msgid "I am not member"
 msgstr "저는 멤버가 아닙니다."
 
-#: ../libpurple/protocols/qq/group_internal.c:44
+#: ../libgaim/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "저는 멤버입니다."
 
-#: ../libpurple/protocols/qq/group_internal.c:47
+#: ../libgaim/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "저는 가입 신청 중입니다."
 
-#: ../libpurple/protocols/qq/group_internal.c:50
+#: ../libgaim/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "저는 관리자입니다."
 
-#: ../libpurple/protocols/qq/group_internal.c:53
+#: ../libgaim/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "알 수 없는 상태"
 
-#: ../libpurple/protocols/qq/group_join.c:82
+#: ../libgaim/protocols/qq/group_join.c:80
 msgid "This group does not allow others to join"
 msgstr "이 그룹에서는 다른 사람들의 참가를 허가하지 않고 있습니다."
 
-#: ../libpurple/protocols/qq/group_join.c:233
-#, fuzzy
-msgid "You have successfully left the group"
+#: ../libgaim/protocols/qq/group_join.c:229
+msgid "You have successfully exited the group"
 msgstr "그룹으로부터 퇴거가 완료되었습니다."
 
-#: ../libpurple/protocols/qq/group_join.c:257
+#: ../libgaim/protocols/qq/group_join.c:253
 msgid "QQ Group Auth"
 msgstr "QQ 그룹 인증"
 
-#: ../libpurple/protocols/qq/group_join.c:258
-#, fuzzy
-msgid "Your authorization request has been accepted by the QQ server"
+#: ../libgaim/protocols/qq/group_join.c:254
+msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "인증 조작이 QQ 서버에 의해 허가되었습니다."
 
-#: ../libpurple/protocols/qq/group_join.c:329
-#, fuzzy
-msgid "You entered a group ID outside the acceptable range"
+#: ../libgaim/protocols/qq/group_join.c:325
+msgid "You inputted a group id outside the acceptable range"
 msgstr "입력한 그룹 ID는 범위 밖입니다."
 
-#: ../libpurple/protocols/qq/group_join.c:360
-#, fuzzy
-msgid "Are you sure you want to leave this Qun?"
-msgstr "정말 %s 을(를) 삭제하시겠습니까?"
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid "Are you sure to exit this Qun?"
+msgstr "이 Qun 을 종료하시겠습니까?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
+#: ../libgaim/protocols/qq/group_join.c:358
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -9856,170 +11870,176 @@ msgstr ""
 "주: 내가 작성자인 경우,\n"
 "이 조작에 의해 최종적으로 Qun 이 완전히 삭제됩니다."
 
-#: ../libpurple/protocols/qq/group_network.c:92
+#: ../libgaim/protocols/qq/group_join.c:361
+msgid "Go ahead"
+msgstr "계속하기"
+
+#: ../libgaim/protocols/qq/group_network.c:90
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "코드 [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:93
+#: ../libgaim/protocols/qq/group_network.c:91
 msgid "Group Operation Error"
 msgstr "그룹 조작 오류"
 
-#. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#, fuzzy
-msgid "Do you want to approve the request?"
+#: ../libgaim/protocols/qq/group_opt.c:124
+#: ../libgaim/protocols/qq/sys_msg.c:84
+msgid "Do you wanna approve the request?"
 msgstr "그 요청을 승인하시겠습니까?"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
-#, fuzzy
-msgid "Enter your reason:"
-msgstr "이유를 입력해 주십시오:"
-
-#: ../libpurple/protocols/qq/group_opt.c:235
-#, fuzzy
-msgid "You have successfully modified Qun member"
+#: ../libgaim/protocols/qq/group_opt.c:230
+msgid "You have successfully modify Qun member"
 msgstr "Qun 멤버 변경이 성공적으로 완료되었습니다."
 
-#: ../libpurple/protocols/qq/group_opt.c:305
-#, fuzzy
-msgid "You have successfully modified Qun information"
+#: ../libgaim/protocols/qq/group_opt.c:300
+msgid "You have successfully modify Qun information"
 msgstr "Qun 정보 변경을 성공적으로 완료했습니다."
 
-#: ../libpurple/protocols/qq/group_opt.c:392
+#: ../libgaim/protocols/qq/group_opt.c:387
 msgid "You have successfully created a Qun"
 msgstr "Qun 생성이 성공적으로 완료했습니다."
 
-#: ../libpurple/protocols/qq/group_opt.c:394
+#: ../libgaim/protocols/qq/group_opt.c:389
 msgid "Would you like to set up the Qun details now?"
 msgstr "지금 바로 Qun 의 상세 정보를 입력하시겠습니까?"
 
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libgaim/protocols/qq/group_opt.c:390
 msgid "Setup"
 msgstr "ìž…ë ¥"
 
-#: ../libpurple/protocols/qq/im.c:432
+#: ../libgaim/protocols/qq/im.c:423
 msgid "System Message"
 msgstr "시스템 메시지"
 
-#: ../libpurple/protocols/qq/im.c:576
-#, fuzzy
-msgid "Failed to send IM."
-msgstr "이름 가져오기에 실패했습니다: %s"
+#: ../libgaim/protocols/qq/im.c:567
+msgid "Server ACK"
+msgstr "서버 ACK"
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
-#, fuzzy
-msgid "Keep alive error"
-msgstr "읽는 중 오류"
+#: ../libgaim/protocols/qq/im.c:567
+msgid "Send IM fail\n"
+msgstr "메일 전송 오류\n"
 
-#: ../libpurple/protocols/qq/login_logout.c:426
-#, fuzzy
-msgid "Error requesting login token"
-msgstr "접속 생성 중 오류"
+#: ../libgaim/protocols/qq/keep_alive.c:85
+msgid "Keep alive error, seems connection lost!"
+msgstr "오류가 연속적으로 발생하고 있습니다. 접속이 끊어진 것 같습니다!"
 
-#: ../libpurple/protocols/qq/login_logout.c:506
+#: ../libgaim/protocols/qq/login_logout.c:408
+msgid "Request login token error!"
+msgstr "로그인 요청 오류!"
+
+#: ../libgaim/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "로그인 할 수 없습니다. 디버그 로그를 확인해 주십시오."
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
+#: ../libgaim/protocols/qq/qq.c:139
+#: ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2351
+#: ../libgaim/protocols/yahoo/yahoo.c:2378
+#: ../libgaim/protocols/yahoo/yahoo.c:2485
+#: ../libgaim/protocols/yahoo/yahoo.c:2506
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "접속할 수 없습니다."
 
-#: ../libpurple/protocols/qq/qq.c:186
+#: ../libgaim/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "알 수 없는 %d"
 
-#: ../libpurple/protocols/qq/qq.c:211
-#, fuzzy
-msgid "TCP Address"
-msgstr "IP 주소"
+#: ../libgaim/protocols/qq/qq.c:209
+#, c-format
+msgid "%s Address"
+msgstr "%s 주소"
 
-#: ../libpurple/protocols/qq/qq.c:213
-#, fuzzy
-msgid "UDP Address"
-msgstr "IP 주소"
-
-#: ../libpurple/protocols/qq/qq.c:242
+#: ../libgaim/protocols/qq/qq.c:240
 msgid "Level"
 msgstr "수준"
 
-#: ../libpurple/protocols/qq/qq.c:373
+#: ../libgaim/protocols/qq/qq.c:294
+msgid "QQ: Available"
+msgstr "QQ: 자리에 있음"
+
+#: ../libgaim/protocols/qq/qq.c:298
+msgid "QQ: Away"
+msgstr "QQ: 자리 비움"
+
+#: ../libgaim/protocols/qq/qq.c:302
+msgid "QQ: Invisible"
+msgstr "QQ: 숨은 상태"
+
+#: ../libgaim/protocols/qq/qq.c:306
+msgid "QQ: Offline"
+msgstr "QQ: 오프라인"
+
+#: ../libgaim/protocols/qq/qq.c:383
 msgid "Invalid name"
 msgstr "이름이 잘못되었습니다."
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libgaim/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>현재의 온라인</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libgaim/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>마지막 갱신</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libgaim/protocols/qq/qq.c:455
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>접속 모드</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libgaim/protocols/qq/qq.c:456
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>서버 IP</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libgaim/protocols/qq/qq.c:457
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>내 공용 IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libgaim/protocols/qq/qq.c:462
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>로그인 일시</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libgaim/protocols/qq/qq.c:463
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>마지막 로그인 IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libgaim/protocols/qq/qq.c:464
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>마지막 로그인 일시</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
+#: ../libgaim/protocols/qq/qq.c:468
 msgid "Login Information"
 msgstr "로그인 정보"
 
-#: ../libpurple/protocols/qq/qq.c:533
-#, fuzzy
-msgid "Set My Information"
-msgstr "서버 정보"
+#: ../libgaim/protocols/qq/qq.c:543
+msgid "Modify My Information"
+msgstr "내 정보 변경"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+#: ../libgaim/protocols/qq/qq.c:546
+#: ../libgaim/protocols/toc/toc.c:1700
 msgid "Change Password"
 msgstr "비밀번호 변경"
 
-#: ../libpurple/protocols/qq/qq.c:539
+#: ../libgaim/protocols/qq/qq.c:549
 msgid "Show Login Information"
 msgstr "로그인 정보 표시"
 
-#: ../libpurple/protocols/qq/qq.c:560
-#, fuzzy
-msgid "Leave this QQ Qun"
+#: ../libgaim/protocols/qq/qq.c:570
+msgid "Exit this QQ Qun"
 msgstr "이 QQ Qun 종료"
 
-#: ../libpurple/protocols/qq/qq.c:584
-#, fuzzy
-msgid "Block this buddy"
-msgstr "이 탭을 닫기"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10030,354 +12050,350 @@ msgstr "이 탭을 닫기"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libgaim/protocols/qq/qq.c:731
+#: ../libgaim/protocols/qq/qq.c:733
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ 프로토콜\t플러그인"
 
-#: ../libpurple/protocols/qq/qq.c:752
-#, fuzzy
-msgid "Connect using TCP"
-msgstr "접속 중입니다."
+#: ../libgaim/protocols/qq/qq.c:752
+msgid "Login in TCP"
+msgstr "TCP 로 로그인"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
+#: ../libgaim/protocols/qq/qq.c:755
+msgid "Login Hidden"
+msgstr "로그인 숨김"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:497
+msgid "Socket send error"
+msgstr "소켓 전송 오류"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:500
+msgid "Connection refused"
+msgstr "접속이 거부되었습니다."
+
+#: ../libgaim/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "소켓 오류"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: ../libgaim/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "소켓으로부터 읽을 수 없습니다."
 
-#: ../libpurple/protocols/qq/send_file.c:707
+#: ../libgaim/protocols/qq/send_file.c:706
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d 님이 파일 %s 을(를) 거절했습니다."
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
+#: ../libgaim/protocols/qq/send_file.c:709
+#: ../libgaim/protocols/qq/send_file.c:738
 msgid "File Send"
 msgstr "파일 보내기"
 
-#: ../libpurple/protocols/qq/send_file.c:736
+#: ../libgaim/protocols/qq/send_file.c:735
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d 님이 %s 의 전송을 취소했습니다."
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: ../libgaim/protocols/qq/sendqueue.c:122
 msgid "Connection lost"
 msgstr "접속을 닫았습니다."
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+#: ../libgaim/protocols/qq/sendqueue.c:130
 msgid "Login failed, no reply"
 msgstr "로그인에 실패했습니다. 응답 없음."
 
-#: ../libpurple/protocols/qq/sys_msg.c:110
-#, fuzzy
-msgid "Do you want to add this buddy?"
+#: ../libgaim/protocols/qq/sys_msg.c:103
+msgid "Do you wanna add this buddy?"
 msgstr "이 상대를 추가하시겠습니까?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
+#: ../libgaim/protocols/qq/sys_msg.c:155
 #, c-format
 msgid "You have been added by %s"
 msgstr "내가 %s 님에 의해 추가되었습니다."
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
+#: ../libgaim/protocols/qq/sys_msg.c:158
+msgid "Would like to add him?"
 msgstr "그를 추가하시겠습니까?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#, fuzzy, c-format
-msgid "%s has added you [%s] to his or her buddy list"
-msgstr "%s 님은 나를 친구 목록에 추가했습니다."
+#: ../libgaim/protocols/qq/sys_msg.c:164
+#, c-format
+msgid "%s has added you [%s]"
+msgstr "%s 님이 나 [%s] 을(를) 추가했습니다."
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
+#: ../libgaim/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "User %s rejected your request"
 msgstr "사용자 %s 님이 내 요청을 거부했습니다."
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
-#, fuzzy, c-format
-msgid "User %s approved your request"
+#: ../libgaim/protocols/qq/sys_msg.c:199
+#, c-format
+msgid "User %s has approved your request"
 msgstr "사용자 %s 님이 내 요청을 승인했습니다."
 
-#. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
-#, fuzzy, c-format
-msgid "%s wants to add you [%s] as a friend"
+#: ../libgaim/protocols/qq/sys_msg.c:222
+#, c-format
+msgid "%s wanna add you [%s] as friends"
 msgstr "%s 님이 나 [%s] 을(를) 친구로 추가하고 싶어 합니다."
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
+#: ../libgaim/protocols/qq/sys_msg.c:223
 #, c-format
 msgid "Message: %s"
 msgstr "메시지: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
+#: ../libgaim/protocols/qq/sys_msg.c:244
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s 님은 친구 목록에 없습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#: ../libgaim/protocols/qq/sys_msg.c:246
+msgid "Would you like to add him?"
+msgstr "그를 추가하시겠습니까?"
+
+#: ../libgaim/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "쓰기 연결을 닫았습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: ../libgaim/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>그룹명:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: ../libgaim/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes 그룹 ID:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libgaim/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "그룹 \"%s\" 정보"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libgaim/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "Notes 주소록 정보"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: ../libgaim/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "그룹을 회의에 초대..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: ../libgaim/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "Notes 주소록 정보 가져오기"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
+#: ../libgaim/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr "핸드쉐이크 전송 중입니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
+#: ../libgaim/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "핸드쉐이크 응답을 기다리고 있습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
+#: ../libgaim/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "핸드쉐이크 응답을 받았기 때문에, 로그인하고 있습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
+#: ../libgaim/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr "로그인 처리 응답을 기다리고 있습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: ../libgaim/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr "로그인 처리가 리다이렉트 되었습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
+#: ../libgaim/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr "강제적으로 로그인하고 있습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libgaim/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr "로그인 처리 응답을 받았습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: ../libgaim/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "서비스 개시"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
+#: ../libgaim/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "접속되었습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:1645
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
+msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Sametime 관리자가 서버 %s 에서 다음의 공지를 발표했습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:1650
+#: ../libgaim/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 관리자 공지"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: ../libgaim/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "접속 초기화"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libgaim/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "소켓으로부터 읽는 중 오류: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libgaim/protocols/sametime/sametime.c:1732
+#: ../libgaim/protocols/sametime/sametime.c:3745
 msgid "Unable to connect to host"
 msgstr "호스트에 접속할 수 없습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libgaim/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s (으)로부터의 공지"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: ../libgaim/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "회의를 폐회했습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: ../libgaim/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "메시지를 보낼 수 없습니다: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
+#: ../libgaim/protocols/sametime/sametime.c:2960
 msgid "Place Closed"
 msgstr "Place Closed"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libgaim/protocols/sametime/sametime.c:3251
 msgid "Microphone"
 msgstr "마이크"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libgaim/protocols/sametime/sametime.c:3252
 msgid "Speakers"
 msgstr "스피커"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libgaim/protocols/sametime/sametime.c:3253
 msgid "Video Camera"
 msgstr "비디오 카메라"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libgaim/protocols/sametime/sametime.c:3257
+msgid "File Transfer"
+msgstr "파일 전송"
+
+#: ../libgaim/protocols/sametime/sametime.c:3291
+#: ../libgaim/protocols/sametime/sametime.c:4165
 msgid "Supports"
 msgstr "지원"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libgaim/protocols/sametime/sametime.c:3296
+#: ../libgaim/protocols/sametime/sametime.c:4139
 msgid "External User"
 msgstr "외부 사용자"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libgaim/protocols/sametime/sametime.c:3402
 msgid "Create conference with user"
 msgstr "사용자를 포함한 회의 생성"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libgaim/protocols/sametime/sametime.c:3403
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
-msgstr ""
-"새로운 회의로 상정할 주제를 입력하고, %s 님에게 초대 메시지를 보내 주십시오."
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgstr "새로운 회의로 상정할 주제를 입력하고, %s 님에게 초대 메시지를 보내 주십시오."
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libgaim/protocols/sametime/sametime.c:3407
 msgid "New Conference"
 msgstr "새 회의"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libgaim/protocols/sametime/sametime.c:3409
 msgid "Create"
 msgstr "생성"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libgaim/protocols/sametime/sametime.c:3473
 msgid "Available Conferences"
 msgstr "참가 가능한 회의"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libgaim/protocols/sametime/sametime.c:3479
 msgid "Create New Conference..."
 msgstr "새 회의 생성..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libgaim/protocols/sametime/sametime.c:3486
 msgid "Invite user to a conference"
 msgstr "회의에 초대"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libgaim/protocols/sametime/sametime.c:3487
 #, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr ""
-"다음 목록으로부터 사용자 %s 님을 초대할 회의를 선택해 주십시오. 새 회의를 생"
-"성할 경우에는 \"새 회의 생성\" 을 선택해 주십시오."
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "다음 목록으로부터 사용자 %s 님을 초대할 회의를 선택해 주십시오. 새 회의를 생성할 경우에는 \"새 회의 생성\" 을 선택해 주십시오."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libgaim/protocols/sametime/sametime.c:3492
 msgid "Invite to Conference"
 msgstr "회의에 초대"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libgaim/protocols/sametime/sametime.c:3582
 msgid "Invite to Conference..."
 msgstr "회의에 초대..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libgaim/protocols/sametime/sametime.c:3587
 msgid "Send TEST Announcement"
 msgstr "TEST 공지 전송"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4434
-msgid "Topic:"
-msgstr "주제:"
-
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libgaim/protocols/sametime/sametime.c:3634
 msgid "No Sametime Community Server specified"
 msgstr "Sametime 커뮤니티 서버를 지정해 주십시오."
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libgaim/protocols/sametime/sametime.c:3656
 #, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr ""
-"계정 %s 에 대한 호스트명 또는 IP 주소가 지정되어 있지 않습니다. 다음 빈 칸을 "
-"입력한 후, 로그인 처리를 계속하시기 바랍니다."
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "계정 %s 에 대한 호스트명 또는 IP 주소가 지정되어 있지 않습니다. 다음 빈 칸을 입력한 후, 로그인 처리를 계속하시기 바랍니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libgaim/protocols/sametime/sametime.c:3661
 msgid "Meanwhile Connection Setup"
 msgstr "접속 설정"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libgaim/protocols/sametime/sametime.c:3662
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime 커뮤니티 서버를 지정해 주십시오."
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4368
-msgid "Connect"
-msgstr "접속"
-
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libgaim/protocols/sametime/sametime.c:4155
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "알 수 없음 (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libgaim/protocols/sametime/sametime.c:4157
 msgid "Last Known Client"
 msgstr "마지막 인식 클라이언트"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libgaim/protocols/sametime/sametime.c:4321
+#: ../libgaim/protocols/sametime/sametime.c:5516
 msgid "User Name"
 msgstr "사용자명"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libgaim/protocols/sametime/sametime.c:4324
+#: ../libgaim/protocols/sametime/sametime.c:5519
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libgaim/protocols/sametime/sametime.c:4348
 msgid "An ambiguous user ID was entered"
 msgstr "모호한 사용자 ID 가 지정되었습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libgaim/protocols/sametime/sametime.c:4349
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"아마도 ID '%s' 은(는) 다음에 표시하는 사용자의 누군가를 참조하고 있는 것 같습"
-"니다. 친구 목록에 추가할 타당한 사용자를 다음 목록에서 선택해 주십시오."
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "아마도 ID '%s' 은(는) 다음에 표시하는 사용자의 누군가를 참조하고 있는 것 같습니다. 친구 목록에 추가할 타당한 사용자를 다음 목록에서 선택해 주십시오."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: ../libgaim/protocols/sametime/sametime.c:4354
 msgid "Select User"
 msgstr "사용자 선택"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libgaim/protocols/sametime/sametime.c:4438
 msgid "Unable to add user: user not found"
 msgstr "사용자를 추가할 수 없습니다: 사용자를 찾을 수 없습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libgaim/protocols/sametime/sametime.c:4440
 #, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
-msgstr ""
-"ID '%s' 에 해당하는 사용자가 Sametime 커뮤니티 안에는 없었습니다. 친구 목록에"
-"서 이 항목을 삭제했습니다."
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "ID '%s' 에 해당하는 사용자가 Sametime 커뮤니티 안에는 없었습니다. 친구 목록에서 이 항목을 삭제했습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libgaim/protocols/sametime/sametime.c:4445
+msgid "Unable to add user"
+msgstr "사용자를 추가할 수 없습니다."
+
+#: ../libgaim/protocols/sametime/sametime.c:5031
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10386,263 +12402,208 @@ msgstr ""
 "파일 %s 을(를) 읽는 중 오류: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libgaim/protocols/sametime/sametime.c:5166
 msgid "Remotely Stored Buddy List"
 msgstr "리모트 친구 목록"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libgaim/protocols/sametime/sametime.c:5171
 msgid "Buddy List Storage Mode"
 msgstr "친구 목록 저장 모드"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libgaim/protocols/sametime/sametime.c:5174
 msgid "Local Buddy List Only"
 msgstr "로컬 친구 목록만"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libgaim/protocols/sametime/sametime.c:5176
 msgid "Merge List from Server"
 msgstr "서버로부터 친구 목록 병합"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libgaim/protocols/sametime/sametime.c:5178
 msgid "Merge and Save List to Server"
 msgstr "친구 목록을 병합하여 서버에 저장"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libgaim/protocols/sametime/sametime.c:5180
 msgid "Synchronize List with Server"
 msgstr "서버의 친구 목록과 동기"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libgaim/protocols/sametime/sametime.c:5229
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "계정 %s 의 Sametime 목록 가져오기"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libgaim/protocols/sametime/sametime.c:5268
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "계정 %s 의 Sametime 목록 내보내기"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libgaim/protocols/sametime/sametime.c:5321
 msgid "Unable to add group: group exists"
 msgstr "그룹을 추가할 수 없습니다: 그룹이 이미 존재합니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libgaim/protocols/sametime/sametime.c:5322
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "이미 '%s' 이름의 그룹이 친구 목록에 있습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libgaim/protocols/sametime/sametime.c:5325
+#: ../libgaim/protocols/sametime/sametime.c:5454
 msgid "Unable to add group"
 msgstr "그룹을 추가할 수 없었습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libgaim/protocols/sametime/sametime.c:5384
 msgid "Possible Matches"
 msgstr "가능성 있는 일치"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libgaim/protocols/sametime/sametime.c:5400
 msgid "Notes Address Book group results"
 msgstr "Notes 주소록 그룹 결과"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libgaim/protocols/sametime/sametime.c:5401
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr ""
-"아마도 ID '%s' 은(는) 다음에 표시하는 Notes 주소록의 어느 그룹을 참조하고 있"
-"는 것 같습니다. 친구 목록에 추가할 타당한 그룹을 다음 목록에서 선택해 주십시"
-"오."
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "아마도 ID '%s' 은(는) 다음에 표시하는 Notes 주소록의 어느 그룹을 참조하고 있는 것 같습니다. 친구 목록에 추가할 타당한 그룹을 다음 목록에서 선택해 주십시오."
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: ../libgaim/protocols/sametime/sametime.c:5406
 msgid "Select Notes Address Book"
 msgstr "Notes 주소록 선택"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libgaim/protocols/sametime/sametime.c:5448
 msgid "Unable to add group: group not found"
 msgstr "그룹을 추가할 수 없습니다: 찾을 수 없습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libgaim/protocols/sametime/sametime.c:5450
 #, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
-msgstr ""
-"ID '%s' 에 해당하는 그룹이 Sametime 커뮤니티 Notes 주소록 안에는 없었습니다."
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgstr "ID '%s' 에 해당하는 그룹이 Sametime 커뮤니티 Notes 주소록 안에는 없었습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libgaim/protocols/sametime/sametime.c:5491
 msgid "Notes Address Book Group"
 msgstr "Notes 주소록 그룹"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr ""
-"다음 빈 칸에 추가할 Notes 주소록 그룹명을 입력하고, 친구 목록에 그 그룹의 멤"
-"버를 추가해 주십시오."
+#: ../libgaim/protocols/sametime/sametime.c:5492
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgstr "다음 빈 칸에 추가할 Notes 주소록 그룹명을 입력하고, 친구 목록에 그 그룹의 멤버를 추가해 주십시오."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libgaim/protocols/sametime/sametime.c:5540
 #, c-format
 msgid "Search results for '%s'"
 msgstr "'%s' 검색 결과"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libgaim/protocols/sametime/sametime.c:5541
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-"아마도 ID '%s' 은(는) 다음에 표시하는 어느 사용자를 참조하고 있는 것 같습니"
-"다. 이 사용자들을 친구 목록에 추가하거나 또는 다음의 동작 버튼을 선택하여 그"
-"들에게 메시지를 보내는 것이 좋을 것 같습니다."
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "아마도 ID '%s' 은(는) 다음에 표시하는 어느 사용자를 참조하고 있는 것 같습니다. 이 사용자들을 친구 목록에 추가하거나 또는 다음의 동작 버튼을 선택하여 그들에게 메시지를 보내는 것이 좋을 것 같습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:762
-msgid "Search Results"
-msgstr "검색 결과"
-
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libgaim/protocols/sametime/sametime.c:5573
 msgid "No matches"
 msgstr "찾을 수 없습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libgaim/protocols/sametime/sametime.c:5574
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Sametime 커뮤니티에는 ID '%s' 와(과) 일치하는 사용자가 없었습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libgaim/protocols/sametime/sametime.c:5578
 msgid "No Matches"
 msgstr "찾을 수 없습니다."
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libgaim/protocols/sametime/sametime.c:5615
 msgid "Search for a user"
 msgstr "사용자 검색"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr ""
-"다음 빈 칸에 이름 또는 ID 의 일부분을 입력하고, Sametime 커뮤니티에 있는 사용"
-"자를 검색해 주십시오."
+#: ../libgaim/protocols/sametime/sametime.c:5616
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "다음 빈 칸에 이름 또는 ID 의 일부분을 입력하고, Sametime 커뮤니티에 있는 사용자를 검색해 주십시오."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libgaim/protocols/sametime/sametime.c:5619
 msgid "User Search"
 msgstr "사용자 검색"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libgaim/protocols/sametime/sametime.c:5631
 msgid "Import Sametime List..."
 msgstr "Sametime 목록 가져오기..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libgaim/protocols/sametime/sametime.c:5635
 msgid "Export Sametime List..."
 msgstr "Sametime 목록 내보내기..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libgaim/protocols/sametime/sametime.c:5639
 msgid "Add Notes Address Book Group..."
 msgstr "Notes 주소록 그룹 추가..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libgaim/protocols/sametime/sametime.c:5643
 msgid "User Search..."
 msgstr "사용자 검색..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libgaim/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "강제적으로 로그인 (서버로부터의 리다이렉트 무시)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libgaim/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "클라이언트 정보 숨김"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
+#: ../libgaim/protocols/silc/buddy.c:52
+#: ../libgaim/protocols/silc/buddy.c:420
+#: ../libgaim/protocols/silc/buddy.c:545
+#: ../libgaim/protocols/silc/buddy.c:711
+#: ../libgaim/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "사용자 %s 님은 네트워크 상에 존재하지 않습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
+#: ../libgaim/protocols/silc/buddy.c:53
+#: ../libgaim/protocols/silc/buddy.c:115
+#: ../libgaim/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:124
+#: ../libgaim/protocols/silc/buddy.c:129
+#: ../libgaim/protocols/silc/buddy.c:134
+#: ../libgaim/protocols/silc/buddy.c:139
+#: ../libgaim/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "키 동의"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
+#: ../libgaim/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "키 동의를 실행할 수 없습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
+#: ../libgaim/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "키 동의하는 동안 오류가 발생했습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "키 동의에 실패했습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
+#: ../libgaim/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "키 동의하는 동안 시간이 초과되었습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
+#: ../libgaim/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "키 동의가 중단되었습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
+#: ../libgaim/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "이미 키 동의가 시작되었습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
+#: ../libgaim/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "키 동의를 자기자신으로는 시작할 수 없습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
+#: ../libgaim/protocols/silc/buddy.c:258
+#: ../libgaim/protocols/silc/buddy.c:388
+#: ../libgaim/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "리모트 사용자는 네트워크 등에 존재하지 않습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
+#: ../libgaim/protocols/silc/buddy.c:294
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
 msgstr "%s 님으로부터 키 동의 요청을 받았습니다. 동의하시겠습니까?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
+#: ../libgaim/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10653,920 +12614,671 @@ msgstr ""
 "리모트 호스트: %s\n"
 "리모트 포트: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
+#: ../libgaim/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "키 동의 요청"
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
+#: ../libgaim/protocols/silc/buddy.c:387
+#: ../libgaim/protocols/silc/buddy.c:422
+#: ../libgaim/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "비밀번호 첨부 IM"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
+#: ../libgaim/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "IM 키를 설정할 수 없습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "IM 비밀번호 설정"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
+#: ../libgaim/protocols/silc/buddy.c:512
+#: ../libgaim/protocols/silc/buddy.c:547
+#: ../libgaim/protocols/silc/ops.c:1494
+#: ../libgaim/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "공개 키 가져오기"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
+#: ../libgaim/protocols/silc/buddy.c:548
+#: ../libgaim/protocols/silc/ops.c:1495
+#: ../libgaim/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "공개 키를 가져오지 못했습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libgaim/protocols/silc/buddy.c:634
+#: ../libgaim/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "공개 키 표시"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/chat.c:237
+#: ../libgaim/protocols/silc/buddy.c:635
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "공개 키를 읽어들이지 못했습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
+#: ../libgaim/protocols/silc/buddy.c:712
+#: ../libgaim/protocols/silc/ops.c:1087
+#: ../libgaim/protocols/silc/ops.c:1159
+#: ../libgaim/protocols/silc/ops.c:1294
+#: ../libgaim/protocols/silc/ops.c:1295
+#: ../libgaim/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "사용자 정보"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
+#: ../libgaim/protocols/silc/buddy.c:713
+#: ../libgaim/protocols/silc/ops.c:1160
+#: ../libgaim/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "사용자 정보를 가져오지 못했습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
+#: ../libgaim/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "친구 %s 은(는) 신뢰되지 않았습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/buddy.c:738
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"친구의 공개 키를 받을 때까지 친구 알림을 받을 수 없습니다. 공개 키를 가져오려"
-"면 [공개 키 가져오기...] 버튼을 눌러 주십시오."
+#: ../libgaim/protocols/silc/buddy.c:737
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "친구의 공개 키를 받을 때까지 친구 알림을 받을 수 없습니다. 공개 키를 가져오려면 [공개 키 가져오기...] 버튼을 눌러 주십시오."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libgaim/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "열기..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libgaim/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "친구 %s 은(는)네트워크 상에 존재하지 않습니다."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"친구를 추가하려면 공개 키를 가져와야 합니다. 공개 키를 가져오려면 [가져오"
-"기...] 버튼을 눌러 주십시오."
+#: ../libgaim/protocols/silc/buddy.c:1076
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "친구를 추가하려면 공개 키를 가져와야 합니다. 공개 키를 가져오려면 [가져오기...] 버튼을 눌러 주십시오."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: ../libgaim/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr "가져오기(_I).."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libgaim/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "타당한 사용자 선택"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"동일한 공개 키를 가진 사용자가 한 명 이상 있습니다. 친구 목록에 추가할 타당"
-"한 사용자를 목록에서 선택해 주십시오."
+#: ../libgaim/protocols/silc/buddy.c:1177
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "동일한 공개 키를 가진 사용자가 한 명 이상 있습니다. 친구 목록에 추가할 타당한 사용자를 목록에서 선택해 주십시오."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"동일한 이름을 가진 사용자가 한 명 이상 있습니다. 친구 목록에 추가할 타당한 사"
-"용자를 목록에서 선택해 주십시오."
+#: ../libgaim/protocols/silc/buddy.c:1179
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "동일한 이름을 가진 사용자가 한 명 이상 있습니다. 친구 목록에 추가할 타당한 사용자를 목록에서 선택해 주십시오."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "분리됨"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
-#: ../libpurple/protocols/silc10/silc.c:49
+#: ../libgaim/protocols/silc/buddy.c:1471
+#: ../libgaim/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "부적절"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
-#: ../libpurple/protocols/silc10/silc.c:51
+#: ../libgaim/protocols/silc/buddy.c:1475
+#: ../libgaim/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "깨워 주세요"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
-#: ../libpurple/protocols/silc10/silc.c:43
+#: ../libgaim/protocols/silc/buddy.c:1477
+#: ../libgaim/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "활동적"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libgaim/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "로봇"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
+#: ../libgaim/protocols/silc/buddy.c:1486
+#: ../libgaim/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
 msgstr "행복함"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
+#: ../libgaim/protocols/silc/buddy.c:1488
+#: ../libgaim/protocols/silc/silc.c:670
+#: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
 msgstr "슬픔"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
+#: ../libgaim/protocols/silc/buddy.c:1490
+#: ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr "언짢음"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
+#: ../libgaim/protocols/silc/buddy.c:1492
+#: ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr "질투남"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
+#: ../libgaim/protocols/silc/buddy.c:1494
+#: ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr "부끄러움"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
+#: ../libgaim/protocols/silc/buddy.c:1496
+#: ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr "무적"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
-#: ../libpurple/protocols/silc10/util.c:524
+#: ../libgaim/protocols/silc/buddy.c:1498
+#: ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
 msgstr "ì—°ì• "
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
+#: ../libgaim/protocols/silc/buddy.c:1500
+#: ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr "취침"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
+#: ../libgaim/protocols/silc/buddy.c:1502
+#: ../libgaim/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr "지루함"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
+#: ../libgaim/protocols/silc/buddy.c:1504
+#: ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr "흥분됨"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
+#: ../libgaim/protocols/silc/buddy.c:1506
+#: ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr "걱정됨"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
-#: ../libpurple/protocols/silc10/ops.c:1202
+#: ../libgaim/protocols/silc/buddy.c:1538
+#: ../libgaim/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "사용자 모드"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
-#: ../libpurple/protocols/silc10/ops.c:1219
+#: ../libgaim/protocols/silc/buddy.c:1550
+#: ../libgaim/protocols/silc/ops.c:1207
+msgid "Mood"
+msgstr "기분"
+
+#: ../libgaim/protocols/silc/buddy.c:1555
+#: ../libgaim/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "선호하는 연락처"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
-#: ../libpurple/protocols/silc10/ops.c:1224
+#: ../libgaim/protocols/silc/buddy.c:1560
+#: ../libgaim/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "선호하는 언어"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
-#: ../libpurple/protocols/silc10/ops.c:1229
+#: ../libgaim/protocols/silc/buddy.c:1565
+#: ../libgaim/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "장치"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
+#: ../libgaim/protocols/silc/buddy.c:1570
+#: ../libgaim/protocols/silc/ops.c:1234
+#: ../libgaim/protocols/silc/silc.c:736
+#: ../libgaim/protocols/silc/silc.c:738
 msgid "Timezone"
 msgstr "시간대"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
-#: ../libpurple/protocols/silc10/ops.c:1239
+#: ../libgaim/protocols/silc/buddy.c:1575
+#: ../libgaim/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "지리적 위치"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libgaim/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "IM 키 초기화"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libgaim/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "키 교환 첨부 IM"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libgaim/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "비밀번호 첨부 IM"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libgaim/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "공개 키 가져오기..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
-#: ../libpurple/protocols/silc10/ops.c:1624
+#: ../libgaim/protocols/silc/buddy.c:1660
+#: ../libgaim/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "사용자 강제 종료"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
-#: ../libpurple/protocols/silc10/chat.c:977
+#: ../libgaim/protocols/silc/buddy.c:1670
+#: ../libgaim/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "화이트보드에 그리기"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
+#: ../libgaim/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "Passphrase(_P):"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
+#: ../libgaim/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "채널 %s 은(는) 네트워크 상에 존재하지 않습니다."
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
+#: ../libgaim/protocols/silc/chat.c:81
+#: ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "채널 정보"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
+#: ../libgaim/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "채널 정보를 가져올 수 없습니다."
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
+#: ../libgaim/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>채널명:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
+#: ../libgaim/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>사용자 수:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
+#: ../libgaim/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>채널 설립자:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
+#: ../libgaim/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>채널 암호:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
+#: ../libgaim/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>채널 HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
+#: ../libgaim/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>채널 주제:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
+#: ../libgaim/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>채널 모드:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
-#: ../libpurple/protocols/silc10/chat.c:165
+#: ../libgaim/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>설립자 키 지문:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:166
+#: ../libgaim/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>설립자 키 Babbleprint:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
-#: ../libpurple/protocols/silc10/chat.c:236
+#: ../libgaim/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "채널 공개 키 추가"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
-#: ../libpurple/protocols/silc10/chat.c:291
+#: ../libgaim/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "공개 키 열기..."
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:401
+#: ../libgaim/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "채널 Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:430
-#: ../libpurple/protocols/silc10/chat.c:408
+#: ../libgaim/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "채널 공개 키 목록"
 
-#: ../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 "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"채널 인증은 인증되어 있지 않은 접근으로부터 채널을 보호하기 위해 사용합니다. "
-"그 인증 방식은 Passphrase 와 전자 서명을 기초로 하고 있습니다. Passphrase 가 "
-"설정되어 있으면 참가하기 위해 Passphrase 가 요구되고, 채널의 공개 키가 설정되"
-"어 있으면 공개 키 목록에 표시되어 있는 사용자만이 참가할 수 있습니다."
+#: ../libgaim/protocols/silc/chat.c:412
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "채널 인증은 인증되어 있지 않은 접근으로부터 채널을 보호하기 위해 사용합니다. 그 인증 방식은 Passphrase 와 전자 서명을 기초로 하고 있습니다. Passphrase 가 설정되어 있으면 참가하기 위해 Passphrase 가 요구되고, 채널의 공개 키가 설정되어 있으면 공개 키 목록에 표시되어 있는 사용자만이 참가할 수 있습니다."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
+#: ../libgaim/protocols/silc/chat.c:421
+#: ../libgaim/protocols/silc/chat.c:422
+#: ../libgaim/protocols/silc/chat.c:459
+#: ../libgaim/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "채널 인증"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
+#: ../libgaim/protocols/silc/chat.c:423
+#: ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "추가 / 삭제"
 
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc10/chat.c:581
+#: ../libgaim/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "그룹명"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
+#: ../libgaim/protocols/silc/chat.c:582
+#: ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:944
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:612
-#: ../libpurple/protocols/silc10/chat.c:596
+#: ../libgaim/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "채널 %s 의 개인 그룹명과 Passphrase 를 입력해 주십시오."
 
-#: ../libpurple/protocols/silc/chat.c:614
-#: ../libpurple/protocols/silc10/chat.c:598
+#: ../libgaim/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "개인 그룹 추가"
 
-#: ../libpurple/protocols/silc/chat.c:742
-#: ../libpurple/protocols/silc10/chat.c:726
+#: ../libgaim/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "사용자 제한"
 
-#: ../libpurple/protocols/silc/chat.c:743
-#: ../libpurple/protocols/silc10/chat.c:727
+#: ../libgaim/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr ""
-"채널에서 제한할 사용자를 설정해 주십시오. 0 으로 설정하면 사용자 제한이 초기"
-"화 됩니다."
+msgstr "채널에서 제한할 사용자를 설정해 주십시오. 0 으로 설정하면 사용자 제한이 초기화 됩니다."
 
-#: ../libpurple/protocols/silc/chat.c:907
-#: ../libpurple/protocols/silc10/chat.c:891
+#: ../libgaim/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "초대 목록"
 
-#: ../libpurple/protocols/silc/chat.c:912
-#: ../libpurple/protocols/silc10/chat.c:896
+#: ../libgaim/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "차단 목록"
 
-#: ../libpurple/protocols/silc/chat.c:920
-#: ../libpurple/protocols/silc10/chat.c:904
+#: ../libgaim/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "개인 그룹 추가"
 
-#: ../libpurple/protocols/silc/chat.c:933
-#: ../libpurple/protocols/silc10/chat.c:917
+#: ../libgaim/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "영속성 해제"
 
-#: ../libpurple/protocols/silc/chat.c:938
-#: ../libpurple/protocols/silc10/chat.c:922
+#: ../libgaim/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "영속성 설정"
 
-#: ../libpurple/protocols/silc/chat.c:946
-#: ../libpurple/protocols/silc10/chat.c:930
+#: ../libgaim/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "사용자 제한 설정"
 
-#: ../libpurple/protocols/silc/chat.c:952
-#: ../libpurple/protocols/silc10/chat.c:936
+#: ../libgaim/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "주제 제한 해제"
 
-#: ../libpurple/protocols/silc/chat.c:957
-#: ../libpurple/protocols/silc10/chat.c:941
+#: ../libgaim/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "주제 제한 설정"
 
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:948
+#: ../libgaim/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "개인 채널 해제"
 
-#: ../libpurple/protocols/silc/chat.c:969
-#: ../libpurple/protocols/silc10/chat.c:953
+#: ../libgaim/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "개인 채널 설정"
 
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:960
+#: ../libgaim/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "보안 채널 해제"
 
-#: ../libpurple/protocols/silc/chat.c:981
-#: ../libpurple/protocols/silc10/chat.c:965
+#: ../libgaim/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "보안 채널 설정"
 
-#: ../libpurple/protocols/silc/chat.c:1045
-#: ../libpurple/protocols/silc10/chat.c:1102
+#: ../libgaim/protocols/silc/chat.c:1034
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+msgid "You are channel founder on <I>%s</I>"
+msgstr "당신은 <I>%s</I> 채널의 설립자입니다."
+
+#: ../libgaim/protocols/silc/chat.c:1038
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I> 채널의 설립자는 <I>%s</I> 입니다."
+
+#: ../libgaim/protocols/silc/chat.c:1097
+#, c-format
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "개인 그룹에 참가하기 전에 채널 %s 에 참가해 주십시오."
 
-#: ../libpurple/protocols/silc/chat.c:1047
-#: ../libpurple/protocols/silc10/chat.c:1104
+#: ../libgaim/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "개인 그룹에 참가"
 
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1105
+#: ../libgaim/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "개인 그룹에 참가할 수 없습니다."
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libgaim/protocols/silc/chat.c:1294
+#: ../libgaim/protocols/silc/silc.c:1152
 msgid "Call Command"
 msgstr "명령 실행"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libgaim/protocols/silc/chat.c:1294
+#: ../libgaim/protocols/silc/silc.c:1152
 msgid "Cannot call command"
 msgstr "명령을 실행할 수 없습니다."
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libgaim/protocols/silc/chat.c:1295
+#: ../libgaim/protocols/silc/silc.c:1153
 msgid "Unknown command"
 msgstr "알 수 없는 명령입니다."
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
+#: ../libgaim/protocols/silc/ft.c:89
+#: ../libgaim/protocols/silc/ft.c:92
+#: ../libgaim/protocols/silc/ft.c:96
+#: ../libgaim/protocols/silc/ft.c:100
+#: ../libgaim/protocols/silc/ft.c:104
+#: ../libgaim/protocols/silc/ft.c:205
+#: ../libgaim/protocols/silc/ft.c:210
+#: ../libgaim/protocols/silc/ft.c:215
+#: ../libgaim/protocols/silc/ft.c:221
+#: ../libgaim/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "보안 파일 전송"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
+#: ../libgaim/protocols/silc/ft.c:90
+#: ../libgaim/protocols/silc/ft.c:93
+#: ../libgaim/protocols/silc/ft.c:97
+#: ../libgaim/protocols/silc/ft.c:101
+#: ../libgaim/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "파일 전송 중 오류"
 
-#: ../libpurple/protocols/silc/ft.c:87
-#, fuzzy
-msgid "Remote disconnected"
-msgstr "%s 님은 접속을 끊었습니다."
-
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
+#: ../libgaim/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "권한이 없습니다."
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
+#: ../libgaim/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "키 동의에 실패했습니다."
 
-#: ../libpurple/protocols/silc/ft.c:114
-#, fuzzy
-msgid "Connection timed out"
-msgstr "접속 시간이 초과되었습니다."
-
-#: ../libpurple/protocols/silc/ft.c:118
-#, fuzzy
-msgid "Creating connection failed"
-msgstr "접속 실패"
-
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
+#: ../libgaim/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "파일 전송 세션이 존재하지 않습니다."
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
+#: ../libgaim/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "파일 전송 세션이 활성화 되어 있지 않습니다."
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
+#: ../libgaim/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "이미 파일 전송이 시작되었습니다."
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
+#: ../libgaim/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "파일 전송에 필요한 키 동의를 실행할 수 없었습니다."
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
+#: ../libgaim/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "파일 전송을 시작할 수 없었습니다."
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
+#: ../libgaim/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "파일을 전송할 수 없습니다."
 
-#: ../libpurple/protocols/silc/ops.c:57
-#, fuzzy
-msgid "Error occurred"
-msgstr "오류"
-
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
+#: ../libgaim/protocols/silc/ops.c:554
+#: ../libgaim/protocols/silc/ops.c:563
+#: ../libgaim/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 은(는) <I>%s</I> 의 주제를 %s (으)로 변경했습니다."
 
-#: ../libpurple/protocols/silc/ops.c:617
-#: ../libpurple/protocols/silc10/ops.c:638
+#: ../libgaim/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 은(는) 채널 <I>%s</I> 의 모드를 %s (으)로 변경했습니다."
 
-#: ../libpurple/protocols/silc/ops.c:621
-#: ../libpurple/protocols/silc10/ops.c:642
+#: ../libgaim/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 은(는) 채널 <I>%s</I> 의 모든 모드를 삭제했습니다."
 
-#: ../libpurple/protocols/silc/ops.c:654
-#: ../libpurple/protocols/silc10/ops.c:675
+#: ../libgaim/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 은(는) <I>%s 의</I> 모드를 %s (으)로 설정했습니다."
 
-#: ../libpurple/protocols/silc/ops.c:662
-#: ../libpurple/protocols/silc10/ops.c:683
+#: ../libgaim/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 은(는) <I>%s 의</I> 모든 모드를 삭제했습니다."
 
-#: ../libpurple/protocols/silc/ops.c:691
-#: ../libpurple/protocols/silc10/ops.c:712
+#: ../libgaim/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "<I>%s</I> (으)로부터 <I>%s</I> (%s) 에 의해 퇴출되었습니다."
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
+#: ../libgaim/protocols/silc/ops.c:742
+#: ../libgaim/protocols/silc/ops.c:747
+#: ../libgaim/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "%s (%s) 에 의해 강제 종료되었습니다."
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
+#: ../libgaim/protocols/silc/ops.c:773
+#: ../libgaim/protocols/silc/ops.c:778
+#: ../libgaim/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "%s (%s) 에 의해 강제 종료되었습니다."
 
-#: ../libpurple/protocols/silc/ops.c:796
-#: ../libpurple/protocols/silc10/ops.c:829
+#: ../libgaim/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "서버 접속 해제"
 
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
+#: ../libgaim/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "개인 정보"
 
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
+#: ../libgaim/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "생일"
 
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
+#: ../libgaim/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "직위"
 
-#: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
+#: ../libgaim/protocols/silc/ops.c:1052
+#: ../libgaim/protocols/silc/silc.c:937
 msgid "Organization"
 msgstr "조직"
 
-#: ../libpurple/protocols/silc/ops.c:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
+#: ../libgaim/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "그룹"
 
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
+#: ../libgaim/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "비고"
 
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "대화에 참가"
 
-#: ../libpurple/protocols/silc/ops.c:1127
-#: ../libpurple/protocols/silc10/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "당신은 <I>%s</I> 채널의 설립자입니다."
-
-#: ../libpurple/protocols/silc/ops.c:1131
-#: ../libpurple/protocols/silc10/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "<I>%s</I> 채널의 설립자는 <I>%s</I> 입니다."
-
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
+#: ../libgaim/protocols/silc/ops.c:1183
+#: ../libgaim/protocols/silc/ops.c:1332
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "실명"
 
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
+#: ../libgaim/protocols/silc/ops.c:1213
 msgid "Status Text"
 msgstr "상태 문자"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
+#: ../libgaim/protocols/silc/ops.c:1285
+#: ../libgaim/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "공개 키 지문"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
+#: ../libgaim/protocols/silc/ops.c:1286
+#: ../libgaim/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "공개 키 Babbleprint"
 
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc10/ops.c:1298
+#: ../libgaim/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "자세히(_M)..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libgaim/protocols/silc/ops.c:1371
+#: ../libgaim/protocols/silc/silc.c:1003
 msgid "Detach From Server"
 msgstr "서버로부터 분리"
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libgaim/protocols/silc/ops.c:1371
 msgid "Cannot detach"
 msgstr "분리할 수 없습니다."
 
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/ops.c:1382
+#: ../libgaim/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
 msgstr "주제를 설정할 수 없습니다."
 
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
+#: ../libgaim/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "별명 변경에 실패했습니다."
 
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
+#: ../libgaim/protocols/silc/ops.c:1462
 msgid "Roomlist"
 msgstr "대화실 목록"
 
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
+#: ../libgaim/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
 msgstr "대화실 목록을 가져올 수 없습니다."
 
-#: ../libpurple/protocols/silc/ops.c:1468
-#, fuzzy
-msgid "Network is empty"
-msgstr "네트워크 통계 정보"
-
-#: ../libpurple/protocols/silc/ops.c:1512
-#: ../libpurple/protocols/silc10/ops.c:1507
+#: ../libgaim/protocols/silc/ops.c:1507
 msgid "No public key was received"
 msgstr "공개 키를 받지 못했습니다."
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
+#: ../libgaim/protocols/silc/ops.c:1519
+#: ../libgaim/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr "서버 정보"
 
-#: ../libpurple/protocols/silc/ops.c:1525
-#: ../libpurple/protocols/silc10/ops.c:1520
+#: ../libgaim/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
 msgstr "서버 정보를 가져올 수 없습니다."
 
-#: ../libpurple/protocols/silc/ops.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
+#: ../libgaim/protocols/silc/ops.c:1549
+#: ../libgaim/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr "서버 통계 정보"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1550
+#: ../libgaim/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "서버 통계 정보를 가져올 수 없습니다."
 
-#: ../libpurple/protocols/silc/ops.c:1556
-#: ../libpurple/protocols/silc10/ops.c:1581
+#: ../libgaim/protocols/silc/ops.c:1559
+msgid "No server statistics available"
+msgstr "서버 통계 정보를 사용할 수 없습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11601,74 +13313,112 @@ msgstr ""
 "서버 오퍼레이터 수 합계: %d\n"
 "라우터 오퍼레이터 수 합계: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
-#: ../libpurple/protocols/silc10/ops.c:1604
+#: ../libgaim/protocols/silc/ops.c:1604
 msgid "Network Statistics"
 msgstr "네트워크 통계 정보"
 
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libgaim/protocols/silc/ops.c:1612
+#: ../libgaim/protocols/silc/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libgaim/protocols/silc/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping 에 실패했습니다."
 
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1617
+#: ../libgaim/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "서버로부터 Ping 응답을 받았습니다."
 
-#: ../libpurple/protocols/silc/ops.c:1609
-#: ../libpurple/protocols/silc10/ops.c:1625
+#: ../libgaim/protocols/silc/ops.c:1625
 msgid "Could not kill user"
 msgstr "사용자를 강제 종료시킬 수 없습니다."
 
-#: ../libpurple/protocols/silc/ops.c:1648
-msgid "WATCH"
-msgstr ""
+#: ../libgaim/protocols/silc/ops.c:1709
+msgid "Error during connecting to SILC Server"
+msgstr "SILC 서버에 접속하는 중 오류"
 
-#: ../libpurple/protocols/silc/ops.c:1648
-#, fuzzy
-msgid "Cannot watch user"
-msgstr "나 자신은 추가할 수 없습니다."
+#: ../libgaim/protocols/silc/ops.c:1714
+msgid "Key Exchange failed"
+msgstr "키 교환에 실패했습니다."
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
+#: ../libgaim/protocols/silc/ops.c:1723
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "분리된 세션의 복귀에 실패했습니다. 새로운 접속을 확립하려면 [재접속] 버튼을 눌러 주십시오."
+
+#: ../libgaim/protocols/silc/ops.c:1758
+msgid "Disconnected by server"
+msgstr "서버가 접속을 끊었습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1820
+#: ../libgaim/protocols/silc/ops.c:1867
+#: ../libgaim/protocols/silc/silc.c:188
 msgid "Resuming session"
 msgstr "세션 복귀 중"
 
-#: ../libpurple/protocols/silc/ops.c:1726
-#: ../libpurple/protocols/silc10/ops.c:1813
+#: ../libgaim/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
 msgstr "접속 인증 중"
 
-#: ../libpurple/protocols/silc/ops.c:1777
-#: ../libpurple/protocols/silc10/ops.c:1860
+#: ../libgaim/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
 msgstr "서버 공개 키 검증 중"
 
-#: ../libpurple/protocols/silc/ops.c:1814
-#: ../libpurple/protocols/silc10/ops.c:1902
+#: ../libgaim/protocols/silc/ops.c:1910
 msgid "Passphrase required"
 msgstr "Passphrase 요구"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
+#: ../libgaim/protocols/silc/ops.c:1939
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "실패: 버전 불일치, 클라이언트를 업그레이드 하십시오."
+
+#: ../libgaim/protocols/silc/ops.c:1942
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "실패: 리모트에서 공개 키를 신뢰/지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1945
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "실패: 리모트에서 권장되는 KE 그룹을 지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1948
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "실패: 리모트에서 권장되는 암호를 지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1951
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "실패: 리모트에서 권장되는 PKCS 를 지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1954
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "실패: 리모트에서 권장되는 해시 함수를 지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1957
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "실패: 리모트에서 권장되는 HMAC 를 지원하지 않습니다."
+
+#: ../libgaim/protocols/silc/ops.c:1959
+msgid "Failure: Incorrect signature"
+msgstr "실패: 잘못된 서명입니다."
+
+#: ../libgaim/protocols/silc/ops.c:1961
+msgid "Failure: Invalid cookie"
+msgstr "실패: 잘못된 쿠키입니다."
+
+#: ../libgaim/protocols/silc/ops.c:1972
+msgid "Failure: Authentication failed"
+msgstr "실패: 인증에 실패했습니다."
+
+#: ../libgaim/protocols/silc/pk.c:103
 #, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-"%s 의 공개 키를 받았지만, 로컬 사본과 일치하지 않습니다. 그래도 이 공개 키를 "
-"받으시겠습니까?"
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
+msgstr "%s 의 공개 키를 받았지만, 로컬 사본과 일치하지 않습니다. 그래도 이 공개 키를 받으시겠습니까?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
+#: ../libgaim/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "%s 의 공개 키를 받았습니다. 이 공개 키를 받으시겠습니까?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
+#: ../libgaim/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11681,103 +13431,66 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
+#: ../libgaim/protocols/silc/pk.c:115
+#: ../libgaim/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "공개 키 검증"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
+#: ../libgaim/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "표시(_V)..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
+#: ../libgaim/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "지원하지 않는 공개 키 형식"
 
-#: ../libpurple/protocols/silc/silc.c:217
-#: ../libpurple/protocols/silc10/ops.c:1749
-msgid "Disconnected by server"
-msgstr "서버가 접속을 끊었습니다."
-
-#: ../libpurple/protocols/silc/silc.c:224
-#: ../libpurple/protocols/silc10/ops.c:1700
-msgid "Error during connecting to SILC Server"
-msgstr "SILC 서버에 접속하는 중 오류"
-
-#: ../libpurple/protocols/silc/silc.c:229
-#: ../libpurple/protocols/silc10/ops.c:1705
-msgid "Key Exchange failed"
-msgstr "키 교환에 실패했습니다."
-
-#: ../libpurple/protocols/silc/silc.c:238
-#: ../libpurple/protocols/silc10/ops.c:1714
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"분리된 세션의 복귀에 실패했습니다. 새로운 접속을 확립하려면 [재접속] 버튼을 "
-"눌러 주십시오."
-
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
-#: ../libpurple/protocols/silc10/silc.c:161
+#: ../libgaim/protocols/silc/silc.c:159
 msgid "Connection failed"
 msgstr "접속 실패"
 
-#: ../libpurple/protocols/silc/silc.c:280
-#: ../libpurple/protocols/silc10/silc.c:193
+#: ../libgaim/protocols/silc/silc.c:180
+msgid "Cannot initialize SILC Client connection"
+msgstr "SILC 클라이언트 접속을 초기화 할 수 없습니다."
+
+#: ../libgaim/protocols/silc/silc.c:191
 msgid "Performing key exchange"
 msgstr "키 교환 실행 중"
 
+#: ../libgaim/protocols/silc/silc.c:277
+msgid "Out of memory"
+msgstr "메모리가 부족합니다."
+
+#: ../libgaim/protocols/silc/silc.c:323
+msgid "Cannot initialize SILC protocol"
+msgstr "SILC 프로토콜을 초기화 할 수 없습니다."
+
+#: ../libgaim/protocols/silc/silc.c:330
+msgid "Cannot find/access ~/.silc directory"
+msgstr "~/.silc 폴더를 검색/접근할 수 없습니다."
+
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/silc.c:325
+#: ../libgaim/protocols/silc/silc.c:335
 msgid "Connecting to SILC Server"
 msgstr "SILC 서버에 접속 중"
 
-#: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy, c-format
-msgid "Could not load SILC key pair"
+#: ../libgaim/protocols/silc/silc.c:344
+#, c-format
+msgid "Could not load SILC key pair: %s"
 msgstr "SILC 의 키 쌍을 읽을 수 없습니다: %s"
 
-#: ../libpurple/protocols/silc/silc.c:366
-#: ../libpurple/protocols/silc10/silc.c:355
+#: ../libgaim/protocols/silc/silc.c:365
 msgid "Unable to create connection"
 msgstr "새로운 접속을 생성할 수 없습니다."
 
-#: ../libpurple/protocols/silc/silc.c:395
-#: ../libpurple/protocols/silc10/silc.c:267
-msgid "Out of memory"
-msgstr "메모리가 부족합니다."
-
-#: ../libpurple/protocols/silc/silc.c:438
-#: ../libpurple/protocols/silc10/silc.c:313
-msgid "Cannot initialize SILC protocol"
-msgstr "SILC 프로토콜을 초기화 할 수 없습니다."
-
-#: ../libpurple/protocols/silc/silc.c:445
-#, fuzzy
-msgid "Error loading SILC key pair"
-msgstr "SILC 키 쌍 생성 중..."
-
-#: ../libpurple/protocols/silc/silc.c:739
-#: ../libpurple/protocols/silc10/silc.c:650
+#: ../libgaim/protocols/silc/silc.c:664
 msgid "Your Current Mood"
 msgstr "현재의 기분"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
-#, c-format
-msgid "Normal"
-msgstr "표준"
-
-#: ../libpurple/protocols/silc/silc.c:755
-#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libgaim/protocols/silc/silc.c:680
 msgid "In love"
 msgstr "ì—°ì• "
 
-#: ../libpurple/protocols/silc/silc.c:766
-#: ../libpurple/protocols/silc10/silc.c:677
+#: ../libgaim/protocols/silc/silc.c:691
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11785,365 +13498,261 @@ msgstr ""
 "\n"
 "선호하는 연락 방법"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
+#: ../libgaim/protocols/silc/silc.c:699
+#: ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
+#: ../libgaim/protocols/silc/silc.c:701
+#: ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libgaim/protocols/silc/silc.c:703
 msgid "Video conferencing"
 msgstr "영상 회의"
 
-#: ../libpurple/protocols/silc/silc.c:783
-#: ../libpurple/protocols/silc10/silc.c:694
+#: ../libgaim/protocols/silc/silc.c:708
 msgid "Your Current Status"
 msgstr "현재의 상태"
 
-#: ../libpurple/protocols/silc/silc.c:790
-#: ../libpurple/protocols/silc10/silc.c:701
+#: ../libgaim/protocols/silc/silc.c:715
 msgid "Online Services"
 msgstr "온라인 서비스"
 
-#: ../libpurple/protocols/silc/silc.c:793
-#: ../libpurple/protocols/silc10/silc.c:704
+#: ../libgaim/protocols/silc/silc.c:718
 msgid "Let others see what services you are using"
 msgstr "어떤 서비스를 이용하고 있는지 다른 사람들에게 공개해 주십시오."
 
-#: ../libpurple/protocols/silc/silc.c:799
-#: ../libpurple/protocols/silc10/silc.c:710
+#: ../libgaim/protocols/silc/silc.c:724
 msgid "Let others see what computer you are using"
 msgstr "어떤 컴퓨터를 이용하고 있는지 다른 사람들에게 공개해 주십시오."
 
-#: ../libpurple/protocols/silc/silc.c:806
-#: ../libpurple/protocols/silc10/silc.c:717
+#: ../libgaim/protocols/silc/silc.c:731
 msgid "Your VCard File"
 msgstr "VCard 형식 파일"
 
-#: ../libpurple/protocols/silc/silc.c:812
-#, fuzzy
-msgid "Timezone (UTC)"
-msgstr "시간대"
-
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
+#: ../libgaim/protocols/silc/silc.c:743
+#: ../libgaim/protocols/silc/silc.c:744
 msgid "User Online Status Attributes"
 msgstr "사용자의 온라인 상태 속성"
 
-#: ../libpurple/protocols/silc/silc.c:818
-#: ../libpurple/protocols/silc10/silc.c:731
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"온라인 상태 정보와 개인 정보를 다른 사용자에게 공개할 수 있습니다. 다른 사용"
-"자에게 공개하고 싶은 정보를 모두 입력해 주십시오."
+#: ../libgaim/protocols/silc/silc.c:745
+msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
+msgstr "온라인 상태 정보와 개인 정보를 다른 사용자에게 공개할 수 있습니다. 다른 사용자에게 공개하고 싶은 정보를 모두 입력해 주십시오."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
-#: ../libpurple/protocols/silc10/silc.c:772
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libgaim/protocols/silc/silc.c:785
+#: ../libgaim/protocols/silc/silc.c:791
+#: ../libgaim/protocols/silc/silc.c:1430
 msgid "Message of the Day"
 msgstr "오늘의 메시지"
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libgaim/protocols/silc/silc.c:785
 msgid "No Message of the Day available"
 msgstr "\"오늘의 메시지\" 를 이용할 수 없습니다."
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libgaim/protocols/silc/silc.c:786
+#: ../libgaim/protocols/silc/silc.c:1425
 msgid "There is no Message of the Day associated with this connection"
 msgstr "이 접속에 대응되는 \"오늘의 메시지\" 는 없습니다."
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
+#: ../libgaim/protocols/silc/silc.c:837
+#: ../libgaim/protocols/silc/silc.c:881
+#: ../libgaim/protocols/silc/silc.c:952
+#: ../libgaim/protocols/silc/silc.c:953
 msgid "Create New SILC Key Pair"
 msgstr "새 SILC 키 쌍 생성"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libgaim/protocols/silc/silc.c:837
 msgid "Passphrases do not match"
 msgstr "새 Passphrases 가 일치하지 않습니다."
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libgaim/protocols/silc/silc.c:881
 msgid "Key Pair Generation failed"
 msgstr "키 쌍 생성에 실패했습니다."
 
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc10/silc.c:907
+#: ../libgaim/protocols/silc/silc.c:920
 msgid "Key length"
 msgstr "키 길이"
 
-#: ../libpurple/protocols/silc/silc.c:998
-#: ../libpurple/protocols/silc10/silc.c:909
+#: ../libgaim/protocols/silc/silc.c:922
 msgid "Public key file"
 msgstr "공개 키 파일"
 
-#: ../libpurple/protocols/silc/silc.c:1000
-#: ../libpurple/protocols/silc10/silc.c:911
+#: ../libgaim/protocols/silc/silc.c:924
 msgid "Private key file"
 msgstr "개인 키 파일"
 
-#: ../libpurple/protocols/silc/silc.c:1023
-#: ../libpurple/protocols/silc10/silc.c:934
+#: ../libgaim/protocols/silc/silc.c:947
 msgid "Passphrase (retype)"
 msgstr "Passphrases (재확인)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
-#: ../libpurple/protocols/silc10/silc.c:941
+#: ../libgaim/protocols/silc/silc.c:954
 msgid "Generate Key Pair"
 msgstr "키 쌍 생성"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libgaim/protocols/silc/silc.c:998
 msgid "Online Status"
 msgstr "온라인 상태"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libgaim/protocols/silc/silc.c:1007
 msgid "View Message of the Day"
 msgstr "\"오늘의 메시지\" 표시"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libgaim/protocols/silc/silc.c:1011
 msgid "Create SILC Key Pair..."
 msgstr "SILC 키 쌍 생성..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libgaim/protocols/silc/silc.c:1110
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "사용자 <I>%s</I> 은(는) 네트워크 상에 존재하지 않습니다."
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libgaim/protocols/silc/silc.c:1301
 msgid "Topic too long"
 msgstr "주제가 너무 깁니다."
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libgaim/protocols/silc/silc.c:1382
 msgid "You must specify a nick"
 msgstr "별명을 지정해 주십시오."
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libgaim/protocols/silc/silc.c:1484
 #, c-format
 msgid "channel %s not found"
 msgstr "채널 %s 을(를) 찾을 수 없습니다."
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libgaim/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 의 채널 모드: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libgaim/protocols/silc/silc.c:1491
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 에는 채널 모드가 설정되어 있지 않습니다."
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libgaim/protocols/silc/silc.c:1504
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "%s 의 채널 모드 설정에 실패"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: ../libgaim/protocols/silc/silc.c:1534
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "알 수 없는 명령: %s (아마 클라이언트의 버그일 수 있습니다.)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libgaim/protocols/silc/silc.c:1597
 msgid "part [channel]:  Leave the chat"
 msgstr "part [채널]:  지정한 채널로부터 퇴출합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libgaim/protocols/silc/silc.c:1601
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [채널]:  지정한 채널로부터 퇴출합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libgaim/protocols/silc/silc.c:1605
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;새 주제&gt;]:  주제를 표시하거나 변경합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libgaim/protocols/silc/silc.c:1610
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;채널&gt; [&lt;비밀번호&gt;]:  이 네트워크 채널에 참가합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libgaim/protocols/silc/silc.c:1614
 msgid "list:  List channels on this network"
 msgstr "list:  이 네트워크 상의 채널 목록을 표시합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libgaim/protocols/silc/silc.c:1618
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;별명&gt;:  지정한 별명의 사용자 정보를 표시합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
+#: ../libgaim/protocols/silc/silc.c:1622
+#: ../libgaim/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr ""
-"msg &lt;별명&gt; &lt;메시지&gt;:  지정한 별명의 사용자에게 개인 메시지를 보냅"
-"니다."
+msgstr "msg &lt;별명&gt; &lt;메시지&gt;:  지정한 별명의 사용자에게 개인 메시지를 보냅니다."
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libgaim/protocols/silc/silc.c:1626
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr ""
-"query &lt;별명&gt; [&lt;메시지&gt;]:  지정한 별명의 사용자에게 개인 메시지를 "
-"보냅니다."
+msgstr "query &lt;별명&gt; [&lt;메시지&gt;]:  지정한 별명의 사용자에게 개인 메시지를 보냅니다."
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libgaim/protocols/silc/silc.c:1630
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  서버에 있는 \"오늘의 메시지\" 를 표시합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libgaim/protocols/silc/silc.c:1634
 msgid "detach:  Detach this session"
 msgstr "detach:  이 세션을 분리합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libgaim/protocols/silc/silc.c:1638
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [메시지]:  추가로 메시지를 남기고, 서버로부터 접속을 끊습니다."
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: ../libgaim/protocols/silc/silc.c:1642
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;명령&gt;:  SILC 클라이언트 명령을 호출합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libgaim/protocols/silc/silc.c:1648
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-"kill &lt;별명&gt; [-pubkey|&lt;이유&gt;]:  별명의 사용자를 강제적으로 종료합"
-"니다."
+msgstr "kill &lt;별명&gt; [-pubkey|&lt;이유&gt;]:  별명의 사용자를 강제적으로 종료합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libgaim/protocols/silc/silc.c:1652
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;새 별명&gt;:  사용 중인 별명을 변경합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libgaim/protocols/silc/silc.c:1656
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;별명&gt;:  별명의 사용자 정보를 표시합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;채널&gt; [+|-&lt;모드&gt;] [인수]:  채널 모드를 표시하거나 변경합니"
-"다."
+#: ../libgaim/protocols/silc/silc.c:1660
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;채널&gt; [+|-&lt;모드&gt;] [인수]:  채널 모드를 표시하거나 변경합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;채널&gt; +|-&lt;모드&gt; &lt;별명&gt;:  지정한 채널에서 별명의 사"
-"용자 모드를 변경합니다."
+#: ../libgaim/protocols/silc/silc.c:1664
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;채널&gt; +|-&lt;모드&gt; &lt;별명&gt;:  지정한 채널에서 별명의 사용자 모드를 변경합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libgaim/protocols/silc/silc.c:1668
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;사용자 모드&gt;:  네트워크에서의 모드를 설정합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libgaim/protocols/silc/silc.c:1672
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;별명&gt; [-pubkey]:  서버의 조작권을 취득합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;채널&gt; [-|+]&lt;별명&gt;:  지정한 별명의 사용자를 초대하거나 또"
-"는 초대 목록으로부터 그 사용자를 추가/삭제합니다."
+#: ../libgaim/protocols/silc/silc.c:1676
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;채널&gt; [-|+]&lt;별명&gt;:  지정한 별명의 사용자를 초대하거나 또는 초대 목록으로부터 그 사용자를 추가/삭제합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../libgaim/protocols/silc/silc.c:1680
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-"kick &lt;채널&gt; &lt;별명&gt; [명령]:  채널로부터 클라이언트를 퇴출시킵니다."
+msgstr "kick &lt;채널&gt; &lt;별명&gt; [명령]:  채널로부터 클라이언트를 퇴출시킵니다."
 
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+#: ../libgaim/protocols/silc/silc.c:1684
 msgid "info [server]:  View server administrative details"
 msgstr "info [서버]:  서버 관리자의 상세 정보를 표시합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+#: ../libgaim/protocols/silc/silc.c:1688
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr ""
-"ban [&lt;채널&gt; +|-&lt;별명&gt;]:  클라이언트를 채널로부터 차단합니다."
+msgstr "ban [&lt;채널&gt; +|-&lt;별명&gt;]:  클라이언트를 채널로부터 차단합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libgaim/protocols/silc/silc.c:1692
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
-"getkey &lt;별명|서버&gt;:  클라이언트 또는 서버의 공개 키를 가져옵니다."
+msgstr "getkey &lt;별명|서버&gt;:  클라이언트 또는 서버의 공개 키를 가져옵니다."
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libgaim/protocols/silc/silc.c:1696
 msgid "stats:  View server and network statistics"
 msgstr "stats:  서버와 네트워크의 통계 정보를 표시합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libgaim/protocols/silc/silc.c:1700
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  접속되어 있는 서버에 PING 을 송신합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libgaim/protocols/silc/silc.c:1705
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;채널&gt;:  채널 내의 사용자 목록을 표시합니다."
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;(복수의) 채널&gt;:  (복수"
-"의) 채널 내의 지정한 사용자 목록을 표시합니다."
+#: ../libgaim/protocols/silc/silc.c:1709
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;(복수의) 채널&gt;:  (복수의) 채널 내의 지정한 사용자 목록을 표시합니다."
 
 #. *< type
 #. *< ui_requirement
@@ -12154,142 +13763,112 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libgaim/protocols/silc/silc.c:1820
 msgid "SILC Protocol Plugin"
 msgstr "SILC 프로토콜 플러그인"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libgaim/protocols/silc/silc.c:1822
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) 프로토콜"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
-msgid "Network"
-msgstr "네트워크"
-
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libgaim/protocols/silc/silc.c:1859
 msgid "Public Key file"
 msgstr "공개 키 파일"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libgaim/protocols/silc/silc.c:1863
 msgid "Private Key file"
 msgstr "개인 키 파일"
 
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: ../libgaim/protocols/silc/silc.c:1873
 msgid "Cipher"
 msgstr "암호"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libgaim/protocols/silc/silc.c:1883
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
-msgid "Use Perfect Forward Secrecy"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libgaim/protocols/silc/silc.c:1886
 msgid "Public key authentication"
 msgstr "공개 키 인증"
 
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libgaim/protocols/silc/silc.c:1889
+msgid "Reject watching by other users"
+msgstr "다른 사용자로부터의 감시 거부"
+
+#: ../libgaim/protocols/silc/silc.c:1892
+msgid "Block invites"
+msgstr "초대 거부"
+
+#: ../libgaim/protocols/silc/silc.c:1895
 msgid "Block IMs without Key Exchange"
 msgstr "키 교환이 없는 IM 거부"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libgaim/protocols/silc/silc.c:1898
+msgid "Reject online status attribute requests"
+msgstr "온라인 상태의 속성 요구 거부"
+
+#: ../libgaim/protocols/silc/silc.c:1901
 msgid "Block messages to whiteboard"
 msgstr "화이트보드 메시지 차단"
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libgaim/protocols/silc/silc.c:1904
 msgid "Automatically open whiteboard"
 msgstr "화이트보드 자동 공개"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libgaim/protocols/silc/silc.c:1907
 msgid "Digitally sign and verify all messages"
 msgstr "전자 서명으로 모든 메시지 검증"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
+#: ../libgaim/protocols/silc/util.c:207
+#: ../libgaim/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "SILC 키 쌍 생성 중..."
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
-#, fuzzy
-msgid "Cannot create SILC key pair\n"
-msgstr "SILC 키 쌍 생성 중..."
-
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
-#: ../libpurple/protocols/silc10/util.c:355
+#: ../libgaim/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "실명: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
-#: ../libpurple/protocols/silc10/util.c:357
+#: ../libgaim/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "사용자명: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
-#: ../libpurple/protocols/silc10/util.c:359
+#: ../libgaim/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "이메일: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:361
+#: ../libgaim/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "호스트명: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:363
+#: ../libgaim/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "조직: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:365
+#: ../libgaim/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "êµ­ê°€: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:366
+#: ../libgaim/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "알고리즘: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:367
+#: ../libgaim/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "키 길이: \t%d 비트\n"
 
-#: ../libpurple/protocols/silc/util.c:372
-#, fuzzy, c-format
-msgid "Version: \t%s\n"
-msgstr "이유: %s"
-
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:369
+#: ../libgaim/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12300,8 +13879,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:370
+#: ../libgaim/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12310,160 +13888,71 @@ msgstr ""
 "공개 키 Babbleprint:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
+#: ../libgaim/protocols/silc/util.c:374
+#: ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "공개 키 정보"
 
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/util.c:555
+#: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
 msgstr "호출"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:561
+#: ../libgaim/protocols/silc/util.c:563
 msgid "Video Conferencing"
 msgstr "영상 회의"
 
-#: ../libpurple/protocols/silc/util.c:583
-#: ../libpurple/protocols/silc10/util.c:579
+#: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
 msgstr "컴퓨터"
 
-#: ../libpurple/protocols/silc/util.c:587
-#: ../libpurple/protocols/silc10/util.c:583
+#: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:585
+#: ../libgaim/protocols/silc/util.c:587
 msgid "Terminal"
 msgstr "터미널"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libgaim/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
-"%s 님이 화이트보드에 메시지를 보내왔습니다. 그 화이트보드를 공개하시겠습니까?"
+msgstr "%s 님이 화이트보드에 메시지를 보내왔습니다. 그 화이트보드를 공개하시겠습니까?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libgaim/protocols/silc/wb.c:288
 #, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
-msgstr ""
-"%s 님이 %s 에 있는 화이트보드에 메시지를 보내왔습니다. 그 화이트보드를 공개하"
-"시겠습니까?"
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgstr "%s 님이 %s 에 있는 화이트보드에 메시지를 보내왔습니다. 그 화이트보드를 공개하시겠습니까?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libgaim/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "화이트보드"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
-msgid "No server statistics available"
-msgstr "서버 통계 정보를 사용할 수 없습니다."
-
-#: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "실패: 버전 불일치, 클라이언트를 업그레이드 하십시오."
-
-#: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "실패: 리모트에서 공개 키를 신뢰/지원하지 않습니다."
-
-#: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "실패: 리모트에서 권장되는 KE 그룹을 지원하지 않습니다."
-
-#: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "실패: 리모트에서 권장되는 암호를 지원하지 않습니다."
-
-#: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "실패: 리모트에서 권장되는 PKCS 를 지원하지 않습니다."
-
-#: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "실패: 리모트에서 권장되는 해시 함수를 지원하지 않습니다."
-
-#: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "실패: 리모트에서 권장되는 HMAC 를 지원하지 않습니다."
-
-#: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
-msgid "Failure: Incorrect signature"
-msgstr "실패: 잘못된 서명입니다."
-
-#: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
-msgid "Failure: Invalid cookie"
-msgstr "실패: 잘못된 쿠키입니다."
-
-#: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
-msgid "Failure: Authentication failed"
-msgstr "실패: 인증에 실패했습니다."
-
-#: ../libpurple/protocols/silc10/silc.c:182
-msgid "Cannot initialize SILC Client connection"
-msgstr "SILC 클라이언트 접속을 초기화 할 수 없습니다."
-
-#: ../libpurple/protocols/silc10/silc.c:290
-#, fuzzy
-msgid "John Noname"
-msgstr "이름 없음"
-
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "~/.silc 폴더를 검색/접근할 수 없습니다."
-
-#: ../libpurple/protocols/silc10/silc.c:334
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "SILC 의 키 쌍을 읽을 수 없습니다: %s"
-
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:417
+#: ../libgaim/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "쓸 수 없었습니다."
 
-#: ../libpurple/protocols/simple/simple.c:439
-#: ../libpurple/protocols/simple/simple.c:1545
+#: ../libgaim/protocols/simple/simple.c:438
+#: ../libgaim/protocols/simple/simple.c:1482
 msgid "Could not connect"
 msgstr "접속할 수 없었습니다."
 
-#: ../libpurple/protocols/simple/simple.c:1062
-#, fuzzy
-msgid "Unknown server response."
-msgstr "원인을 알 수 없습니다."
-
-#: ../libpurple/protocols/simple/simple.c:1579
-#: ../libpurple/protocols/simple/simple.c:1621
-#: ../libpurple/protocols/simple/simple.c:1634
-#: ../libpurple/protocols/simple/simple.c:1685
+#: ../libgaim/protocols/simple/simple.c:1516
+#: ../libgaim/protocols/simple/simple.c:1558
+#: ../libgaim/protocols/simple/simple.c:1571
+#: ../libgaim/protocols/simple/simple.c:1622
 msgid "Could not create listen socket"
 msgstr "감시 소켓을 생성할 수 없었습니다."
 
-#: ../libpurple/protocols/simple/simple.c:1602
+#: ../libgaim/protocols/simple/simple.c:1539
 msgid "Couldn't resolve host"
 msgstr "호스트명을 해석할 수 없었습니다."
 
-#: ../libpurple/protocols/simple/simple.c:1693
+#: ../libgaim/protocols/simple/simple.c:1630
 msgid "Could not resolve hostname"
 msgstr "호스트명을 해석할 수 없었습니다."
 
-#: ../libpurple/protocols/simple/simple.c:1710
+#: ../libgaim/protocols/simple/simple.c:1647
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 의 아이디에 공백 또는 @ 기호가 포함되어 있지 않은 것 같습니다."
 
@@ -12475,251 +13964,242 @@ msgstr "SIP 의 아이디에 공백 또ë
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1893
+#: ../libgaim/protocols/simple/simple.c:1816
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 프로토콜 플러그인"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1894
+#: ../libgaim/protocols/simple/simple.c:1817
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 프로토콜 플러그인"
 
-#: ../libpurple/protocols/simple/simple.c:1922
+#: ../libgaim/protocols/simple/simple.c:1839
 msgid "Publish status (note: everyone may watch you)"
 msgstr "상태를 공개 (주: 다른 사용자가 모두 볼 수 있습니다.)"
 
-#: ../libpurple/protocols/simple/simple.c:1928
+#: ../libgaim/protocols/simple/simple.c:1845
 msgid "Use UDP"
 msgstr "UDP 사용"
 
-#: ../libpurple/protocols/simple/simple.c:1930
+#: ../libgaim/protocols/simple/simple.c:1847
 msgid "Use proxy"
 msgstr "프록시 사용"
 
-#: ../libpurple/protocols/simple/simple.c:1932
+#: ../libgaim/protocols/simple/simple.c:1849
 msgid "Proxy"
 msgstr "프록시"
 
-#: ../libpurple/protocols/simple/simple.c:1934
+#: ../libgaim/protocols/simple/simple.c:1851
 msgid "Auth User"
 msgstr "사용자 인증"
 
-#: ../libpurple/protocols/simple/simple.c:1936
+#: ../libgaim/protocols/simple/simple.c:1853
 msgid "Auth Domain"
 msgstr "도메인 인증"
 
-#: ../libpurple/protocols/toc/toc.c:139
+#: ../libgaim/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "%s 검색 중"
 
-#: ../libpurple/protocols/toc/toc.c:148
+#: ../libgaim/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s (으)로의 접속에 실패했습니다."
 
-#: ../libpurple/protocols/toc/toc.c:201
+#: ../libgaim/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "접속: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
+#: ../libgaim/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "파일 %s 을(를) 쓸 수 없습니다."
 
-#: ../libpurple/protocols/toc/toc.c:491
+#: ../libgaim/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "파일 %s 을(를) 읽을 수 없습니다."
 
-#: ../libpurple/protocols/toc/toc.c:494
+#: ../libgaim/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "메시지가 너무 길어 마지막 %s 바이트가 잘렸습니다."
 
-#: ../libpurple/protocols/toc/toc.c:497
+#: ../libgaim/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 님은 현재 로그인 되어 있지 않습니다."
 
-#: ../libpurple/protocols/toc/toc.c:500
+#: ../libgaim/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s 경고는 허가되어 있지 않습니다."
 
-#: ../libpurple/protocols/toc/toc.c:503
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "사용자 속도 제한을 초과하였기 때문에, 메시지가 유실되었습니다."
 
-#: ../libpurple/protocols/toc/toc.c:506
+#: ../libgaim/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s 에서의 대화는 가능하지 않습니다."
 
-#: ../libpurple/protocols/toc/toc.c:509
+#: ../libgaim/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "너무 빨라 %s 메시지를 전송할 수 없습니다."
 
-#: ../libpurple/protocols/toc/toc.c:512
+#: ../libgaim/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "너무 커서 %s (으)로부터의 IM 을 무시했습니다."
 
-#: ../libpurple/protocols/toc/toc.c:515
+#: ../libgaim/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "너무 빨라 %s 님으로부터의 IM 을 무시했습니다."
 
-#: ../libpurple/protocols/toc/toc.c:518
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "실패했습니다."
 
-#: ../libpurple/protocols/toc/toc.c:521
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "너무 많이 일치합니다."
 
-#: ../libpurple/protocols/toc/toc.c:524
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "더 많은 수식어가 필요합니다."
 
-#: ../libpurple/protocols/toc/toc.c:527
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "일시적으로 디렉토리 서비스를 이용할 수 없습니다."
 
-#: ../libpurple/protocols/toc/toc.c:530
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "이메일 검색이 거부되었습니다."
 
-#: ../libpurple/protocols/toc/toc.c:533
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "검색어가 무시되었습니다."
 
-#: ../libpurple/protocols/toc/toc.c:536
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "검색어가 없습니다."
 
-#: ../libpurple/protocols/toc/toc.c:539
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "디렉토리 정보가 없습니다."
 
-#: ../libpurple/protocols/toc/toc.c:543
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "지원되지 않는 국가입니다."
 
-#: ../libpurple/protocols/toc/toc.c:546
+#: ../libgaim/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "원인을 알 수 없는 실패: %s"
 
-#: ../libpurple/protocols/toc/toc.c:549
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:549
 msgid "Incorrect screen name or password."
 msgstr "아이디 또는 비밀번호가 틀립니다."
 
-#: ../libpurple/protocols/toc/toc.c:552
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "일시적으로 서비스를 이용할 수 없습니다."
 
-#: ../libpurple/protocols/toc/toc.c:555
-#, c-format
+#: ../libgaim/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "로그인 경고 수준이 너무 높습니다."
 
-#: ../libpurple/protocols/toc/toc.c:558
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"접속과 해제를 반복 수행했습니다. 10분 정도 후에 재시도 하십시오. 이대로 계속"
-"하면 더 많이 시간을 기다려야 합니다."
+#: ../libgaim/protocols/toc/toc.c:558
+msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
+msgstr "접속과 해제를 반복 수행했습니다. 10분 정도 후에 재시도 하십시오. 이대로 계속하면 더 많이 시간을 기다려야 합니다."
 
-#: ../libpurple/protocols/toc/toc.c:560
+#: ../libgaim/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "원인을 알 수 없는 접속 오류가 발생했습니다: %s"
 
-#: ../libpurple/protocols/toc/toc.c:563
+#: ../libgaim/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "알 수 없는 오류 %d 이(가) 발생했습니다 (정보: %s)."
 
-#: ../libpurple/protocols/toc/toc.c:590
+#: ../libgaim/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "그룹명이 잘못되었습니다."
 
-#: ../libpurple/protocols/toc/toc.c:674
+#: ../libgaim/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "접속을 닫았습니다."
 
-#: ../libpurple/protocols/toc/toc.c:714
+#: ../libgaim/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "응답을 기다리는 중입니다..."
 
-#: ../libpurple/protocols/toc/toc.c:792
+#: ../libgaim/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 가 일시정지 상태에서 복귀했습니다. 메시지를 다시 보낼 수 있습니다."
 
-#: ../libpurple/protocols/toc/toc.c:995
+#: ../libgaim/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "비밀번호 변경이 성공적으로 완료되었습니다."
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5925
-#: ../pidgin/gtkblist.c:6281
+#: ../libgaim/protocols/toc/toc.c:999
+msgid "TOC has sent a PAUSE command."
+msgstr "TOC 가 PAUSE 명령을 보냈습니다."
+
+#: ../libgaim/protocols/toc/toc.c:1000
+msgid "When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
+msgstr "이것이 발생한 경우, TOC 는 메시지 송신을 무시하기 때문에 메시지를 보낼 수 없습니다. Pidgin은 모든 송신 데이터를 차단합니다. 일시적인 현상이므로 잠시만 기다려 주십시오."
+
+#: ../libgaim/protocols/toc/toc.c:1373
 msgid "_Group:"
 msgstr "그룹(_G):"
 
-#: ../libpurple/protocols/toc/toc.c:1535
+#: ../libgaim/protocols/toc/toc.c:1555
 msgid "Get Dir Info"
 msgstr "폴더 정보 가져오기"
 
-#: ../libpurple/protocols/toc/toc.c:1675
+#: ../libgaim/protocols/toc/toc.c:1695
 msgid "Set Dir Info"
 msgstr "폴더 정보 설정"
 
-#: ../libpurple/protocols/toc/toc.c:1797
+#: ../libgaim/protocols/toc/toc.c:1817
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "쓰기 모드에서 %s 을(를) 열 수 없습니다!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
+#: ../libgaim/protocols/toc/toc.c:1853
 msgid "File transfer failed; other side probably canceled."
 msgstr "파일 전송에 실패했습니다. 아마도 상대측에서 취소한 것 같습니다."
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
+#: ../libgaim/protocols/toc/toc.c:1898
+#: ../libgaim/protocols/toc/toc.c:1938
+#: ../libgaim/protocols/toc/toc.c:2062
+#: ../libgaim/protocols/toc/toc.c:2150
 msgid "Could not connect for transfer."
 msgstr "전송할 수 없었습니다."
 
-#: ../libpurple/protocols/toc/toc.c:2075
+#: ../libgaim/protocols/toc/toc.c:2095
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "파일 헤더를 기록할 수 없습니다. 파일은 전송되지 않습니다."
 
-#: ../libpurple/protocols/toc/toc.c:2175
+#: ../libgaim/protocols/toc/toc.c:2195
 msgid "Save As..."
 msgstr "다른 이름으로 저장..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
+#: ../libgaim/protocols/toc/toc.c:2229
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 님으로부터 %s 님에게 %d 개의 파일 요청: %s (%.2f %s)%s%s"
 msgstr[1] "%s 님으로부터 %s 님에게 %d 개의 파일 요청: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
+#: ../libgaim/protocols/toc/toc.c:2236
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 님이 파일을 보내도록 요청하고 있습니다."
@@ -12734,235 +14214,203 @@ msgstr "%s 님이 파일을 보내도록
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
+#: ../libgaim/protocols/toc/toc.c:2326
+#: ../libgaim/protocols/toc/toc.c:2328
 msgid "TOC Protocol Plugin"
 msgstr "TOC 프로토콜 플러그인"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:840
+#: ../libgaim/protocols/yahoo/yahoo.c:793
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! 메시지를 보낼 수 없었습니다."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:962
+#: ../libgaim/protocols/yahoo/yahoo.c:852
+#: ../libgaim/protocols/yahoo/yahoo.c:3732
+msgid "Buzz!!"
+msgstr "버저!!"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:898
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 의 Yahoo! 시스템 메시지"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libgaim/protocols/yahoo/yahoo.c:958
 msgid "Authorization denied message:"
 msgstr "인증 거부 메시지:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#: ../libgaim/protocols/yahoo/yahoo.c:1037
 #, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s 은(는) 다음의 이유로 친구 목록에 추가하려는 내 요구를 (이전으로 거슬러 올"
-"라가) 거부했습니다:\" %s"
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "%s 은(는) 친구 목록에 추가하려는 내 요구를 (이전으로 거슬러 올라가) 거부했습니다."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libgaim/protocols/yahoo/yahoo.c:1040
 #, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s 은(는) 친구 목록에 추가하려는 내 요구를 (이전으로 거슬러 올라가) 거부했습"
-"니다."
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "%s 은(는) 다음의 이유로 친구 목록에 추가하려는 내 요구를 (이전으로 거슬러 올라가) 거부했습니다:\" %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1054
+#: ../libgaim/protocols/yahoo/yahoo.c:1043
 msgid "Add buddy rejected"
 msgstr "거부할 친구 추가"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
-#, fuzzy, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-msgstr ""
-"Yahoo 서버가 인식할 수 없는 인증 방식의 사용을 요구해 왔습니다. 이 버전의 "
-"Pidgin은 아마도 Yahoo 에 접속을 할 수 없는 것 같습니다. %s (으)로 업데이트 가"
-"능한 지 확인하십시오."
+#: ../libgaim/protocols/yahoo/yahoo.c:1794
+#, c-format
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "Yahoo 서버가 인식할 수 없는 인증 방식의 사용을 요구해 왔습니다. 이 버전의 Pidgin은 아마도 Yahoo 에 접속을 할 수 없는 것 같습니다. %s (으)로 업데이트 가능한 지 확인하십시오."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1999
+#: ../libgaim/protocols/yahoo/yahoo.c:1797
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 인증 실패"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#: ../libgaim/protocols/yahoo/yahoo.c:1863
 #, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"%s 을(를) 무시하려고 했지만, 사용자가 친구 목록에 있습니다. 그 사용자를 친구 "
-"목록에서 삭제하고 무시할 경우에는 \"예\" 를 눌러 주십시오."
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "%s 을(를) 무시하려고 했지만, 사용자가 친구 목록에 있습니다. 그 사용자를 친구 목록에서 삭제하고 무시할 경우에는 \"예\" 를 눌러 주십시오."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2068
+#: ../libgaim/protocols/yahoo/yahoo.c:1866
 msgid "Ignore buddy?"
 msgstr "친구를 무시하시겠습니까?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2131
+#: ../libgaim/protocols/yahoo/yahoo.c:1914
+msgid "Normal authentication failed!"
+msgstr "표준 인증에 실패했습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1915
+msgid "The normal authentication method has failed. This means either your password is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now attempt to log in using Web Messenger authentication, which will result in reduced functionality and features."
+msgstr "표준 인증 방식으로 실패했습니다. 이것은 사용 중인 비밀번호가 틀리거나 혹은 Yahoo! 의 인증 절차가 변경된 경우입니다. Pidgin은 웹 메신저 인증 방식을 이용하여 로그인을 시험해 보지만, 이용 가능한 기능이 줄어들 수도 있습니다."
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1926
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "사용 중인 계정이 잠겨 있습니다. Yahoo! 웹사이트로 로그인 하십시오."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libgaim/protocols/yahoo/yahoo.c:1929
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"알 수 없는 오류 번호 %d 입니다. Yahoo! 웹사이트로 로그인하면 해결될 수도 있습"
-"니다."
+msgstr "알 수 없는 오류 번호 %d 입니다. Yahoo! 웹사이트로 로그인하면 해결될 수도 있습니다."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2188
+#: ../libgaim/protocols/yahoo/yahoo.c:1983
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"그룹 %2$s 의 친구 %1$s 을(를) 계정 %3$s (으)로 서버 목록에 추가할 수 없었습니"
-"다."
+msgstr "그룹 %2$s 의 친구 %1$s 을(를) 계정 %3$s (으)로 서버 목록에 추가할 수 없었습니다."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2191
+#: ../libgaim/protocols/yahoo/yahoo.c:1986
 msgid "Could not add buddy to server list"
 msgstr "친구를 서버 목록에 추가할 수 없었습니다."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2310
+#: ../libgaim/protocols/yahoo/yahoo.c:2105
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 재생 가능 %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2653
+#: ../libgaim/protocols/yahoo/yahoo.c:2436
 msgid "Received unexpected HTTP response from server."
 msgstr "서버로부터 예상치 못한 HTTP 응답을 받았습니다."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2677
-#: ../libpurple/protocols/yahoo/yahoo.c:2863
-#: ../libpurple/protocols/yahoo/yahoo.c:2966
-#: ../libpurple/protocols/yahoo/yahoo.c:2976
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: ../libgaim/protocols/yahoo/yahoo.c:2460
+#: ../libgaim/protocols/yahoo/yahoo.c:2632
+#: ../libgaim/protocols/yahoo/yahoo.c:2735
+#: ../libgaim/protocols/yahoo/yahoo.c:2745
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libgaim/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "접속 오류"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2703
-#, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
-"서버와의 접속에 실패했습니다:\n"
-"%s"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2728
-#, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"서버와의 접속을 확립하지 못했습니다:\n"
-"%s"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
+#: ../libgaim/protocols/yahoo/yahoo.c:2860
+#: ../libgaim/protocols/yahoo/yahoo.c:3466
 msgid "Not at Home"
 msgstr "집에 없음"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libgaim/protocols/yahoo/yahoo.c:2862
+#: ../libgaim/protocols/yahoo/yahoo.c:3469
 msgid "Not at Desk"
 msgstr "자리에 없음"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libgaim/protocols/yahoo/yahoo.c:2864
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not in Office"
 msgstr "사무실에 없음"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libgaim/protocols/yahoo/yahoo.c:2868
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "On Vacation"
 msgstr "휴가 중"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3095
-#: ../libpurple/protocols/yahoo/yahoo.c:3787
+#: ../libgaim/protocols/yahoo/yahoo.c:2872
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "Stepped Out"
 msgstr "잠시 외출"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3188
-#: ../libpurple/protocols/yahoo/yahoo.c:3218
+#: ../libgaim/protocols/yahoo/yahoo.c:2965
+#: ../libgaim/protocols/yahoo/yahoo.c:2995
 msgid "Not on server list"
 msgstr "서버 목록에 없습니다."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3293
+#: ../libgaim/protocols/yahoo/yahoo.c:3012
+#: ../libgaim/protocols/yahoo/yahoo.c:3070
 msgid "Appear Online"
 msgstr "온라인으로 표시"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3238
-#: ../libpurple/protocols/yahoo/yahoo.c:3314
+#: ../libgaim/protocols/yahoo/yahoo.c:3015
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Appear Permanently Offline"
 msgstr "일시적으로 오프라인으로 표시"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
+#: ../libgaim/protocols/yahoo/yahoo.c:3033
 msgid "Presence"
 msgstr "자리에 있음"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3299
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Offline"
 msgstr "오프라인으로 표시"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3308
+#: ../libgaim/protocols/yahoo/yahoo.c:3085
 msgid "Don't Appear Permanently Offline"
 msgstr "일시적으로 오프라인으로 표시 안 함"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3356
+#: ../libgaim/protocols/yahoo/yahoo.c:3133
 msgid "Join in Chat"
 msgstr "대화에 참가"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3362
+#: ../libgaim/protocols/yahoo/yahoo.c:3139
 msgid "Initiate Conference"
 msgstr "회의에 초대"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3390
+#: ../libgaim/protocols/yahoo/yahoo.c:3167
 msgid "Presence Settings"
 msgstr "자리 있음 상태 설정"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3396
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
 msgid "Start Doodling"
 msgstr "낙서 시작"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#, fuzzy
-msgid "Activate which ID?"
+#: ../libgaim/protocols/yahoo/yahoo.c:3205
+msgid "Active which ID?"
 msgstr "어느 ID 를 활성화 하시겠습니까?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
-#, fuzzy
-msgid "Join whom in chat?"
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
+msgid "Join who in chat?"
 msgstr "어느 대화에 참가하시겠습니까?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3520
+#: ../libgaim/protocols/yahoo/yahoo.c:3224
 msgid "Activate ID..."
 msgstr "ID 활성화..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3524
+#: ../libgaim/protocols/yahoo/yahoo.c:3228
 msgid "Join User in Chat..."
 msgstr "대화에 참가..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3529
-#, fuzzy
-msgid "Open Inbox"
-msgstr "Hotmail의 받은 편지함 열기"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4138
+#: ../libgaim/protocols/yahoo/yahoo.c:3791
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;대화실&gt;: Yahoo 네트워크 상에 있는 대화에 참가"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4143
+#: ../libgaim/protocols/yahoo/yahoo.c:3796
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Yahoo 네트워크 상에 있는 대화실 목록 표시"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4151
+#: ../libgaim/protocols/yahoo/yahoo.c:3800
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: 사용자에게 부저음 울림"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3804
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 사용자에게 낙서 요구"
 
@@ -12976,246 +14424,221 @@ msgstr "doodle: 사용자에게 낙서 ì
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
-#: ../libpurple/protocols/yahoo/yahoo.c:4362
+#: ../libgaim/protocols/yahoo/yahoo.c:3899
+#: ../libgaim/protocols/yahoo/yahoo.c:3901
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo! 프로토콜 플러그인"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4385
+#: ../libgaim/protocols/yahoo/yahoo.c:3918
 msgid "Yahoo Japan"
 msgstr "Yahoo Korea! 에 접속"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4388
+#: ../libgaim/protocols/yahoo/yahoo.c:3921
 msgid "Pager server"
 msgstr "호출기 서버"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4391
+#: ../libgaim/protocols/yahoo/yahoo.c:3924
 msgid "Japan Pager server"
 msgstr "한국 호출기 서버"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libgaim/protocols/yahoo/yahoo.c:3927
 msgid "Pager port"
 msgstr "호출기 포트"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libgaim/protocols/yahoo/yahoo.c:3930
 msgid "File transfer server"
 msgstr "파일 전송 서버"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libgaim/protocols/yahoo/yahoo.c:3933
 msgid "Japan file transfer server"
 msgstr "한국 파일 전송 서버"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libgaim/protocols/yahoo/yahoo.c:3936
 msgid "File transfer port"
 msgstr "파일 전송 포트"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libgaim/protocols/yahoo/yahoo.c:3939
 msgid "Chat room locale"
 msgstr "대화실 위치"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libgaim/protocols/yahoo/yahoo.c:3942
 msgid "Ignore conference and chatroom invitations"
 msgstr "회의 및 대화실 초대 무시"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
 msgid "Chat room list URL"
 msgstr "대화실 URL 목록"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
+#: ../libgaim/protocols/yahoo/yahoo.c:3953
 msgid "Yahoo Chat server"
 msgstr "Yahoo 대화 서버"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4423
+#: ../libgaim/protocols/yahoo/yahoo.c:3956
 msgid "Yahoo Chat port"
 msgstr "Yahoo 대화 포트 번호"
 
+#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s 은(는) 회의 초대를 대화실 \"%s\" 에 거절했습니다 (이유는 \"%s\")."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "초대가 거부되었습니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "대화 참가에 실패했습니다."
+
+#. -6
+#: ../libgaim/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "알 수 없는 대화실"
+
+#. -15
+#: ../libgaim/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "아마도 대화실이 모두 찬 것 같습니다."
+
+#. -35
+#: ../libgaim/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "이용 불가"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:374
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "알 수 없는 오류입니다. 로그아웃 후 5초 정도 있다가 다시 대화실로 참가하십시오."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "나는 %s 에서 대화 중입니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:627
+msgid "Failed to join buddy in chat"
+msgstr "대화 중인 친구에게 참가할 수 없습니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:628
+msgid "Maybe they're not in a chat?"
+msgstr "아마도 대화에 아무도 없는 것 같습니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+msgid "Fetching the room list failed."
+msgstr "대화실 목록 가져오기에 실패했습니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+msgid "Voices"
+msgstr "음성"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+msgid "Webcams"
+msgstr "웹카메라"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+msgid "Unable to fetch room list."
+msgstr "대화실 목록 가져올 수 없습니다."
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+msgid "User Rooms"
+msgstr "사용자실"
+
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "낙서 요청을 보냄"
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
 msgid "Unable to establish file descriptor."
 msgstr "파일 기술자를 가져올 수 없습니다."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
+#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
 msgid "Write Error"
 msgstr "쓰기 오류"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Korea 프로파일"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Yahoo! 프로파일"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr ""
-"죄송합니다. 이 버전에서는 성인 컨텐트를 포함하고 있으면, 마크가 붙은 프로파일"
-"은 이용할 수 없습니다."
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
+msgstr "죄송합니다. 이 버전에서는 성인 컨텐트를 포함하고 있으면, 마크가 붙은 프로파일은 이용할 수 없습니다."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
-msgstr ""
-"이 프로파일의 열람을 희망하는 경우에는, 사용 중인 웹 브라우저로부터 다음의 링"
-"크를 방문해 주십시오:"
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:816
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
+msgstr "이 프로파일의 열람을 희망하는 경우에는, 사용 중인 웹 브라우저로부터 다음의 링크를 방문해 주십시오:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1089
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1093
 msgid "Hobbies"
 msgstr "취미"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
 msgid "Latest News"
 msgstr "최신 뉴스"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
 msgid "Home Page"
 msgstr "홈페이지"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
 msgid "Cool Link 1"
 msgstr "추천 링크 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
 msgstr "추천 링크 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
 msgstr "추천 링크 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
 msgid "Last Update"
 msgstr "최종 갱신일"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 의 사용자 정보는 사용할 수 없습니다."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
-msgstr ""
-"죄송합니다. 이 프로파일은 이 버전에서는 지원하지 않는 서식 혹은 언어입니다."
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1181
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
+msgstr "죄송합니다. 이 프로파일은 이 버전에서는 지원하지 않는 서식 혹은 언어입니다."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"사용자 프로파일을 가져올 수 없었습니다. 아마도 일시적인 서버쪽의 문제인 것 같"
-"습니다. 잠시 후 재시도 하십시오."
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1197
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "사용자 프로파일을 가져올 수 없었습니다. 아마도 일시적인 서버쪽의 문제인 것 같습니다. 잠시 후 재시도 하십시오."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"사용자 프로파일을 가져올 수 없었습니다. 아마도 서버가 존재하지 않는 것 같습니"
-"다. 단, 가끔 Yahoo! 는 사용자 프로파일을 가져오지 못할 때가 있습니다. 사용자"
-"가 확실히 존재하면, 잠시 후 재시도 해 보십시오."
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1200
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "사용자 프로파일을 가져올 수 없었습니다. 아마도 서버가 존재하지 않는 것 같습니다. 단, 가끔 Yahoo! 는 사용자 프로파일을 가져오지 못할 때가 있습니다. 사용자가 확실히 존재하면, 잠시 후 재시도 해 보십시오."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
 msgstr "사용자 프로파일이 비어 있습니다."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 은(는) 회의 초대를 대화실 \"%s\" 에 거절했습니다 (이유는 \"%s\")."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
-msgid "Invitation Rejected"
-msgstr "초대가 거부되었습니다."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
-msgid "Failed to join chat"
-msgstr "대화 참가에 실패했습니다."
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
-msgid "Unknown room"
-msgstr "알 수 없는 대화실"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
-msgid "Maybe the room is full"
-msgstr "아마도 대화실이 모두 찬 것 같습니다."
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
-msgid "Not available"
-msgstr "이용 불가"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"알 수 없는 오류입니다. 로그아웃 후 5초 정도 있다가 다시 대화실로 참가하십시"
-"오."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "나는 %s 에서 대화 중입니다."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
-msgid "Failed to join buddy in chat"
-msgstr "대화 중인 친구에게 참가할 수 없습니다."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
-msgid "Maybe they're not in a chat?"
-msgstr "아마도 대화에 아무도 없는 것 같습니다."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Fetching the room list failed."
-msgstr "대화실 목록 가져오기에 실패했습니다."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
-msgid "Voices"
-msgstr "음성"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
-msgid "Webcams"
-msgstr "웹카메라"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-msgid "Unable to fetch room list."
-msgstr "대화실 목록 가져올 수 없습니다."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
-msgid "User Rooms"
-msgstr "사용자실"
-
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libgaim/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "YCHT 서버를 사용한 접속에 문제가 있습니다."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: ../libgaim/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13224,117 +14647,102 @@ msgstr ""
 "서버와의 접속이 끊어졌습니다.\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:354
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr ""
-"(이 메시지를 교환하는 동안 오류가 발생했습니다.\t 계정 편집기의 '인코딩' 설정"
-"을 확인해 주십시오.)"
+#: ../libgaim/protocols/zephyr/zephyr.c:355
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgstr "(이 메시지를 교환하는 동안 오류가 발생했습니다.\t 계정 편집기의 '인코딩' 설정을 확인해 주십시오.)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
+#: ../libgaim/protocols/zephyr/zephyr.c:753
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "대화 %s,%s,%s 에 전송할 수 없습니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
+#: ../libgaim/protocols/zephyr/zephyr.c:787
+#: ../libgaim/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "사용자"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:792
+#: ../libgaim/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "숨어 있거나 접속되어 있지 않습니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
+#: ../libgaim/protocols/zephyr/zephyr.c:798
+#: ../libgaim/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br> %s 에 %s 부터 있습니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
+#: ../libgaim/protocols/zephyr/zephyr.c:1546
+#: ../libgaim/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "모두"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
+#: ../libgaim/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "클래스(_C):"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
+#: ../libgaim/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "인스턴스(_I):"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
+#: ../libgaim/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "받는 사람(_R):"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
+#: ../libgaim/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "%s,%s,%s 에의 구독 시행 실패"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
+#: ../libgaim/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;별명&gt;: 사용자의 위치를 확인합니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
+#: ../libgaim/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;별명&gt;: 사용자의 위치를 확인합니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
+#: ../libgaim/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;인스턴스&gt;: 이 클래스에서 사용할 인스턴스를 설정합니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
+#: ../libgaim/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;인스턴스&gt;: 이 클래스에서 사용할 인스턴스를 설정합니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
+#: ../libgaim/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;인스턴스&gt;: 이 클래스에서 사용할 인스턴스를 설정합니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
+#: ../libgaim/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
-"sub &lt;클래스&gt; &lt;인스턴스&gt; &lt;받는 사람&gt;: 새 대화에 참가합니다."
+msgstr "sub &lt;클래스&gt; &lt;인스턴스&gt; &lt;받는 사람&gt;: 새 대화에 참가합니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;인스턴스&gt;: &lt;메시지,<i>인스턴스</i>,*&gt; 에 메시지를 보냅니다."
+#: ../libgaim/protocols/zephyr/zephyr.c:2721
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;인스턴스&gt;: &lt;메시지,<i>인스턴스</i>,*&gt; 에 메시지를 보냅니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2727
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;클래스&gt; &lt;인스턴스&gt;: &lt;<i>클래스</i>,<i>인스턴스</i>,*&gt; "
-"에 메시지를 보냅니다."
+#: ../libgaim/protocols/zephyr/zephyr.c:2727
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;클래스&gt; &lt;인스턴스&gt;: &lt;<i>클래스</i>,<i>인스턴스</i>,*&gt; 에 메시지를 보냅니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;클래스&gt; &lt;인스턴스&gt; &lt;받는 사람&gt;: &lt;<i>클래스</i>,<i>"
-"인스턴스</i>,<i>받는 사람</i>&gt; 에 메시지를 보냅니다."
+#: ../libgaim/protocols/zephyr/zephyr.c:2733
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;클래스&gt; &lt;인스턴스&gt; &lt;받는 사람&gt;: &lt;<i>클래스</i>,<i>인스턴스</i>,<i>받는 사람</i>&gt; 에 메시지를 보냅니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;인스턴스&gt; &lt;받는 사람&gt;: &lt;MESSAGE,<i>인스턴스</i>,<i>받는 "
-"사람</i>&gt; 에 메시지를 보냅니다."
+#: ../libgaim/protocols/zephyr/zephyr.c:2739
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;인스턴스&gt; &lt;받는 사람&gt;: &lt;MESSAGE,<i>인스턴스</i>,<i>받는 사람</i>&gt; 에 메시지를 보냅니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
+#: ../libgaim/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
-"zc &lt;클래스&gt;: &lt;<i>클래스</i>,PERSONAL,*&gt; 에 메시지를 보냅니다."
+msgstr "zc &lt;클래스&gt;: &lt;<i>클래스</i>,PERSONAL,*&gt; 에 메시지를 보냅니다."
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
+#: ../libgaim/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "재구독"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
+#: ../libgaim/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "서버로부터 구독을 가져옵니다."
 
@@ -13348,45 +14756,47 @@ msgstr "서버로부터 구독을 가져
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libgaim/protocols/zephyr/zephyr.c:2940
+#: ../libgaim/protocols/zephyr/zephyr.c:2942
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 프로토콜 플러그인"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libgaim/protocols/zephyr/zephyr.c:2961
 msgid "Use tzc"
 msgstr "tzc 사용"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libgaim/protocols/zephyr/zephyr.c:2964
 msgid "tzc command"
 msgstr "tzc 명령"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libgaim/protocols/zephyr/zephyr.c:2967
 msgid "Export to .anyone"
 msgstr ".anyone 으로 내보내기"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libgaim/protocols/zephyr/zephyr.c:2970
 msgid "Export to .zephyr.subs"
 msgstr ".zephyr.subs 로 내보내기"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
+#: ../libgaim/protocols/zephyr/zephyr.c:2973
 msgid "Import from .anyone"
 msgstr ".anyone 으로부터 가져오기"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
+#: ../libgaim/protocols/zephyr/zephyr.c:2976
 msgid "Import from .zephyr.subs"
 msgstr ".zephyr.subs 로부터 가져오기"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
+#: ../libgaim/protocols/zephyr/zephyr.c:2979
 msgid "Realm"
 msgstr "Realm"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
+#: ../libgaim/protocols/zephyr/zephyr.c:2982
 msgid "Exposure"
 msgstr "노출"
 
-#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:899 ../libpurple/proxy.c:1058
-#: ../libpurple/proxy.c:1629
+#: ../libgaim/proxy.c:442
+#: ../libgaim/proxy.c:864
+#: ../libgaim/proxy.c:1021
+#: ../libgaim/proxy.c:1579
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13395,79 +14805,69 @@ msgstr ""
 "소켓을 생성할 수 없습니다:\n"
 "%s"
 
-#: ../libpurple/proxy.c:662
+#: ../libgaim/proxy.c:644
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "HTTP 프록시로부터의 응답을 해석할 수 없습니다: %s\n"
 
-#: ../libpurple/proxy.c:701 ../libpurple/proxy.c:747 ../libpurple/proxy.c:783
-#: ../libpurple/proxy.c:795
+#: ../libgaim/proxy.c:672
+#: ../libgaim/proxy.c:718
+#: ../libgaim/proxy.c:756
+#: ../libgaim/proxy.c:768
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 프록시 접속 오류 %d"
 
-#: ../libpurple/proxy.c:791
+#: ../libgaim/proxy.c:764
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr ""
-"접근이 거부되었습니다: HTTP 프록시 서버가 포트 번호 %d 의 터널링을 거부했습니"
-"다."
+msgstr "접근이 거부되었습니다: HTTP 프록시 서버가 포트 번호 %d 의 터널링을 거부했습니다."
 
-#: ../libpurple/proxy.c:1019
+#: ../libgaim/proxy.c:984
 #, c-format
 msgid "Error resolving %s"
 msgstr "%s 을(를) 해석하는 중 오류"
 
-#: ../libpurple/proxy.c:1727
+#: ../libgaim/proxy.c:1676
 msgid "Could not resolve host name"
 msgstr "호스트명을 해석할 수 없었습니다."
 
 #. *
-#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1378
+#: ../libgaim/request.h:1341
 msgid "_Yes"
 msgstr "예(_Y)"
 
-#: ../libpurple/request.h:1378
+#: ../libgaim/request.h:1341
 msgid "_No"
 msgstr "아니오(_N)"
 
 #. *
-#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1398
+#: ../libgaim/request.h:1360
 msgid "_Accept"
 msgstr "허가(_A)"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
+#: ../libgaim/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "지금 자리에 없습니다."
 
-#: ../libpurple/savedstatuses.c:535
+#: ../libgaim/savedstatuses.c:525
 msgid "saved statuses"
 msgstr "저장된 상태"
 
-#: ../libpurple/server.c:234
+#: ../libgaim/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 님을 %s 님으로 인식했습니다.\n"
 
-#: ../libpurple/server.c:302
+#: ../libgaim/server.c:674
 #, c-format
-msgid "Requesting %s's attention..."
-msgstr ""
-
-#: ../libpurple/server.c:347
-#, c-format
-msgid "%s has requested your attention!"
-msgstr ""
-
-#: ../libpurple/server.c:793
-#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
@@ -13475,548 +14875,155 @@ msgstr ""
 "%s 님이 %s 님을 대화실 %s (으)로 초대하고 있습니다:\n"
 "%s"
 
-#: ../libpurple/server.c:798
+#: ../libgaim/server.c:679
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 님이 %s 님을 대화실 %s (으)로 초대하고 있습니다:\n"
 
-#: ../libpurple/server.c:802
+#: ../libgaim/server.c:683
 msgid "Accept chat invitation?"
 msgstr "대화실로의 초대를 수락하시겠습니까?"
 
-#: ../libpurple/sslconn.c:164
-#, fuzzy
-msgid "SSL Connection Failed"
-msgstr "접속에 실패했습니다."
-
-#: ../libpurple/sslconn.c:166
-msgid "SSL Handshake Failed"
-msgstr "SSL 핸드쉐이크에 실패했습니다."
-
-#: ../libpurple/sslconn.c:168
-msgid "SSL peer presented an invalid certificate"
-msgstr ""
-
-#: ../libpurple/sslconn.c:171
-#, fuzzy
-msgid "Unknown SSL error"
-msgstr "알 수 없는 오류"
-
-#: ../libpurple/status.c:153
+#: ../libgaim/status.c:153
 msgid "Unset"
 msgstr "해제"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1059
-msgid "Do not disturb"
-msgstr "다른 용무 중"
+#: ../libgaim/status.c:156
+msgid "Unavailable"
+msgstr "이용 불가"
 
-#: ../libpurple/status.c:159
-msgid "Extended away"
-msgstr "장기 자리 비움"
-
-#: ../libpurple/status.c:160
+#: ../libgaim/status.c:160
 msgid "Mobile"
 msgstr "휴대 기기"
 
-#: ../libpurple/status.c:609
+#: ../libgaim/status.c:611
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 님이 상태를 %s (으)로부터 %s (으)로 변경했습니다."
 
-#: ../libpurple/status.c:612
-#, fuzzy, c-format
-msgid "%s (%s) changed status from %s to %s"
-msgstr "%s 님이 상태를 %s (으)로부터 %s (으)로 변경했습니다."
-
-#: ../libpurple/status.c:623
+#: ../libgaim/status.c:621
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 님을 %s 님으로 인식했습니다."
 
-#: ../libpurple/status.c:625
-#, fuzzy, c-format
-msgid "%s (%s) is now %s"
-msgstr "%s 님을 %s 님으로 인식했습니다."
-
-#: ../libpurple/status.c:631
+#: ../libgaim/status.c:626
 #, c-format
 msgid "%s is no longer %s"
 msgstr "이제 %s 님은 %s 님이 아닙니다."
 
-#: ../libpurple/status.c:633
-#, fuzzy, c-format
-msgid "%s (%s) is no longer %s"
-msgstr "이제 %s 님은 %s 님이 아닙니다."
-
-#: ../libpurple/status.c:1244
+#: ../libgaim/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s 님이 대기 중이 되었습니다."
 
-#: ../libpurple/status.c:1261
+#: ../libgaim/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 님이 대기 중으로부터 복귀했습니다."
 
-#: ../libpurple/status.c:1324
+#: ../libgaim/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 님이 대기 중이 되었습니다."
 
-#: ../libpurple/status.c:1326
+#: ../libgaim/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 님이 대기 중으로부터 복귀했습니다."
 
-#: ../libpurple/util.c:701
+#: ../libgaim/util.c:680
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2706
+#: ../libgaim/util.c:2434
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s 을(를) 읽는 중 오류"
 
-#: ../libpurple/util.c:2707
+#: ../libgaim/util.c:2435
 #, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"%s 을(를) 읽는 중 오류가 발생했습니다. 이 정보는 읽을 수 없습니다. 또한, 오래"
-"된 파일 이름을 \"%s~\" (으)로 변경했습니다."
+msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
+msgstr "%s 을(를) 읽는 중 오류가 발생했습니다. 이 정보는 읽을 수 없습니다. 또한, 오래된 파일 이름을 \"%s~\" (으)로 변경했습니다."
 
-#: ../libpurple/util.c:3207
+#: ../libgaim/util.c:2898
 msgid "Calculating..."
 msgstr "계산 중..."
 
-#: ../libpurple/util.c:3210
+#: ../libgaim/util.c:2901
 msgid "Unknown."
 msgstr "알 수 없음."
 
-#: ../libpurple/util.c:3236
+#: ../libgaim/util.c:2927
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d ì´ˆ"
 msgstr[1] "%d ì´ˆ"
 
-#: ../libpurple/util.c:3248
+#: ../libgaim/util.c:2939
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 일"
 msgstr[1] "%d 일"
 
-#: ../libpurple/util.c:3256
+#: ../libgaim/util.c:2947
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 시간"
 msgstr[1] "%s %d 시간"
 
-#: ../libpurple/util.c:3262
+#: ../libgaim/util.c:2953
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 시간"
 msgstr[1] "%d 시간"
 
-#: ../libpurple/util.c:3270
+#: ../libgaim/util.c:2961
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 분"
 msgstr[1] "%s %d 분"
 
-#: ../libpurple/util.c:3276
+#: ../libgaim/util.c:2967
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 분"
 msgstr[1] "%d 분"
 
-#: ../libpurple/util.c:3536
+#: ../libgaim/util.c:3166
+#: ../libgaim/util.c:3464
 #, c-format
-msgid "Could not open %s: Redirected too many times"
-msgstr ""
-
-#: ../libpurple/util.c:3573 ../libpurple/util.c:3869
-#, c-format
 msgid "Unable to connect to %s"
 msgstr "%s (으)로 접속할 수 없습니다."
 
-#: ../libpurple/util.c:3696
+#: ../libgaim/util.c:3292
 #, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-"%s (으)로부터 받은 정보를 저장하기 위한 메모리를 확보하지 못했습니다. 웹 서버"
-"로부터 무언가 악의를 가지고 전송하고 있을 가능성이 있습니다."
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "%s (으)로부터 받은 정보를 저장하기 위한 메모리를 확보하지 못했습니다. 웹 서버로부터 무언가 악의를 가지고 전송하고 있을 가능성이 있습니다."
 
-#: ../libpurple/util.c:3731
+#: ../libgaim/util.c:3327
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "%s (으)로부터 읽는 중 오류: %s"
 
-#: ../libpurple/util.c:3762
+#: ../libgaim/util.c:3358
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "%s (으)로 쓰는 중 오류: %s"
 
-#: ../libpurple/util.c:3787
+#: ../libgaim/util.c:3383
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "%s (으)로 접속할 수 없습니다: %s"
 
-#: ../pidgin.desktop.in.h:1
-msgid "Internet Messenger"
-msgstr "인터넷 메신저"
-
-#: ../pidgin.desktop.in.h:2
-msgid "Pidgin Internet Messenger"
-msgstr "Pidgin 인터넷 메신저"
-
-#: ../pidgin.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr "복수의 프로토콜을 이용하여 인터넷 메시지를 보냅니다."
-
-#: ../pidgin/eggtrayicon.c:128
-msgid "Orientation"
-msgstr "ë°©í–¥"
-
-#: ../pidgin/eggtrayicon.c:129
-msgid "The orientation of the tray."
-msgstr "트레이의 방향입니다."
-
-#. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
-msgid "Login Options"
-msgstr "로그인 설정"
-
-#: ../pidgin/gtkaccount.c:428
-msgid "Pro_tocol:"
-msgstr "프로토콜(_T):"
-
-#: ../pidgin/gtkaccount.c:439
-msgid "Screen _name:"
-msgstr "아이디(_N):"
-
-#: ../pidgin/gtkaccount.c:529
-msgid "_Local alias:"
-msgstr "별칭(_L):"
-
-#: ../pidgin/gtkaccount.c:533
-msgid "Remember pass_word"
-msgstr "비밀번호 저장"
-
-#. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
-msgid "User Options"
-msgstr "사용자 설정"
-
-#: ../pidgin/gtkaccount.c:604
-msgid "New _mail notifications"
-msgstr "새 메일 알림"
-
-#. Buddy icon
-#: ../pidgin/gtkaccount.c:609
-msgid "Use this buddy _icon for this account:"
-msgstr "다음 아이콘 사용:"
-
-#. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
-#, c-format
-msgid "%s Options"
-msgstr "%s 설정"
-
-#: ../pidgin/gtkaccount.c:936
-msgid "Use GNOME Proxy Settings"
-msgstr "GNOME 프록시 설정 사용"
-
-#: ../pidgin/gtkaccount.c:937
-msgid "Use Global Proxy Settings"
-msgstr "글로벌 프록시 설정 사용"
-
-#: ../pidgin/gtkaccount.c:943
-msgid "No Proxy"
-msgstr "프록시 없음"
-
-#: ../pidgin/gtkaccount.c:949
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ../pidgin/gtkaccount.c:955
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: ../pidgin/gtkaccount.c:961
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
-msgid "Use Environmental Settings"
-msgstr "환경 설정 사용"
-
-#. This is an easter egg.
-#. It means one of two things, both intended as humourus:
-#. A) your network is really slow and you have nothing better to do than
-#. look at butterflies.
-#. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
-msgid "If you look real closely"
-msgstr "가까이 잘 보면"
-
-#. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
-msgid "you can see the butterflies mating"
-msgstr "나비가 친구가 되어 있는 것을 알 수 있습니다."
-
-#: ../pidgin/gtkaccount.c:1030
-msgid "Proxy Options"
-msgstr "프록시 설정"
-
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
-msgid "Proxy _type:"
-msgstr "프록시 형식(_T):"
-
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
-msgid "_Host:"
-msgstr "호스트명(_H):"
-
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
-msgid "_Port:"
-msgstr "포트 번호(_P):"
-
-#: ../pidgin/gtkaccount.c:1065
-msgid "_Username:"
-msgstr "사용자명(_U):"
-
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
-msgid "Pa_ssword:"
-msgstr "비밀번호(_S):"
-
-#: ../pidgin/gtkaccount.c:1195
-#, fuzzy
-msgid "Unable to save new account"
-msgstr "새로운 접속을 생성할 수 없습니다."
-
-#: ../pidgin/gtkaccount.c:1196
-msgid "An account already exists with the specified criteria."
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1474
-msgid "Add Account"
-msgstr "계정 추가"
-
-#: ../pidgin/gtkaccount.c:1493
-msgid "_Basic"
-msgstr "기본 설정(_B)"
-
-#: ../pidgin/gtkaccount.c:1500
-msgid "Create this new account on the server"
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1516
-msgid "_Advanced"
-msgstr "고급 설정(_A)"
-
-#: ../pidgin/gtkaccount.c:1974 ../pidgin/gtkplugin.c:569
-msgid "Enabled"
-msgstr "사용"
-
-#: ../pidgin/gtkaccount.c:2002
-msgid "Protocol"
-msgstr "프로토콜"
-
-#: ../pidgin/gtkaccount.c:2202
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
-"\n"
-"You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add</b> button below and configure your first account. If you want %s to "
-"connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
-msgstr ""
-"<span size='larger' weight='bold'>%s에 오신 것을 환영합니다!</span>\n"
-"\n"
-"아직 계정이 설정되지 않았습니다. %s을 사용하여 접속을 시작하는 경우에는 아래"
-"에 있는 <b>추가</b> 버튼을 누른 후, 계정 정보를 입력하십시오. %s을 사용하여 "
-"복수의 계정으로 접속하는 경우에는, 각 계정마다 <b>추가</b> 버튼을 눌러 설정하"
-"십시오.\n"
-"\n"
-"친구 목록 창에 있는 <b>계정 -> 추가/편집</b> 메뉴에서도 이 창을 열 수 있습니"
-"다."
-
-#: ../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] ""
-
-#: ../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 "메시지(_M):"
-
-#: ../pidgin/gtkblist.c:945
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr "참가할 대화에 대해 적당한 정보를 입력해 주십시오.\n"
-
-#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6242
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:396
-msgid "_Account:"
-msgstr "계정(_A):"
-
-#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
-msgid "_Block"
-msgstr "거부(_B)"
-
-#: ../pidgin/gtkblist.c:1245
-msgid "Un_block"
-msgstr "거부 안 함(_B)"
-
-#: ../pidgin/gtkblist.c:1288
-msgid "Move to"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:1328
-msgid "Get _Info"
-msgstr "정보 가져오기(_I)"
-
-#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
-msgid "I_M"
-msgstr "인스턴트 메시지(_M)"
-
-#: ../pidgin/gtkblist.c:1337
-#, fuzzy
-msgid "_Send File..."
-msgstr "파일 전송(_S)"
-
-#: ../pidgin/gtkblist.c:1344
-#, fuzzy
-msgid "Add Buddy _Pounce..."
-msgstr "친구 알림 추가(_P)"
-
-#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
-#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
-msgid "View _Log"
-msgstr "로그 보기(_L)"
-
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Hide when offline"
-msgstr "오프라인일 때에는 허가되지 않았습니다."
-
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Show when offline"
-msgstr "오프라인일 때에는 허가되지 않았습니다."
-
-#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
-#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
-msgid "_Alias..."
-msgstr "별칭(_A)..."
-
-#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
-#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
-msgid "_Remove"
-msgstr "삭제(_R)"
-
-#: ../pidgin/gtkblist.c:1434
-#, fuzzy
-msgid "Add _Buddy..."
-msgstr "친구 추가"
-
-#: ../pidgin/gtkblist.c:1437
-#, fuzzy
-msgid "Add C_hat..."
-msgstr "대화 추가"
-
-#: ../pidgin/gtkblist.c:1440
-msgid "_Delete Group"
-msgstr "그룹 삭제(_D)"
-
-#: ../pidgin/gtkblist.c:1442
-msgid "_Rename"
-msgstr "이름 바꾸기(_R)"
-
-#. join button
-#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
-msgid "_Join"
-msgstr "참가(_J)"
-
-#: ../pidgin/gtkblist.c:1464
-msgid "Auto-Join"
-msgstr "자동 참가"
-
-#: ../pidgin/gtkblist.c:1466
-#, fuzzy
-msgid "Persistent"
-msgstr "페르시아어"
-
-#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
-msgid "_Collapse"
-msgstr "숨기기(_C)"
-
-#: ../pidgin/gtkblist.c:1532
-msgid "_Expand"
-msgstr "보이기(_E)"
-
-#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
-#: ../pidgin/gtkblist.c:4929 ../pidgin/gtkblist.c:4942
-msgid "/Tools/Mute Sounds"
-msgstr "/도구/소리 끄기"
-
-#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4919
-#: ../pidgin/gtkpounce.c:437
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr "지금 친구 추가가 가능한 계정에 접속되어 있지 않습니다."
-
-#. Buddies menu
-#: ../pidgin/gtkblist.c:3067
-msgid "/_Buddies"
-msgstr "/친구(_B)"
-
-#: ../pidgin/gtkblist.c:3068
-msgid "/Buddies/New Instant _Message..."
-msgstr "/친구/새 인스턴스 메시지(_M)..."
-
-#: ../pidgin/gtkblist.c:3069
-msgid "/Buddies/Join a _Chat..."
-msgstr "/친구/대화 참가(_C)..."
-
-#: ../pidgin/gtkblist.c:3070
-msgid "/Buddies/Get User _Info..."
-msgstr "/친구/사용자 정보 가져오기(_I)..."
-
-#: ../pidgin/gtkblist.c:3071
-msgid "/Buddies/View User _Log..."
-msgstr "/친구/사용자 로그 보기(_L)..."
-
 #: ../pidgin/gtkblist.c:3073
-#, fuzzy
-msgid "/Buddies/Sh_ow"
+msgid "/Buddies/Show"
 msgstr "/친구/보기"
 
 #: ../pidgin/gtkblist.c:3074
@@ -14039,4395 +15046,201 @@ msgstr "/친구/보기/프로토콜 ì•„ì
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/친구/보기/프로토콜 아이콘(_P)"
 
-#: ../pidgin/gtkblist.c:3079
-msgid "/Buddies/_Sort Buddies"
-msgstr "/친구/친구 정렬(_S)"
+#: ../libpurple/protocols/msn/msn.c:2311
+msgid "HTTP Method Server"
+msgstr "HTTP 방식 서버"
 
-#: ../pidgin/gtkblist.c:3081
-msgid "/Buddies/_Add Buddy..."
-msgstr "/친구/친구 추가(_A)..."
-
-#: ../pidgin/gtkblist.c:3082
-msgid "/Buddies/Add C_hat..."
-msgstr "/친구/대화 추가(_H)..."
-
-#: ../pidgin/gtkblist.c:3083
-msgid "/Buddies/Add _Group..."
-msgstr "/친구/그룹 추가(_G)..."
-
-#: ../pidgin/gtkblist.c:3085
-msgid "/Buddies/_Quit"
-msgstr "/친구/종료(_Q)"
-
-#. Accounts menu
-#: ../pidgin/gtkblist.c:3088
-msgid "/_Accounts"
-msgstr "/계정(_A)"
-
-#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6943
-#, fuzzy
-msgid "/Accounts/Manage"
-msgstr "/계정"
-
-#. Tools
-#: ../pidgin/gtkblist.c:3092
-msgid "/_Tools"
-msgstr "/도구(_T)"
-
-#: ../pidgin/gtkblist.c:3093
-msgid "/Tools/Buddy _Pounces"
-msgstr "/도구/친구 알림(_P)"
-
 #: ../pidgin/gtkblist.c:3094
 msgid "/Tools/_Certificates"
 msgstr "/도구/인증(_C)"
 
-#: ../pidgin/gtkblist.c:3095
-msgid "/Tools/Plu_gins"
-msgstr "/도구/플러그인(_G)"
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "인증"
 
-#: ../pidgin/gtkblist.c:3096
-msgid "/Tools/Pr_eferences"
-msgstr "/도구/설정(_E)"
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:725
+msgid "X.509 Certificates"
+msgstr "X.509 인증"
 
-#: ../pidgin/gtkblist.c:3097
-msgid "/Tools/Pr_ivacy"
-msgstr "/도구/개인 정보(_I)"
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid "You have no database of root certificates, so this certificate cannot be validated."
+msgstr "루트 인증 데이터베이스가 없습니다.이 인증은 유효화 되지 못했습니다."
 
-#: ../pidgin/gtkblist.c:3099
-msgid "/Tools/_File Transfers"
-msgstr "/도구/파일 전송(_F)"
+#: ../finch/gntcertmgr.c:86
+#: ../pidgin/gtkcertmgr.c:188
+msgid "Certificate Import"
+msgstr "인증 가져오기"
 
-#: ../pidgin/gtkblist.c:3100
-msgid "/Tools/R_oom List"
-msgstr "/도구/대화실 목록(_O)"
+#: ../finch/gntcertmgr.c:88
+#: ../pidgin/gtkcertmgr.c:190
+msgid "Type the host name this certificate is for."
+msgstr "이 인증을 위한 호스트명을 입력하십시오."
 
-#: ../pidgin/gtkblist.c:3101
-msgid "/Tools/System _Log"
-msgstr "/도구/시스템 로그(_L)"
+#: ../finch/gntcertmgr.c:99
+#: ../pidgin/gtkcertmgr.c:212
+msgid "Certificate Import Error"
+msgstr "인증 가져오기 오류"
 
-#: ../pidgin/gtkblist.c:3103
-msgid "/Tools/Mute _Sounds"
-msgstr "/도구/소리 끄기(_S)"
+#: ../finch/gntcertmgr.c:100
+#: ../pidgin/gtkcertmgr.c:213
+msgid "X.509 certificate import failed"
+msgstr "X.509 인증 가져오기 실패"
 
-#. Help
-#: ../pidgin/gtkblist.c:3105
-msgid "/_Help"
-msgstr "/도움말(_H)"
+#: ../finch/gntcertmgr.c:110
+#: ../pidgin/gtkcertmgr.c:224
+msgid "Select a PEM certificate"
+msgstr "PEM 인증 선택"
 
-#: ../pidgin/gtkblist.c:3106
-msgid "/Help/Online _Help"
-msgstr "/도움말/온라인 도움말(_H)"
-
-#: ../pidgin/gtkblist.c:3107
-msgid "/Help/_Debug Window"
-msgstr "/도움말/디버그 창(_D)"
-
-#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
-msgid "/Help/_About"
-msgstr "/도움말/Pidgin 정보(_A)"
-
-#: ../pidgin/gtkblist.c:3140
+#: ../finch/gntcertmgr.c:127
+#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
-"\n"
-"<b>Account:</b> %s"
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
 msgstr ""
-"\n"
-"<b>계정:</b> %s"
+"%s 파일로 내보내기 실패함.\n"
+"목적 경로에 쓰기 권한이 있는지 확인하십시오.\n"
 
-#: ../pidgin/gtkblist.c:3218
-msgid "Buddy Alias"
-msgstr "친구의 별칭"
+#: ../finch/gntcertmgr.c:129
+#: ../pidgin/gtkcertmgr.c:247
+msgid "Certificate Export Error"
+msgstr "인증 내보내기 오류"
 
-#: ../pidgin/gtkblist.c:3247
-msgid "Logged In"
-msgstr "접속 시간"
+#: ../finch/gntcertmgr.c:130
+#: ../pidgin/gtkcertmgr.c:248
+msgid "X.509 certificate export failed"
+msgstr "X.509 인증 내보내기 실패"
 
-#: ../pidgin/gtkblist.c:3293
-msgid "Last Seen"
-msgstr "마지막에 만난 것은"
+#: ../finch/gntcertmgr.c:159
+#: ../pidgin/gtkcertmgr.c:299
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509 인증 내보내기"
 
-#: ../pidgin/gtkblist.c:3314
-msgid "Spooky"
-msgstr "Spooky"
-
-#: ../pidgin/gtkblist.c:3316
-msgid "Awesome"
-msgstr "Awesome"
-
-#: ../pidgin/gtkblist.c:3318
-msgid "Rockin'"
-msgstr "Rockin'"
-
-#: ../pidgin/gtkblist.c:3657
-#, fuzzy, c-format
-msgid "Idle %dd %dh %02dm"
-msgstr "대기 시간: %dh %02dm"
-
-#: ../pidgin/gtkblist.c:3659
+#: ../finch/gntcertmgr.c:188
 #, c-format
-msgid "Idle %dh %02dm"
-msgstr "대기 시간: %dh %02dm"
+msgid "Certificate for %s"
+msgstr "%s 인증"
 
-#: ../pidgin/gtkblist.c:3661
-#, c-format
-msgid "Idle %dm"
-msgstr "대기 시간: %dm"
+#: ../finch/gntcertmgr.c:198
+msgid "SSL Host Certificate"
+msgstr "SSL 호스트 인증"
 
-#: ../pidgin/gtkblist.c:3814
-msgid "/Buddies/New Instant Message..."
-msgstr "/친구/새 인스턴트 메시지..."
-
-#: ../pidgin/gtkblist.c:3815 ../pidgin/gtkblist.c:3848
-msgid "/Buddies/Join a Chat..."
-msgstr "/친구/대화 참가..."
-
-#: ../pidgin/gtkblist.c:3816
-msgid "/Buddies/Get User Info..."
-msgstr "/친구/사용자 정보 가져오기..."
-
-#: ../pidgin/gtkblist.c:3817
-msgid "/Buddies/Add Buddy..."
-msgstr "/친구/친구 추가..."
-
-#: ../pidgin/gtkblist.c:3818 ../pidgin/gtkblist.c:3851
-msgid "/Buddies/Add Chat..."
-msgstr "/친구/대화 추가..."
-
-#: ../pidgin/gtkblist.c:3819
-msgid "/Buddies/Add Group..."
-msgstr "/친구/그룹 추가..."
-
-#: ../pidgin/gtkblist.c:3854
-msgid "/Tools/Privacy"
-msgstr "/도구/개인 정보"
-
-#: ../pidgin/gtkblist.c:3857
-msgid "/Tools/Room List"
-msgstr "/도구/대화실 목록"
-
-#: ../pidgin/gtkblist.c:3989 ../pidgin/gtkdocklet.c:155
-#: ../pidgin/gtkdocklet.c:160
+#: ../finch/gntcertmgr.c:233
+#: ../pidgin/gtkcertmgr.c:372
 #, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%2$s 님으로부터 %1$d개의 읽지 않은 메일이 있습니다.\n"
-msgstr[1] "%2$s さんから %1$d個の未?のメッセ?ジがあります\n"
+msgid "Really delete certificate for %s?"
+msgstr "정말 %s 인증을 삭제하시겠습니까?"
 
-#: ../pidgin/gtkblist.c:4149
-msgid "Manually"
-msgstr "수동 정렬"
+#: ../finch/gntcertmgr.c:236
+#: ../pidgin/gtkcertmgr.c:374
+msgid "Confirm certificate delete"
+msgstr "인증 삭제 확인"
 
-#: ../pidgin/gtkblist.c:4152
-msgid "By status"
-msgstr "상태순"
+#: ../finch/gntcertmgr.c:293
+#: ../pidgin/gtkcertmgr.c:602
+msgid "Certificate Manager"
+msgstr "인증 관리자"
 
-#: ../pidgin/gtkblist.c:4153
-msgid "By log size"
-msgstr "로그 크기순"
-
-#: ../pidgin/gtkblist.c:4358 ../pidgin/gtkconn.c:180
-#, c-format
-msgid "%s disconnected"
-msgstr "%s 님은 접속을 끊었습니다."
-
-#: ../pidgin/gtkblist.c:4393
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s 님은 접속을 끊었습니다: %s</span>"
-
-#: ../pidgin/gtkblist.c:4545
-msgid "<b>Username:</b>"
-msgstr "<b>사용자명</b>:"
-
-#: ../pidgin/gtkblist.c:4552
-msgid "<b>Password:</b>"
-msgstr "<b>비밀번호</b>:"
-
-#: ../pidgin/gtkblist.c:4563
-msgid "_Login"
-msgstr "로그인(_L)"
-
-#: ../pidgin/gtkblist.c:4646
-msgid "/Accounts"
-msgstr "/계정"
-
-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4660
-#, 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 "
-"able to sign on, set your status, and talk to your friends."
-msgstr ""
-"<span weight='bold' size='larger'>%s에 오신 것을 환영합니다!</span>\n"
-"\n"
-"아직 사용할 수 있는 계정이 없습니다.<b>계정 -> 추가/편집</b> 메뉴에서 <b>계정"
-"</b> 창을 열어 계정을 사용으로 선택하십시오. 계정 사용을 선택하면, 접속하여 "
-"상태를 설정한 후 친구와 대화할 수 있습니다."
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../pidgin/gtkblist.c:4923
-#, fuzzy
-msgid "/Buddies/Show/Offline Buddies"
-msgstr "/친구/보기/오프라인 친구(_O)"
-
-#: ../pidgin/gtkblist.c:4926
-#, fuzzy
-msgid "/Buddies/Show/Empty Groups"
-msgstr "/친구/보기/빈 그룹(_E)"
-
-#: ../pidgin/gtkblist.c:4932
-#, fuzzy
-msgid "/Buddies/Show/Buddy Details"
-msgstr "/친구/보기/친구 상세(_D)"
-
-#: ../pidgin/gtkblist.c:4935
-#, fuzzy
-msgid "/Buddies/Show/Idle Times"
-msgstr "/친구/보기/대기 시간(_T)"
-
-#: ../pidgin/gtkblist.c:4938
-#, fuzzy
-msgid "/Buddies/Show/Protocol Icons"
-msgstr "/친구/보기/프로토콜 아이콘(_P)"
-
-#: ../pidgin/gtkblist.c:5850
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"친구 목록에 추가하고자 하는 상대의 아이디를 입력해 주십시오. 친구의 별칭 또"
-"는 별명을 입력할 수 있습니다(선택 사항). 별칭은 가능한 경우 아이디 대신으로 "
-"표시됩니다.\n"
-
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:5873
-#, fuzzy
-msgid "A_ccount:"
-msgstr "계정:"
-
-#. End of account box
-#: ../pidgin/gtkblist.c:5885
-#, fuzzy
-msgid "_Screen name:"
-msgstr "아이디:"
-
-#: ../pidgin/gtkblist.c:5907 ../pidgin/gtkblist.c:6263
-#, fuzzy
-msgid "A_lias:"
-msgstr "별칭:"
-
-#: ../pidgin/gtkblist.c:6175
-msgid "This protocol does not support chat rooms."
-msgstr "이 프로토콜에서는 대화실을 지원하지 않습니다."
-
-#: ../pidgin/gtkblist.c:6191
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "대화가 가능한 프로토콜로 접속되어 있지 않습니다."
-
-#: ../pidgin/gtkblist.c:6232
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"이 대화의 별칭과 친구 목록에 추가할 때의 적당한 정보를 입력해 주십시오.\n"
-
-#: ../pidgin/gtkblist.c:6291
-msgid "Autojoin when account becomes online."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6292
-msgid "Hide chat when the window is closed."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6318
-msgid "Please enter the name of the group to be added."
-msgstr "참가할 그룹명을 입력해 주십시오."
-
-#: ../pidgin/gtkblist.c:6963
-#, fuzzy
-msgid "<PurpleMain>/Accounts/"
-msgstr "<PidginMain>/계정/"
-
-#: ../pidgin/gtkblist.c:6987
-msgid "_Edit Account"
-msgstr "계정 편집(_E)"
-
-#: ../pidgin/gtkblist.c:7000 ../pidgin/gtkconv.c:3143
-msgid "No actions available"
-msgstr "이용 가능한 동작이 없습니다."
-
-#: ../pidgin/gtkblist.c:7008
-msgid "_Disable"
-msgstr "사용 안 함(_D)"
-
-#: ../pidgin/gtkblist.c:7020
-msgid "Enable Account"
-msgstr "계정 사용"
-
-#: ../pidgin/gtkblist.c:7026
-#, fuzzy
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PidginMain>/계정/계정을 사용합니다."
-
-#: ../pidgin/gtkblist.c:7075
-msgid "/Tools"
-msgstr "/도구"
-
-#: ../pidgin/gtkblist.c:7145
-msgid "/Buddies/Sort Buddies"
-msgstr "/친구/친구 정렬"
-
-#. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-msgid "SSL Servers"
-msgstr "SSL 서버"
-
-#: ../pidgin/gtkconn.c:181
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"오류를 해결하고 계정을 다시 사용할 수 있을 때까지 %s이 재접속하지 않습니다."
-
-#: ../pidgin/gtkconv.c:524
-#, fuzzy
-msgid "Unknown command."
-msgstr "알 수 없는 명령입니다."
-
-#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
-msgid "That buddy is not on the same protocol as this chat."
-msgstr "그 친구는 이 대화의 동일 프로토콜 상에 있지 않습니다."
-
-#: ../pidgin/gtkconv.c:816
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr "지금 그 친구를 초대 가능한 계정으로 접속되어 있지 않습니다."
-
-#: ../pidgin/gtkconv.c:869
-msgid "Invite Buddy Into Chat Room"
-msgstr "친구를 대화실로 초대"
-
-#. Put our happy label in it.
-#: ../pidgin/gtkconv.c:899
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"초대하고자 하는 상대의 이름과 초대 메시지(선택 사항)을 입력해 주십시오."
-
-#: ../pidgin/gtkconv.c:920
-msgid "_Buddy:"
-msgstr "친구(_B):"
-
-#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
-msgid "_Message:"
-msgstr "메시지(_M):"
-
-#: ../pidgin/gtkconv.c:995
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>%s 님과의 대화</h1>\n"
-
-#: ../pidgin/gtkconv.c:1033
-msgid "Save Conversation"
-msgstr "대화 저장"
-
-#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
-msgid "Find"
-msgstr "찾기"
-
-#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:195
-msgid "_Search for:"
-msgstr "검색 단어(_S):"
-
-#: ../pidgin/gtkconv.c:1676
-msgid "Un-Ignore"
-msgstr "무시 안 함"
-
-#: ../pidgin/gtkconv.c:1679
-msgid "Ignore"
-msgstr "무시할 대상"
-
-#: ../pidgin/gtkconv.c:1699
-msgid "Get Away Message"
-msgstr "자리 비움 메시지"
-
-#: ../pidgin/gtkconv.c:1722
-msgid "Last said"
-msgstr "마지막 메시지:"
-
-#: ../pidgin/gtkconv.c:2671
-msgid "Unable to save icon file to disk."
-msgstr "아이콘 파일을 저장할 수 없습니다."
-
-#: ../pidgin/gtkconv.c:2722
-msgid "Save Icon"
-msgstr "아이콘 저장"
-
-#: ../pidgin/gtkconv.c:2774
-msgid "Animate"
-msgstr "애니메이션 사용"
-
-#: ../pidgin/gtkconv.c:2779
-msgid "Hide Icon"
-msgstr "아이콘 숨기기"
-
-#: ../pidgin/gtkconv.c:2782
-msgid "Save Icon As..."
-msgstr "아이콘을 다른 이름으로 저장..."
-
-#: ../pidgin/gtkconv.c:2786
-msgid "Set Custom Icon..."
-msgstr "사용자 아이콘 설정..."
-
-#: ../pidgin/gtkconv.c:2799
-msgid "Remove Custom Icon"
-msgstr "사용자 아이콘 삭제"
-
-#: ../pidgin/gtkconv.c:2931
-msgid "Show All"
-msgstr ""
-
-#. Conversation menu
-#: ../pidgin/gtkconv.c:2950
-msgid "/_Conversation"
-msgstr "/대화(_C)"
-
-#: ../pidgin/gtkconv.c:2952
-msgid "/Conversation/New Instant _Message..."
-msgstr "/대화/새 인스턴트 메시지(_M)..."
-
-#: ../pidgin/gtkconv.c:2957
-msgid "/Conversation/_Find..."
-msgstr "/대화/찾기(_F)..."
-
-#: ../pidgin/gtkconv.c:2959
-msgid "/Conversation/View _Log"
-msgstr "/대화/로그 보기(_L)"
-
-#: ../pidgin/gtkconv.c:2960
-msgid "/Conversation/_Save As..."
-msgstr "/대화/다른 이름으로 저장(_S)..."
-
-#: ../pidgin/gtkconv.c:2962
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/대화/화면 비우기(_R)"
-
-#: ../pidgin/gtkconv.c:2966
-msgid "/Conversation/Se_nd File..."
-msgstr "/대화/파일 전송(_N)..."
-
-#: ../pidgin/gtkconv.c:2967
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/대화/친구 알림 추가(_P)..."
-
-#: ../pidgin/gtkconv.c:2969
-msgid "/Conversation/_Get Info"
-msgstr "/대화/정보 가져오기(_G)"
-
-#: ../pidgin/gtkconv.c:2971
-msgid "/Conversation/In_vite..."
-msgstr "/대화/초대(_V)..."
-
-#: ../pidgin/gtkconv.c:2973
-msgid "/Conversation/M_ore"
-msgstr "/대화/자세히(_O)"
-
-#: ../pidgin/gtkconv.c:2977
-msgid "/Conversation/Al_ias..."
-msgstr "/대화/별칭(_I)..."
-
-#: ../pidgin/gtkconv.c:2979
-msgid "/Conversation/_Block..."
-msgstr "/대화/거부(_B)..."
-
-#: ../pidgin/gtkconv.c:2981
-#, fuzzy
-msgid "/Conversation/_Unblock..."
-msgstr "/대화/거부(_B)..."
-
-#: ../pidgin/gtkconv.c:2983
-msgid "/Conversation/_Add..."
-msgstr "/대화/추가(_A)..."
-
-#: ../pidgin/gtkconv.c:2985
-msgid "/Conversation/_Remove..."
-msgstr "/대화/삭제(_R)..."
-
-#: ../pidgin/gtkconv.c:2990
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/대화/링크 삽입(_K)..."
-
-#: ../pidgin/gtkconv.c:2992
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/대화/이미지 삽입(_E)..."
-
-#: ../pidgin/gtkconv.c:2998
-msgid "/Conversation/_Close"
-msgstr "/대화/닫기(_C)"
-
-#. Options
-#: ../pidgin/gtkconv.c:3002
-msgid "/_Options"
-msgstr "/설정(_O)"
-
-#: ../pidgin/gtkconv.c:3003
-msgid "/Options/Enable _Logging"
-msgstr "/설정/로그 기록(_L)"
-
-#: ../pidgin/gtkconv.c:3004
-msgid "/Options/Enable _Sounds"
-msgstr "/설정/소리 사용(_S)"
-
-#: ../pidgin/gtkconv.c:3006
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/설정/서식 도구모음 표시(_T)"
-
-#: ../pidgin/gtkconv.c:3007
-msgid "/Options/Show Ti_mestamps"
-msgstr "/설정/타임스탬프 표시(_M)"
-
-#: ../pidgin/gtkconv.c:3131
-msgid "/Conversation/More"
-msgstr "/대화/자세히(_O)"
-
-#: ../pidgin/gtkconv.c:3187
-#, fuzzy
-msgid "/Options"
-msgstr "/설정(_O)"
-
-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#. * the 'Conversation' menu pops up.
-#. 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:3222 ../pidgin/gtkconv.c:3254
-msgid "/Conversation"
-msgstr "/대화"
-
-#: ../pidgin/gtkconv.c:3262
-msgid "/Conversation/View Log"
-msgstr "/대화/로그 보기"
-
-#: ../pidgin/gtkconv.c:3268
-msgid "/Conversation/Send File..."
-msgstr "/대화/파일 전송..."
-
-#: ../pidgin/gtkconv.c:3272
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/대화/친구 알림 추가..."
-
-#: ../pidgin/gtkconv.c:3278
-msgid "/Conversation/Get Info"
-msgstr "/대화/정보 가져오기..."
-
-#: ../pidgin/gtkconv.c:3282
-msgid "/Conversation/Invite..."
-msgstr "/대화/초대..."
-
-#: ../pidgin/gtkconv.c:3288
-msgid "/Conversation/Alias..."
-msgstr "/대화/별칭..."
-
-#: ../pidgin/gtkconv.c:3292
-msgid "/Conversation/Block..."
-msgstr "/대화/거부..."
-
-#: ../pidgin/gtkconv.c:3296
-#, fuzzy
-msgid "/Conversation/Unblock..."
-msgstr "/대화/거부..."
-
-#: ../pidgin/gtkconv.c:3300
-msgid "/Conversation/Add..."
-msgstr "/대화/추가..."
-
-#: ../pidgin/gtkconv.c:3304
-msgid "/Conversation/Remove..."
-msgstr "/대화/삭제..."
-
-#: ../pidgin/gtkconv.c:3310
-msgid "/Conversation/Insert Link..."
-msgstr "/대화/링크 삽입..."
-
-#: ../pidgin/gtkconv.c:3314
-msgid "/Conversation/Insert Image..."
-msgstr "/대화/이미지 삽입..."
-
-#: ../pidgin/gtkconv.c:3320
-msgid "/Options/Enable Logging"
-msgstr "/설정/로그 기록"
-
-#: ../pidgin/gtkconv.c:3323
-msgid "/Options/Enable Sounds"
-msgstr "/설정/소리 사용"
-
-#: ../pidgin/gtkconv.c:3336
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/설정/서식 도구모음 표시"
-
-#: ../pidgin/gtkconv.c:3339
-msgid "/Options/Show Timestamps"
-msgstr "/설정/타임스탬프 표시"
-
-#: ../pidgin/gtkconv.c:3416 ../pidgin/gtkconv.c:3458
-msgid "User is typing..."
-msgstr "사용자가 무언가를 입력하고 있습니다..."
-
-#: ../pidgin/gtkconv.c:3461
-msgid "User has typed something and stopped"
-msgstr "사용자는 무언가를 입력하다가 일시중지 상태입니다."
-
-#. Build the Send To menu
-#: ../pidgin/gtkconv.c:3645 ../pidgin/gtkconv.c:8181
-#, fuzzy
-msgid "S_end To"
-msgstr "받을 사람(_S)"
-
-#: ../pidgin/gtkconv.c:4357
-msgid "_Send"
-msgstr "보내기(_S)"
-
-#. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4470
-msgid "0 people in room"
-msgstr "아무도 없습니다."
-
-#: ../pidgin/gtkconv.c:5844 ../pidgin/gtkconv.c:5965
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "대화실에 %d 명이 있습니다."
-msgstr[1] "대화실에 %d 명이 있습니다."
-
-#: ../pidgin/gtkconv.c:6572 ../pidgin/gtkstatusbox.c:660
-msgid "Typing"
-msgstr "입력 중입니다."
-
-#: ../pidgin/gtkconv.c:6576
-msgid "Stopped Typing"
-msgstr "입력을 중지했습니다."
-
-#: ../pidgin/gtkconv.c:6579
-msgid "Nick Said"
-msgstr "Nick Said"
-
-#: ../pidgin/gtkconv.c:6582 ../pidgin/gtkdocklet.c:685
-msgid "Unread Messages"
-msgstr "읽지 않은 메시지"
-
-#: ../pidgin/gtkconv.c:6588
-msgid "New Event"
-msgstr "새 이벤트"
-
-#: ../pidgin/gtkconv.c:7700
-#, fuzzy
-msgid "clear: Clears all conversation scrollbacks."
-msgstr "비우기: 대화 창에 있는 이전의 메시지를 삭제합니다."
-
-#: ../pidgin/gtkconv.c:7863
-msgid "Confirm close"
-msgstr "닫기 확인"
-
-#: ../pidgin/gtkconv.c:7895
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "아직 읽지 않은 메시지가 있습니다. 정말 창을 닫으시겠습니까?"
-
-#: ../pidgin/gtkconv.c:8514
-msgid "Close other tabs"
-msgstr "다른 탭 닫기"
-
-#: ../pidgin/gtkconv.c:8520
-msgid "Close all tabs"
-msgstr "모든 탭 닫기"
-
-#: ../pidgin/gtkconv.c:8528
-msgid "Detach this tab"
-msgstr "이 탭을 분리"
-
-#: ../pidgin/gtkconv.c:8534
-msgid "Close this tab"
-msgstr "이 탭을 닫기"
-
-#: ../pidgin/gtkconv.c:9031
-msgid "Close conversation"
-msgstr "대화 창을 닫습니다."
-
-#: ../pidgin/gtkconv.c:9633
-msgid "Last created window"
-msgstr "마지막에 생성한 창을 재이용"
-
-#: ../pidgin/gtkconv.c:9635
-msgid "Separate IM and Chat windows"
-msgstr "메시지와 대화 창을 분리"
-
-#: ../pidgin/gtkconv.c:9637 ../pidgin/gtkprefs.c:1417
-msgid "New window"
-msgstr "새 창으로 열기"
-
-#: ../pidgin/gtkconv.c:9639
-msgid "By group"
-msgstr "그룹마다 공유"
-
-#: ../pidgin/gtkconv.c:9641
-msgid "By account"
-msgstr "계정마다 공유"
-
-#: ../pidgin/gtkdebug.c:234
-msgid "Save Debug Log"
-msgstr "디버그 로그 저장"
-
-#: ../pidgin/gtkdebug.c:582
-msgid "Invert"
-msgstr "결과 반전"
-
-#: ../pidgin/gtkdebug.c:585
-msgid "Highlight matches"
-msgstr "일치하는 단어 강조 표시"
-
-#: ../pidgin/gtkdebug.c:652
-msgid "_Icon Only"
-msgstr "아이콘만(_I)"
-
-#: ../pidgin/gtkdebug.c:653
-msgid "_Text Only"
-msgstr "문자만(_T)"
-
-#: ../pidgin/gtkdebug.c:654
-msgid "_Both Icon & Text"
-msgstr "둘 다(_B)"
-
-#: ../pidgin/gtkdebug.c:775
-msgid "Filter"
-msgstr "í•„í„°"
-
-#: ../pidgin/gtkdebug.c:794
-msgid "Right click for more options."
-msgstr "오른쪽 클릭 메뉴에 추가 옵션 표시"
-
-#: ../pidgin/gtkdebug.c:824
-msgid "Level "
-msgstr "수준"
-
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
-msgid "Select the debug filter level."
-msgstr "디버그 필터 수준을 선택해 주십시오."
-
-#: ../pidgin/gtkdebug.c:833
-msgid "All"
-msgstr "모두"
-
-#: ../pidgin/gtkdebug.c:834
-msgid "Misc"
-msgstr "기타"
-
-#: ../pidgin/gtkdebug.c:836
-msgid "Warning"
-msgstr "경고"
-
-#: ../pidgin/gtkdebug.c:837
-msgid "Error "
-msgstr "오류"
-
-#: ../pidgin/gtkdebug.c:838
-msgid "Fatal Error"
-msgstr "치명적 오류"
-
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
-msgid "lead developer"
-msgstr "수석 개발자"
-
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
-msgid "developer"
-msgstr "개발자"
-
-#: ../pidgin/gtkdialogs.c:87
-msgid "support"
-msgstr "지원"
-
-#: ../pidgin/gtkdialogs.c:88
-msgid "support/QA"
-msgstr "지원/QA"
-
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
-msgid "developer & webmaster"
-msgstr "개발자/웹마스터"
-
-#: ../pidgin/gtkdialogs.c:99
-msgid "Senior Contributor/QA"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:108
-msgid "win32 port"
-msgstr "Win32 포팅"
-
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
-msgid "maintainer"
-msgstr "관리자"
-
-#: ../pidgin/gtkdialogs.c:111
-msgid "libfaim maintainer"
-msgstr "libfaim 관리자"
-
-#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
-msgid "hacker and designated driver [lazy bum]"
-msgstr "해커 및 지정 드라이버 [lazy bum]"
-
-#: ../pidgin/gtkdialogs.c:115
-#, fuzzy
-msgid "XMPP developer"
-msgstr "개발자"
-
-#: ../pidgin/gtkdialogs.c:116
-msgid "original author"
-msgstr "초기 제작자"
-
-#: ../pidgin/gtkdialogs.c:133
-msgid "Afrikaans"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
-msgid "Arabic"
-msgstr "아라비아어"
-
-#: ../pidgin/gtkdialogs.c:135
-msgid "Belarusian Latin"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
-msgid "Bulgarian"
-msgstr "불가리아어"
-
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-msgid "Bengali"
-msgstr "벵갈어"
-
-#: ../pidgin/gtkdialogs.c:142
-msgid "Bosnian"
-msgstr "보스니아어"
-
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
-msgid "Catalan"
-msgstr "카타로니아어"
-
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
-msgid "Valencian-Catalan"
-msgstr "발렌시아-카타로니아어"
-
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
-msgid "Czech"
-msgstr "체코어"
-
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
-msgid "Danish"
-msgstr "덴마크어"
-
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
-msgid "German"
-msgstr "독일어"
-
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
-msgid "Dzongkha"
-msgstr "징카어"
-
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
-msgid "Greek"
-msgstr "그리스어"
-
-#: ../pidgin/gtkdialogs.c:156
-msgid "Australian English"
-msgstr "영어 (호주)"
-
-#: ../pidgin/gtkdialogs.c:157
-msgid "Canadian English"
-msgstr "영어 (캐나다)"
-
-#: ../pidgin/gtkdialogs.c:158
-msgid "British English"
-msgstr "영어 (영국)"
-
-#: ../pidgin/gtkdialogs.c:159
-msgid "Esperanto"
-msgstr "에스페란토어"
-
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
-msgid "Spanish"
-msgstr "스페인어"
-
-#: ../pidgin/gtkdialogs.c:161
-#, fuzzy
-msgid "Estonian"
-msgstr "보스니아어"
-
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
-msgid "Euskera(Basque)"
-msgstr "유케라 (바스크어)"
-
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
-msgid "Persian"
-msgstr "페르시아어"
-
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
-msgid "Finnish"
-msgstr "핀란드어"
-
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
-msgid "French"
-msgstr "프랑스어"
-
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
-msgid "Galician"
-msgstr "갈리시아어"
-
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
-msgid "Gujarati"
-msgstr "구자라티어"
-
-#: ../pidgin/gtkdialogs.c:172
-msgid "Gujarati Language Team"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
-msgid "Hebrew"
-msgstr "히브리어"
-
-#: ../pidgin/gtkdialogs.c:174
-msgid "Hindi"
-msgstr "힌디어"
-
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
-msgid "Hungarian"
-msgstr "헝가리어"
-
-#: ../pidgin/gtkdialogs.c:176
-#, fuzzy
-msgid "Indonesian"
-msgstr "마케도니아어"
-
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
-msgid "Italian"
-msgstr "이태리어"
-
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-msgid "Japanese"
-msgstr "일본어"
-
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
-msgid "Georgian"
-msgstr "그루지아어"
-
-#: ../pidgin/gtkdialogs.c:179
-#, fuzzy
-msgid "Ubuntu Georgian Translators"
-msgstr "현재 번역자"
-
-#: ../pidgin/gtkdialogs.c:180
-#, fuzzy
-msgid "Kannada"
-msgstr "차단되었습니다."
-
-#: ../pidgin/gtkdialogs.c:180
-msgid "Kannada Translation team"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
-msgid "Korean"
-msgstr "한국어"
-
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
-msgid "Kurdish"
-msgstr "쿠르드어"
-
-#: ../pidgin/gtkdialogs.c:185
-#, fuzzy
-msgid "Lao"
-msgstr "사자자리"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
-msgid "Lithuanian"
-msgstr "리투아니아어"
-
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
-msgid "Macedonian"
-msgstr "마케도니아어"
-
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
-#, fuzzy
-msgid "Bokmål Norwegian"
-msgstr "노르웨이어"
-
-#: ../pidgin/gtkdialogs.c:191
-msgid "Nepali"
-msgstr "네팔어"
-
-#: ../pidgin/gtkdialogs.c:192
-msgid "Dutch, Flemish"
-msgstr "네덜란드, 프란다스어"
-
-#: ../pidgin/gtkdialogs.c:193
-#, fuzzy
-msgid "Norwegian Nynorsk"
-msgstr "노르웨이어"
-
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
-msgid "Polish"
-msgstr "폴란드어"
-
-#: ../pidgin/gtkdialogs.c:197
-msgid "Portuguese"
-msgstr "포르투갈어"
-
-#: ../pidgin/gtkdialogs.c:198
-msgid "Portuguese-Brazil"
-msgstr "포르투갈-브라질어"
-
-#: ../pidgin/gtkdialogs.c:199
-#, fuzzy
-msgid "Pashto"
-msgstr "사진"
-
-#: ../pidgin/gtkdialogs.c:200
-msgid "Romanian"
-msgstr "루마니아어"
-
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
-msgid "Russian"
-msgstr "러시아어"
-
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
-msgid "Slovak"
-msgstr "슬로바키아어"
-
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
-msgid "Slovenian"
-msgstr "슬로베니아어"
-
-#: ../pidgin/gtkdialogs.c:205
-msgid "Albanian"
-msgstr "알바니아어"
-
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
-msgid "Serbian"
-msgstr "세르비아어"
-
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
-msgid "Swedish"
-msgstr "스웨덴어"
-
-#: ../pidgin/gtkdialogs.c:209
-msgid "Tamil"
-msgstr "타밀어"
-
-#: ../pidgin/gtkdialogs.c:210
-msgid "Telugu"
-msgstr "텔루구어"
-
-#: ../pidgin/gtkdialogs.c:211
-msgid "Thai"
-msgstr "타이어"
-
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
-msgid "Turkish"
-msgstr "터키어"
-
-#: ../pidgin/gtkdialogs.c:213
-msgid "Vietnamese"
-msgstr "베트남어"
-
-#: ../pidgin/gtkdialogs.c:213
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh 및 Gnome-Vi 팀"
-
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
-msgid "Simplified Chinese"
-msgstr "중국어 (간체)"
-
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
-msgid "Hong Kong Chinese"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
-msgid "Traditional Chinese"
-msgstr "중국어 (번체)"
-
-#: ../pidgin/gtkdialogs.c:225
-msgid "Amharic"
-msgstr "아무하라어"
-
-#: ../pidgin/gtkdialogs.c:357
-#, c-format
-msgid "About %s"
-msgstr "%s ì •ë³´"
-
-#: ../pidgin/gtkdialogs.c:400
-#, c-format
-msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr ""
-"%s은 AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
-"Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu 그리고 QQ 프로토콜을 모두 이용할 "
-"수 있는 GTK+ 툴킷을 채용한 모듈형 메시지 클라이언트입니다.<BR><BR>GPL 라이센"
-"스(버전 2 이상)가 정하는 조항 하에 재배포 또는 변경이 가능합니다. GPL 복사가 "
-"본 %s 패키지 내에 'COPYING' 라고 하는 파일명으로서 포함되어 있습니다. %s의 저"
-"작권은 그 공헌자에게 귀속됩니다. 공헌자의 상세한 목록에 대해서는 'COPYRIGHT' "
-"를 참조해 주십시오. 본 프로그램은 어떠한 보증도 하지 않습니다.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:418
-#, c-format
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net의 #pidgin 채널<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:423
-msgid "Current Developers"
-msgstr "현재 개발자"
-
-#: ../pidgin/gtkdialogs.c:438
-msgid "Crazy Patch Writers"
-msgstr "Crazy Patch 제작자"
-
-#: ../pidgin/gtkdialogs.c:453
-msgid "Retired Developers"
-msgstr "이전 개발자"
-
-#: ../pidgin/gtkdialogs.c:468
-#, fuzzy
-msgid "Retired Crazy Patch Writers"
-msgstr "Crazy Patch 제작자"
-
-#: ../pidgin/gtkdialogs.c:483
-#, fuzzy
-msgid "Artists"
-msgstr "양치기자리"
-
-#: ../pidgin/gtkdialogs.c:498
-msgid "Current Translators"
-msgstr "현재 번역자"
-
-#: ../pidgin/gtkdialogs.c:518
-msgid "Past Translators"
-msgstr "이전 번역자"
-
-#: ../pidgin/gtkdialogs.c:536
-msgid "Debugging Information"
-msgstr "디버깅 정보"
-
-#: ../pidgin/gtkdialogs.c:754 ../pidgin/gtkdialogs.c:893
-#: ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "이름(_N)"
-
-#: ../pidgin/gtkdialogs.c:759 ../pidgin/gtkdialogs.c:898
-#: ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "계정(_A)"
-
-#: ../pidgin/gtkdialogs.c:906
-msgid "Get User Info"
-msgstr "사용자 정보 가져오기"
-
-#: ../pidgin/gtkdialogs.c:908
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr "정보를 표시할 상대의 아이디 또는 별칭을 입력해 주십시오."
-
-#: ../pidgin/gtkdialogs.c:998
-msgid "View User Log"
-msgstr "사용자 로그 보기"
-
-#: ../pidgin/gtkdialogs.c:1000
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr "로그를 표시할 상대의 아이디 또는 별칭을 입력해 주십시오."
-
-#: ../pidgin/gtkdialogs.c:1020
-msgid "Alias Contact"
-msgstr "연락처 별칭"
-
-#: ../pidgin/gtkdialogs.c:1021
-msgid "Enter an alias for this contact."
-msgstr "이 연락처의 별칭을 입력해 주십시오."
-
-#: ../pidgin/gtkdialogs.c:1043
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "%s 의 별칭을 입력해 주십시오."
-
-#: ../pidgin/gtkdialogs.c:1045
-msgid "Alias Buddy"
-msgstr "친구 별칭"
-
-#: ../pidgin/gtkdialogs.c:1066
-msgid "Alias Chat"
-msgstr "대화 별칭"
-
-#: ../pidgin/gtkdialogs.c:1067
-msgid "Enter an alias for this chat."
-msgstr "이 대화의 별칭을 입력해 주십시오."
-
-#: ../pidgin/gtkdialogs.c:1106
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"친구 목록에서 %s 님을 포함한 %d 명의 친구의 삭제하려고 합니다. 계속 하시겠습"
-"니까?"
-msgstr[1] ""
-"친구 목록에서 %s 님을 포함한 %d 명의 친구의 삭제하려고 합니다. 계속 하시겠습"
-"니까?"
-
-#: ../pidgin/gtkdialogs.c:1114
-msgid "Remove Contact"
-msgstr "연락처 삭제"
-
-#: ../pidgin/gtkdialogs.c:1117
-msgid "_Remove Contact"
-msgstr "삭제(_R)"
-
-#: ../pidgin/gtkdialogs.c:1148
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr "%s 그룹과 %s 그룹을 하나로 통합하려고 합니다. 계속 하시겠습니까?"
-
-#: ../pidgin/gtkdialogs.c:1155
-msgid "Merge Groups"
-msgstr "그룹 통합"
-
-#: ../pidgin/gtkdialogs.c:1158
-msgid "_Merge Groups"
-msgstr "그룹 통합(_M)"
-
-#: ../pidgin/gtkdialogs.c:1208
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"친구 목록에서 %s 그룹과 그 구성원을 모두 삭제하려고 합니다. 계속 하시겠습니"
-"까?"
-
-#: ../pidgin/gtkdialogs.c:1211
-msgid "Remove Group"
-msgstr "그룹 삭제"
-
-#: ../pidgin/gtkdialogs.c:1214
-msgid "_Remove Group"
-msgstr "삭제(_R)"
-
-#: ../pidgin/gtkdialogs.c:1247
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "친구 목록에서 %s 을(를) 삭제하려고 합니다. 계속 하시겠습니까?"
-
-#: ../pidgin/gtkdialogs.c:1250
-msgid "Remove Buddy"
-msgstr "친구 삭제"
-
-#: ../pidgin/gtkdialogs.c:1253
-msgid "_Remove Buddy"
-msgstr "삭제(_R)"
-
-#: ../pidgin/gtkdialogs.c:1274
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr "친구 목록에서 %s 대화를 삭제하려고 합니다. 계속 하시겠습니까?"
-
-#: ../pidgin/gtkdialogs.c:1277
-msgid "Remove Chat"
-msgstr "대화 삭제"
-
-#: ../pidgin/gtkdialogs.c:1280
-msgid "_Remove Chat"
-msgstr "삭제(_R)"
-
-#: ../pidgin/gtkdocklet.c:152
-msgid "Right-click for more unread messages...\n"
-msgstr "읽지 않은 메시지를 표시할 경우에는 오른쪽 버튼을 눌러주십시오...\n"
-
-#: ../pidgin/gtkdocklet.c:533
-msgid "Change Status"
-msgstr "상태 바꾸기"
-
-#: ../pidgin/gtkdocklet.c:680
-msgid "Show Buddy List"
-msgstr "친구 목록 열기..."
-
-#: ../pidgin/gtkdocklet.c:706
-msgid "New Message..."
-msgstr "새 메시지..."
-
-#: ../pidgin/gtkdocklet.c:721
-msgid "Mute Sounds"
-msgstr "소리 끄기"
-
-#: ../pidgin/gtkdocklet.c:728
-#, fuzzy
-msgid "Blink on New Message"
-msgstr "새로운 메시지가 도착하면 깜박거림"
-
-#: ../pidgin/gtkdocklet.c:738
-msgid "Quit"
-msgstr "종료"
-
-#: ../pidgin/gtkft.c:154
-msgid "Not started"
-msgstr "시작되지 않았습니다."
-
-#: ../pidgin/gtkft.c:274
-msgid "<b>Receiving As:</b>"
-msgstr "<b>받는 사람:</b>"
-
-#: ../pidgin/gtkft.c:276
-msgid "<b>Receiving From:</b>"
-msgstr "<b>수신 위치:</b>"
-
-#: ../pidgin/gtkft.c:280
-msgid "<b>Sending To:</b>"
-msgstr "<b>송신 위치:</b>"
-
-#: ../pidgin/gtkft.c:282
-msgid "<b>Sending As:</b>"
-msgstr "<b>보낸 사람:</b>"
-
-#: ../pidgin/gtkft.c:498
-msgid "There is no application configured to open this type of file."
-msgstr "이 형식의 파일을 열기 위해 지정된 응용 프로그램이 없습니다."
-
-#: ../pidgin/gtkft.c:503
-msgid "An error occurred while opening the file."
-msgstr "파일을 여는 중 오류가 발생했습니다."
-
-#: ../pidgin/gtkft.c:540
-#, c-format
-msgid "Error launching %s: %s"
-msgstr "%s 실행 중 오류: %s"
-
-#: ../pidgin/gtkft.c:549
-#, c-format
-msgid "Error running %s"
-msgstr "%s 실행 중 오류"
-
-#: ../pidgin/gtkft.c:550
-#, c-format
-msgid "Process returned error code %d"
-msgstr "프로세스가 오류 코드 %d 을(를) 반환했습니다."
-
-#: ../pidgin/gtkft.c:697
-msgid "Filename:"
-msgstr "파일명:"
-
-#: ../pidgin/gtkft.c:698
-msgid "Local File:"
-msgstr "로컬 파일:"
-
-#: ../pidgin/gtkft.c:700
-msgid "Speed:"
-msgstr "속도:"
-
-#: ../pidgin/gtkft.c:701
-msgid "Time Elapsed:"
-msgstr "경과 시간:"
-
-#: ../pidgin/gtkft.c:702
-msgid "Time Remaining:"
-msgstr "남은 시간:"
-
-#: ../pidgin/gtkft.c:784
-msgid "Close this window when all transfers _finish"
-msgstr "전송이 완료되면 이 창을 닫음(_F)"
-
-#: ../pidgin/gtkft.c:794
-msgid "C_lear finished transfers"
-msgstr "완료된 전송은 비우기(_L)"
-
-#. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
-msgid "File transfer _details"
-msgstr "파일 전송 상세(_D)"
-
-#. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
-msgid "_Pause"
-msgstr "일시정지(_P)"
-
-#. Resume button
-#: ../pidgin/gtkft.c:843
-msgid "_Resume"
-msgstr "복귀(_R)"
-
-#: ../pidgin/gtkimhtml.c:816
-msgid "Paste as Plain _Text"
-msgstr "문자열로 붙여넣기(_T)"
-
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1195
-msgid "_Reset formatting"
-msgstr "서식 초기화(_R)"
-
-#: ../pidgin/gtkimhtml.c:1373
-msgid "Hyperlink color"
-msgstr "하이퍼링크 색상"
-
-#: ../pidgin/gtkimhtml.c:1374
-msgid "Color to draw hyperlinks."
-msgstr "하이퍼링크를 나타내는 색상입니다."
-
-#: ../pidgin/gtkimhtml.c:1377
-msgid "Hyperlink prelight color"
-msgstr "하이퍼링크 (prelight) 색상"
-
-#: ../pidgin/gtkimhtml.c:1378
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "하이퍼링크 위에 커서가 놓였을 때의 색상입니다."
-
-#: ../pidgin/gtkimhtml.c:1598
-msgid "_Copy E-Mail Address"
-msgstr "이메일 주소 복사(_C)"
-
-#: ../pidgin/gtkimhtml.c:1610
-msgid "_Open Link in Browser"
-msgstr "링크를 브라우저로 열기(_O)"
-
-#: ../pidgin/gtkimhtml.c:1620
-msgid "_Copy Link Location"
-msgstr "링크 주소 복사(_C)"
-
-#: ../pidgin/gtkimhtml.c:3369
-msgid ""
-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"<span size='larger' weight='bold'>알 수 없는 파일 형식</span>\n"
-"\n"
-"기본 PNG 이미지로 인식합니다."
-
-#: ../pidgin/gtkimhtml.c:3372
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"알 수 없는 파일 형식입니다.\n"
-"\n"
-"기본 PNG 이미지로 인식합니다."
-
-#: ../pidgin/gtkimhtml.c:3401
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span size='larger' weight='bold'>이미지 저장 중 오류</span>\n"
-"\n"
-"%s"
-
-#: ../pidgin/gtkimhtml.c:3404
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"이미지 저장 중 오류\n"
-"\n"
-"%s"
-
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
-msgid "Save Image"
-msgstr "이미지 저장"
-
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
-msgid "_Save Image..."
-msgstr "이미지 저장(_S)..."
-
-#: ../pidgin/gtkimhtmltoolbar.c:163
-msgid "Select Font"
-msgstr "글꼴 선택"
-
-#: ../pidgin/gtkimhtmltoolbar.c:242
-msgid "Select Text Color"
-msgstr "글자색 선택"
-
-#: ../pidgin/gtkimhtmltoolbar.c:321
-msgid "Select Background Color"
-msgstr "배경색 선택"
-
-#: ../pidgin/gtkimhtmltoolbar.c:410
-msgid "_URL"
-msgstr "URL(_U)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:418
-msgid "_Description"
-msgstr "설명(_D)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:421
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr "삽입할 링크의 URL과 그 설명(선택 사항)을 입력해 주십시오."
-
-#: ../pidgin/gtkimhtmltoolbar.c:425
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "삽입할 링크의 URL을 입력해 주십시오."
-
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
-msgid "Insert Link"
-msgstr "링크를 삽입합니다."
-
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1263
-msgid "_Insert"
-msgstr "삽입(_I)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:514
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "이미지 저장에 실패했습니다: %s\n"
-
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
-msgid "Insert Image"
-msgstr "이미지를 삽입합니다."
-
-#: ../pidgin/gtkimhtmltoolbar.c:761
-msgid "This theme has no available smileys."
-msgstr "이 테마에는 이용 가능한 이모티콘이 없습니다."
-
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
-msgid "Smile!"
-msgstr "이모티콘!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1220
-msgid "_Font"
-msgstr "글꼴(_F)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
-msgid "Group Items"
-msgstr "그룹 ID"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Ungroup Items"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "굵게"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "기울림"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "밑줄"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1091
-msgid "Strikethrough"
-msgstr "취소줄"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-msgid "Increase Font Size"
-msgstr "글자 크기 크게"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-msgid "Decrease Font Size"
-msgstr "글자 크기 작게"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1096
-msgid "Font Face"
-msgstr "글꼴 종류"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1097
-msgid "Background Color"
-msgstr "배경색"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1098
-msgid "Foreground Color"
-msgstr "글자색"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-msgid "Reset Formatting"
-msgstr "서식을 초기화 합니다."
-
-#: ../pidgin/gtkimhtmltoolbar.c:1103
-msgid "Insert IM Image"
-msgstr "IM 이미지를 삽입합니다."
-
-#: ../pidgin/gtkimhtmltoolbar.c:1104
-msgid "Insert Smiley"
-msgstr "이모티콘을 삽입합니다."
-
-#: ../pidgin/gtkimhtmltoolbar.c:1180
-msgid "<b>_Bold</b>"
-msgstr "<b>굵게(_B)</b>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1181
-msgid "<i>_Italic</i>"
-msgstr "<i>기울림(_I)</i>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1182
-msgid "<u>_Underline</u>"
-msgstr "<u>밑줄(_U)</u>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1183
-msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr "<span strikethrough='true'>취소줄</span>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1184
-msgid "<span size='larger'>_Larger</span>"
-msgstr "<span size='larger'>크게(_L)</span>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1186
-msgid "_Normal"
-msgstr "표준(_N)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1188
-msgid "<span size='smaller'>_Smaller</span>"
-msgstr "<span size='smaller'>작게(_S)</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:1192
-msgid "_Font face"
-msgstr "글꼴(_F)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1193
-msgid "Foreground _color"
-msgstr "글자색(_C)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1194
-msgid "Bac_kground color"
-msgstr "배경색(_K)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1271
-msgid "_Image"
-msgstr "이미지(_I)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1277
-msgid "_Link"
-msgstr "링크(_L)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1283
-msgid "_Horizontal rule"
-msgstr "수평 눈금(_H)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1305
-msgid "_Smile!"
-msgstr "이모티콘(_S)"
-
-#: ../pidgin/gtklog.c:293
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
-msgstr "정말 %s 님과 %s 에 시작된 대화 기록을 영구적으로 삭제하시겠습니까?"
-
-#: ../pidgin/gtklog.c:304
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr "정말 %s 에서 %s 에 시작된 대화 기록을 영구적으로 삭제하시겠습니까?"
-
-#: ../pidgin/gtklog.c:309
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr "정말 %s 시작된 시스템 기록을 영구적으로 삭제하시겠습니까?"
-
-#: ../pidgin/gtklog.c:453
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>%s 에서의 대화 (%s)</span>"
-
-#: ../pidgin/gtklog.c:456
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>%s 님과의 대화 (%s)</span>"
-
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%Yë…„%B"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"시스템 이벤트 로그는 설정 창에서 \"상태 변경을 모두 시스템 로그에 기록\" 기능"
-"이 사용 가능일 때만 기록합니다."
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"인스턴트 메시지 로그는 설정 창에서 \"인스턴트 메시지를 모두 로그에 기록\" 기"
-"능이 사용 가능일 때만 기록합니다."
-
-#: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"대화 로그는 설정 창에서 \"대화를 모두 로그에 기록\" 기능이 사용 가능일 때만 "
-"기록합니다."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "로그를 찾을 수 없습니다."
-
-#. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
-msgid "_Browse logs folder"
-msgstr "로그 폴더 찾아보기(_B)"
-
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "로그 전체 크기:"
-
-#: ../pidgin/gtklog.c:710
-#, c-format
-msgid "Conversations in %s"
-msgstr "%s 님과의 대화"
-
-#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
-#, c-format
-msgid "Conversations with %s"
-msgstr "%s 님과의 대화"
-
-#: ../pidgin/gtklog.c:810
-msgid "System Log"
-msgstr "시스템 로그"
-
-#: ../pidgin/gtkmain.c:386
-#, fuzzy, c-format
-msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%s 상세 정보는 `%s -h' 를 입력해 주십시오.\n"
-
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"사용법: %s [옵션]...\n"
-"\n"
-"  -c, --config=DIR    DIR에 있는 설정 파일 사용\n"
-"  -d, --debug         디버그 정보를 표준 출력으로 표시\n"
-"  -h, --help          이 도움말을 표시하고 종료\n"
-"  -n, --nologin       자동으로 로그인 하지 않음\n"
-"  -l, --login[=NAME]  자동으로 로그인 (선택 인수 NAME 은\n"
-"                      사용할 계정을 지정, 쉼표로 분리)\n"
-"  -v, --version       현재 버전을 표시하고 종료\n"
-
-#: ../pidgin/gtkmain.c:516
-#, c-format
-msgid ""
-"%s %s has segfaulted and attempted to dump a core file.\n"
-"This is a bug in the software and has happened through\n"
-"no fault of your own.\n"
-"\n"
-"If you can reproduce the crash, please notify the developers\n"
-"by reporting a bug at:\n"
-"%ssimpleticket/\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%swiki/GetABacktrace\n"
-"\n"
-"If you need further assistance, please IM either SeanEgn or \n"
-"LSchiere (via AIM).  Contact information for Sean and Luke \n"
-"on other protocols is at\n"
-"%swiki/DeveloperPages\n"
-msgstr ""
-"세그먼트 오류가 발생하여 %s %s이(가)\n"
-"core 파일 출력을 시험했습니다.\n"
-"이것은 소프트웨어의 버그이며, 사용자 실수가 아닙니다.\n"
-"\n"
-"이 문제가 재현 가능하면, 다음 사이트로부터\n"
-"개발자에게 버그로서 보고해 주십시오.\n"
-"%ssimpleticket/\n"
-"\n"
-"문제를 재현하기 위한 순서와 core 파일로부터의\n"
-"버그 추적 정보도 첨부해 주십시오.\n"
-"버그 추적 정보의 취득 방법을 알 수 없는 경우에는\n"
-"다음 사이트에 있는 설명을 참조해 주십시오.\n"
-"%swiki/GetABacktrace\n"
-"\n"
-"도움말이 필요하면 IM 으로\n"
-"SeanEgn 씨 또는 LSchiere 씨 (모두 AIM 경우) 에게\n"
-"말을 걸어봐 주십시오 그 외의 프로토콜 경우에 대해서는\n"
-"다음 사이트를 참조해 주십시오.\n"
-"%swiki/DeveloperPages\n"
-
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
-#, fuzzy
-msgid "Pidgin"
-msgstr "해(돼지)"
-
-#: ../pidgin/gtknotify.c:349
-msgid "Open All Messages"
-msgstr "모든 메시지 열기"
-
-#: ../pidgin/gtknotify.c:402
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">새로운 메일이 도착했습니다!</span>"
-
-#: ../pidgin/gtknotify.c:545
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s 에는 %d 개의 새로운 메시지가 있습니다."
-msgstr[1] "%s 에는 %d 개의 새로운 메시지가 있습니다."
-
-#: ../pidgin/gtknotify.c:569
-#, fuzzy, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>%d 개의 새로운 메시지가 있습니다.</b>"
-msgstr[1] "<b>%d 개의 새로운 메시지가 있습니다.</b>"
-
-#: ../pidgin/gtknotify.c:997
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "브라우저 명령 \"%s\" 이(가) 올바르지 않습니다."
-
-#: ../pidgin/gtknotify.c:999 ../pidgin/gtknotify.c:1011
-#: ../pidgin/gtknotify.c:1024 ../pidgin/gtknotify.c:1152
-msgid "Unable to open URL"
-msgstr "URL을 열 수 없습니다."
-
-#: ../pidgin/gtknotify.c:1009 ../pidgin/gtknotify.c:1022
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "\"%s\" 실행 중 오류: %s"
-
-#: ../pidgin/gtknotify.c:1153
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr ""
-"브라우저 명령이 '수동설정'으로 되어 있지만, 명령이 지정되어 있지 않습니다."
-
-#: ../pidgin/gtkplugin.c:265
-msgid "The following plugins will be unloaded."
-msgstr "다음의 플러그인을 해제합니다."
-
-#: ../pidgin/gtkplugin.c:284
-msgid "Multiple plugins will be unloaded."
-msgstr "복수의 플러그인을 해제합니다."
-
-#: ../pidgin/gtkplugin.c:288
-msgid "Unload Plugins"
-msgstr "플러그인 해제"
-
-#: ../pidgin/gtkplugin.c:400
-#, c-format
-msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr ""
-"%s%s<span weight=\"bold\">제작자: </span> %s\n"
-"<span weight=\"bold\">웹사이트: </span> %s\n"
-"<span weight=\"bold\">파일명: </span> %s"
-
-#: ../pidgin/gtkplugin.c:410
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Check the plugin website for an update.</span>"
-msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">오류: %s\n"
-"업데이트가 있는 지 웹사이트에서 확인해 주십시오.</span>"
-
-#: ../pidgin/gtkplugin.c:536
-msgid "Configure Pl_ugin"
-msgstr "플러그인 설정(_U)"
-
-#: ../pidgin/gtkplugin.c:599
-msgid "<b>Plugin Details</b>"
-msgstr "<b>플러그인 상세</b>"
-
-#: ../pidgin/gtkpounce.c:157
-msgid "Select a file"
-msgstr "파일 선택"
-
-#. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
-msgid "Pounce on Whom"
-msgstr "알림을 받을 친구"
-
-#: ../pidgin/gtkpounce.c:566
-msgid "_Buddy name:"
-msgstr "친구 이름(_B):"
-
-#: ../pidgin/gtkpounce.c:600
-msgid "Si_gns on"
-msgstr "접속했을 때(_G)"
-
-#: ../pidgin/gtkpounce.c:602
-msgid "Signs o_ff"
-msgstr "접속을 해제했을 때(_F)"
-
-#: ../pidgin/gtkpounce.c:604
-msgid "Goes a_way"
-msgstr "자리 비움이 되었을 때(_W)"
-
-#: ../pidgin/gtkpounce.c:606
-msgid "Ret_urns from away"
-msgstr "자리 비움으로부터 복귀했을 때(_U)"
-
-#: ../pidgin/gtkpounce.c:608
-msgid "Becomes _idle"
-msgstr "대기 상태가 되었을 때(_I)"
-
-#: ../pidgin/gtkpounce.c:610
-msgid "Is no longer i_dle"
-msgstr "대기 상태로부터 복귀했을 때(_D)"
-
-#: ../pidgin/gtkpounce.c:612
-msgid "Starts _typing"
-msgstr "입력 시작했을 때(_T)"
-
-#: ../pidgin/gtkpounce.c:614
-msgid "P_auses while typing"
-msgstr "입력을 일시 중지했을 때(_A)"
-
-#: ../pidgin/gtkpounce.c:616
-msgid "Stops t_yping"
-msgstr "입력을 멈추었을 때(_Y)"
-
-#: ../pidgin/gtkpounce.c:618
-msgid "Sends a _message"
-msgstr "메시지 전송 시(_M)"
-
-#: ../pidgin/gtkpounce.c:661
-msgid "Ope_n an IM window"
-msgstr "대화 창 열기(_N)"
-
-#: ../pidgin/gtkpounce.c:663
-msgid "_Pop up a notification"
-msgstr "팝업으로 알림(_P)"
-
-#: ../pidgin/gtkpounce.c:665
-msgid "Send a _message"
-msgstr "메시지 보내기(_M)"
-
-#: ../pidgin/gtkpounce.c:667
-msgid "E_xecute a command"
-msgstr "명령 실행(_X)"
-
-#: ../pidgin/gtkpounce.c:669
-msgid "P_lay a sound"
-msgstr "소리 재생(_L)"
-
-#: ../pidgin/gtkpounce.c:675
-msgid "Brows_e..."
-msgstr "찾아보기(_E)..."
-
-#: ../pidgin/gtkpounce.c:677
-msgid "Br_owse..."
-msgstr "찾아보기(_O)..."
-
-#: ../pidgin/gtkpounce.c:678
-msgid "Pre_view"
-msgstr "미리보기(_V)"
-
-#: ../pidgin/gtkpounce.c:805
-#, fuzzy
-msgid "P_ounce only when my status is not Available"
-msgstr "자신의 상태를 지정할 수 없을 때에만 알림을 받음(_O)"
-
-#: ../pidgin/gtkpounce.c:810
-msgid "_Recurring"
-msgstr "반복(_R)"
-
-#: ../pidgin/gtkpounce.c:1253
-msgid "Pounce Target"
-msgstr "알림 받을 상대"
-
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#, fuzzy
-msgid "Default"
-msgstr "GNOME 디폴트"
-
-#: ../pidgin/gtkprefs.c:517
-msgid "Smiley theme failed to unpack."
-msgstr "이모티콘 테마를 풀 수 없습니다."
-
-#: ../pidgin/gtkprefs.c:644
-msgid "Install Theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:697
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"아래의 목록으로부터 사용할 이모티콘 테마를 선택해 주십시오. 이 목록 중에 새로"
-"운 테마를 드래그앤드롭 하면 설치할 수 있습니다."
-
-#: ../pidgin/gtkprefs.c:732
-msgid "Icon"
-msgstr "아이콘"
-
-#: ../pidgin/gtkprefs.c:894
-msgid "System Tray Icon"
-msgstr "시스템 트레이 아이콘"
-
-#: ../pidgin/gtkprefs.c:895
-msgid "_Show system tray icon:"
-msgstr "시스템 트레이 아이콘 표시(_S):"
-
-#: ../pidgin/gtkprefs.c:899
-msgid "On unread messages"
-msgstr "메시지를 받았을 때"
-
-#: ../pidgin/gtkprefs.c:904
-msgid "Conversation Window Hiding"
-msgstr "대화 창 숨기기"
-
-#: ../pidgin/gtkprefs.c:905
-msgid "_Hide new IM conversations:"
-msgstr "새 대화 창 숨기기(_H):"
-
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
-msgid "When away"
-msgstr "자리 비움일 때만"
-
-#. All the tab options!
-#: ../pidgin/gtkprefs.c:916
-msgid "Tabs"
-msgstr "탭"
-
-#: ../pidgin/gtkprefs.c:918
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "탭 창에 메시지와 대화 표시(_T)"
-
-#: ../pidgin/gtkprefs.c:932
-msgid "Show close b_utton on tabs"
-msgstr "탭에 닫기 버튼 표시(_U)"
-
-#: ../pidgin/gtkprefs.c:935
-msgid "_Placement:"
-msgstr "탭 위치(_P):"
-
-#: ../pidgin/gtkprefs.c:937
-msgid "Top"
-msgstr "위쪽"
-
-#: ../pidgin/gtkprefs.c:938
-msgid "Bottom"
-msgstr "아래쪽"
-
-#: ../pidgin/gtkprefs.c:939
-msgid "Left"
-msgstr "왼쪽"
-
-#: ../pidgin/gtkprefs.c:940
-msgid "Right"
-msgstr "오른쪽"
-
-#: ../pidgin/gtkprefs.c:942
-msgid "Left Vertical"
-msgstr "왼쪽으로 수직방향"
-
-#: ../pidgin/gtkprefs.c:943
-msgid "Right Vertical"
-msgstr "오른쪽으로 수직방향"
-
-#: ../pidgin/gtkprefs.c:950
-msgid "N_ew conversations:"
-msgstr "새 대화(_E):"
-
-#: ../pidgin/gtkprefs.c:995
-msgid "Show _formatting on incoming messages"
-msgstr "수신 메시지의 서식 표시(_F)"
-
-#: ../pidgin/gtkprefs.c:997
-msgid "Close IMs immediately when the tab is closed"
-msgstr ""
-
 #: ../pidgin/gtkprefs.c:1000
 msgid "Show _detailed information"
 msgstr "상세 정보 보이기(_D)"
 
-#: ../pidgin/gtkprefs.c:1002
-msgid "Enable buddy ic_on animation"
-msgstr "친구 아이콘 애니메이션 표시(_O)"
-
-#: ../pidgin/gtkprefs.c:1009
-msgid "_Notify buddies that you are typing to them"
-msgstr "메시지가 입력 중임을 친구에게 알림(_N)"
-
-#: ../pidgin/gtkprefs.c:1012
-msgid "Highlight _misspelled words"
-msgstr "틀린 철자 강조 표시(_M)"
-
-#: ../pidgin/gtkprefs.c:1016
-msgid "Use smooth-scrolling"
-msgstr "부드러운 스크롤 사용"
-
-#: ../pidgin/gtkprefs.c:1019
-msgid "F_lash window when IMs are received"
-msgstr "메시지를 받으면 창을 깜빡거림(_L)"
-
 #: ../pidgin/gtkprefs.c:1021
 msgid "Minimi_ze new conversation windows"
 msgstr "최소화로 새 대화창 열기(_Z)"
 
-#: ../pidgin/gtkprefs.c:1025
-msgid "Font"
-msgstr "글꼴"
+#: ../pidgin/gtkimhtmltoolbar.c:846
+#: ../pidgin/gtkimhtmltoolbar.c:1220
+msgid "_Font"
+msgstr "글꼴(_F)"
 
-#: ../pidgin/gtkprefs.c:1027
-msgid "Use document font from _theme"
-msgstr "테마로부터 문서 글꼴 사용(_T)"
-
-#: ../pidgin/gtkprefs.c:1029
-msgid "Use font from _theme"
-msgstr "테마로부터 글꼴 사용(_T)"
-
-#: ../pidgin/gtkprefs.c:1031
-msgid "Conversation _font:"
-msgstr "대화창 글꼴(_F):"
-
-#: ../pidgin/gtkprefs.c:1045
-msgid "Default Formatting"
-msgstr "기본 서식"
-
-#: ../pidgin/gtkprefs.c:1064
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-msgstr ""
-"서식을 지원하는 프로토콜을 사용할 때, 보낸 메시지가 어떻게 표시되는지 나타냅"
-"니다. :)"
-
-#: ../pidgin/gtkprefs.c:1130
-msgid "ST_UN server:"
-msgstr "STUN 서버(_U):"
-
-#: ../pidgin/gtkprefs.c:1142
-msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">예: stunserver.org</span>"
-
-#: ../pidgin/gtkprefs.c:1146
-msgid "_Autodetect IP address"
-msgstr "IP 주소를 자동으로 감지(_A)"
-
-#: ../pidgin/gtkprefs.c:1155
-msgid "Public _IP:"
-msgstr "공인 IP(_I):"
-
-#: ../pidgin/gtkprefs.c:1184
-msgid "Ports"
-msgstr "포트"
-
-#: ../pidgin/gtkprefs.c:1187
-msgid "_Manually specify range of ports to listen on"
-msgstr "수동으로 감시할 포트 번호의 범위를 지정(_M)"
-
-#: ../pidgin/gtkprefs.c:1190
-msgid "_Start port:"
-msgstr "시작 포트 번호(_S):"
-
-#: ../pidgin/gtkprefs.c:1197
-msgid "_End port:"
-msgstr "종료 포트 번호(_E):"
-
-#: ../pidgin/gtkprefs.c:1205
-msgid "Proxy Server"
-msgstr "프록시 서버"
-
-#: ../pidgin/gtkprefs.c:1209
-msgid "No proxy"
-msgstr "프록시 없음"
-
-#: ../pidgin/gtkprefs.c:1265
-msgid "_User:"
-msgstr "사용자명(_U):"
-
-#: ../pidgin/gtkprefs.c:1330
-msgid "Seamonkey"
-msgstr "Seamonkey"
-
-#: ../pidgin/gtkprefs.c:1331
-msgid "Opera"
-msgstr "Opera"
-
-#: ../pidgin/gtkprefs.c:1332
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../pidgin/gtkprefs.c:1333
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../pidgin/gtkprefs.c:1334
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../pidgin/gtkprefs.c:1335
-msgid "GNOME Default"
-msgstr "GNOME 디폴트"
-
-#: ../pidgin/gtkprefs.c:1336
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../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
-msgid "Manual"
-msgstr "수동 설정"
-
-#: ../pidgin/gtkprefs.c:1401
-msgid "Browser Selection"
-msgstr "브라우저 선택"
-
-#: ../pidgin/gtkprefs.c:1405
-msgid "_Browser:"
-msgstr "브라우저(_B):"
-
-#: ../pidgin/gtkprefs.c:1413
-msgid "_Open link in:"
-msgstr "링크를 여는 방식(_O):"
-
-#: ../pidgin/gtkprefs.c:1415
-msgid "Browser default"
-msgstr "브라우저 설정에 따름"
-
-#: ../pidgin/gtkprefs.c:1416
-msgid "Existing window"
-msgstr "기존 창에서 열기"
-
-#: ../pidgin/gtkprefs.c:1418
-msgid "New tab"
-msgstr "새 탭으로 열기"
-
-#: ../pidgin/gtkprefs.c:1432
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"수동 설정(_M):\n"
-"(URL은 %s (으)로 지정)"
-
-#: ../pidgin/gtkprefs.c:1472
-msgid "Log _format:"
-msgstr "로그 서식(_F):"
-
-#: ../pidgin/gtkprefs.c:1477
-msgid "Log all _instant messages"
-msgstr "메시지를 모두 기록에 기록(_L)"
-
-#: ../pidgin/gtkprefs.c:1479
-msgid "Log all c_hats"
-msgstr "대화를 모두 로그에 기록(_H)"
-
-#: ../pidgin/gtkprefs.c:1481
-msgid "Log all _status changes to system log"
-msgstr "상태 변경을 모두 로그에 기록(_S)"
-
-#: ../pidgin/gtkprefs.c:1627
-msgid "Sound Selection"
-msgstr "소리 선택"
-
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
-msgid "Quietest"
-msgstr "가장 조용히"
-
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
-msgid "Quieter"
-msgstr "약간 조용히"
-
-#: ../pidgin/gtkprefs.c:1641
-#, c-format
-msgid "Quiet"
-msgstr "조용히"
-
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
-msgid "Loud"
-msgstr "크게"
-
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
-msgid "Louder"
-msgstr "약간 크게"
-
-#: ../pidgin/gtkprefs.c:1649
-#, c-format
-msgid "Loudest"
-msgstr "가장 크게"
-
-#: ../pidgin/gtkprefs.c:1715
-msgid "_Method:"
-msgstr "방식(_M):"
-
-#: ../pidgin/gtkprefs.c:1717
-msgid "Console beep"
-msgstr "비프음"
-
-#: ../pidgin/gtkprefs.c:1724
-msgid "No sounds"
-msgstr "소리 없음"
-
-#: ../pidgin/gtkprefs.c:1732
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"소리 명령(_O)\n"
-"(파일명은 %s (으)로 지정)"
-
-#: ../pidgin/gtkprefs.c:1759
-msgid "Sounds when conversation has _focus"
-msgstr "대화 창이 활성되면 소리 재생(_F)"
-
-#: ../pidgin/gtkprefs.c:1761
-msgid "Enable sounds:"
-msgstr "소리를 재생할 때:"
-
-#: ../pidgin/gtkprefs.c:1772
-msgid "Volume:"
-msgstr "음량:"
-
-#: ../pidgin/gtkprefs.c:1852
-msgid "Play"
-msgstr "재생"
-
-#: ../pidgin/gtkprefs.c:1929
-msgid "_Report idle time:"
-msgstr "대기 시간을 보고할 때(_R):"
-
-#: ../pidgin/gtkprefs.c:1934
-msgid "Based on keyboard or mouse use"
-msgstr "키보드나 마우스 조작을 시작했을 때"
-
-#: ../pidgin/gtkprefs.c:1943
-msgid "_Auto-reply:"
-msgstr "자동 응답(_A):"
-
-#: ../pidgin/gtkprefs.c:1947
-msgid "When both away and idle"
-msgstr "자리 비움으로 대기 상태일 때"
-
-#. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1953
-msgid "Auto-away"
-msgstr "자동 자리 비움"
-
-#: ../pidgin/gtkprefs.c:1955
-msgid "Change status when _idle"
-msgstr "대기 상태가 되면 상태 변경(_I)"
-
 #: ../pidgin/gtkprefs.c:1959
 msgid "_Minutes before becoming idle:"
 msgstr "대기 시간 간격(분)(_M)"
 
-#: ../pidgin/gtkprefs.c:1967
-msgid "Change _status to:"
-msgstr "다음 상태로 변경(_S):"
+#: ../libpurple/plugins/joinpart.c:229
+msgid "Join/Part Hiding Configuration"
+msgstr "Join/Part Hiding 설정"
 
-#. Signon status stuff
-#: ../pidgin/gtkprefs.c:1988
-msgid "Status at Startup"
-msgstr "시작 시의 상태"
-
-#: ../pidgin/gtkprefs.c:1990
-msgid "Use status from last _exit at startup"
-msgstr "마지막 종료 시의 상태 유지(_E)"
-
-#: ../pidgin/gtkprefs.c:1996
-msgid "Status to a_pply at startup:"
-msgstr "시작 시에 적용할 상태(_P):"
-
-#: ../pidgin/gtkprefs.c:2034
-msgid "Interface"
-msgstr "인터페이스"
-
-#: ../pidgin/gtkprefs.c:2036
-msgid "Smiley Themes"
-msgstr "이모티콘 테마"
-
-#: ../pidgin/gtkprefs.c:2043
-msgid "Browser"
-msgstr "브라우저"
-
-#: ../pidgin/gtkprefs.c:2047
-msgid "Status / Idle"
-msgstr "상태 / 대기"
-
-#: ../pidgin/gtkprivacy.c:80
-msgid "Allow all users to contact me"
-msgstr "모든 사용자로부터 연락 허가"
-
-#: ../pidgin/gtkprivacy.c:81
-msgid "Allow only the users on my buddy list"
-msgstr "친구 목록에 등록되어 있는 사용자만 허가"
-
-#: ../pidgin/gtkprivacy.c:82
-msgid "Allow only the users below"
-msgstr "다음 사용자만 허가"
-
-#: ../pidgin/gtkprivacy.c:83
-msgid "Block all users"
-msgstr "모든 사용자 거부"
-
-#: ../pidgin/gtkprivacy.c:84
-msgid "Block only the users below"
-msgstr "다음 사용자만 거부"
-
-#: ../pidgin/gtkprivacy.c:370
-msgid "Privacy"
-msgstr "개인 정보"
-
-#: ../pidgin/gtkprivacy.c:382
-msgid "Changes to privacy settings take effect immediately."
-msgstr "개인 정보 설정의 변경은 즉시 반영됩니다."
-
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
-msgid "Set privacy for:"
-msgstr "설정할 개인 정보:"
-
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
-msgid "Permit User"
-msgstr "허가할 사용자"
-
-#: ../pidgin/gtkprivacy.c:558
-msgid "Type a user you permit to contact you."
-msgstr "연락을 허가할 사용자를 입력해 주십시오."
-
-#: ../pidgin/gtkprivacy.c:559
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "연락을 허가하지 않을 사용자의 이름을 입력해 주십시오."
-
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
-msgid "_Permit"
-msgstr "허가(_P)"
-
-#: ../pidgin/gtkprivacy.c:568
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "%s 님으로부터의 연락을 허가하시겠습니까?"
-
-#: ../pidgin/gtkprivacy.c:570
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "정말 %s 님에게 연락을 허가하시겠습니까?"
-
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
-msgid "Block User"
-msgstr "사용자 거부"
-
-#: ../pidgin/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "거부할 사용자를 입력해 주십시오."
-
-#: ../pidgin/gtkprivacy.c:601
-msgid "Please enter the name of the user you wish to block."
-msgstr "거부하지 않을 사용자의 이름을 입력해 주십시오."
-
-#: ../pidgin/gtkprivacy.c:609
-#, c-format
-msgid "Block %s?"
-msgstr "%s 님을 거부하시겠습니까?"
-
-#: ../pidgin/gtkprivacy.c:611
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "정말 %s 님을 거부하시겠습니까?"
-
-#: ../pidgin/gtkrequest.c:272
-msgid "Apply"
-msgstr "적용"
-
-#: ../pidgin/gtkrequest.c:1507
-msgid "That file already exists"
-msgstr "이미 존재하는 파일입니다."
-
-#: ../pidgin/gtkrequest.c:1508
-msgid "Would you like to overwrite it?"
-msgstr "덮어쓰시겠습니까?"
-
-#: ../pidgin/gtkrequest.c:1511
-msgid "Overwrite"
-msgstr "덮어쓰기"
-
-#: ../pidgin/gtkrequest.c:1512
-msgid "Choose New Name"
-msgstr "다른 이름 선택"
-
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
-msgid "Select Folder..."
-msgstr "폴더 선택..."
-
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:375
-msgid "Room List"
-msgstr "대화실 목록"
-
-#. list button
-#: ../pidgin/gtkroomlist.c:443
-msgid "_Get List"
-msgstr "목록 가져오기(_G)"
-
-#. add button
-#: ../pidgin/gtkroomlist.c:451
-msgid "_Add Chat"
-msgstr "대화 추가(_A)"
-
-#: ../pidgin/gtksavedstatuses.c:337
-msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "정말 선택한 저장된 상태를 삭제하시겠습니까?"
-
-#. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
-msgid "_Use"
-msgstr "사용(_U)"
-
-#: ../pidgin/gtksavedstatuses.c:780
-msgid "Title already in use.  You must choose a unique title."
-msgstr "그 제목은 이미 사용 중입니다. 중복되지 않는 제목을 입력해 주십시오."
-
-#: ../pidgin/gtksavedstatuses.c:970
-msgid "Different"
-msgstr "다른 상태"
-
-#: ../pidgin/gtksavedstatuses.c:1159
-msgid "_Title:"
-msgstr "제목(_T):"
-
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
-msgid "_Status:"
-msgstr "상태(_S):"
-
-#. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
-msgid "Use a _different status for some accounts"
-msgstr "같은 계정으로 다른 상태를 이용(_D)"
-
-#. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
-msgid "Sa_ve & Use"
-msgstr "저장 후 사용(_V)"
-
-#: ../pidgin/gtksavedstatuses.c:1480
-#, c-format
-msgid "Status for %s"
-msgstr "%s 의 상태"
-
-#: ../pidgin/gtkstatusbox.c:664
-msgid "Waiting for network connection"
-msgstr "네트워크 접속 대기 중입니다."
-
-#: ../pidgin/gtkutils.c:633
-#, fuzzy
-msgid "Google Talk"
-msgstr "Toggle Tag"
-
-#: ../pidgin/gtkutils.c:1400 ../pidgin/gtkutils.c:1423
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "%s 을(를) 불러올 때 오류가 발생했습니다: %s"
-
-#: ../pidgin/gtkutils.c:1403 ../pidgin/gtkutils.c:1425
-msgid "Failed to load image"
-msgstr "이미지 불러오기에 실패했습니다."
-
-#: ../pidgin/gtkutils.c:1499
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "폴더 %s 은(는) 전송할 수 없습니다."
-
-#: ../pidgin/gtkutils.c:1500
-#, fuzzy, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
-msgstr ""
-"%s에서는 폴더 자체를 전송할 수 없습니다. 파일을 개별적으로 전송해 주십시오."
-
-#: ../pidgin/gtkutils.c:1534 ../pidgin/gtkutils.c:1546
-#: ../pidgin/gtkutils.c:1553
-msgid "You have dragged an image"
-msgstr "드래그 한 것은 이미지입니다."
-
-#: ../pidgin/gtkutils.c:1535
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"이 이미지를 파일로 전송하거나 메시지 안에 삽입하거나 혹은 사용자의 친구 아이"
-"콘으로 이용할 수 있습니다."
-
-#: ../pidgin/gtkutils.c:1541 ../pidgin/gtkutils.c:1561
-msgid "Set as buddy icon"
-msgstr "친구 아이콘으로 하기"
-
-#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
-msgid "Send image file"
-msgstr "파일로 보내기"
-
-#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1562
-msgid "Insert in message"
-msgstr "메시지 안에 삽입"
-
-#: ../pidgin/gtkutils.c:1547
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "이 사용자의 친구 아이콘으로 이미지를 설정하시겠습니까?"
-
-#: ../pidgin/gtkutils.c:1554
-#, fuzzy
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
-msgstr ""
-"이 이미지를 파일로 전송하거나 메시지 안에 삽입하거나 혹은 사용자의 친구 아이"
-"콘으로 이용할 수 있습니다."
-
-#: ../pidgin/gtkutils.c:1555
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"이 이미지를 메시지 안에 삽입하거나, 이 사용자의 친구 아이콘으로 이용할 수 있"
-"습니다."
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1614
-msgid "Cannot send launcher"
-msgstr "실행기는 전송할 수 없습니다."
-
-#: ../pidgin/gtkutils.c:1614
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"드래그 한 것은 데스크탑 실행기입니다. 아마도 실행기 자신이 아닌, 실행기가 지"
-"시하고 있는 오브젝트를 전송하고자 할 것입니다."
-
-#: ../pidgin/gtkutils.c:2349
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>파일:</b> %s\n"
-"<b>파일 크기:</b> %s\n"
-"<b>이미지 크기:</b> %dx%d"
-
-#: ../pidgin/gtkutils.c:2645
-#, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
-"파일 '%s' 은(는) %s (으)로는 너무 큽니다. 더 작은 이미지로 시도해 보십시오.\n"
-
-#: ../pidgin/gtkutils.c:2647
-msgid "Icon Error"
-msgstr "아이콘 오류"
-
-#: ../pidgin/gtkutils.c:2648
-msgid "Could not set icon"
-msgstr "아이콘을 전송할 수 없었습니다."
-
-#: ../pidgin/gtkutils.c:2748
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "파일 '%s' 을(를) 열 수 없었습니다: %s"
-
-#: ../pidgin/gtkutils.c:2797
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"이미지 '%s' 의 불러오기에 실패했습니다: 원인은 알 수 없으나, 아마도 잘못된 이"
-"미지 파일인 것 같습니다."
-
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
-msgid "Save File"
-msgstr "파일 저장"
-
-#: ../pidgin/gtkwhiteboard.c:861
-msgid "Select color"
-msgstr "색상 선택"
-
-#: ../pidgin/pidginstock.c:87
-msgid "_Alias"
-msgstr "별칭(_A)"
-
-#: ../pidgin/pidginstock.c:89
-msgid "Close _tabs"
-msgstr "탭 닫기(_T)"
-
-#: ../pidgin/pidginstock.c:91
-msgid "_Get Info"
-msgstr "정보 가져오기(_G)"
-
-#: ../pidgin/pidginstock.c:92
-msgid "_Invite"
-msgstr "초대(_I)"
-
-#: ../pidgin/pidginstock.c:93
-msgid "_Modify"
-msgstr "변경(_M)"
-
-#: ../pidgin/pidginstock.c:94
-msgid "_Open Mail"
-msgstr "메일 열기(_O)"
-
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
-msgid "Pidgin smileys"
-msgstr ""
-
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
-msgid "Penguin Pimps"
-msgstr ""
-
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
-msgid "Selecting this disables graphical emoticons."
-msgstr ""
-
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
-#, fuzzy
-msgid "none"
-msgstr "(없음)"
-
-#: ../pidgin/plugins/cap/cap.c:450
-msgid "Display Statistics"
-msgstr "통계 표시"
-
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
-msgid "Response Probability:"
-msgstr "응답 확률:"
-
-#: ../pidgin/plugins/cap/cap.c:811
-msgid "Statistics Configuration"
-msgstr "통계 설정"
-
-#. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
-msgid "Maximum response timeout:"
-msgstr "최대 응답 시간 초과:"
-
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
-msgid "minutes"
-msgstr "분간"
-
-#. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
-msgid "Maximum last-seen difference:"
-msgstr "최대 last-seen 차이:"
-
-#. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
-msgid "Threshold:"
-msgstr "임계값:"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
-msgid "Contact Availability Prediction"
-msgstr "연락 가능성 예측"
+#: ../libpurple/plugins/joinpart.c:270
+msgid "Join/Part Hiding"
+msgstr "Join/Part Hiding"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
-msgid "Contact Availability Prediction plugin."
-msgstr "친구와 대화할 가능성을 예측하는 플러그인입니다."
-
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"연락 가능성을 예측하는 플러그인 (CAP) 을 사용하여 친구와 대화한 통계로부터 경"
-"험치를 표시합니다."
+#: ../libpurple/plugins/joinpart.c:273
+msgid "Hides extraneous join/part messages."
+msgstr "외부 참가/부분 메시지를 안 보입니다."
 
-#: ../pidgin/plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "대기 중인 친구"
-
-#: ../pidgin/plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "자리 비움 중인 친구"
-
-#: ../pidgin/plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "\"장시간\" 자리 비움 상태의 친구"
-
-#. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "휴대 기기 친구"
-
-#: ../pidgin/plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "오프라인 친구"
-
-#: ../pidgin/plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "상태별 점수"
-
-#: ../pidgin/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr "<i>가장 큰 점수</i> 를 갖는 친구가 우선적으로 연락됩니다.\n"
-
-#: ../pidgin/plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "점수가 같을 때에는 마지막 친구가 우선함"
-
-#: ../pidgin/plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "계정별 점수"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/contact_priority.c:187
-msgid "Contact Priority"
-msgstr "연락 우선 순위"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr "친구의 여러 상태에 맞추어 우선 순위를 조절할 수 있습니다."
-
-#. *< description
-#: ../pidgin/plugins/contact_priority.c:192
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"연락 우선 순위를 계산할 때에 친구의 상태 (대기/자리 비움/오프라인 등)의 점수"
-"를 변경할 수 있습니다."
-
-#: ../pidgin/plugins/convcolors.c:23
-msgid "Conversation Colors"
-msgstr "Conversation Colors"
-
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
-msgid "Customize colors in the conversation window"
-msgstr "대화 창안에 표시하는 메시지의 색상을 설정합니다."
-
-#: ../pidgin/plugins/convcolors.c:82
-msgid "Error Messages"
-msgstr "오류 메시지"
-
-#: ../pidgin/plugins/convcolors.c:83
-msgid "Highlighted Messages"
-msgstr "강조 표시 메시지"
-
-#: ../pidgin/plugins/convcolors.c:84
-msgid "System Messages"
-msgstr "시스템 메시지"
-
-#: ../pidgin/plugins/convcolors.c:85
-msgid "Sent Messages"
-msgstr "보낸 메시지"
-
-#: ../pidgin/plugins/convcolors.c:86
-msgid "Received Messages"
-msgstr "받은 메시지"
-
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
-#, c-format
-msgid "Select Color for %s"
-msgstr "%s (으)로 사용할 색상 선택"
-
-#: ../pidgin/plugins/convcolors.c:310
-msgid "Ignore incoming format"
-msgstr "수신한 메시지 서식 무시"
-
-#: ../pidgin/plugins/convcolors.c:311
-msgid "Apply in Chats"
-msgstr "대화 적용"
-
-#: ../pidgin/plugins/convcolors.c:312
-msgid "Apply in IMs"
-msgstr "메시지에 적용"
-
-#: ../pidgin/plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "대화 횟수순으로 정렬"
-
-#: ../pidgin/plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Conversation Placement"
-
-#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-#: ../pidgin/plugins/extplacement.c:105
-msgid ""
-"Note: The preference for \"New conversations\" must be set to \"By "
-"conversation count\"."
-msgstr ""
-
-#: ../pidgin/plugins/extplacement.c:111
-msgid "Number of conversations per window"
-msgstr "창마다 대화 탭의 개수"
-
-#: ../pidgin/plugins/extplacement.c:117
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "대화 탭을 번호순으로 배치할 때 메시지와 대화 창을 분리"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/extplacement.c:146
-msgid "ExtPlacement"
-msgstr "ExtPlacement"
-
-#. *< name
-#. *< version
-#: ../pidgin/plugins/extplacement.c:148
-msgid "Extra conversation placement options."
-msgstr "대화 탭을 배치할 때의 옵션입니다."
-
-#. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"대화 창마다에 대화 탭의 개수를 제한하여, 선택적으로 메시지와 대화 창을 분리합"
-"니다."
+#: ../libpurple/plugins/joinpart.c:275
+msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
+msgstr "큰 대화방에서 활성적으로 대화에 참여하고 있는 사람들을 제외한 사람들의 참가/부분 메시지를 안 보이게 합니다."
 
-#. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "마우스 제스처 설정"
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+msgid "Windows Pidgin Options"
+msgstr "Windows Pidgin 설정"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "마우스 가운데 버튼"
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
+msgid "Options specific to Pidgin for Windows."
+msgstr "Windows를 위한 Pidgin 설정을 제공합니다."
 
-#: ../pidgin/plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "마우스 오른쪽 버튼"
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr "친구 목록 도킹과 같은 Windows에 대한 Pidgin 설정을 제공합니다."
 
-#. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "마우스 제스처를 시각적으로 표시(_V)"
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:530
+msgid "SSL Servers"
+msgstr "SSL 서버"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
-msgid "Mouse Gestures"
-msgstr "마우스 제스처"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
-msgid "Provides support for mouse gestures"
-msgstr "마우스 제스처 기능을 제공합니다."
-
-#. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
+#: ../pidgin/gtkaccount.c:2201
+#, c-format
 msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-"대화 창에서 마우스 제스처 기능을 제공합니다.\n"
-"다음의 동작을 실행하는 경우에는, 마우스 가운데 버튼을 드래그 해 주십시오:\n"
+"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
 "\n"
-"아래→오른쪽으로 드래그 하면 대화를 닫습니다.\n"
-"위→왼쪽으로 드래그 하면 이전의 대화로 이동합니다.\n"
-"위→오른쪽으로 드래그 하면 다음의 대화로 이동합니다."
-
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
-msgid "Instant Messaging"
-msgstr "인스턴트 메신저"
-
-#. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
-msgid "Select a person from your address book below, or add a new person."
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
-"아래의 주소록으로부터 친구를 선택하거나 또는 친구를 새로 추가해 주십시오."
-
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
-msgid "Group:"
-msgstr "그룹:"
-
-#. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
-msgid "New Person"
-msgstr "새 친구"
-
-#. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
-msgid "Select Buddy"
-msgstr "친구 선택"
-
-#. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"주소록으로부터 추가할 친구를 선택하거나 또는 새 친구를 작성해 주십시오."
-
-#. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
-msgid "User _details"
-msgstr "사용자 상세(_D)"
-
-#. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
-msgid "_Associate Buddy"
-msgstr "친구와의 연대(_A)"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
-msgid "Unable to send e-mail"
-msgstr "이메일을 보낼 수 없음"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:241
-msgid "The evolution executable was not found in the PATH."
-msgstr "환경변수 PATH 로부터 Evolution의 실행 형식을 찾을 수 없습니다."
-
-#: ../pidgin/plugins/gevolution/gevolution.c:247
-msgid "An e-mail address was not found for this buddy."
-msgstr "이 친구의 이메일 주소가 없습니다."
-
-#: ../pidgin/plugins/gevolution/gevolution.c:273
-msgid "Add to Address Book"
-msgstr "주소록에 추가"
-
-#: ../pidgin/plugins/gevolution/gevolution.c:285
-msgid "Send E-Mail"
-msgstr "이메일 전송"
-
-#. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
-msgid "Evolution Integration Configuration"
-msgstr "Evolution과의 연대 설정"
-
-#. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "자동으로 친구로 추가할 계정을 모두 선택해 주십시오."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Evolution과의 연대"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "Evolution과의 연대 기능을 제공합니다."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
-msgid "Please enter the person's information below."
-msgstr "사용자 정보를 입력해 주십시오."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "친구 목록의 이름과 계정 형식을 입력해 주십시오."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
-msgid "Account type:"
-msgstr "계정 형식:"
-
-#. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
-msgid "Optional information:"
-msgstr "추가 정보:"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
-msgid "First name:"
-msgstr "이름:"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
-msgid "Last name:"
-msgstr "성:"
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
-msgid "E-mail:"
-msgstr "이메일:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK 신호 시험"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr "모든 UI 신호가 정상적으로 동작하는지 시험합니다."
-
-#: ../pidgin/plugins/gtkbuddynote.c:36
-#, fuzzy, c-format
-msgid ""
+"<span size='larger' weight='bold'>%s에 오신 것을 환영합니다!</span>\n"
 "\n"
-"<b>Buddy Note</b>: %s"
-msgstr "Buddy Notes"
+"아직 계정이 설정되지 않았습니다. %s을 사용하여 접속을 시작하는 경우에는 아래에 있는 <b>추가</b> 버튼을 누른 후, 계정 정보를 입력하십시오. %s을 사용하여 복수의 계정으로 접속하는 경우에는, 각 계정마다 <b>추가</b> 버튼을 눌러 설정하십시오.\n"
+"\n"
+"친구 목록 창에 있는 <b>계정 -> 추가/편집</b> 메뉴에서도 이 창을 열 수 있습니다."
 
-#: ../pidgin/plugins/history.c:195
-msgid "History"
-msgstr "History"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Iconify on Away"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "자리를 벗어나면 친구 목록과 대화 창을 아이콘화 합니다."
-
-#: ../pidgin/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "메일 확인"
-
-#: ../pidgin/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "새 로컬 메일을 확인합니다."
-
-#: ../pidgin/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"새로운 메일이 있으면 그것을 표시하기 위한 작은 상자를 친구 목록에 추가합니다."
-
-#: ../pidgin/plugins/markerline.c:23
-msgid "Markerline"
-msgstr "Markerline"
-
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
-msgid "Draw a line to indicate new messages in a conversation."
-msgstr "대화 창 안에 있는 새 메시지에 밑줄을 그립니다."
-
-#: ../pidgin/plugins/markerline.c:246
-msgid "Draw Markerline in "
-msgstr "밑줄 적용 대상"
-
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
-msgid "_IM windows"
-msgstr "메시지 창(_I)"
-
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
-msgid "C_hat windows"
-msgstr "대화 창(_H)"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"음악 메시지 세션을 요구했습니다. 수락할 경우에는 MM 아이콘을 눌러 주십시오."
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "음악 메시지 세션에 들어갔습니다."
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
-msgid "Music Messaging"
-msgstr "음악 메시지"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
-msgid "There was a conflict in running the command:"
-msgstr "실행 중인 명령에서 충돌이 발생했습니다:"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
-msgid "Error Running Editor"
-msgstr "편집기 실행 오류"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
-msgid "The following error has occurred:"
-msgstr "다음의 오류가 발생했습니다:"
-
-#. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
-msgid "Music Messaging Configuration"
-msgstr "음악 메시지 설정"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
-msgid "Score Editor Path"
-msgstr "점수 편집기 경로"
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
-msgid "_Apply"
-msgstr "적용(_A)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "합작하기 위한 음악 메시지 플러그인입니다."
-
-#. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"실시간으로 공통 점수를 편집함으로써 여러 명의 친구 사이에서 음악의 일부분을 "
-"동시에 연주할 수 있도록 하는 음악 메시지 플러그인입니다."
-
-#. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
-msgid "Notify For"
-msgstr "연락처"
-
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
-msgstr "\t누군가가 나의 아이디를 호출할 때만(_O)"
-
-#: ../pidgin/plugins/notify.c:707
-msgid "_Focused windows"
-msgstr "활성 창(_F)"
-
-#. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
-msgid "Notification Methods"
-msgstr "알림 방식"
-
-#: ../pidgin/plugins/notify.c:722
-msgid "Prepend _string into window title:"
-msgstr "문자열을 창 제목 앞부분에 추가(_S):"
-
-#. Count method button
-#: ../pidgin/plugins/notify.c:741
-msgid "Insert c_ount of new messages into window title"
-msgstr "새 메시지 수를 창 제목에 삽입(_O)"
-
-#. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
-msgid "Insert count of new message into _X property"
-msgstr "새 메시지 수를 X 속성에 삽입(_X)"
-
-#. Urgent method button
-#: ../pidgin/plugins/notify.c:758
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "창 관리자에게 \"긴급\" 힌트 설정(_U)"
-
-#. Raise window method button
-#: ../pidgin/plugins/notify.c:767
-msgid "R_aise conversation window"
-msgstr "대화 창을 전면으로 표시(_A)"
-
-#. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
-msgid "Notification Removal"
-msgstr "알림을 삭제할 시기"
-
-#. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
-msgid "Remove when conversation window _gains focus"
-msgstr "대화 창이 활성되면(_G)"
-
-#. Remove on click button
-#: ../pidgin/plugins/notify.c:787
-msgid "Remove when conversation window _receives click"
-msgstr "대화 창을 클릭하면(_R)"
-
-#. Remove on type button
-#: ../pidgin/plugins/notify.c:795
-msgid "Remove when _typing in conversation window"
-msgstr "대화 창에서 무언가를 입력하면(_T)"
-
-#. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
-msgid "Remove when a _message gets sent"
-msgstr "메시지를 전송하면(_M)"
-
-#. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
-msgid "Remove on switch to conversation ta_b"
-msgstr "대화 창의 탭이 전환되면(_B)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/notify.c:907
-msgid "Message Notification"
-msgstr "Message Notification"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "읽지 않은 메시지를 알리는 다양한 방법을 제공합니다."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/pidgininc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin 데모 플러그인"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "다양한 동작을 실행하는 샘플 플러그인입니다 - 설명을 참조해 주십시오."
-
-#. *  description
-#: ../pidgin/plugins/pidgininc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"이것은 다양한 동작을 실행하는 정말 대단한 플러그인입니다:\n"
-"- 로그인하면 프로그램의 제작자를 알려줍니다.\n"
-"- 수신한 모든 문자를 반전시킵니다.\n"
-"- 로그인하면 친구 목록의 사람들에게 메시지를 즉시 보냅니다."
-
-#: ../pidgin/plugins/pidginrc.c:41
-msgid "Cursor Color"
-msgstr "커서 색상"
-
-#: ../pidgin/plugins/pidginrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "두번째 커서 색상"
-
-#: ../pidgin/plugins/pidginrc.c:43
-msgid "Hyperlink Color"
-msgstr "하이퍼링크 색상"
-
-#: ../pidgin/plugins/pidginrc.c:54
-msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView 수평방향 분리자"
-
-#: ../pidgin/plugins/pidginrc.c:69
-msgid "Conversation Entry"
-msgstr "메지시 글꼴"
-
-#: ../pidgin/plugins/pidginrc.c:70
-msgid "Request Dialog"
-msgstr "질문 창의 글꼴"
-
-#: ../pidgin/plugins/pidginrc.c:71
-msgid "Notify Dialog"
-msgstr "알림 창의 글꼴"
-
-#: ../pidgin/plugins/pidginrc.c:247
-msgid "Select Color"
-msgstr "글꼴 색상"
-
-#: ../pidgin/plugins/pidginrc.c:294
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:4616
 #, c-format
-msgid "Select Interface Font"
-msgstr "인터페이스 글꼴 선택"
-
-#: ../pidgin/plugins/pidginrc.c:297
-#, c-format
-msgid "Select Font for %s"
-msgstr "%s (으)로 사용할 글꼴 선택"
-
-#: ../pidgin/plugins/pidginrc.c:365
-msgid "GTK+ Interface Font"
-msgstr "GTK+ 인터페이스 글꼴"
-
-#: ../pidgin/plugins/pidginrc.c:385
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ 글자 바로 가기 테마"
-
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-#: ../pidgin/plugins/pidginrc.c:422
-msgid "Interface colors"
-msgstr "인터페이스 색상"
-
-#: ../pidgin/plugins/pidginrc.c:446
-msgid "Widget Sizes"
-msgstr "Widget 크기"
-
-#: ../pidgin/plugins/pidginrc.c:467
-msgid "Fonts"
-msgstr "글꼴"
-
-#: ../pidgin/plugins/pidginrc.c:491
-msgid "Gtkrc File Tools"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:496
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "이 설정을 \"%s%sgtkrc-2.0\" 에 저장"
-
-#: ../pidgin/plugins/pidginrc.c:505
-msgid "Re-read gtkrc files"
-msgstr "이 \"gtkrc\" 파일을 읽어들임"
-
-#: ../pidgin/plugins/pidginrc.c:538
-msgid "Pidgin GTK+ Theme Control"
-msgstr "Pidgin GTK+ 테마 정의"
-
-#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "\"gtkrc\" 의 설정에 접근하는 기능을 제공합니다."
-
-#: ../pidgin/plugins/raw.c:175
-msgid "Raw"
-msgstr "Raw 데이터"
-
-#: ../pidgin/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "Raw 데이터를 문자 형식의 프로토콜로 전송할 수 있습니다."
-
-#: ../pidgin/plugins/raw.c:178
-#, fuzzy
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"입력한 Raw 데이터를 문자 형식 프로토콜 (Jabber, MSN, IRC, TOC) 에 전송할 수 "
-"있습니다. 전송할 때에는 입력 상자 안에서 [엔터] 키를 눌러 주십시오. 디버그 창"
-"에서 전송 내용을 감시해 주십시오."
-
-#: ../pidgin/plugins/relnot.c:71
-#, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
-msgstr ""
-"사용 중인 %s 버전은 %s 입니다. 현재 버전은 %s 입니다. 다음 사이트에서 다운로"
-"드 받을 수 있습니다: <a href=\"%s\">%s</a><hr>"
-
-#: ../pidgin/plugins/relnot.c:79
-#, fuzzy, c-format
-msgid "<b>ChangeLog:</b><br>%s"
-msgstr ""
-"<b>변경 로그:</b>\n"
-"%s<br><br>"
-
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
-msgid "New Version Available"
-msgstr "최신 버전 알림"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/relnot.c:143
-msgid "Release Notification"
-msgstr "Release Notification"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/relnot.c:146
-msgid "Checks periodically for new releases."
-msgstr "최신 릴리즈의 정보를 주기적으로 확인합니다."
-
-#. *  description
-#: ../pidgin/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"최신 릴리즈를 주기적으로 확인하여 변경 로그 (ChangeLog) 를 사용자에게 알립니"
-"다."
-
-#: ../pidgin/plugins/spellchk.c:1962
-msgid "Duplicate Correction"
-msgstr "문자열이 중복되고 있습니다."
-
-#: ../pidgin/plugins/spellchk.c:1963
-msgid "The specified word already exists in the correction list."
-msgstr "지정한 문자열은 이미 목록에 있습니다."
-
-#: ../pidgin/plugins/spellchk.c:2177
-msgid "Text Replacements"
-msgstr "문자열 대체"
-
-#: ../pidgin/plugins/spellchk.c:2200
-msgid "You type"
-msgstr "입력한 문자열"
-
-#: ../pidgin/plugins/spellchk.c:2214
-msgid "You send"
-msgstr "실제 전송할 문자열"
-
-#: ../pidgin/plugins/spellchk.c:2228
-msgid "Whole words only"
-msgstr "단어만"
-
-#: ../pidgin/plugins/spellchk.c:2240
-msgid "Case sensitive"
-msgstr "대/소문자 구별"
-
-#: ../pidgin/plugins/spellchk.c:2266
-msgid "Add a new text replacement"
-msgstr "새로운 대체 추가"
-
-#: ../pidgin/plugins/spellchk.c:2282
-msgid "You _type:"
-msgstr "입력한 문자열(_T):"
-
-#: ../pidgin/plugins/spellchk.c:2299
-msgid "You _send:"
-msgstr "실제 전송할 문자열(_S):"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "대/소문자 구별(_E)"
-
-#: ../pidgin/plugins/spellchk.c:2313
-msgid "Only replace _whole words"
-msgstr "단어가 일치할 때 대체(_W)"
-
-#: ../pidgin/plugins/spellchk.c:2338
-msgid "General Text Replacement Options"
-msgstr "일반적인 문자열의 대체 설정"
-
-#: ../pidgin/plugins/spellchk.c:2339
-msgid "Enable replacement of last word on send"
-msgstr "전송 시에 정리하여 대체"
-
-#: ../pidgin/plugins/spellchk.c:2370
-msgid "Text replacement"
-msgstr "Text replacement"
-
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "사용자가 정의한 규칙에 따라 실제로 전송할 메지시를 대체합니다."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
-msgid "Buddy Ticker"
-msgstr "Buddy Ticker"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "친구 목록을 수평방향으로 스크롤하는 버전입니다."
-
-#: ../pidgin/plugins/timestamp.c:137
-msgid "Display Timestamps Every"
-msgstr "타임스탬프 표시 간격"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/timestamp.c:202
-msgid "Timestamp"
-msgstr "Timestamp"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/timestamp.c:205
-msgid "Display iChat-style timestamps"
-msgstr "iChat 형식의 타임스탬프를 표시합니다."
-
-#. *  description
-#: ../pidgin/plugins/timestamp.c:207
-msgid "Display iChat-style timestamps every N minutes."
-msgstr "iChat 형식의 타임스탬프를 N분 마다 대화에 삽입합니다."
-
-#: ../pidgin/plugins/timestamp_format.c:23
-msgid "Timestamp Format Options"
-msgstr "타임스탬프 서식 설정"
-
-#: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force 24-hour time format"
-msgstr "강제적으로 24-시간제 적용(_F)"
-
-#: ../pidgin/plugins/timestamp_format.c:33
-msgid "Show dates in..."
-msgstr "표시할 조건:"
-
-#: ../pidgin/plugins/timestamp_format.c:38
-msgid "Co_nversations:"
-msgstr "대화 창(_N):"
-
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
-msgid "For delayed messages"
-msgstr "메시지가 지연되었을 때"
-
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
-msgid "For delayed messages and in chats"
-msgstr "메시지가 지연되고 있는 대화 시"
-
-#: ../pidgin/plugins/timestamp_format.c:47
-msgid "_Message Logs:"
-msgstr "메시지 로그(_M):"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
-msgid "Message Timestamp Formats"
-msgstr "Message Timestamp Formats"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
-msgid "Customizes the message timestamp formats."
-msgstr "메시지에 부여하는 타임스탬프의 서식을 정의합니다."
-
-#. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"이 플러그인을 사용하면 대화나 로그 메시지에 부여하는 타임스탬프의 형식을 정의"
-"할 수 있습니다."
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
-msgid "Opacity:"
-msgstr "불투명도:"
-
-#. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
-msgid "IM Conversation Windows"
-msgstr "메시지 대화 창"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
-msgid "_IM window transparency"
-msgstr "대화 창의 투명도(_I)"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
-msgid "_Show slider bar in IM window"
-msgstr "대화 창 안에 슬라이드바 표시(_S)"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
-msgid "Remove IM window transparency on focus"
-msgstr "활성되면 대화 창의 투명도 해제"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
-msgid "Always on top"
-msgstr "항상 맨 위에"
-
-#. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
-msgid "Buddy List Window"
-msgstr "친구 목록 창"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
-msgid "_Buddy List window transparency"
-msgstr "친구 목록 투명도(_B)"
-
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
-msgid "Remove Buddy List window transparency on focus"
-msgstr "활성되면 친구 목록의 투명도 해제"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
-msgid "Transparency"
-msgstr "Transparency"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "친구 목록과 대화 창을 계단식으로 투명화 합니다."
-
-#. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"* Note: This plugin requires Win2000 or greater."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
-"이 플러그인은 가변식 투과를 사용하여 친구 목록과 대화 창을 투명하게 합니다.\n"
+"<span weight='bold' size='larger'>%s에 오신 것을 환영합니다!</span>\n"
 "\n"
-"* 주: 이 플러그인은 윈도우즈 2000 이상에서만 동작합니다."
+"아직 사용할 수 있는 계정이 없습니다.<b>계정 -> 추가/편집</b> 메뉴에서 <b>계정</b> 창을 열어 계정을 사용으로 선택하십시오. 계정 사용을 선택하면, 접속하여 상태를 설정한 후 친구와 대화할 수 있습니다."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ 런타임 버전"
+#: ../libpurple/protocols/msn/nexus.c:137
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID 인증: 연결할 수 없음"
 
-#. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
-msgid "Startup"
-msgstr "시작"
+#: ../libpurple/protocols/msn/nexus.c:275
+msgid "Windows Live ID authentication Failed"
+msgstr "Windows Live ID 인증 실패"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
+#: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "_Start %s on Windows startup"
-msgstr "윈도우즈 시작 시 %s 실행(_S)"
+msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
+msgstr "사용 중인 %s 버전은 %s 입니다. 현재 버전은 %s 입니다. 다음 사이트에서 다운로드 받을 수 있습니다: <a href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
-msgid "_Dockable Buddy List"
-msgstr "친구 목록을 결합할 수 있게(_D)"
-
-#. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
-msgid "_Keep Buddy List window on top:"
-msgstr "친구 목록을 맨 위로 배치한 상태 유지(_K):"
-
-#. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
-msgid "Only when docked"
-msgstr "결합했을 때만"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
-msgid "_Flash window when chat messages are received"
-msgstr "대화에서 메시지를 받으면 창을 깜박거림(_F)"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
-msgid "Windows Pidgin Options"
-msgstr "Windows Pidgin 설정"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
-msgid "Options specific to Pidgin for Windows."
-msgstr "Windows를 위한 Pidgin 설정을 제공합니다."
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "친구 목록 도킹과 같은 Windows에 대한 Pidgin 설정을 제공합니다."
-
-#: ../pidgin/plugins/xmppconsole.c:667
-msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>로그아웃 했습니다.</font>"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
-msgid "XMPP Console"
-msgstr "XMPP 콘솔"
-
-#: ../pidgin/plugins/xmppconsole.c:753
-msgid "Account: "
-msgstr "계정: "
-
-#: ../pidgin/plugins/xmppconsole.c:780
-msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr "<font color='#777777'>XMPP에 접속되어 있지 않습니다.</font>"
-
-#: ../pidgin/plugins/xmppconsole.c:790
-msgid "Insert an <iq/> stanza."
-msgstr "<iq/> stanza 를 삽입합니다."
-
-#: ../pidgin/plugins/xmppconsole.c:799
-msgid "Insert a <presence/> stanza."
-msgstr "<presence/> stanza 를 삽입합니다."
-
-#: ../pidgin/plugins/xmppconsole.c:808
-msgid "Insert a <message/> stanza."
-msgstr "<message/> stanza 를 삽입합니다."
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
-msgid "Send and receive raw XMPP stanzas."
-msgstr "낮은 수준의 XMPP stanza 를 전송 또는 수신합니다."
-
-#. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-"이것은 XMPP 서버 또는 클라이언트를 디버그 할 때에 편리한 플러그인입니다."
-
-#~ msgid "Toggle offline buddies"
-#~ msgstr "오프라인 친구로 전환"
-
-#~ msgid "Sort by status"
-#~ msgstr "상태순"
-
-#~ msgid "Sort alphabetically"
-#~ msgstr "알파벳순"
-
-#~ msgid "Sort by log size"
-#~ msgstr "로그 크기순"
-
-#~ msgid ""
-#~ "%s was disconnected due to the following error:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s 님이 다음의 오류로 인해 접속을 끊었습니다:\n"
-#~ "%s"
-
-#~ msgid "Commands are not supported yet. Message was NOT sent."
-#~ msgstr "아직 지원되지 않는 명령입니다. 메시지를 보내지 못했습니다."
-
-#~ msgid "Timestamps"
-#~ msgstr "타임스탬프"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Still need to do something about this."
-#~ msgstr "아직 무언가 해야 할 일이 남은 것 같습니다."
-
-#~ msgid "Alias..."
-#~ msgstr "별칭..."
-
-#~ msgid "Add a _Buddy"
-#~ msgstr "친구 추가(_B)"
-
-#~ msgid "Add a C_hat"
-#~ msgstr "대화 추가(_H)"
-
-#~ msgid "/Buddies/Show _Offline Buddies"
-#~ msgstr "/친구/오프라인 친구 표시(_O)"
-
-#~ msgid "/Buddies/Show _Empty Groups"
-#~ msgstr "/친구/빈 그룹 표시(_E)"
-
-#~ msgid "/Buddies/Show Buddy _Details"
-#~ msgstr "/친구/친구 상세 표시(_D)"
-
-#~ msgid "/Buddies/Show Idle _Times"
-#~ msgstr "/친구/대기 시간 표시(_T)"
-
-#~ msgid "/Accounts/Add\\/Edit"
-#~ msgstr "/계정/추가\\/편집"
-
-#~ msgid "/Tools/Buddy Pounces"
-#~ msgstr "/도구/친구 알림"
-
-#~ msgid "/Buddies/Show Offline Buddies"
-#~ msgstr "/친구/오프라인 친구 표시"
-
-#~ msgid "/Buddies/Show Empty Groups"
-#~ msgstr "/친구/빈 그룹 표시"
-
-#~ msgid "/Buddies/Show Buddy Details"
-#~ msgstr "/친구/친구 상세 표시"
-
-#~ msgid "/Buddies/Show Idle Times"
-#~ msgstr "/친구/대기 시간 표시"
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/설정/친구 아이콘 표시(_I)"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/설정/친구 아이콘 표시"
-
-#~ msgid "Jabber developer"
-#~ msgstr "Jabber 개발자"
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-#~ msgstr ""
-#~ "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net の #wingaim 채널<BR><BR>"
-
-#~ msgid "Insert link"
-#~ msgstr "링크 삽입"
-
-#~ msgid "Insert image"
-#~ msgstr "이미지 삽입"
-
-#~ msgid "_Smiley"
-#~ msgstr "이모티콘(_S)"
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "친구 아이콘 표시(_I)"
-
-#~ msgid ""
-#~ "You can send this image as a file transfer or embed it into this message, "
-#~ "or use it as the buddy icon for this user."
-#~ msgstr ""
-#~ "이 이미지를 파일로 전송하거나 메시지 안에 삽입하거나 혹은 사용자의 친구 아"
-#~ "이콘으로 이용할 수 있습니다."
-
-#~ msgid "GtkTreeView Expander Size"
-#~ msgstr "GtkTreeView Expander 크기"
-
-#~ msgid "Conversation History"
-#~ msgstr "대화 히스토리 글꼴"
-
-#~ msgid "Log Viewer"
-#~ msgstr "로그 뷰어 글꼴"
-
-#~ msgid "GtkTreeView Indent Expanders"
-#~ msgstr "GtkTreeView의 Expander를 들여쓰기 함"
-
-#~ msgid "Tools"
-#~ msgstr "도구"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because it belongs to an account "
-#~ "which is disabled or offline.  This buddy and the group were not "
-#~ "removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because they belong to accounts "
-#~ "which are currently disabled or offline.  These buddies and the group "
-#~ "were not removed.\n"
-#~ msgstr[0] ""
-#~ "%d 개의 계정이 사용 안 함 또는 오프라인 상태이기 때문에 그 계정을 그룹 %s "
-#~ "(으)로부터 삭제하지 못했습니다. 그 친구와 그룹은 삭제할 수 없습니다.\n"
-#~ msgstr[1] ""
-#~ "%d 개의 계정이 사용 안 함 또는 오프라인 상태이기 때문에 그 계정을 그룹 %s "
-#~ "(으)로부터 삭제하지 못했습니다. 그 친구와 그룹은 삭제할 수 없습니다.\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "그룹을 삭제할 수 없습니다."
-
-#~ msgid "Autoreply"
-#~ msgstr "Autoreply"
-
-#~ msgid "Autoreply for all the protocols"
-#~ msgstr "모든 프로토콜로 자동 응답합니다."
-
-#~ msgid ""
-#~ "This plugin lets you set autoreply message for any protocol. You can set "
-#~ "the global autoreply message from the Plugin-options dialog. To set some "
-#~ "specific autoreply message for a particular buddy, right click on the "
-#~ "buddy in the buddy-list window. To set autoreply messages for some "
-#~ "account, go to the `Advanced' tab of the Account-edit dialog."
-#~ msgstr ""
-#~ "이 프로토콜을 사용하면 어떤 종류의 프로토콜로도 자동으로 응답할 수 있게 됩"
-#~ "니다. [플러그인 설정]에서 공통으로 사용할 자동 응답 메시지를 지정할 수 있"
-#~ "습니다. 특정 친구에 대해 자동 응답 메시지를 지정하려면, 친구 목록의 친구 "
-#~ "위에서 오른쪽 클릭해 주십시오. 계정마다 자동 응답 메시지를 지정하려면, 계"
-#~ "정 편집 창의 \"고급 설정\" 탭을 이용하십시오."
-
-#~ msgid "Set autoreply message for %s"
-#~ msgstr "%s 에 대한 자동 응답 메시지"
-
-#~ msgid "Set Autoreply Message"
-#~ msgstr "자동 응답 메시지 설정"
-
-#~ msgid ""
-#~ "The following message will be sent to the buddy when the buddy sends you "
-#~ "a message and autoreply is enabled."
-#~ msgstr ""
-#~ "자동 응답을 사용함으로 할 때 친구가 메시지를 보내 오면, 다음 메시지를 상대"
-#~ "에게 전송합니다:"
-
-#~ msgid "Set _Autoreply Message"
-#~ msgstr "자동 응답 메시지 설정(_A)"
-
-#~ msgid "Autoreply message"
-#~ msgstr "자동 응답 메시지"
-
-#~ msgid "Send autoreply messages when"
-#~ msgstr "자동 응답 메시지를 보낼 시기"
-
-#~ msgid "When my account is _away"
-#~ msgstr "내가 자리 비움일 때(_A)"
-
-#~ msgid "When my account is _idle"
-#~ msgstr "내가 대기 중일 때(_I)"
-
-#~ msgid "_Default reply"
-#~ msgstr "기본 응답(_D)"
-
-#~ msgid "Status message"
-#~ msgstr "상태 메시지"
-
-#~ msgid "Autoreply with status message"
-#~ msgstr "상태 메시지를 추가하여 자동 응답"
-
-#~ msgid "Always when there is a status message"
-#~ msgstr "항상"
-
-#~ msgid "Only when there's no autoreply message"
-#~ msgstr "자동 응답이 없을 때만"
-
-#~ msgid "Delay between autoreplies"
-#~ msgstr "자동 응답 간격"
-
-#~ msgid "_Minimum delay (mins)"
-#~ msgstr "간격(분)(_M)"
-
-#~ msgid "Times to send autoreplies"
-#~ msgstr "자동 응답 회수"
-
-#~ msgid "Ma_ximum count"
-#~ msgstr "최대값(_X)"
-
-#~ msgid ""
-#~ "I am currently not available. Please leave your message, and I will get "
-#~ "back to you as soon as possible."
-#~ msgstr ""
-#~ "지금 저는 응답할 수 있는 상태가 아니므로, 메시지를 남겨 주십시오. 확인하"
-#~ "는 대로 연락을 드리겠습니다."
-
-#~ msgid "Jabber Account"
-#~ msgstr "Jabber 계정"
-
-#~ msgid "Cannot join %s:"
-#~ msgstr "%s 에 참가할 수 없습니다:"
-
-#~ msgid "Server couldn't authenticate you without a password"
-#~ msgstr "서버는 비밀번호가 없는 당신을 인증할 수 없었습니다."
-
-#~ msgid "Search for Jabber users"
-#~ msgstr "Jabber 사용자 검색"
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "잘못된 Jabber ID"
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "Jabber 비밀번호 변경"
-
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "Jabber 플러그인 프로토콜"
-
-#~ msgid "You have just sent a Nudge!"
-#~ msgstr "지금 신호를 전송했습니다!"
-
-#~ msgid "Has you"
-#~ msgstr "내가 등록됨"
-
-#~ msgid ""
-#~ "Always use AIM/ICQ proxy server for file transfers\n"
-#~ "(slower, but does not reveal your IP address)"
-#~ msgstr ""
-#~ "파일 전송은 항상 AIM/ICQ 프록시 서버 이용\n"
-#~ "(속도는 느리지만, IP 주소가 노출되지 않습니다.)"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "SNAC threw 오류: %s\n"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "%s 사용자 정보를 이용할 수 없습니다:"
-
-#~ msgid "Rate limiting error."
-#~ msgstr "속도 제한 오류입니다."
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "원인은 알 수 없지만, 접속이 끊어졌습니다."
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "내 아이디는 현재 다음과 같이 조형되어 있습니다:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "알 수 없는 이유에 의해 친구 %s 을(를) 추가할 수 없었습니다. 일반적인 문제"
-#~ "로서는, 친구 목록에 추가 가능한 친구 수를 초과한 경우일 수 있습니다."
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "새 아이디 서식:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "아이디 서식..."
-
-#~ msgid "_Connect"
-#~ msgstr "접속(_C)"
-
-#~ msgid "Are you sure to exit this Qun?"
-#~ msgstr "이 Qun 을 종료하시겠습니까?"
-
-#~ msgid "Go ahead"
-#~ msgstr "계속하기"
-
-#~ msgid "Server ACK"
-#~ msgstr "서버 ACK"
-
-#~ msgid "Send IM fail\n"
-#~ msgstr "메일 전송 오류\n"
-
-#~ msgid "Keep alive error, seems connection lost!"
-#~ msgstr "오류가 연속적으로 발생하고 있습니다. 접속이 끊어진 것 같습니다!"
-
-#~ msgid "Request login token error!"
-#~ msgstr "로그인 요청 오류!"
-
-#~ msgid "%s Address"
-#~ msgstr "%s 주소"
-
-#~ msgid "QQ: Available"
-#~ msgstr "QQ: 자리에 있음"
-
-#~ msgid "QQ: Away"
-#~ msgstr "QQ: 자리 비움"
-
-#~ msgid "QQ: Invisible"
-#~ msgstr "QQ: 숨은 상태"
-
-#~ msgid "QQ: Offline"
-#~ msgstr "QQ: 오프라인"
-
-#~ msgid "Modify My Information"
-#~ msgstr "내 정보 변경"
-
-#~ msgid "Login in TCP"
-#~ msgstr "TCP 로 로그인"
-
-#~ msgid "Login Hidden"
-#~ msgstr "로그인 숨김"
-
-#~ msgid "Socket send error"
-#~ msgstr "소켓 전송 오류"
-
-#~ msgid "Connection refused"
-#~ msgstr "접속이 거부되었습니다."
-
-#~ msgid "Would like to add him?"
-#~ msgstr "그를 추가하시겠습니까?"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "다른 사용자로부터의 감시 거부"
-
-#~ msgid "Block invites"
-#~ msgstr "초대 거부"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "온라인 상태의 속성 요구 거부"
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC 가 PAUSE 명령을 보냈습니다."
-
-#~ msgid ""
-#~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Gaim will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
-#~ msgstr ""
-#~ "이것이 발생한 경우, TOC 는 메시지 송신을 무시하기 때문에 메시지를 보낼 수 "
-#~ "없습니다. Pidgin은 모든 송신 데이터를 차단합니다. 일시적인 현상이므로 잠시"
-#~ "만 기다려 주십시오."
-
-#~ msgid "Normal authentication failed!"
-#~ msgstr "표준 인증에 실패했습니다."
-
-#~ msgid ""
-#~ "The normal authentication method has failed. This means either your "
-#~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Gaim will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
-#~ msgstr ""
-#~ "표준 인증 방식으로 실패했습니다. 이것은 사용 중인 비밀번호가 틀리거나 혹"
-#~ "은 Yahoo! 의 인증 절차가 변경된 경우입니다. Pidgin은 웹 메신저 인증 방식"
-#~ "을 이용하여 로그인을 시험해 보지만, 이용 가능한 기능이 줄어들 수도 있습니"
-#~ "다."
-
-#~ msgid "Unavailable"
-#~ msgstr "이용 불가"
============================================================
--- po/nb.po	f663d7f55e0520a2f60769d9eb8dfdf2fcfbefae
+++ po/nb.po	e5eb43b29d211aa505b87cb9936362544f9d8721
@@ -1,10 +1,9 @@
 # translation of nb.po to Norsk bokmål
-# Pidgin Norwegian Bokmål translation
+# Gaim Norwegian translation
 # Copyright (C) 2003, Petter Johan Olsen <petter.olsen at cc.uit.no>
 # Copyright (C) 2005, Kyrre Ness Sjøbæk  <kyrre at solution-forge.net>
-# Copyright (C), Hallvard Glad <hallvard.glad at gmail.com>
 #
-# This file is distributed under the same license as the Pidgin package.
+# This file is distributed under the same license as the Gaim package.
 #
 # Contributors:
 #  Petter Johan Olsen   initial translation for 0.62
@@ -18,26 +17,26 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-26 09:23-0400\n"
-"PO-Revision-Date: 2007-09-26 13:48+0100\n"
-"Last-Translator: Espen Stefansen <espens at svn.gnome.org>\n"
+"POT-Creation-Date: 2007-09-28 15:32-0500\n"
+"PO-Revision-Date: 2005-06-08 15:51+0200\n"
+"Last-Translator: Hallvard Glad <hallvard.glad at gmail.com>\n"
 "Language-Team: Norsk bokmål <no at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: KBabel 1.3.1\n"
 
-#: ../finch/finch.c:64
-#: ../finch/finch.c:301
-#: ../finch/finch.c:330
+#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
 #: ../finch/finch.c:418
+#, fuzzy
 msgid "Finch"
-msgstr "Finch"
+msgstr "Fransk"
 
 #: ../finch/finch.c:206
-#, c-format
+#, fuzzy, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s. Prøv '%s -h' for mer informasjon.\n"
+msgstr "Gaim %s. Prøv '%s -h' for mer informasjon.\n"
 
 #: ../finch/finch.c:208
 #, c-format
@@ -52,47 +51,42 @@ msgstr ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 
-#: ../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 investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
 msgstr ""
 
-#: ../finch/gntaccount.c:124
-#: ../finch/gntaccount.c:484
-#: ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433
-#: ../finch/gntblist.c:446
-#: ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234
-#: ../finch/gntstatus.c:301
-#: ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
+#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/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
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576
-#: ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Feil"
 
 #: ../finch/gntaccount.c:124
+#, fuzzy
 msgid "Account was not added"
-msgstr "Kontoen ble ikke lagt til"
+msgstr "Kontoen har blitt deaktivert"
 
 #: ../finch/gntaccount.c:125
 msgid "Screenname of an account must be non-empty."
-msgstr "Skjermnavnet for en konto kan ikke være tomt."
+msgstr ""
 
 #: ../finch/gntaccount.c:437
 msgid "New mail notifications"
-msgstr "Varsling om nye e-poster"
+msgstr "Varsling om ny e-post"
 
 #: ../finch/gntaccount.c:447
 msgid "Remember password"
@@ -100,31 +94,30 @@ msgid "There's no protocol plugins insta
 
 #: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
-msgstr "Det er ingen protokolltillegg installert."
+msgstr ""
 
 #: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(Du har sikkert glemt 'make install'.)"
+msgstr ""
 
-#: ../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 "Endre konto"
 
 #
 #: ../finch/gntaccount.c:496
+#, fuzzy
 msgid "New Account"
-msgstr "Ny konto"
+msgstr "Konto"
 
-#: ../finch/gntaccount.c:521
-#: ../pidgin/gtkft.c:696
+#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protokoll:"
 
 #: ../finch/gntaccount.c:529
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:290
+#, fuzzy
 msgid "Screen name:"
 msgstr "Skjermnavn:"
 
@@ -138,37 +131,21 @@ msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575
-#: ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889
-#: ../finch/gntblist.c:344
-#: ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456
-#: ../finch/gntblist.c:803
-#: ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101
-#: ../finch/gntblist.c:2224
-#: ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379
-#: ../finch/gntpounce.c:459
-#: ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1058
-#: ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485
-#: ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013
-#: ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298
-#: ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666
-#: ../libpurple/protocols/gg/gg.c:803
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
+#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
+#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c: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
@@ -177,12 +154,10 @@ msgstr "Alias:"
 #: ../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
@@ -217,231 +192,176 @@ msgstr "Alias:"
 #: ../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: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
-#: ../pidgin/gtkprivacy.c:604
-#: ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271
-#: ../pidgin/gtksavedstatuses.c:345
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
+#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
+#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
+#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
+#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
+#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
+#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
 #: ../pidgin/gtkstatusbox.c:1574
 msgid "Cancel"
-msgstr "Avbryt"
+msgstr "_Avbryt"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579
-#: ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379
-#: ../finch/gntpounce.c:465
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055
-#: ../finch/gntstatus.c:488
-#: ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727
-#: ../pidgin/gtkdebug.c:749
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
+#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
 #: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr "Lagre"
 
-#: ../finch/gntaccount.c:632
-#: ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333
-#: ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker på at du vil slette %s?"
 
+#
 #: ../finch/gntaccount.c:635
+#, fuzzy
 msgid "Delete Account"
-msgstr "Slett konto"
+msgstr "Konto"
 
 #. Delete button
-#: ../finch/gntaccount.c:637
-#: ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319
-#: ../finch/gntpounce.c:666
-#: ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907
-#: ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100
-#: ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1573
+#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
 msgid "Delete"
 msgstr "Slett"
 
-#: ../finch/gntaccount.c:669
-#: ../finch/gntblist.c:2121
-#: ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325
-#: ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Kontoer"
 
 #: ../finch/gntaccount.c:675
+#, fuzzy
 msgid "You can enable/disable accounts from the following list."
-msgstr "Du kan aktivere/deaktivere kontoer fra følgende liste."
+msgstr "Du venter på godkjenning fra disse kontaktene"
 
 #. 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/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
+#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:6266
-#: ../pidgin/gtkconv.c:1712
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Legg til"
 
 #. Modify button
-#: ../finch/gntaccount.c:703
-#: ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#, fuzzy
 msgid "Modify"
-msgstr "Endre"
+msgstr "_Endre"
 
-#: ../finch/gntaccount.c:811
-#: ../pidgin/gtkaccount.c:2441
-#, c-format
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s har lagt til %s i sin kontaktliste%s%s"
+msgstr "%s%s%s%s har lagt %s til i sin kontaktliste%s%s%s"
 
-#: ../finch/gntaccount.c:884
-#: ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Legg til kontakten i listen din?"
 
-#: ../finch/gntaccount.c:944
-#: ../pidgin/gtkaccount.c:2551
-#, c-format
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#, fuzzy, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s%s%s%s ønsker å legge til %s i sin kontaktliste%s%s."
+msgstr "Brukeren %s ønsker å legge til %s i kontaktlisten sin."
 
-#: ../finch/gntaccount.c:969
-#: ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999
-#: ../pidgin/gtkaccount.c:2574
+#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
 #: ../pidgin/gtkaccount.c:2580
+#, fuzzy
 msgid "Authorize buddy?"
-msgstr "Godkjenn kontakt?"
+msgstr "Godkjenn"
 
-#: ../finch/gntaccount.c:976
-#: ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575
-#: ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Godkjenn"
 
-#: ../finch/gntaccount.c:977
-#: ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576
-#: ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Nekt"
 
 #: ../finch/gntblist.c:289
 msgid "You must provide a screename for the buddy."
-msgstr "Du må oppgi et skjermnavn for kontakten."
+msgstr ""
 
 #: ../finch/gntblist.c:291
 msgid "You must provide a group."
-msgstr "Du må oppgi en gruppe."
+msgstr ""
 
 #: ../finch/gntblist.c:293
+#, fuzzy
 msgid "You must select an account."
-msgstr "Du må velge en konto."
+msgstr "Du må angi et kallenavn"
 
 #: ../finch/gntblist.c:295
 msgid "The selected account is not online."
 msgstr ""
 
 #: ../finch/gntblist.c:300
+#, fuzzy
 msgid "Error adding buddy"
-msgstr "Feil ved å legge til kontakt"
+msgstr ""
+"Klarte ikke lese %s:\n"
+"%s\n"
 
-#: ../finch/gntblist.c:325
-#: ../libpurple/protocols/oscar/oscar.c:2884
-#: ../pidgin/gtkaccount.c:1981
-#: ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Skjermnavn"
 
-#: ../finch/gntblist.c:328
-#: ../finch/gntblist.c:410
-#: ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1507
+#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
+#: ../libpurple/protocols/msn/msn.c:1395
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207
-#: ../pidgin/gtkdialogs.c:1019
-#: ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1065
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
 #: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:331
-#: ../finch/gntblist.c:413
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
+#, fuzzy
 msgid "Group"
-msgstr "Gruppe"
+msgstr "Gruppe:"
 
-#: ../finch/gntblist.c:335
-#: ../finch/gntblist.c:401
-#: ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3206
-#: ../pidgin/gtknotify.c:503
-#: ../pidgin/gtkpounce.c:1268
-#: ../pidgin/plugins/gevolution/gevolution.c:445
+#
+#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
+#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
+#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
-#: ../finch/gntblist.c:341
-#: ../finch/gntblist.c:852
+#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -450,44 +370,38 @@ msgstr "Konto"
 #: ../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 kontakt"
 
 #: ../finch/gntblist.c:341
+#, fuzzy
 msgid "Please enter buddy information."
-msgstr "Vennligst skriv inn kontakteninformasjon."
+msgstr "Navnet på kontakten du vil varsle."
 
-#: ../finch/gntblist.c:370
-#: ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
 msgid "Chats"
 msgstr "Samtaler"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407
-#: ../libpurple/protocols/jabber/jabber.c:924
+#: ../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/qq/buddy_info.c:44
-#: ../pidgin/gtkplugin.c:582
+#: ../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
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Navn"
 
-#: ../finch/gntblist.c:416
-#: ../finch/gntblist.c:819
+#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+#, fuzzy
 msgid "Auto-join"
 msgstr "Automatisk pålogging"
 
-#: ../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 samtale"
 
@@ -495,96 +409,100 @@ msgstr ""
 msgid "You can edit more information from the context menu later."
 msgstr ""
 
-#: ../finch/gntblist.c:433
-#: ../finch/gntblist.c:446
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
+#, fuzzy
 msgid "Error adding group"
-msgstr "Feil ved å legge til gruppe"
+msgstr ""
+"Klarte ikke lese %s:\n"
+"%s\n"
 
 #: ../finch/gntblist.c:434
+#, fuzzy
 msgid "You must give a name for the group to add."
-msgstr "Du må angi et navn til gruppen som skal legges til."
+msgstr "Vennligst skriv inn navnet på gruppen som skal legges til."
 
 #: ../finch/gntblist.c:447
+#, fuzzy
 msgid "A group with the name already exists."
-msgstr "En gruppe med dette navnet eksisterer allerede"
+msgstr "En mappe med dette navnet eksisterer allerede"
 
-#: ../finch/gntblist.c:454
-#: ../finch/gntblist.c:856
+#: ../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"
 
 #: ../finch/gntblist.c:454
+#, fuzzy
 msgid "Enter the name of the group"
-msgstr "Vennligst skriv inn navnet på gruppen"
+msgstr "Vennligst skriv inn navnet på gruppen som skal legges til."
 
 #: ../finch/gntblist.c:802
+#, fuzzy
 msgid "Edit Chat"
-msgstr "Rediger samtale"
+msgstr "Legg til samtale"
 
 #: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
-msgstr "Vennligst oppdater de nødvendige feltene."
+msgstr ""
 
-#: ../finch/gntblist.c:803
-#: ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#, fuzzy
 msgid "Edit"
 msgstr "Rediger"
 
 #: ../finch/gntblist.c:828
+#, fuzzy
 msgid "Edit Settings"
-msgstr "Rediger innstillinger"
+msgstr "Skjulte Innstillinger"
 
-#: ../finch/gntblist.c:864
-#: ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../finch/gntblist.c:864
-#: ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#, fuzzy
 msgid "Retrieving..."
-msgstr "Mottar..."
+msgstr "Kobler til..."
 
-#: ../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"
 msgstr "Hent informasjon"
 
 #: ../finch/gntblist.c:908
+#, fuzzy
 msgid "Add Buddy Pounce"
-msgstr "Legg til kontaktvarsling"
+msgstr "Legg til kompisvarsling"
 
 #. 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
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1607
 msgid "Send File"
 msgstr "Send fil"
 
 #: ../finch/gntblist.c:919
+#, fuzzy
 msgid "View Log"
-msgstr "Vis logg"
+msgstr "Vis _logg"
 
 #: ../finch/gntblist.c:1000
-#, c-format
+#, fuzzy, c-format
 msgid "Please enter the new name for %s"
-msgstr "Vennligst skriv inn det nye navnet for %s"
+msgstr "Vennligst skriv inn nytt navn for gruppen."
 
-#: ../finch/gntblist.c:1002
-#: ../finch/gntblist.c:1250
+#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#, fuzzy
 msgid "Rename"
-msgstr "Endre navn"
+msgstr "End_re navn"
 
 #: ../finch/gntblist.c:1002
+#, fuzzy
 msgid "Set Alias"
-msgstr "Angi alias"
+msgstr "Alias"
 
 #: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
@@ -599,31 +517,25 @@ msgstr ""
 msgstr ""
 
 #: ../finch/gntblist.c:1092
-#, c-format
+#, fuzzy, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Er du sikker på at du vil slette %s?"
 
 #. XXX: anything to do with the returned ui-handle?
 #: ../finch/gntblist.c:1095
+#, fuzzy
 msgid "Confirm Remove"
-msgstr "Bekreft fjerning"
+msgstr "Bekrefte konto"
 
-#: ../finch/gntblist.c:1100
-#: ../finch/gntblist.c:1252
-#: ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1709
-#: ../pidgin/gtkrequest.c:276
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
+#: ../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 "Kontaktliste"
@@ -637,23 +549,20 @@ msgstr ""
 msgstr ""
 
 #. General
-#: ../finch/gntblist.c:1298
-#: ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050
-#: ../libpurple/protocols/gg/gg.c:1123
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../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
@@ -663,31 +572,28 @@ msgstr ""
 #: ../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 "Kallenavn"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320
-#: ../finch/gntprefs.c:261
+#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
 #: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/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 "Inaktiv"
 
 #: ../finch/gntblist.c:1334
+#, fuzzy
 msgid "On Mobile"
-msgstr "PÃ¥ mobil"
+msgstr "Send til mobil"
 
 #: ../finch/gntblist.c:1415
 #, c-format
@@ -697,82 +603,70 @@ msgstr ""
 msgstr ""
 
 #: ../finch/gntblist.c:1424
-#, c-format
+#, fuzzy, c-format
 msgid "Account: %s (%s)"
-msgstr "Konto: %s (%s)"
+msgstr "%s på %s (%s)"
 
 #: ../finch/gntblist.c:1436
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"Sist sett: %s siden"
+"<b>%s:</b> %s"
 
-#: ../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
+#, fuzzy
 msgid "Saved..."
-msgstr "Lagret..."
+msgstr "Lagre fil..."
 
-#: ../finch/gntblist.c:2089
-#: ../finch/gntplugin.c:255
-#: ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523
-#: ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Tillegg"
 
-#: ../finch/gntblist.c:2205
-#: ../pidgin/gtkdialogs.c:750
-#: ../pidgin/gtkdialogs.c:889
-#: ../pidgin/gtkdialogs.c:970
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
+#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
+#, fuzzy
 msgid "_Name"
-msgstr "_Navn"
+msgstr "Navn"
 
-#: ../finch/gntblist.c:2210
-#: ../pidgin/gtkdialogs.c:755
-#: ../pidgin/gtkdialogs.c:894
-#: ../pidgin/gtkdialogs.c:975
+#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
+#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
 msgid "_Account"
 msgstr "Konto:"
 
-#: ../finch/gntblist.c:2218
-#: ../pidgin/gtkdialogs.c:763
+#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
 msgid "New Instant Message"
 msgstr "Ny direktemelding"
 
-#: ../finch/gntblist.c:2220
-#: ../pidgin/gtkdialogs.c:765
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Vennligst skriv inn skjermnavnet eller aliaset på den personen du vil sende direktemelding til."
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Vennligst skriv inn skjermnavnet på den personen du vil sende direktemelding "
+"til."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2223
-#: ../finch/gntcertmgr.c:90
-#: ../finch/gntconn.c:136
-#: ../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
+#: ../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
@@ -789,131 +683,107 @@ msgstr "Vennligst skriv inn skjermnavnet
 #: ../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:768
-#: ../pidgin/gtkdialogs.c:907
-#: ../pidgin/gtkdialogs.c:999
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
+#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
-msgstr "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
+#, fuzzy
 msgid "Options"
-msgstr "Brukervalg"
+msgstr "/_Brukervalg"
 
-#: ../finch/gntblist.c:2267
-msgid "Send IM..."
-msgstr "Send direktemelding..."
-
-#: ../finch/gntblist.c:2271
+#: ../finch/gntblist.c:2247
 #, fuzzy
-msgid "Show"
-msgstr "Vis alle"
+msgid "Send IM..."
+msgstr "Lagre fil..."
 
-#: ../finch/gntblist.c:2276
+#: ../finch/gntblist.c:2251
 #, fuzzy
-msgid "Empty groups"
-msgstr "Vis tomme grupper"
+msgid "Show empty groups"
+msgstr "Etter gruppe"
 
-#: ../finch/gntblist.c:2282
+#: ../finch/gntblist.c:2257
 #, fuzzy
-msgid "Offline buddies"
-msgstr "Vis avloggede kontakter"
+msgid "Show offline buddies"
+msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: ../finch/gntblist.c:2288
+#: ../finch/gntblist.c:2263
 #, fuzzy
-msgid "Sort"
-msgstr "Port"
+msgid "Sort by status"
+msgstr "Status"
 
-#: ../finch/gntblist.c:2293
+#: ../finch/gntblist.c:2267
 #, fuzzy
-msgid "By Status"
-msgstr "Etter status"
-
-#: ../finch/gntblist.c:2297
-#: ../pidgin/gtkblist.c:4106
-msgid "Alphabetically"
+msgid "Sort alphabetically"
 msgstr "Alfabetisk"
 
-#: ../finch/gntblist.c:2301
+#: ../finch/gntblist.c:2271
 #, fuzzy
-msgid "By Log Size"
+msgid "Sort by log size"
 msgstr "Etter loggstørrelse"
 
-#: ../finch/gntcertmgr.c:86
-#: ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#, fuzzy
 msgid "Certificate Import"
-msgstr "Importering av sertifikat"
+msgstr "Koble til"
 
-#: ../finch/gntcertmgr.c:87
-#: ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr "Spesifiser et vertsnavn"
+msgstr ""
 
-#: ../finch/gntcertmgr.c:88
-#: ../pidgin/gtkcertmgr.c:190
+#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
-msgstr "Skriv inn vertsnavnet som dette sertifikatet er for."
+msgstr ""
 
-#: ../finch/gntcertmgr.c:97
-#: ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
-"Filen %s kunne ikke bli importert.\n"
-"Pass på at filen er lesbar og i PEM-format.\n"
 
-#: ../finch/gntcertmgr.c:99
-#: ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:100
-#: ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:110
-#: ../pidgin/gtkcertmgr.c:224
+#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "Velg et PEM-sertifikat"
+msgstr "Velg fil"
 
-#: ../finch/gntcertmgr.c:127
-#: ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:129
-#: ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:130
-#: ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:159
-#: ../pidgin/gtkcertmgr.c:299
+#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
 msgstr ""
 
 #: ../finch/gntcertmgr.c:188
 #, c-format
 msgid "Certificate for %s"
-msgstr "Sertifikat for %s"
+msgstr ""
 
 #: ../finch/gntcertmgr.c:195
 #, c-format
@@ -928,193 +798,183 @@ msgstr ""
 msgid "SSL Host Certificate"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:233
-#: ../pidgin/gtkcertmgr.c:372
+#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr "Virkelig slett sertifikat for %s?"
+msgstr ""
 
-#: ../finch/gntcertmgr.c:236
-#: ../pidgin/gtkcertmgr.c:374
+#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
-msgstr "Bekreft sletting av sertifikat"
+msgstr ""
 
-#: ../finch/gntcertmgr.c:293
-#: ../pidgin/gtkcertmgr.c:602
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
 msgid "Certificate Manager"
-msgstr "Sertifikatshåndterer"
+msgstr ""
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298
-#: ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
+#, fuzzy
 msgid "Hostname"
-msgstr "Vertsnavn"
+msgstr "Etternavn:"
 
-#: ../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 "Info"
 
 #. 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/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
 #: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2468
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
-msgstr "Lukk"
+msgstr "L_ukk"
 
-#: ../finch/gntconn.c:125
-#, c-format
+#: ../finch/gntconn.c:124
+#, fuzzy, c-format
 msgid "%s (%s)"
-msgstr "%s (%s)"
+msgstr "%s på %s (%s)"
 
-#: ../finch/gntconn.c:128
-#, c-format
+#: ../finch/gntconn.c:127
+#, fuzzy, c-format
 msgid "%s disconnected."
-msgstr "%s koblet fra."
+msgstr "Frakoblet."
 
-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:128
 #, fuzzy, c-format
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
-msgstr "%s ble avkoblet pga. en feil. %s Kontoen har blitt avstengt. Korriger feilen og slå på kontoen for å tilkoble."
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s ble avkoblet pga. en feil. %s Kontoen har blitt avstengt. Korriger feilen "
+"og slå på kontoen for å tilkoble."
 
-#: ../finch/gntconn.c:138
-#: ../pidgin/gtkblist.c:4323
+#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#, fuzzy
 msgid "Re-enable Account"
-msgstr "Reaktiver konto"
+msgstr "Registrere ny jabber-konto"
 
 #: ../finch/gntconv.c:139
 msgid "No such command."
 msgstr "Ingen slik kommando"
 
-#: ../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 skrev inn feil antall argumenter til den 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 "Din kommando feilet av ukjent årsak."
 
-#: ../finch/gntconv.c:153
-#: ../pidgin/gtkconv.c:543
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#, fuzzy
 msgid "That command only works in chats, not IMs."
-msgstr "Den kommandoen virker bare i samtalegrupper, ikke i direktemeldinger."
+msgstr "Den kommandoen virker bare i samtalegrupper, ikke i direktemeldinger"
 
-#: ../finch/gntconv.c:156
-#: ../pidgin/gtkconv.c:546
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#, fuzzy
 msgid "That command only works in IMs, not chats."
 msgstr "Den kommandoen virker bare i direktemeldinger, ikke samtalegrupper"
 
-#: ../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 "Denne kommandoen virker ikke på denne protokollen"
 
 #: ../finch/gntconv.c:168
+#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "Meldingen kunne ikke bli sendt, fordi du ikke er koblet til."
+msgstr "Meldingen kunne ikke bli sendt, brukeren er frakoblet:"
 
 #: ../finch/gntconv.c:251
-#, c-format
+#, fuzzy, c-format
 msgid "%s (%s -- %s)"
-msgstr "%s (%s -- %s)"
+msgstr "%s på %s (%s)"
 
 #: ../finch/gntconv.c:274
 #, c-format
 msgid "%s [%s]"
-msgstr "%s [%s]"
+msgstr ""
 
-#: ../finch/gntconv.c:279
-#: ../finch/gntconv.c:801
-#, c-format
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#, fuzzy, c-format
 msgid ""
 "\n"
 "%s is typing..."
-msgstr ""
-"\n"
-"%s skriver..."
+msgstr "Brukeren skriver en melding..."
 
 #: ../finch/gntconv.c:298
+#, fuzzy
 msgid "You have left this chat."
-msgstr "Du har forlatt denne samtalen"
+msgstr "Du snakker i samtalen"
 
-#: ../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 ""
 
-#: ../finch/gntconv.c:420
-#: ../pidgin/gtkconv.c:1423
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Logging stoppet. Framtidige beskjeder i denne samtalen vil ikke bli logget."
+#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Logging stoppet. Framtidige beskjeder i denne samtalen vil ikke bli logget."
 
-#: ../finch/gntconv.c:469
+#: ../finch/gntconv.c:442
+#, fuzzy
 msgid "Send To"
-msgstr "Send til"
+msgstr "Send som"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:486
+#, fuzzy
 msgid "Conversation"
-msgstr "Samtale"
+msgstr "Samtaler"
 
-#: ../finch/gntconv.c:519
+#: ../finch/gntconv.c:492
 msgid "Clear Scrollback"
 msgstr ""
 
-#: ../finch/gntconv.c:523
-#: ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#, fuzzy
 msgid "Show Timestamps"
-msgstr "Vis tidsstempler"
+msgstr "Tidsstempler"
 
-#: ../finch/gntconv.c:539
+#: ../finch/gntconv.c:512
+#, fuzzy
 msgid "Add Buddy Pounce..."
-msgstr "Legg til kontaktvarsling..."
+msgstr "Legg til kompisvarsling"
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:527
+#, fuzzy
 msgid "Enable Logging"
-msgstr "Aktiver logging"
+msgstr "/Brukervalg/Slå på logging"
 
-#: ../finch/gntconv.c:560
+#: ../finch/gntconv.c:533
+#, fuzzy
 msgid "Enable Sounds"
-msgstr "Aktiver lyder"
+msgstr "/Brukervalg/Slå på lyder"
 
-#: ../finch/gntconv.c:766
+#: ../finch/gntconv.c:739
 msgid "<AUTO-REPLY> "
 msgstr ""
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:889
+#: ../finch/gntconv.c:861
 msgid "List of users:\n"
 msgstr ""
 
-#: ../finch/gntconv.c:1051
-#: ../pidgin/gtkconv.c:370
+#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
 msgid "Supported debug options are:  version"
 msgstr "Støttede avlusningsmuligheter er: version"
 
-#: ../finch/gntconv.c:1087
-#: ../pidgin/gtkconv.c:422
+#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr "Ingen slik kommando (i denne sammenheng)."
 
-#: ../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"
@@ -1122,63 +982,65 @@ msgstr ""
 "Bruk \"/help &lt;command&gt;\" for hjelp på en spesifikk kommando.\n"
 "De følgende kommandoer er tilgjengelige i denne sammenhengen:\n"
 
-#: ../finch/gntconv.c:1148
-#: ../pidgin/gtkconv.c:7642
-msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
-msgstr "say &lt;message&gt;: Send en beskjed normalt som om du ikke brukte en kommando."
+#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;message&gt;: Send en beskjed normalt som om du ikke brukte en "
+"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;: Send en IRC stil handling til en kompis eller samtale."
+msgstr ""
+"me &lt;action&gt;: Send en IRC stil handling til en kompis eller samtale."
 
-#: ../finch/gntconv.c:1154
-#: ../pidgin/gtkconv.c:7648
-msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
-msgstr "debug &lt;option&gt;: Send diverse debug informasjon til den pågående samtalen."
+#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;option&gt;: Send diverse debug informasjon til den pågående "
+"samtalen."
 
-#: ../finch/gntconv.c:1157
-#: ../pidgin/gtkconv.c:7651
+#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 #, fuzzy
 msgid "clear: Clears the conversation scrollback."
 msgstr "%s har lukket samtalevinduet."
 
-#: ../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 ""
 
-#: ../finch/gntconv.c:1163
+#: ../finch/gntconv.c:1135
 msgid "users:  Show the list of users in the chat."
 msgstr ""
 
-#: ../finch/gntconv.c:1168
+#: ../finch/gntconv.c:1140
 msgid "plugins: Show the plugins window."
 msgstr ""
 
-#: ../finch/gntconv.c:1171
+#: ../finch/gntconv.c:1143
 msgid "buddylist: Show the buddylist."
 msgstr ""
 
-#: ../finch/gntconv.c:1174
+#: ../finch/gntconv.c:1146
 msgid "accounts: Show the accounts window."
 msgstr ""
 
-#: ../finch/gntconv.c:1177
+#: ../finch/gntconv.c:1149
 msgid "debugwin: Show the debug window."
 msgstr ""
 
-#: ../finch/gntconv.c:1180
+#: ../finch/gntconv.c:1152
 msgid "prefs: Show the preference window."
 msgstr ""
 
-#: ../finch/gntconv.c:1183
+#: ../finch/gntconv.c:1155
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
-#: ../finch/gntdebug.c:235
-#: ../finch/gntui.c:86
-#: ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Avlusningsvindu"
 
@@ -1186,88 +1048,73 @@ msgstr "Avlusningsvindu"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256
-#: ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
 #, fuzzy
 msgid "Clear"
 msgstr "L_ukk"
 
 #: ../finch/gntdebug.c:262
+#, fuzzy
 msgid "Filter: "
-msgstr "Filter:"
+msgstr "Feilet."
 
-#: ../finch/gntdebug.c:266
-#: ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Pause"
 
-#: ../finch/gntft.c:118
-#: ../pidgin/gtkft.c:229
-#, c-format
+#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
+#, fuzzy, c-format
 msgid "File Transfers - %d%% of %d files"
-msgstr "Filoverføringer - %d%% av %d filer"
+msgstr "Filoverføring til %s avbrutt.\n"
 
 #. Create the window.
-#: ../finch/gntft.c:123
-#: ../finch/gntft.c:196
-#: ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234
-#: ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "Filoverføringer"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Framdrift"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Størrelse"
 
 #: ../finch/gntft.c:201
+#, fuzzy
 msgid "Speed"
-msgstr "Hastighet"
+msgstr "Hastighet:"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Gjenstår"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201
-#: ../finch/gntstatus.c:547
-#: ../finch/gntstatus.c:576
+#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
 #: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
 #: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c: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
-#: ../pidgin/gtksavedstatuses.c:999
-#: ../pidgin/gtksavedstatuses.c:1144
+#: ../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"
 
@@ -1276,124 +1123,113 @@ msgstr ""
 msgstr ""
 
 #: ../finch/gntft.c:218
+#, fuzzy
 msgid "Clear finished transfers"
 msgstr "Fjern fullførte overføringer"
 
 #: ../finch/gntft.c:232
+#, fuzzy
 msgid "Stop"
-msgstr "Stopp"
+msgstr "Hiptop"
 
-#: ../finch/gntft.c:305
-#: ../pidgin/gtkft.c:169
-#: ../pidgin/gtkft.c:973
+#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "Venter på at overføringen skal starte"
 
-#: ../finch/gntft.c:372
-#: ../pidgin/gtkft.c:166
-#: ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "Avbrutt"
 
-#: ../finch/gntft.c:374
-#: ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
-msgstr "Feilet"
+msgstr "Feilet."
 
-#: ../finch/gntft.c:420
-#: ../pidgin/gtkft.c:134
-#, c-format
+#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#, fuzzy, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KiB/s"
+msgstr "%.2f KB/s"
 
 #: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
-msgstr "Filen ble lagret som %s."
+msgstr ""
 
-#: ../finch/gntft.c:432
-#: ../finch/gntft.c:433
-#: ../pidgin/gtkft.c:163
+#
+#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
 #: ../pidgin/gtkft.c:1116
 msgid "Finished"
-msgstr "Fullført"
+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"
 
 #: ../finch/gntnotify.c:165
+#, fuzzy
 msgid "Emails"
-msgstr "E-poster"
+msgstr "E-post"
 
-#: ../finch/gntnotify.c:171
-#: ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
 msgid "You have mail!"
-msgstr "Du har e-post!"
+msgstr ""
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:510
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#, fuzzy
 msgid "Sender"
-msgstr "Avsender"
+msgstr "Kjønn"
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:517
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
 msgid "Subject"
-msgstr "Tittel"
+msgstr ""
 
 #: ../finch/gntnotify.c:201
-#, c-format
+#, fuzzy, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s (%s) har %d ny beskjed."
-msgstr[1] "%s (%s) har %d nye beskjeder."
+msgstr[0] "%s har %d ny beskjed."
+msgstr[1] "%s har %d nye beskjeder."
 
-#: ../finch/gntnotify.c:225
-#: ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#, fuzzy
 msgid "New Mail"
-msgstr "Ny e-post"
+msgstr "E-post"
 
-#: ../finch/gntnotify.c:290
-#: ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: ../finch/gntnotify.c:291
-#: ../libpurple/protocols/toc/toc.c:476
+#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
 #: ../pidgin/gtknotify.c:941
 msgid "Buddy Information"
 msgstr "Kontaktinformasjon"
 
-#: ../finch/gntnotify.c:380
-#: ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#, fuzzy
 msgid "Continue"
-msgstr "Fortsett"
+msgstr "Kobler til"
 
-#: ../finch/gntnotify.c:389
-#: ../pidgin/gtkconv.c:1649
+#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
 msgstr "Direktemelding"
 
-#: ../finch/gntnotify.c:392
+#: ../finch/gntnotify.c:389
+#, fuzzy
 msgid "Join"
-msgstr "Bli med"
+msgstr "_Bli med i samtalegruppe"
 
-#: ../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
 #, fuzzy
 msgid "(none)"
 msgstr "(uten navn)"
 
-#: ../finch/gntplugin.c:75
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
 msgid "ERROR"
-msgstr "FEIL"
+msgstr ""
 
 #: ../finch/gntplugin.c:75
 #, fuzzy
@@ -1414,12 +1250,6 @@ msgstr ""
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
-"Navn: %s\n"
-"Versjon: %s\n"
-"Beskrivelse: %s\n"
-"Forfatter: %s\n"
-"Hjemmeside: %s\n"
-"Filnavn: %s\n"
 
 #: ../finch/gntplugin.c:187
 msgid "Plugin need to be loaded before you can configure it."
@@ -1444,57 +1274,52 @@ msgstr "Konfigurer rom"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371
-#: ../finch/gntplugin.c:378
-#: ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90
-#: ../pidgin/gtkdocklet.c:524
-#: ../pidgin/gtkprefs.c:2069
+#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: ../finch/gntpounce.c:183
-#: ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Navnet på kontakten du vil varsle."
 
-#: ../finch/gntpounce.c:328
-#: ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "New Buddy Pounce"
-msgstr "Legg til kontaktvarsling"
+msgstr "Legg til kompisvarsling"
 
-#: ../finch/gntpounce.c:328
-#: ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "Edit Buddy Pounce"
-msgstr "Rediger kontaktvarsling"
+msgstr "Rediger kompisvarsling"
 
 #: ../finch/gntpounce.c:333
 msgid "Pounce Who"
-msgstr "Varsle hvem"
+msgstr "Varsling for"
 
 #. Account:
-#: ../finch/gntpounce.c:336
-#: ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Konto:"
 
 #: ../finch/gntpounce.c:358
+#, fuzzy
 msgid "Buddy name:"
 msgstr "Kontaktnavn:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374
-#: ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#, fuzzy
 msgid "Pounce When Buddy..."
-msgstr "Varsle når kontakt..."
+msgstr "Varsle når"
 
 #: ../finch/gntpounce.c:376
+#, fuzzy
 msgid "Signs on"
-msgstr "Logger på"
+msgstr "PÃ¥lo_gging"
 
 #: ../finch/gntpounce.c:377
+#, fuzzy
 msgid "Signs off"
-msgstr "Logger av"
+msgstr "Logg _av"
 
 #: ../finch/gntpounce.c:378
 #, fuzzy
@@ -1502,20 +1327,24 @@ msgstr "Når fraværende"
 msgstr "Når fraværende"
 
 #: ../finch/gntpounce.c:379
+#, fuzzy
 msgid "Returns from away"
-msgstr "Returnerer fra fravær"
+msgstr "_Returnere fra fravær"
 
 #: ../finch/gntpounce.c:380
+#, fuzzy
 msgid "Becomes idle"
-msgstr "Blir inaktiv"
+msgstr "%s har blitt inaktiv"
 
 #: ../finch/gntpounce.c:381
+#, fuzzy
 msgid "Is no longer idle"
-msgstr "Er ikke lenger inaktiv"
+msgstr "%s er ikke lenger inaktiv"
 
 #: ../finch/gntpounce.c:382
+#, fuzzy
 msgid "Starts typing"
-msgstr "Starter å skrive"
+msgstr "Venn s_tarter å skrive"
 
 #: ../finch/gntpounce.c:383
 #, fuzzy
@@ -1523,16 +1352,17 @@ msgstr "Brukeren skriver en melding..."
 msgstr "Brukeren skriver en melding..."
 
 #: ../finch/gntpounce.c:384
+#, fuzzy
 msgid "Stops typing"
-msgstr "Stopper å skrive"
+msgstr "Venn slutter å skrive til deg"
 
 #: ../finch/gntpounce.c:385
+#, fuzzy
 msgid "Sends a message"
-msgstr "Sender en beskjed"
+msgstr "Send _beskjed"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414
-#: ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
 #, fuzzy
 msgid "Action"
 msgstr "Sted"
@@ -1548,14 +1378,17 @@ msgstr "Varslingsvindu spretter o_pp"
 msgstr "Varslingsvindu spretter o_pp"
 
 #: ../finch/gntpounce.c:418
+#, fuzzy
 msgid "Send a message"
-msgstr "Send en beskjed"
+msgstr "Send _beskjed"
 
 #: ../finch/gntpounce.c:419
+#, fuzzy
 msgid "Execute a command"
 msgstr "Kjør en kommando"
 
 #: ../finch/gntpounce.c:420
+#, fuzzy
 msgid "Play a sound"
 msgstr "Spill av en lyd"
 
@@ -1563,97 +1396,85 @@ msgstr ""
 msgid "Pounce only when my status is not available"
 msgstr ""
 
-#: ../finch/gntpounce.c:450
-#: ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
 msgid "Recurring"
 msgstr ""
 
 #: ../finch/gntpounce.c:618
+#, fuzzy
 msgid "Cannot create pounce"
-msgstr "Kan ikke opprette varsling"
+msgstr "Kan ikke endre kallenavn"
 
 #: ../finch/gntpounce.c:619
 msgid "You do not have any accounts."
-msgstr "Du har ingen kontoer."
+msgstr ""
 
 #: ../finch/gntpounce.c:620
 msgid "You must create an account first before you can create a pounce."
-msgstr "Du må opprette en konto før du kan opprette en varsling."
+msgstr ""
 
-#: ../finch/gntpounce.c:662
-#: ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Er du sikker på at du vil slette %s?"
 
-#: ../finch/gntpounce.c:696
-#: ../finch/gntui.c:84
-#: ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#, fuzzy
 msgid "Buddy Pounces"
-msgstr "Kontaktvarsling"
+msgstr "Legg til kompisvarsling"
 
-#: ../finch/gntpounce.c:810
-#: ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s har begynt å skrive til deg (%s)"
 
-#: ../finch/gntpounce.c:812
-#: ../pidgin/gtkpounce.c:1454
-#, c-format
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#, fuzzy, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s har pauset under skriving til deg (%s)"
+msgstr "%s har begynt å skrive til deg (%s)"
 
-#: ../finch/gntpounce.c:814
-#: ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s har logget på (%s)"
 
-#: ../finch/gntpounce.c:816
-#: ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s har blitt aktiv igjen (%s)"
 
-#: ../finch/gntpounce.c:818
-#: ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s har kommet tilbake (%s)"
 
-#: ../finch/gntpounce.c:820
-#: ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s har sluttet å skrive til deg (%s)"
 
-#: ../finch/gntpounce.c:822
-#: ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s har logget av (%s)"
 
-#: ../finch/gntpounce.c:824
-#: ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s har blitt inaktiv (%s)"
 
-#: ../finch/gntpounce.c:826
-#: ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s er borte. (%s)"
 
-#: ../finch/gntpounce.c:828
-#: ../pidgin/gtkpounce.c:1470
-#, c-format
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#, fuzzy, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s har sendt deg en beskjed. (%s)"
+msgstr "%s ønsker å sende deg %s (%s)"
 
-#: ../finch/gntpounce.c:829
-#: ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukjent varslingshendelse. Vennligst rapporter dette!"
 
@@ -1661,41 +1482,43 @@ msgstr ""
 msgid "Based on keyboard use"
 msgstr ""
 
-#: ../finch/gntprefs.c:94
-#: ../pidgin/gtkprefs.c:1932
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#, fuzzy
 msgid "From last sent message"
-msgstr "Fra sist sendte beskjed"
+msgstr "CTRL-Enter sender beskjeden"
 
-#: ../finch/gntprefs.c:96
-#: ../pidgin/gtkprefs.c:898
-#: ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1931
-#: ../pidgin/gtkprefs.c:1945
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Aldri"
 
 #: ../finch/gntprefs.c:184
+#, fuzzy
 msgid "Show Idle Time"
-msgstr "Vis inaktivtid"
+msgstr "Sett fraværstid for konto"
 
 #: ../finch/gntprefs.c:185
+#, fuzzy
 msgid "Show Offline Buddies"
-msgstr "Vis avloggede kontakter"
+msgstr "/Kontakter/Vis _avloggede kontakter"
 
 #: ../finch/gntprefs.c:192
+#, fuzzy
 msgid "Notify buddies when you are typing"
 msgstr "Varsle kontakter når skriver til dem"
 
 #: ../finch/gntprefs.c:198
+#, fuzzy
 msgid "Log format"
-msgstr "Logg-format"
+msgstr "Logg_format:"
 
 #: ../finch/gntprefs.c:199
 msgid "Log IMs"
 msgstr ""
 
 #: ../finch/gntprefs.c:200
+#, fuzzy
 msgid "Log chats"
 msgstr "Logg alle samtaler"
 
@@ -1720,244 +1543,224 @@ msgstr "Antall minutter før fraværsmar
 msgstr "Antall minutter før fraværsmarkert:"
 
 #: ../finch/gntprefs.c:210
+#, fuzzy
 msgid "Change status to"
-msgstr "Endre status til"
+msgstr "Endre adresse 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 "Logging"
 
 #: ../finch/gntrequest.c:583
+#, fuzzy
 msgid "Not implemented yet."
-msgstr "Ikke implementert enda"
+msgstr "Funksjonen er ikke implementert"
 
-#: ../finch/gntrequest.c:659
-#: ../pidgin/gtkrequest.c:1555
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
 #: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Lagre fil..."
 
-#: ../finch/gntrequest.c:659
-#: ../pidgin/gtkrequest.c:1556
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
 #: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Ã…pne fil..."
 
-#: ../finch/gntsound.c:97
-#: ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs in"
 msgstr "Kontakt logger inn"
 
-#: ../finch/gntsound.c:98
-#: ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Buddy logs out"
 msgstr "Kontakt logger ut"
 
-#: ../finch/gntsound.c:99
-#: ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received"
 msgstr "Beskjed mottatt"
 
-#: ../finch/gntsound.c:100
-#: ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message received begins conversation"
 msgstr "Beskjed mottas og samtale starter"
 
-#: ../finch/gntsound.c:101
-#: ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Message sent"
 msgstr "Beskjed sendt"
 
-#: ../finch/gntsound.c:102
-#: ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person enters chat"
 msgstr "Person blir med i samtalen"
 
-#: ../finch/gntsound.c:103
-#: ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "Person leaves chat"
 msgstr "Person forlater samtalen"
 
-#: ../finch/gntsound.c:104
-#: ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "You talk in chat"
 msgstr "Du snakker i samtalen"
 
-#: ../finch/gntsound.c:105
-#: ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
 msgid "Others talk in chat"
 msgstr "Andre snakker i samtalen"
 
-#: ../finch/gntsound.c:107
-#: ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#, fuzzy
 msgid "Someone says your screen name in chat"
-msgstr "Noen roper skjermnavnet ditt i en samtale"
+msgstr "Noen sier navnet ditt i en samtale"
 
-#: ../finch/gntsound.c:361
-#: ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer Failure"
-msgstr "Feil i GStreamer"
+msgstr ""
 
-#: ../finch/gntsound.c:362
-#: ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
 msgid "GStreamer failed to initialize."
 msgstr ""
 
-#: ../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
+#, fuzzy
 msgid "(default)"
-msgstr "(forvalgt)"
+msgstr "Gnome-standard"
 
 #: ../finch/gntsound.c:729
+#, fuzzy
 msgid "Select Sound File ..."
-msgstr "Velg lydfil ..."
+msgstr "Velg fil"
 
 #: ../finch/gntsound.c:904
+#, fuzzy
 msgid "Sound Preferences"
-msgstr "Lydinnstillinger"
+msgstr "Innstillinger"
 
 #: ../finch/gntsound.c:915
+#, fuzzy
 msgid "Profiles"
-msgstr "Profiler"
+msgstr "Profil"
 
-#: ../finch/gntsound.c:954
-#: ../pidgin/gtkprefs.c:1719
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
 msgid "Automatic"
 msgstr "Automatisk"
 
 #: ../finch/gntsound.c:957
+#, fuzzy
 msgid "Console Beep"
 msgstr "Konsollpip"
 
-#: ../finch/gntsound.c:958
-#: ../pidgin/gtkprefs.c:1723
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
 msgid "Command"
 msgstr "Kommando"
 
 #: ../finch/gntsound.c:959
+#, fuzzy
 msgid "No Sound"
-msgstr "Ingen lyd"
+msgstr "Lyder"
 
-#: ../finch/gntsound.c:961
-#: ../pidgin/gtkprefs.c:1714
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
 msgid "Sound Method"
 msgstr "Lydtype"
 
 #: ../finch/gntsound.c:966
+#, fuzzy
 msgid "Method: "
-msgstr "Metode: "
+msgstr "_Metode:"
 
 #: ../finch/gntsound.c:973
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Lydkommando\n"
+"_Program for lydavspilling\n"
 "(%s for filnavn)"
 
 #. Sound options
-#: ../finch/gntsound.c:981
-#: ../pidgin/gtkprefs.c:1758
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
 msgid "Sound Options"
 msgstr "Lydinnstillinger"
 
+#
 #: ../finch/gntsound.c:982
+#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "Lyder når samtalen har fokus"
+msgstr "Lyder når samtalevinduet har _fokus"
 
-#: ../finch/gntsound.c:990
-#: ../pidgin/gtkprefs.c:897
-#: ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1765
-#: ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
+#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+#, fuzzy
 msgid "Always"
-msgstr "Alltid"
+msgstr "Borte"
 
-#: ../finch/gntsound.c:991
-#: ../pidgin/gtkprefs.c:1763
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#, fuzzy
 msgid "Only when available"
-msgstr "Bare hvis tilgjengelig"
+msgstr "Ikke tilgjengelig"
 
-#: ../finch/gntsound.c:992
-#: ../pidgin/gtkprefs.c:1764
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#, fuzzy
 msgid "Only when not available"
-msgstr "Bare hvis ikke tilgjengelig."
+msgstr "Snakkerom i %s er ikke tilgjengelig."
 
 #: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
-msgstr "Volum(0-100):"
+msgstr ""
 
 #. Sound events
-#: ../finch/gntsound.c:1018
-#: ../pidgin/gtkprefs.c:1800
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
 msgid "Sound Events"
 msgstr "Lydhendelser"
 
-#: ../finch/gntsound.c:1020
-#: ../pidgin/gtkprefs.c:1859
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
 msgid "Event"
 msgstr "Hendelse"
 
 #: ../finch/gntsound.c:1020
+#, fuzzy
 msgid "File"
-msgstr "Fil"
+msgstr "Feilet."
 
-#: ../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 "Bla gjennom..."
 
 #: ../finch/gntstatus.c:138
-#, c-format
+#, fuzzy, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Er du sikker på at du vil slette '%s'?"
+msgstr "Er du sikker på at du vil slette %s?"
 
 #: ../finch/gntstatus.c:141
+#, fuzzy
 msgid "Delete Status"
-msgstr "Slett status"
+msgstr "PÃ¥loggningsstatus"
 
-#: ../finch/gntstatus.c:176
-#: ../pidgin/gtksavedstatuses.c:597
+#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
+#, fuzzy
 msgid "Saved Statuses"
-msgstr "Lagrede statuser"
+msgstr "Tjenerstatistikk"
 
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:539
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Tittel"
 
-#: ../finch/gntstatus.c:183
-#: ../pidgin/gtksavedstatuses.c:515
+#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Type"
 
@@ -1969,43 +1772,31 @@ msgstr "Type"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:564
-#: ../finch/gntstatus.c:576
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
 #: ../libpurple/protocols/bonjour/bonjour.c:256
 #: ../libpurple/protocols/bonjour/bonjour.c:263
 #: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597
-#: ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613
-#: ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627
-#: ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
 #: ../libpurple/protocols/jabber/jabber.c:1532
 #: ../libpurple/protocols/jabber/jabber.c:1555
 #: ../libpurple/protocols/jabber/jabber.c:1578
 #: ../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
@@ -2013,27 +1804,28 @@ msgstr "Type"
 #: ../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
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
-msgstr "Beskjed"
+msgstr "Beskjed:"
 
 #. Use
-#: ../finch/gntstatus.c:194
-#: ../finch/gntstatus.c:593
+#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
+#, fuzzy
 msgid "Use"
 msgstr "Bruk"
 
 #: ../finch/gntstatus.c:301
+#, fuzzy
 msgid "Invalid title"
-msgstr "Ugyldig tittel"
+msgstr "Ugyldig authzid"
 
 #: ../finch/gntstatus.c:302
+#, fuzzy
 msgid "Please enter a non-empty title for the status."
-msgstr "Vennligst ikke angi et tom tittel til statusen."
+msgstr "Vennligst skriv inn nytt navn for gruppen."
 
 #: ../finch/gntstatus.c:310
 #, fuzzy
@@ -2041,51 +1833,54 @@ msgstr "Dupliserings Korrigering"
 msgstr "Dupliserings Korrigering"
 
 #: ../finch/gntstatus.c:311
+#, fuzzy
 msgid "Please enter a different title for the status."
-msgstr "Vennligst skriv inn en annen tittel til statusen."
+msgstr "Vennligst skriv inn nytt navn for gruppen."
 
 #: ../finch/gntstatus.c:452
 #, fuzzy
 msgid "Substatus"
 msgstr "Status"
 
-#: ../finch/gntstatus.c:464
-#: ../pidgin/gtkft.c:699
+#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Status:"
 
 #: ../finch/gntstatus.c:479
+#, fuzzy
 msgid "Message:"
 msgstr "Beskjed:"
 
 #: ../finch/gntstatus.c:528
+#, fuzzy
 msgid "Edit Status"
-msgstr "Endre status"
+msgstr "Sivilstatus"
 
 #: ../finch/gntstatus.c:570
+#, fuzzy
 msgid "Use different status for following accounts"
-msgstr "Bruk en annen status for følgende kontoer"
+msgstr "Bruk en annen status for noen kontoer"
 
 #. Save & Use
 #: ../finch/gntstatus.c:604
+#, fuzzy
 msgid "Save & Use"
-msgstr "Lagre og bruk"
+msgstr "Lagre & bruk"
 
 #: ../finch/gntui.c:85
 msgid "Certificates"
-msgstr "Sertifikater"
+msgstr ""
 
-#: ../finch/gntui.c:89
-#: ../pidgin/gtkprefs.c:2037
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
 msgid "Sounds"
 msgstr "Lyder"
 
 #: ../finch/gntui.c:91
+#, fuzzy
 msgid "Statuses"
-msgstr "Statuser"
+msgstr "Status"
 
-#: ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
 #, fuzzy
 msgid "Error loading the plugin."
@@ -2097,8 +1892,9 @@ msgstr "Kan ikke sende fil"
 msgstr "Kan ikke sende fil"
 
 #: ../finch/plugins/gntclipboard.c:122
+#, fuzzy
 msgid "Couldn't find window"
-msgstr "Kan ikke finne vindu"
+msgstr "Kan ikke sende fil"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
@@ -2106,30 +1902,32 @@ msgid "GntClipboard"
 
 #: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
-msgstr "GntClipboard"
+msgstr ""
 
 #: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr ""
 
 #: ../finch/plugins/gntclipboard.c:161
-msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
 msgstr ""
 
 #: ../finch/plugins/gntgf.c:231
-#, c-format
+#, fuzzy, c-format
 msgid "%s just signed on"
-msgstr "%s logget akkurat på"
+msgstr "%s har logget på"
 
 #: ../finch/plugins/gntgf.c:238
-#, c-format
+#, fuzzy, c-format
 msgid "%s just signed off"
-msgstr "%s logget akkurat av"
+msgstr "%s logget av"
 
 #: ../finch/plugins/gntgf.c:246
-#, c-format
+#, fuzzy, c-format
 msgid "%s sent you a message"
-msgstr "%s har sendt deg en beskjed"
+msgstr "%s ønsker å sende deg en fil."
 
 #: ../finch/plugins/gntgf.c:265
 #, c-format
@@ -2137,25 +1935,28 @@ msgstr ""
 msgstr ""
 
 #: ../finch/plugins/gntgf.c:267
-#, c-format
+#, fuzzy, c-format
 msgid "%s sent a message in %s"
-msgstr "%s sendte en beskjed i %s"
+msgstr "Send _beskjed"
 
 #: ../finch/plugins/gntgf.c:305
+#, fuzzy
 msgid "Buddy signs on/off"
-msgstr "Kontakt logget på/av"
+msgstr "Kontakt er avlogget:"
 
 #: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr ""
 
 #: ../finch/plugins/gntgf.c:307
+#, fuzzy
 msgid "Someone speaks in a chat"
-msgstr "Noen snakker i en samtale"
+msgstr "Noen sier navnet ditt i en samtale"
 
 #: ../finch/plugins/gntgf.c:308
+#, fuzzy
 msgid "Someone says your name in a chat"
-msgstr "Noen sa navnet ditt i en samtale"
+msgstr "Noen sier navnet ditt i en samtale"
 
 #: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
@@ -2171,73 +1972,74 @@ msgid "GntGf"
 
 #: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
-msgstr "GntGf"
+msgstr ""
 
-#: ../finch/plugins/gntgf.c:379
-#: ../finch/plugins/gntgf.c:380
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:116
-#: ../pidgin/plugins/history.c:123
-#, c-format
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#, fuzzy, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>Samtaler med %s på %s:</b><br>"
+msgstr "Samtaler med %s"
 
-#: ../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 "Historie Tillegg Krever Logging"
 
-#: ../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"
-"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
 msgstr ""
 "Logging kan slås på gjennom Verktøy -> Innstillinger -> Logging.\n"
 "\n"
-"Å slå på logging for lynmeldinger og/eller prat vil aktivere historie for den samme samtaletypen."
+"Å slå på logging for lynmeldinger og/eller prat vil aktivere historie for "
+"den samme samtaletypen."
 
 #: ../finch/plugins/gnthistory.c:179
 #, fuzzy
 msgid "GntHistory"
-msgstr "GntHistorikk"
+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 tidligere loggede samtaler i nye samtaler."
 
-#: ../finch/plugins/gnthistory.c:182
-#: ../pidgin/plugins/history.c:195
-msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
-msgstr "Når en ny samtale startes, vil dette tillegget sette inn den forrige samtalen i den pågående."
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"NÃ¥r en ny samtale startes, vil dette tillegget sette inn den forrige "
+"samtalen i den pågående."
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr ""
 
-#: ../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 ""
 
-#: ../finch/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:123
-#: ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr ""
 
 #: ../libpurple/account.c:791
+#, fuzzy
 msgid "accounts"
-msgstr "kontoer"
+msgstr "Kontoer"
 
-#: ../libpurple/account.c:958
-#: ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#, fuzzy
 msgid "Password is required to sign on."
 msgstr "Passord kreves for å logge på."
 
@@ -2247,29 +2049,28 @@ msgstr "Oppgi passord for %s (%s)"
 msgstr "Oppgi passord for %s (%s)"
 
 #: ../libpurple/account.c:999
+#, fuzzy
 msgid "Enter Password"
-msgstr "Oppgi passord"
+msgstr "Oppgi  passord"
 
 #
 #: ../libpurple/account.c:1004
+#, fuzzy
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../libpurple/account.c:1039
-#: ../libpurple/connection.c:105
+#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Mangler protokolltillegg for %s"
 
-#: ../libpurple/account.c:1041
-#: ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4318
+#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
+#: ../pidgin/gtkblist.c:4036
 msgid "Connection Error"
 msgstr "Feil ved tilkobling"
 
-#: ../libpurple/account.c:1199
-#: ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
 #: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "De nye passordene stemmer ikke overens."
@@ -2278,14 +2079,17 @@ msgstr "Fyll ut alle feltene fullstendig
 msgid "Fill out all fields completely."
 msgstr "Fyll ut alle feltene fullstendig."
 
+#
 #: ../libpurple/account.c:1231
 msgid "Original password"
 msgstr "Opprinnelig passord"
 
+#
 #: ../libpurple/account.c:1238
 msgid "New password"
 msgstr "Nytt passord"
 
+#
 #: ../libpurple/account.c:1245
 msgid "New password (again)"
 msgstr "Nytt passord (igjen)"
@@ -2295,6 +2099,7 @@ msgstr "Endre passord for %s:"
 msgid "Change password for %s"
 msgstr "Endre passord for %s:"
 
+#
 #: ../libpurple/account.c:1259
 msgid "Please enter your current password and your new password."
 msgstr "Skriv inn ditt nåværende passord og ditt nye passord."
@@ -2304,36 +2109,31 @@ msgstr "Endre brukerinformasjon for %s"
 msgid "Change user information for %s"
 msgstr "Endre brukerinformasjon for %s"
 
-#: ../libpurple/account.c:1293
-#: ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Sett brukerinfo"
 
-#: ../libpurple/account.c:1764
-#: ../libpurple/protocols/gg/gg.c:1017
+#: ../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/qq/qq.c:232
-#: ../pidgin/gtkft.c:160
+#: ../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 "Ukjent"
 
-#: ../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"
 msgstr "Kontakter"
 
 #: ../libpurple/blist.c:548
+#, fuzzy
 msgid "buddy list"
-msgstr "kontaktliste"
+msgstr "Kontaktliste"
 
 #: ../libpurple/certificate.c:545
 msgid "(DOES NOT MATCH)"
@@ -2371,9 +2171,9 @@ msgstr ""
 
 #. Make messages
 #: ../libpurple/certificate.c:1171
-#, c-format
+#, fuzzy, c-format
 msgid "Accept certificate for %s?"
-msgstr "Aksepter sertifikat for %s?"
+msgstr "Aksepter samtaleinvitasjon?"
 
 #. TODO: Find what the handle ought to be
 #: ../libpurple/certificate.c:1177
@@ -2385,18 +2185,18 @@ msgstr "Godta"
 msgid "Accept"
 msgstr "Godta"
 
-#: ../libpurple/certificate.c:1187
-#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:90
 #: ../libpurple/protocols/qq/sys_msg.c:246
+#, fuzzy
 msgid "Reject"
-msgstr "Avslå"
+msgstr "Nullstill"
 
 #: ../libpurple/certificate.c:1188
 msgid "_View Certificate..."
-msgstr "_Se på sertfikat..."
+msgstr ""
 
 #. Prompt the user to authenticate the certificate
 #. TODO: Provide the user with more guidance about why he is
@@ -2404,14 +2204,18 @@ msgstr "_Se på sertfikat..."
 #. vrq will be completed by user_auth
 #: ../libpurple/certificate.c:1288
 #, c-format
-msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #: ../libpurple/certificate.c:1313
 #, c-format
-msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
 msgstr ""
 
 #: ../libpurple/certificate.c:1331
@@ -2424,8 +2228,7 @@ msgstr ""
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339
-#: ../libpurple/certificate.c:1416
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
 msgid "SSL Certificate Error"
 msgstr ""
 
@@ -2436,17 +2239,23 @@ msgstr "Ugyldig godkjennings mekanisme"
 
 #. vrq will be completed by user_auth
 #: ../libpurple/certificate.c:1360
-msgid "You have no database of root certificates, so this certificate cannot be validated."
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
 msgstr ""
 
 #. vrq will be completed by user_auth
 #: ../libpurple/certificate.c:1382
-msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 
 #: ../libpurple/certificate.c:1408
 #, c-format
-msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
 msgstr ""
 
 #: ../libpurple/certificate.c:1417
@@ -2454,7 +2263,7 @@ msgstr ""
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1882
+#: ../libpurple/certificate.c:1881
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2466,52 +2275,54 @@ msgstr ""
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1891
+#: ../libpurple/certificate.c:1890
+#, fuzzy
 msgid "Certificate Information"
-msgstr "Sertifikatinformasjon"
+msgstr "Profilinformasjon"
 
+#
 #: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Registreringsfeil"
 
+#
 #: ../libpurple/connection.c:180
+#, fuzzy
 msgid "Unregistration Error"
-msgstr "Avregistreringsfeil"
+msgstr "Registreringsfeil"
 
 #: ../libpurple/connection.c:350
-#, c-format
+#, fuzzy, c-format
 msgid "+++ %s signed on"
-msgstr "+++ %s logget på"
+msgstr "%s har logget på"
 
 #: ../libpurple/connection.c:380
-#, c-format
+#, fuzzy, c-format
 msgid "+++ %s signed off"
-msgstr "+++ %s logget av"
+msgstr "%s logget av"
 
-#: ../libpurple/connection.c:497
-#: ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
+#: ../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 "Ukjent feil"
 
 #: ../libpurple/conversation.c:170
+#, fuzzy
 msgid "Unable to send message: The message is too large."
-msgstr "Kunne ikke sende beskjed: Beskjeden er for stor."
+msgstr "Kunne ikke sende beskjed. Beskjeden er for stor."
 
-#: ../libpurple/conversation.c:173
-#: ../libpurple/conversation.c:186
-#, c-format
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#, fuzzy, c-format
 msgid "Unable to send message to %s."
-msgstr "Klarte ikke å sende beskjed til %s."
+msgstr "Kunne ikke sende beskjed til %s."
 
 #: ../libpurple/conversation.c:174
 msgid "The message is too large."
-msgstr "Beskjeden er for stor."
+msgstr "Meldingen er for stor."
 
-#: ../libpurple/conversation.c:183
-#: ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
 #: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Kunne ikke sende beskjed."
@@ -2521,8 +2332,9 @@ msgstr "Send beskjed"
 msgstr "Send beskjed"
 
 #: ../libpurple/conversation.c:1214
+#, fuzzy
 msgid "_Send Message"
-msgstr "_Send beskjed"
+msgstr "Send beskjed"
 
 #: ../libpurple/conversation.c:1620
 #, c-format
@@ -2573,8 +2385,7 @@ msgstr ""
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 
-#: ../libpurple/desktopitem.c:287
-#: ../libpurple/desktopitem.c:878
+#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 #, fuzzy
 msgid "No name"
 msgstr "Etternavn:"
@@ -2589,8 +2400,7 @@ msgstr "Kunne ikke sende beskjed til %s.
 msgid "Unable to send request to resolver process\n"
 msgstr "Kunne ikke sende beskjed til %s."
 
-#: ../libpurple/dnsquery.c:549
-#: ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
 #, fuzzy, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2599,8 +2409,7 @@ msgstr ""
 "Klarte ikke lese %s:\n"
 "%s\n"
 
-#: ../libpurple/dnsquery.c:552
-#: ../libpurple/dnsquery.c:711
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
 #: ../libpurple/dnsquery.c:831
 #, fuzzy, c-format
 msgid "Error resolving %s: %d"
@@ -2616,7 +2425,7 @@ msgstr "Feil under lesing fra socket."
 msgstr "Feil under lesing fra socket."
 
 #: ../libpurple/dnsquery.c:578
-#, fuzzy
+#, fuzzy, c-format
 msgid "EOF while reading from resolver process"
 msgstr "Feil under lesing fra socket."
 
@@ -2626,8 +2435,9 @@ msgstr "Autentiseringsfeil"
 msgstr "Autentiseringsfeil"
 
 #: ../libpurple/dnsquery.c:762
+#, fuzzy
 msgid "Unknown reason"
-msgstr "Ukjent grunn"
+msgstr "Ukjent grunn."
 
 #: ../libpurple/ft.c:209
 #, c-format
@@ -2671,7 +2481,9 @@ msgid "%s is not a regular file. Cowardl
 #: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s er ikke en vanlig fil. Gaim nekter å overskrive den for å ikke risikere å ødelegge noe.\n"
+msgstr ""
+"%s er ikke en vanlig fil. Gaim nekter å overskrive den for å ikke risikere å "
+"ødelegge noe.\n"
 
 #: ../libpurple/ft.c:347
 #, c-format
@@ -2700,9 +2512,9 @@ msgstr ""
 "Port: %d"
 
 #: ../libpurple/ft.c:436
-#, c-format
+#, fuzzy, c-format
 msgid "%s is offering to send file %s"
-msgstr "%s tilbyr å sende filen %s"
+msgstr "Tilbyr å sende %s til %s"
 
 #: ../libpurple/ft.c:488
 #, c-format
@@ -2715,9 +2527,9 @@ msgstr "Tilbyr å sende %s til %s"
 msgstr "Tilbyr å sende %s til %s"
 
 #: ../libpurple/ft.c:521
-#, c-format
+#, fuzzy, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Starter overføring av %s fra %s"
+msgstr "Aksepter forespørselen for filoverføring fra %s?"
 
 #: ../libpurple/ft.c:682
 #, c-format
@@ -2725,6 +2537,7 @@ msgstr "Overføring av filen %s er ferdi
 msgstr "Overføring av filen %s er ferdig."
 
 #: ../libpurple/ft.c:685
+#, c-format
 msgid "File transfer complete"
 msgstr "Filoverføring ferdig"
 
@@ -2734,6 +2547,7 @@ msgstr "Du avbrøt overføringen av %s."
 msgstr "Du avbrøt overføringen av %s."
 
 #: ../libpurple/ft.c:1108
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Filoverføring avbrutt."
 
@@ -2748,150 +2562,168 @@ msgstr "%s avbrøt filoverføringen."
 msgstr "%s avbrøt filoverføringen."
 
 #: ../libpurple/ft.c:1228
-#, c-format
+#, fuzzy, c-format
 msgid "File transfer to %s failed."
-msgstr "Filoverføring til %s feilet."
+msgstr "Filoverføring til %s avbrutt.\n"
 
 #: ../libpurple/ft.c:1230
-#, c-format
+#, fuzzy, c-format
 msgid "File transfer from %s failed."
-msgstr "Filoverføring fra %s feilet."
+msgstr "Filoverføring fra %s avbrutt.\n"
 
 #: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
-msgstr "Kjør kommandoen i en terminal"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "Kommando for å håndtere «aim»-URLer, hvis aktivert."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "Kommando for å håndtere «gg»-URLer, hvis aktivert."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "Kommando for å håndtere «icq»-URLer, hvis aktivert."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "Kommando for å håndtere «irc»-URLer, hvis aktivert."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr "Kommando for å håndtere «msnim»-URLer, hvis aktivert."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "Kommando for å håndtere «sip»-URLer, hvis aktivert."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr "Kommando for å håndtere «xmpp»-URLer, hvis aktivert."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr "Kommando for å håndtere «ymsgr»-URLer, hvis aktivert."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
-msgstr "Håndtereren for «aim»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
-msgstr "Håndtereren for «gg»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
-msgstr "Håndtereren for «icq»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
-msgstr "Håndtereren for «irc»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
-msgstr "Håndtereren for «msnim»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
-msgstr "Håndtereren for «sip»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
-msgstr "Håndtereren for «xmpp»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
-msgstr "Håndtereren for «ymsgr»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
-msgstr "Sann hvis kommandoen spesifisert i «kommando»-nøkkelen skal håndtere «aim»-URLer."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
-msgstr "Sann hvis kommandoen spesifisert i «kommando»-nøkkelen skal håndtere «gg»-URLer."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
-msgstr "Sann hvis kommandoen spesifisert i «kommando»-nøkkelen skal håndtere «icq»-URLer."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
-msgstr "Sann hvis kommandoen spesifisert i «kommando»-nøkkelen skal håndtere «irc»-URLer."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
-msgstr "Sann hvis kommandoen spesifisert i «kommando»-nøkkelen skal håndtere «msnim»-URLer."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
-msgstr "Sann hvis kommandoen spesifisert i «kommando»-nøkkelen skal håndtere «sip»-URLer."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
-msgstr "Sann hvis kommandoen spesifisert i «kommando»-nøkkelen skal håndtere «xmpp»-URLer."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
-msgstr "Sann hvis kommandoen spesifisert i «kommando»-nøkkelen skal håndtere «ymsgr»-URLer."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
-msgid "True if the command used to handle this type of URL should be run in a terminal."
-msgstr "Sann hvis kommandoen som skal håndtere denne type URLer skal kjøres i en terminal."
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "Om den spesifike kommandoen skal håndtere «aim»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "Om den spesifike kommandoen skal håndtere «gg»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "Om den spesifike kommandoen skal håndtere «icq»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "Om den spesifike kommandoen skal håndtere «irc»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "Om den spesifike kommandoen skal håndtere «msnim»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "Om den spesifike kommandoen skal håndtere «sip»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "Om den spesifike kommandoen skal håndtere «xmpp»-URLer"
+msgstr ""
 
 #: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "Om den spesifike kommandoen skal håndtere «ymsgr»-URLer"
+msgstr ""
 
 #: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -2919,21 +2751,27 @@ msgstr "XML"
 
 #: ../libpurple/log.c:1366
 #, c-format
-msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;STANDARDSVAR&gt;:</b></font> %s<br/>\n"
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
+"STANDARDSVAR&gt;:</b></font> %s<br/>\n"
 
 #: ../libpurple/log.c:1368
 #, c-format
-msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;STANDARDSVAR&gt;:</b></font> %s<br/>\n"
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
+"STANDARDSVAR&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1426
-#: ../libpurple/log.c:1559
+#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Kunne ikke finne banen til loggen!</b></font>"
 
-#: ../libpurple/log.c:1438
-#: ../libpurple/log.c:1568
+#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kunne ikke lese fil: %s</b></font>"
@@ -2946,9 +2784,10 @@ msgid "You are using %s, but this plugin
 #: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr "Du bruker %s, men dette tillegget krever %s."
+msgstr ""
 
 #: ../libpurple/plugin.c:380
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2968,12 +2807,17 @@ msgstr ""
 
 #: ../libpurple/plugin.c:547
 #, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
-msgstr "Det nødvendige tillegget %s ble ikke funnet. Installer dette tillegget og prøv igjen."
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+"Det nødvendige tillegget %s ble ikke funnet. Installer dette tillegget og "
+"prøv igjen."
 
 #: ../libpurple/plugin.c:552
+#, fuzzy
 msgid "Unable to load the plugin"
-msgstr "Klarte ikke å laste tillegget."
+msgstr "Gaim klarte ikke å laste tillegget."
 
 #: ../libpurple/plugin.c:574
 #, c-format
@@ -2996,11 +2840,11 @@ msgstr "Lar deg laste perl-tillegg."
 msgstr "Lar deg laste perl-tillegg."
 
 #: ../libpurple/plugins/autoaccept.c:23
+#, fuzzy
 msgid "Autoaccept"
-msgstr "Autoaksepter"
+msgstr "Godta"
 
-#: ../libpurple/plugins/autoaccept.c:25
-#: ../libpurple/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 #, fuzzy
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Aksepter forespørselen for filoverføring fra %s?"
@@ -3026,28 +2870,24 @@ msgid "_Save"
 
 #: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
-msgstr "_Lagre"
+msgstr "Lagre"
 
-#: ../libpurple/plugins/autoaccept.c:165
-#: ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204
-#: ../libpurple/plugins/idle.c:230
+#: ../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/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
-#: ../pidgin/gtkblist.c:527
 msgid "_Cancel"
 msgstr "_Avbryt"
 
 #: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
-msgstr "Spør"
+msgstr ""
 
 #: ../libpurple/plugins/autoaccept.c:169
 #, fuzzy
@@ -3082,19 +2922,19 @@ msgstr ""
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#: ../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
+#, fuzzy
 msgid "Notes"
-msgstr "Merknader"
+msgstr "Merknad"
 
 #: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
-msgstr "Skriv inn merknadene dine under..."
+msgstr ""
 
 #: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
-msgstr "Rediger merknader..."
+msgstr ""
 
 #. *< major version
 #. *< minor version
@@ -3104,21 +2944,19 @@ msgstr "Rediger merknader..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
-#: ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
+#, fuzzy
 msgid "Buddy Notes"
-msgstr "Kontaktmerknader"
+msgstr "Kontakter"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
-#: ../pidgin/plugins/gtkbuddynote.c:76
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr ""
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
-#: ../pidgin/plugins/gtkbuddynote.c:77
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 #, fuzzy
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "Legg til brukeren i kontaktlisten din"
@@ -3137,8 +2975,7 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267
-#: ../libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr ""
 
@@ -3150,7 +2987,7 @@ msgid "DBus Example"
 #. *< id
 #: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
-msgstr "DBus-eksempel"
+msgstr ""
 
 #. *< name
 #. *< version
@@ -3168,41 +3005,36 @@ msgstr ""
 #. *< priority
 #. *< id
 #: ../libpurple/plugins/filectl.c:248
+#, fuzzy
 msgid "File Control"
-msgstr "Filkontroll"
+msgstr "Styre Gaim fra kontrollfil"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251
-#: ../libpurple/plugins/filectl.c:253
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 #, fuzzy
 msgid "Allows control by entering commands in a file."
 msgstr "Lar deg kontrollere Gaim ved å skrive inn kommandoer i en fil."
 
-#: ../libpurple/plugins/idle.c:158
-#: ../libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minutter"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165
-#: ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225
-#: ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: ../libpurple/plugins/idle.c:166
-#: ../libpurple/plugins/idle.c:258
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 #, fuzzy
 msgid "Set Account Idle Time"
 msgstr "Sett fraværstid for konto"
 
-#: ../libpurple/plugins/idle.c:169
-#: ../libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Sett"
 
@@ -3210,8 +3042,7 @@ msgstr ""
 msgid "None of your accounts are idle."
 msgstr ""
 
-#: ../libpurple/plugins/idle.c:200
-#: ../libpurple/plugins/idle.c:262
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 #, fuzzy
 msgid "Unset Account Idle Time"
 msgstr "Sett fraværstid for konto"
@@ -3221,8 +3052,7 @@ msgstr "Bruk"
 msgid "_Unset"
 msgstr "Bruk"
 
-#: ../libpurple/plugins/idle.c:226
-#: ../libpurple/plugins/idle.c:266
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 #, fuzzy
 msgid "Set Idle Time for All Accounts"
 msgstr "Frigi Borte-tid For Alle Idle Kontoer"
@@ -3232,8 +3062,7 @@ msgstr "Frigi Borte-tid For Alle Idle Ko
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Frigi Borte-tid For Alle Idle Kontoer"
 
-#: ../libpurple/plugins/idle.c:320
-#: ../libpurple/plugins/idle.c:321
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 #, fuzzy
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Lar deg manuelt sette hvor lenge du har vært borte."
@@ -3257,8 +3086,12 @@ msgstr "Test IPC-støtte for tillegg (so
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
-msgstr "Test IPC-støtte for tillegg (som klient). Dette finner tjenertillegget og kaller de registrerte kommandoene."
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Test IPC-støtte for tillegg (som klient). Dette finner tjenertillegget og "
+"kaller de registrerte kommandoene."
 
 #
 #. *< type
@@ -3281,7 +3114,8 @@ msgid "Test plugin IPC support, as a ser
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Test IPC-støtte for tillegg (som tjener). Dette registrerer IPC-kommandoene."
+msgstr ""
+"Test IPC-støtte for tillegg (som tjener). Dette registrerer IPC-kommandoene."
 
 #: ../libpurple/plugins/joinpart.c:229
 #, fuzzy
@@ -3315,7 +3149,9 @@ msgstr ""
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:275
-msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
 msgstr ""
 
 #. This is used in the place of a timezone abbreviation if the
@@ -3324,9 +3160,10 @@ msgid "(UTC)"
 #. * not a real timezone.
 #: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
-msgstr "(UTC)"
+msgstr ""
 
 #: ../libpurple/plugins/log_reader.c:1577
+#, fuzzy
 msgid "User is offline."
 msgstr "Brukeren er avlogget"
 
@@ -3338,9 +3175,9 @@ msgstr "Automatisk tilkobling ved brudd"
 #: ../libpurple/plugins/log_reader.c:1593
 #: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
-#, c-format
+#, fuzzy, c-format
 msgid "%s has signed off."
-msgstr "%s har logget av."
+msgstr "%s har logget av (%s)"
 
 #: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
@@ -3351,7 +3188,9 @@ msgstr "Du har blitt koblet fra tjeneren
 msgstr "Du har blitt koblet fra tjeneren."
 
 #: ../libpurple/plugins/log_reader.c:1628
-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
 msgstr ""
 
 #: ../libpurple/plugins/log_reader.c:1643
@@ -3360,8 +3199,9 @@ msgstr "Meldingen kunne ikke bli sendt, 
 msgstr "Meldingen kunne ikke bli sendt, brukeren er frakoblet:"
 
 #: ../libpurple/plugins/log_reader.c:1648
+#, fuzzy
 msgid "Message could not be sent."
-msgstr "Beskjeden kunne ikke bli sendt."
+msgstr "Din Yahoo!-beskjed ble ikke sendt."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -3369,23 +3209,25 @@ msgid "Adium"
 #: ../libpurple/plugins/log_reader.c:2349
 #: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
-msgstr "Adium"
+msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2362
 #: ../libpurple/plugins/log_reader.c:2477
+#, fuzzy
 msgid "Fire"
-msgstr "Fire"
+msgstr "Firefox"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2374
 #: ../libpurple/plugins/log_reader.c:2481
+#, fuzzy
 msgid "Messenger Plus!"
-msgstr "Messenger Plus!"
+msgstr "Melding fra %s"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -3393,15 +3235,16 @@ msgid "QIP"
 #: ../libpurple/plugins/log_reader.c:2388
 #: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
-msgstr "QIP"
+msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2400
 #: ../libpurple/plugins/log_reader.c:2490
+#, fuzzy
 msgid "MSN Messenger"
-msgstr "MSN Messenger"
+msgstr "Lynmeldingsklient"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -3409,7 +3252,7 @@ msgid "Trillian"
 #: ../libpurple/plugins/log_reader.c:2412
 #: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
-msgstr "Trillian"
+msgstr ""
 
 #. Add general preferences.
 #: ../libpurple/plugins/log_reader.c:2454
@@ -3453,9 +3296,11 @@ msgid ""
 #. * description
 #: ../libpurple/plugins/log_reader.c:2531
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
 msgstr ""
 
 #
@@ -3479,8 +3324,9 @@ msgstr ""
 #. *< priority
 #. *< id
 #: ../libpurple/plugins/newline.c:68
+#, fuzzy
 msgid "New Line"
-msgstr "Ny linje"
+msgstr "Nytt vindu"
 
 #. *< name
 #. *< version
@@ -3491,25 +3337,30 @@ msgstr "Kunne ikke sende beskjed."
 
 #. *< summary
 #: ../libpurple/plugins/newline.c:71
-msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the screen name in the conversation window."
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:25
-#: ../libpurple/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:95
-msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgid ""
+"The rest of the messages will be saved as pounce. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
-msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:160
@@ -3522,30 +3373,26 @@ msgstr ""
 msgstr ""
 
 #: ../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/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
 msgid "Yes"
 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/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305
-#: ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "Nei"
 
@@ -3570,8 +3417,7 @@ msgstr "Perl-tilleggslaster"
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603
-#: ../libpurple/plugins/perl/perl.c:604
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Lar deg laste perl-tillegg."
 
@@ -3584,7 +3430,9 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/plugins/psychic.c:22
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libpurple/plugins/psychic.c:72
@@ -3644,16 +3492,15 @@ msgstr "Simpelt tillegg"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40
-#: ../libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Test for å se at mesteparten fungerer."
 
 #. 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-sertifikater"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -3661,7 +3508,7 @@ msgstr "X.509-sertifikater"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3669,8 +3516,8 @@ msgstr "GNUTLS"
 #. *< 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."
 
@@ -3707,8 +3554,7 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97
-#: ../libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Tilbyr ett felles grensesnitt for SSL-biblioteker."
 
@@ -3733,9 +3579,9 @@ msgstr "%s er ikke lenger inaktiv"
 msgstr "%s er ikke lenger inaktiv"
 
 #: ../libpurple/plugins/statenotify.c:73
-#, c-format
+#, fuzzy, c-format
 msgid "%s has signed on."
-msgstr "%s har logget på."
+msgstr "%s har logget på (%s)"
 
 #: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
@@ -3770,22 +3616,27 @@ msgstr "Varsle når kontakt endrer tilst
 #. *  description
 #: ../libpurple/plugins/statenotify.c:151
 #: ../libpurple/plugins/statenotify.c:154
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
-msgstr "Varsler i et samtalevindu når en kontakt blir borte/inaktiv, eller returnerer."
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Varsler i et samtalevindu når en kontakt blir borte/inaktiv, eller "
+"returnerer."
 
 #
-#: ../libpurple/plugins/tcl/tcl.c:423
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-tilleggslaster"
 
 #
-#: ../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 "Lar deg laste Tcl-tillegg."
 
-#: ../libpurple/plugins/tcl/tcl.c:509
-msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+#: ../libpurple/plugins/tcl/tcl.c:507
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
 #. Send a message about the connection error
@@ -3795,7 +3646,8 @@ msgstr "Kunne ikke lage ny tilkobling."
 msgstr "Kunne ikke lage ny tilkobling."
 
 #: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
 #. Creating the options for the protocol
@@ -3803,21 +3655,23 @@ msgstr ""
 #: ../libpurple/protocols/bonjour/bonjour.c:656
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/jabber/jabber.c:942
+#, fuzzy
 msgid "First name"
-msgstr "Fornavn"
+msgstr "Fornavn:"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:353
 #: ../libpurple/protocols/bonjour/bonjour.c:659
 #: ../libpurple/protocols/gg/gg.c:627
 #: ../libpurple/protocols/jabber/jabber.c:947
+#, fuzzy
 msgid "Last name"
-msgstr "Etternavn"
+msgstr "Etternavn:"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:357
 #: ../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
@@ -3828,14 +3682,16 @@ msgstr "E-post"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/bonjour/bonjour.c:665
+#, fuzzy
 msgid "AIM Account"
-msgstr "AIM-konto"
+msgstr "Legg til konto"
 
 #
 #: ../libpurple/protocols/bonjour/bonjour.c:363
 #: ../libpurple/protocols/bonjour/bonjour.c:668
+#, fuzzy
 msgid "XMPP Account"
-msgstr "XMPP-konto"
+msgstr "Konto"
 
 #. *< type
 #. *< ui_requirement
@@ -3865,17 +3721,18 @@ msgstr "Ny Person"
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
+#, fuzzy
 msgid "E-mail"
-msgstr "E-post"
+msgstr "E-post:"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
-msgstr "Bonjour"
+msgstr ""
 
 #: ../libpurple/protocols/bonjour/jabber.c:380
-#, c-format
+#, fuzzy, c-format
 msgid "%s has closed the conversation."
-msgstr "%s har lukket samtalen."
+msgstr "%s har blitt invitert til denne samtalen."
 
 #: ../libpurple/protocols/bonjour/jabber.c:437
 #: ../libpurple/protocols/bonjour/jabber.c:660
@@ -3904,58 +3761,56 @@ msgstr "Kunne ikke opprette socket"
 msgid "Could not listen on socket"
 msgstr "Kunne ikke opprette socket"
 
-#: ../libpurple/protocols/gg/gg.c:76
-#: ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
 msgid "Invalid proxy settings"
 msgstr "Ugyldige proxyinnstilinger"
 
-#: ../libpurple/protocols/gg/gg.c:77
-#: ../libpurple/proxy.c:1829
-msgid "Either the host name or port number specified for your given proxy type is invalid."
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
 msgstr "Det spesifiserte maskinnavnet eller portnummeret for proxy er ugyldig."
 
-#: ../libpurple/protocols/gg/gg.c:115
-#: ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 #, fuzzy
 msgid "Token Error"
 msgstr "Ukjent feil"
 
-#: ../libpurple/protocols/gg/gg.c:116
-#: ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 #, fuzzy
 msgid "Unable to fetch the token.\n"
 msgstr "Klarte ikke hente ned romliste."
 
-#: ../libpurple/protocols/gg/gg.c:269
-#: ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#, fuzzy
 msgid "Save Buddylist..."
-msgstr "Lagre kontaktliste..."
+msgstr "Sende kontaktliste"
 
 #: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Kompislisten din er tom, ingenting ble skrevet til filen."
 
-#: ../libpurple/protocols/gg/gg.c:276
-#: ../libpurple/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
+#, fuzzy
 msgid "Couldn't open file"
-msgstr "Kunne ikke åpne filen"
+msgstr "Kan ikke sende fil"
 
 #: ../libpurple/protocols/gg/gg.c:289
 #, fuzzy
 msgid "Buddylist saved successfully!"
 msgstr "Passordet er endret"
 
-#: ../libpurple/protocols/gg/gg.c:307
-#: ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#, fuzzy
 msgid "Couldn't load buddylist"
-msgstr "Kunne ikke laste kontaktliste"
+msgstr "Kunne ikke eksportere kontaktliste"
 
 #: ../libpurple/protocols/gg/gg.c:324
 #, fuzzy
 msgid "Load Buddylist..."
-msgstr "Last kontaktliste..."
+msgstr "_Alias for kontakt..."
 
 #: ../libpurple/protocols/gg/gg.c:325
 #, fuzzy
@@ -3963,16 +3818,18 @@ msgstr "Passordet er endret"
 msgstr "Passordet er endret"
 
 #: ../libpurple/protocols/gg/gg.c:336
+#, fuzzy
 msgid "Save buddylist..."
-msgstr "Lagre kontaktliste"
+msgstr "Sende kontaktliste"
 
 #: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Fyll inn registrerings feltene."
 
 #: ../libpurple/protocols/gg/gg.c:389
+#, fuzzy
 msgid "Passwords do not match."
-msgstr "Passordene stemmer ikke overens."
+msgstr "De nye passordene stemmer ikke overens."
 
 #: ../libpurple/protocols/gg/gg.c:398
 #, fuzzy
@@ -3988,34 +3845,29 @@ msgstr "Registreringen var vellykket!"
 msgid "Registration completed successfully!"
 msgstr "Registreringen var vellykket!"
 
-#: ../libpurple/protocols/gg/gg.c:482
-#: ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 #: ../libpurple/protocols/jabber/jabber.c:913
 #: ../libpurple/protocols/jabber/jabber.c:916
 #: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr "Passord"
 
-#: ../libpurple/protocols/gg/gg.c:487
-#: ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 #, fuzzy
 msgid "Password (retype)"
 msgstr "Passord sendt"
 
-#: ../libpurple/protocols/gg/gg.c:492
-#: ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 #, fuzzy
 msgid "Enter current token"
 msgstr "%s er ikke pålogget."
 
-#: ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 #, fuzzy
 msgid "Current token"
 msgstr "Pålogget på"
 
-#: ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrere ny jabber-konto"
@@ -4024,46 +3876,42 @@ msgstr "Vennligst fyll ut de følgende f
 msgid "Please, fill in the following fields"
 msgstr "Vennligst fyll ut de følgende felt."
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/gg/gg.c:1054
+#: ../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"
 
 #: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
-msgstr "Fødselsår"
+msgstr "Fødselsdato"
 
-#: ../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
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Kjønn"
 
 #: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
-msgstr "Hankjønn eller hunkjønn"
+msgstr ""
 
 #: ../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 "Hankjønn"
 
 #: ../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"
@@ -4074,10 +3922,10 @@ msgstr "PÃ¥logget"
 msgid "Only online"
 msgstr "PÃ¥logget"
 
-#: ../libpurple/protocols/gg/gg.c:661
-#: ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#, fuzzy
 msgid "Find buddies"
-msgstr "Finn kontakter"
+msgstr "Dimme ned inaktive kontakter"
 
 #: ../libpurple/protocols/gg/gg.c:663
 #, fuzzy
@@ -4108,8 +3956,9 @@ msgstr "Passordet er endret"
 msgstr "Passordet er endret"
 
 #: ../libpurple/protocols/gg/gg.c:770
+#, fuzzy
 msgid "Current password"
-msgstr "Nåværende passord"
+msgstr "Feil passord."
 
 #
 #: ../libpurple/protocols/gg/gg.c:795
@@ -4117,103 +3966,87 @@ msgstr "Skriv inn ditt nåværende passo
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Skriv inn ditt nåværende passord og ditt nye passord."
 
-#: ../libpurple/protocols/gg/gg.c:799
-#: ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#, fuzzy
 msgid "Change Gadu-Gadu Password"
-msgstr "Endre Gadu-Gadu-passord"
+msgstr "Kunne ikke bytte Gadu-Gadu-passord"
 
 #: ../libpurple/protocols/gg/gg.c:876
-#, c-format
+#, fuzzy, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Velg en samtale for kontakt: %s"
+msgstr "Fjern samtalen fra kontaktlisten din"
 
-#: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 #, fuzzy
 msgid "Add to chat..."
 msgstr "Legg til samtalegruppe"
 
 #: ../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/qq/qq.c:170
-#: ../libpurple/protocols/qq/qq.c:177
+#: ../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
-#: ../pidgin/gtkdocklet.c:450
-#: ../pidgin/gtkstatusbox.c:1061
+#: ../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 "Avlogget"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2036
-#: ../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/jabber/buddy.c:2033
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3100
-#: ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438
-#: ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Tilgjengelig"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014
-#: ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/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/qq/qq.c:180
-#: ../libpurple/protocols/qq/qq.c:284
+#: ../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 "Borte"
 
-#: ../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/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../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/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2210
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Fornavn"
 
-#: ../libpurple/protocols/gg/gg.c:1059
-#: ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Fødselsår"
 
-#: ../libpurple/protocols/gg/gg.c:1111
-#: ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3907
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3911
 #, fuzzy
 msgid "Unable to display the search results."
 msgstr "Kunne ikke invitere bruker (%s)."
@@ -4223,6 +4056,7 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/gg/gg.c:1172
+#, fuzzy
 msgid "Search results"
 msgstr "Søkeresultater"
 
@@ -4236,8 +4070,7 @@ msgstr "Skriv inn ditt nye passord"
 msgid "There are no users matching your search criteria."
 msgstr "Skriv inn ditt nye passord"
 
-#: ../libpurple/protocols/gg/gg.c:1310
-#: ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Kunne ikke lese socket"
 
@@ -4261,14 +4094,12 @@ msgstr "Det er ingen kontaktliste på Ga
 msgid "Your buddy list was stored on the server."
 msgstr "Det er ingen kontaktliste på Gadu-Gadu-tjeneren."
 
-#: ../libpurple/protocols/gg/gg.c:1509
-#: ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 #, fuzzy
 msgid "Connection failed."
 msgstr "Tilkopling feilet"
 
-#: ../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"
 
@@ -4307,12 +4138,14 @@ msgstr "Du har blitt koblet fra tjeneren
 msgstr "Du har blitt koblet fra tjeneren."
 
 #: ../libpurple/protocols/gg/gg.c:2021
+#, fuzzy
 msgid "Find buddies..."
-msgstr "Finn kontakter..."
+msgstr "Dimme ned inaktive kontakter"
 
 #: ../libpurple/protocols/gg/gg.c:2027
+#, fuzzy
 msgid "Change password..."
-msgstr "Endre passord..."
+msgstr "Bytt passord..."
 
 #: ../libpurple/protocols/gg/gg.c:2033
 #, fuzzy
@@ -4391,8 +4224,9 @@ msgstr "Intet tema for kanalen"
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
+#, fuzzy
 msgid "File Transfer Failed"
-msgstr "Filoverføring feilet"
+msgstr "Filoverføring avbrutt."
 
 #: ../libpurple/protocols/irc/dcc_send.c:297
 #: ../libpurple/protocols/irc/dcc_send.c:338
@@ -4417,11 +4251,9 @@ msgstr "MOTD for %s"
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: ../libpurple/protocols/irc/irc.c:127
-#: ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612
-#: ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2354
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2356
 msgid "Server has disconnected"
 msgstr "Tjeneren har koplet fra"
 
@@ -4429,15 +4261,13 @@ msgstr "Vis MOTD"
 msgid "View MOTD"
 msgstr "Vis MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:261
-#: ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
-#: ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Passord"
 
@@ -4449,16 +4279,15 @@ msgstr "IRC-kallenavn kan ikke inneholde
 #. 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/zephyr/zephyr.c:1621
-#: ../pidgin/gtkstatusbox.c:662
+#: ../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 "Kobler til"
 
@@ -4471,21 +4300,20 @@ msgstr "SSL-støtte utilgjengelig"
 #. 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 "Kunne ikke opprette socket"
 
 #: ../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 "Kunne ikke koble til"
 
-#: ../libpurple/protocols/irc/irc.c:609
-#: ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2350
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr "Lesefeil"
 
@@ -4524,25 +4352,23 @@ msgstr "IRC-protokolltillegg"
 msgstr "IRC-protokolltillegg"
 
 #. 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/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2185
+#: ../libpurple/protocols/oscar/oscar.c:6671
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/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 "Tjener"
 
 #. 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
@@ -4555,8 +4381,7 @@ msgstr "Tegnkodinger:"
 msgid "Encodings"
 msgstr "Tegnkodinger:"
 
-#: ../libpurple/protocols/irc/irc.c:949
-#: ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
 #: ../libpurple/protocols/jabber/jabber.c:904
 #: ../libpurple/protocols/jabber/jabber.c:907
 #: ../libpurple/protocols/silc/buddy.c:1539
@@ -4574,8 +4399,7 @@ msgstr "Brukernavn"
 msgid "Username"
 msgstr "Brukernavn"
 
-#: ../libpurple/protocols/irc/irc.c:952
-#: ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -4586,8 +4410,9 @@ msgstr "Virkelig navn"
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
 #: ../libpurple/protocols/irc/irc.c:960
+#, fuzzy
 msgid "Use SSL"
-msgstr "Bruk SSL"
+msgstr "SSL"
 
 #: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
@@ -4616,7 +4441,7 @@ msgstr " <i>(registrert)</i>"
 msgstr " <i>(registrert)</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"
@@ -4629,8 +4454,9 @@ msgstr "Pålogget på"
 msgstr "Pålogget på"
 
 #: ../libpurple/protocols/irc/msgs.c:334
+#, fuzzy
 msgid "Idle for"
-msgstr "Inaktiv for"
+msgstr "Inaktiv"
 
 #: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
@@ -4648,17 +4474,17 @@ msgid "%s has changed the topic to: %s"
 #: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s har endret temaet til: %s"
+msgstr "%s har endret kanaltema til: %s"
 
 #: ../libpurple/protocols/irc/msgs.c:422
 #, fuzzy, c-format
 msgid "%s has cleared the topic."
-msgstr "%s har endret tema til: %s"
+msgstr "%s har endret kanaltema til: %s"
 
 #: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "Temaet for %s er: %s"
+msgstr "Kanaltema for %s er %s"
 
 #: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
@@ -4725,8 +4551,7 @@ msgstr "Du har blitt sparket ut fra %s: 
 msgstr "Du har blitt sparket ut fra %s: %s"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800
-#: ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
@@ -4737,19 +4562,26 @@ msgstr "mode (%s %s) av %s"
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) av %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908
-#: ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Ugyldig brukernavn"
 
 #: ../libpurple/protocols/irc/msgs.c:910
 #, fuzzy
-msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
-msgstr "Ditt valgte kontonavn ble avvist av tjeneren. Sannsynligvis inneholder det ugyldige tegn."
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Ditt valgte kontonavn ble avvist av tjeneren. Sannsynligvis inneholder det "
+"ugyldige tegn."
 
 #: ../libpurple/protocols/irc/msgs.c:915
-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
-msgstr "Ditt valgte kontonavn ble avvist av tjeneren. Sannsynligvis inneholder det ugyldige tegn."
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Ditt valgte kontonavn ble avvist av tjeneren. Sannsynligvis inneholder det "
+"ugyldige tegn."
 
 #: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
@@ -4800,8 +4632,12 @@ msgstr "action &lt;action to perform&gt;
 
 #: ../libpurple/protocols/irc/parse.c:123
 #, fuzzy
-msgid "away [message]:  Set an away message, or use no message to return from being away."
-msgstr "fraværende [melding]:  Sett en melding som skal vises når du er fraværende, eller ikke sett noen for å returnere."
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"fraværende [melding]:  Sett en melding som skal vises når du er fraværende, "
+"eller ikke sett noen for å returnere."
 
 #: ../libpurple/protocols/irc/parse.c:124
 #, fuzzy
@@ -4809,32 +4645,62 @@ msgstr "quote [...]:  Send en rå komman
 msgstr "quote [...]:  Send en rå kommando til serveren."
 
 #: ../libpurple/protocols/irc/parse.c:125
-msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
-msgstr "deop &lt;nick1&gt; [nick2] ...:  Fjern kanal OP status fra noen. Du må være kanal OP for å gjøre dette."
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;nick1&gt; [nick2] ...:  Fjern kanal OP status fra noen. Du må være "
+"kanal OP for å gjøre dette."
 
 #: ../libpurple/protocols/irc/parse.c:126
-msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
-msgstr "devoice &lt;nick1&gt; [nick2] ...:  Fjern kanal voice status fra noen, hindre de fra å snakke om kanalen er moderert (+m). Du må være kanal OP for å gjøre dette."
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+"devoice &lt;nick1&gt; [nick2] ...:  Fjern kanal voice status fra noen, "
+"hindre de fra å snakke om kanalen er moderert (+m). Du må være kanal OP for "
+"å gjøre dette."
 
 #: ../libpurple/protocols/irc/parse.c:127
-msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
-msgstr "invite &lt;nick&gt; [room]:  Inviter noen til å joine deg i spsifisert kanel eller den nåværende kanalen."
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;nick&gt; [room]:  Inviter noen til å joine deg i spsifisert kanel "
+"eller den nåværende kanalen."
 
 #: ../libpurple/protocols/irc/parse.c:128
-msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Fyll inn en eller flere kanaler, alternativt gi en nøkkel for hver om nødvendig."
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Fyll inn en eller flere "
+"kanaler, alternativt gi en nøkkel for hver om nødvendig."
 
 #: ../libpurple/protocols/irc/parse.c:129
-msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Fyll inn en eller flere kanaler, alternativt gi en nøkkel for hver om nødvendig."
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Fyll inn en eller "
+"flere kanaler, alternativt gi en nøkkel for hver om nødvendig."
 
 #: ../libpurple/protocols/irc/parse.c:130
-msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
-msgstr "kick &lt;nick&gt; [message]:  Fjern noen fra en kanal. Du må være kanal OP for å gjøre dette."
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;nick&gt; [message]:  Fjern noen fra en kanal. Du må være kanal OP "
+"for å gjøre dette."
 
 #: ../libpurple/protocols/irc/parse.c:131
-msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
-msgstr "list:  Vis en liste over samtalerom på et nettverk.<i>Advarsel, noen servere kan disconnecte om du gjør dette.<i>"
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:  Vis en liste over samtalerom på et nettverk.<i>Advarsel, noen servere "
+"kan disconnecte om du gjør dette.<i>"
 
 #: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -4846,19 +4712,26 @@ msgstr "quote [...]:  Send en rå komman
 msgstr "quote [...]:  Send en rå kommando til serveren."
 
 #: ../libpurple/protocols/irc/parse.c:134
-msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
-msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Sett er fjern en kanal eller bruker modus."
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Sett er fjern en kanal "
+"eller bruker modus."
 
 #: ../libpurple/protocols/irc/parse.c:135
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "msg &lt;nick&gt; &lt;message&gt;:  Send en privat beskjed til en bruker."
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send en privat beskjed til en bruker."
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [channel]:  Vis brukere i denne 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;new nickname&gt;:  Skift nick."
 
@@ -4868,12 +4741,20 @@ msgstr "quote [...]:  Send en rå komman
 msgstr "quote [...]:  Send en rå kommando til serveren."
 
 #: ../libpurple/protocols/irc/parse.c:139
-msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
-msgstr "op &lt;nick1&gt; [nick2] ...:  Tillat OP status til noen. Du må være kanal OP for å gjøre dette."
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;nick1&gt; [nick2] ...:  Tillat OP status til noen. Du må være kanal "
+"OP for å gjøre dette."
 
 #: ../libpurple/protocols/irc/parse.c:140
-msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "operwall &lt;message&gt;:  Om du ikke vet hva dette er, kan du sannsynligvis ikke bruke dette."
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;message&gt;:  Om du ikke vet hva dette er, kan du sannsynligvis "
+"ikke bruke dette."
 
 #: ../libpurple/protocols/irc/parse.c:141
 #, fuzzy
@@ -4881,16 +4762,26 @@ msgstr "quote [...]:  Send en rå komman
 msgstr "quote [...]:  Send en rå kommando til serveren."
 
 #: ../libpurple/protocols/irc/parse.c:142
-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
-msgstr "part [room] [message]:  Forlat nåværende kanal eller en spesifisert kanal med en beskjed."
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [room] [message]:  Forlat nåværende kanal eller en spesifisert kanal "
+"med en beskjed."
 
 #: ../libpurple/protocols/irc/parse.c:143
-msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
 msgstr "ping [nick]:  Send ping til en bruker."
 
 #: ../libpurple/protocols/irc/parse.c:144
-msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "query &lt;nick&gt; &lt;message&gt;:  Send en privat beskjed til en bruker (vises ikke i kanal)."
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;nick&gt; &lt;message&gt;:  Send en privat beskjed til en bruker "
+"(vises ikke i kanal)."
 
 #: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
@@ -4901,8 +4792,12 @@ msgstr "quote [...]:  Send en rå komman
 msgstr "quote [...]:  Send en rå kommando til serveren."
 
 #: ../libpurple/protocols/irc/parse.c:147
-msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
-msgstr "remove &lt;nick&gt; [message]:  Fjern noen fra et rom. Du må være kanal OP for å gjøre dette."
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;nick&gt; [message]:  Fjern noen fra et rom. Du må være kanal OP "
+"for å gjøre dette."
 
 #: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
@@ -4921,12 +4816,20 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/irc/parse.c:152
-msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
-msgstr "voice &lt;nick1&gt; [nick2] ...:  Gi voice til noen. Du må være kanal OP for å gjøre dette."
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;nick1&gt; [nick2] ...:  Gi voice til noen. Du må være kanal OP for "
+"å gjøre dette."
 
 #: ../libpurple/protocols/irc/parse.c:153
-msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "wallops &lt;message&gt;:  Om du ikke vet hva dette er, kan du sannsynligvis ikke bruke det."
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;message&gt;:  Om du ikke vet hva dette er, kan du sannsynligvis "
+"ikke bruke det."
 
 #: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -4951,10 +4854,8 @@ msgstr "CTCP PING-svar"
 msgstr "CTCP PING-svar"
 
 #: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581
-#: ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694
-#: ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Frakoblet."
@@ -4972,24 +4873,32 @@ msgstr "Kommando deaktivert"
 msgid "Ad-Hoc Command Failed"
 msgstr "Kommando deaktivert"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:176
+#: ../libpurple/protocols/jabber/adhoccommands.c:173
 #, fuzzy
 msgid "execute"
 msgstr "Uventet"
 
 #: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Tjeneren krever TLS/SSL for å logge inn, men støtte for dette ble ikke funnet."
+msgstr ""
+"Tjeneren krever TLS/SSL for å logge inn, men støtte for dette ble ikke "
+"funnet."
 
 #: ../libpurple/protocols/jabber/auth.c:116
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Tjeneren forlanger identitetsbekreftelse i ren tekst over en ukryptert forbindelse"
+msgstr ""
+"Tjeneren forlanger identitetsbekreftelse i ren tekst over en ukryptert "
+"forbindelse"
 
 #: ../libpurple/protocols/jabber/auth.c:319
 #: ../libpurple/protocols/jabber/auth.c:508
 #, fuzzy, c-format
-msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "Denne tjeneren forlanger autentifikasjon i ren tekst over en ukryptert forbindelse. Tillat dette og fortsett identitetsbekreftelse?"
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"Denne tjeneren forlanger autentifikasjon i ren tekst over en ukryptert "
+"forbindelse. Tillat dette og fortsett identitetsbekreftelse?"
 
 #: ../libpurple/protocols/jabber/auth.c:321
 #: ../libpurple/protocols/jabber/auth.c:322
@@ -5018,8 +4927,12 @@ msgstr "Ugyldig svar fra tjener."
 msgstr "Ugyldig svar fra tjener."
 
 #: ../libpurple/protocols/jabber/auth.c:600
-msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "Denne tjeneren forlanger autentifikasjon i ren tekst over en ukryptert forbindelse. Tillat dette og fortsett identitetsbekreftelse?"
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+"Denne tjeneren forlanger autentifikasjon i ren tekst over en ukryptert "
+"forbindelse. Tillat dette og fortsett identitetsbekreftelse?"
 
 #: ../libpurple/protocols/jabber/auth.c:797
 #: ../libpurple/protocols/jabber/auth.c:820
@@ -5111,16 +5024,15 @@ msgstr "Rolle"
 
 #: ../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 "Beskrivelse"
@@ -5132,18 +5044,24 @@ msgstr "Rediger vCard for Jabber"
 msgstr "Rediger vCard for Jabber"
 
 #: ../libpurple/protocols/jabber/buddy.c:724
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
-msgstr "Alle feltene nedenfor er valgfrie. Du trenger bare å skrive den informasjonen du ønsker"
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+"Alle feltene nedenfor er valgfrie. Du trenger bare å skrive den "
+"informasjonen du ønsker"
 
 #: ../libpurple/protocols/jabber/buddy.c:795
 #: ../libpurple/protocols/jabber/buddy.c:960
+#, fuzzy
 msgid "Client"
-msgstr "Klient"
+msgstr "By"
 
 #: ../libpurple/protocols/jabber/buddy.c:799
 #: ../libpurple/protocols/jabber/buddy.c:964
+#, fuzzy
 msgid "Operating System"
-msgstr "Operativsystem"
+msgstr "Skjul operativsystem"
 
 #: ../libpurple/protocols/jabber/buddy.c:815
 #: ../libpurple/protocols/jabber/buddy.c:975
@@ -5433,7 +5351,7 @@ msgstr ""
 
 #: ../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"
 
@@ -5449,8 +5367,9 @@ msgstr "Ressurs"
 #: ../libpurple/protocols/jabber/jabber.c:1577
 #: ../libpurple/protocols/jabber/jabber.c:1600
 #: ../libpurple/protocols/jabber/jabber.c:1623
+#, fuzzy
 msgid "Priority"
-msgstr "Prioritet"
+msgstr "Port"
 
 #: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
@@ -5460,8 +5379,8 @@ msgstr "Mellomnavn"
 
 #: ../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
@@ -5480,111 +5399,118 @@ msgstr "Logo"
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr "Fjern fraværsmarkering for"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr "Midlertidig borte for"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr "Avbryt varsling av tilstedeværelse"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr "Spør på nytt om godkjenning"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
+#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
+#: ../libpurple/protocols/jabber/buddy.c:1985
+#, fuzzy
 msgid "Log In"
-msgstr "Logg inn"
+msgstr "Innlogging"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:1989
+#, fuzzy
 msgid "Log Out"
-msgstr "Logg ut"
+msgstr "Logget ut"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/buddy.c:2035
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Pratsom"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr "Utvidet borte"
 
-#: ../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 "Ikke forstyrr"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/protocols/jabber/buddy.c:2208
 msgid "JID"
 msgstr ""
 
-#: ../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 "Etternavn"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr "Følgende resultat fra ditt søk"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2322
-msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+#: ../libpurple/protocols/jabber/buddy.c:2319
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2342
+#: ../libpurple/protocols/jabber/buddy.c:2339
 #, fuzzy
 msgid "Directory Query Failed"
 msgstr "Direktekopling feilet"
 
-#: ../libpurple/protocols/jabber/buddy.c:2343
+#: ../libpurple/protocols/jabber/buddy.c:2340
 #, fuzzy
 msgid "Could not query the directory server."
 msgstr "Kunne ikke starte filoverføring"
 
 #. 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
 #, fuzzy, c-format
 msgid "Server Instructions: %s"
 msgstr "Tjenerinformasjon"
 
-#: ../libpurple/protocols/jabber/buddy.c:2384
+#: ../libpurple/protocols/jabber/buddy.c:2381
 #, fuzzy
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "Fyll inn ett eller flere felt for å søke etter matchende Jabber brukere."
+msgstr ""
+"Fyll inn ett eller flere felt for å søke etter matchende Jabber brukere."
 
-#: ../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
+#, fuzzy
 msgid "Search for XMPP users"
-msgstr "Søk etter XMPP-brukere"
+msgstr "_Søk etter:"
 
 #. "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
@@ -5596,29 +5522,29 @@ msgstr "Søk"
 msgid "Search"
 msgstr "Søk"
 
-#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2427
 #, fuzzy
 msgid "Invalid Directory"
 msgstr "Ugyldig feil"
 
-#: ../libpurple/protocols/jabber/buddy.c:2447
+#: ../libpurple/protocols/jabber/buddy.c:2444
 #, fuzzy
 msgid "Enter a User Directory"
 msgstr "Kan ikke sende en katalog."
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2445
 #, fuzzy
 msgid "Select a user directory to search"
 msgstr "Velg en konferanseserver å spørre"
 
 #
-#: ../libpurple/protocols/jabber/buddy.c:2451
+#: ../libpurple/protocols/jabber/buddy.c:2448
 #, fuzzy
 msgid "Search Directory"
 msgstr "_Søk etter:"
 
 #: ../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:"
@@ -5734,9 +5660,9 @@ msgstr "Lesefeil"
 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"
@@ -5800,12 +5726,13 @@ msgstr "Du er allerede registrert"
 msgstr "Du er allerede 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/stat"
 
 #: ../libpurple/protocols/jabber/jabber.c:967
+#, fuzzy
 msgid "Postal code"
 msgstr "Postnummer"
 
@@ -5830,7 +5757,8 @@ msgstr "Registrer"
 
 #: ../libpurple/protocols/jabber/jabber.c:994
 #, fuzzy
-msgid "Please fill out the information below to change your account registration."
+msgid ""
+"Please fill out the information below to change your account registration."
 msgstr "Fyll ut feltene under for å registrere den nye kontoen din."
 
 #: ../libpurple/protocols/jabber/jabber.c:997
@@ -5885,7 +5813,7 @@ msgstr "Nullstiller datastrøm"
 msgstr "Nullstiller datastrøm"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:390
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autentiserer"
 
@@ -5898,7 +5826,7 @@ msgstr "Nullstiller datastrøm på nytt"
 #: ../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 "Ikke godkjent"
 
@@ -6063,15 +5991,16 @@ msgstr "Passord (igjen)"
 
 #: ../libpurple/protocols/jabber/jabber.c:1734
 #: ../libpurple/protocols/jabber/jabber.c:1735
+#, fuzzy
 msgid "Change XMPP Password"
-msgstr "Endre XMPP-passord"
+msgstr "Bytt passord"
 
 #: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Please enter your new password"
 msgstr "Skriv inn ditt nye passord"
 
 #: ../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..."
@@ -6079,7 +6008,7 @@ msgstr "Sett brukerinfo..."
 
 #. 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..."
@@ -6088,8 +6017,9 @@ msgstr "Bytt passord..."
 #
 #. }
 #: ../libpurple/protocols/jabber/jabber.c:1759
+#, fuzzy
 msgid "Search for Users..."
-msgstr "Søk etter brukere..."
+msgstr "_Søk etter:"
 
 #: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Bad Request"
@@ -6343,80 +6273,69 @@ msgstr "Kunne ikke spille av lyd fordi l
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Kunne ikke spille av lyd fordi lydfilen (%s) ikke eksisterer."
 
-#: ../libpurple/protocols/jabber/jabber.c:2250
-#: ../libpurple/protocols/yahoo/yahoo.c:4118
-#, fuzzy
-msgid "Buzz"
-msgstr "Buzz!!"
-
-#: ../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 "Brukeren har blokkert deg"
-
-#: ../libpurple/protocols/jabber/jabber.c:2252
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2291
+#: ../libpurple/protocols/jabber/jabber.c:2253
 msgid "config:  Configure a chat room."
 msgstr "config:  Endre innstillingene for et samtalerom"
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2257
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Endre innstillingene for et samtalerom"
 
-#: ../libpurple/protocols/jabber/jabber.c:2304
+#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
 msgstr "part [rom]:  Forlat rommet"
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrer med et gruppesamtalerom."
 
-#: ../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]:  Vis eller endre 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;bruker&gt; [rom]:  Forby en bruker fra rommet"
 
-#: ../libpurple/protocols/jabber/jabber.c:2327
-msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+#: ../libpurple/protocols/jabber/jabber.c:2289
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2333
-msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+#: ../libpurple/protocols/jabber/jabber.c:2295
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2339
+#: ../libpurple/protocols/jabber/jabber.c:2301
 #, fuzzy
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;bruker&gt; [rom]:  Inviter en bruker 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; [vert]:  Bli med i en gruppesamtale på denne serveren"
+msgstr ""
+"join: &lt;rom&gt; [vert]:  Bli med i en gruppesamtale på denne serveren"
 
-#: ../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;bruker&gt; [rom]:  Spark en bruker ut av rommet"
 
-#: ../libpurple/protocols/jabber/jabber.c:2356
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;bruker&gt; &lt;melding&gt;:  Send en privatmelding til en annen bruker"
+#: ../libpurple/protocols/jabber/jabber.c:2318
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;bruker&gt; &lt;melding&gt;:  Send en privatmelding til en annen "
+"bruker"
 
-#: ../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
 #, fuzzy
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Buzz en kontakt for å få deres oppmerksomhet"
@@ -6439,14 +6358,15 @@ msgstr "MSN-protokolltillegg"
 
 #
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#, fuzzy
 msgid "Domain"
-msgstr "Domene"
+msgstr "Rumensk"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:210
+#, fuzzy
 msgid "Require SSL/TLS"
-msgstr "Krever SSL/TLS"
+msgstr "Krev TLS"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:214
 #, fuzzy
@@ -6458,8 +6378,8 @@ msgstr "Tillat identitetsbekreftelse i r
 msgstr "Tillat identitetsbekreftelse i ren tekst over ukrypterte forbindelser"
 
 #: ../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
 #, fuzzy
 msgid "Connect port"
 msgstr "Koble til"
@@ -6468,10 +6388,9 @@ msgstr "Koble til"
 #. * 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
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Koble til tjener"
 
@@ -6505,6 +6424,12 @@ msgstr "Jabber beskjedfeil"
 msgid "XMPP Message Error"
 msgstr "Jabber beskjedfeil"
 
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "Brukeren har blokkert deg"
+
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6514,34 +6439,39 @@ msgstr "XML-parsefeil"
 msgid "XML Parse error"
 msgstr "XML-parsefeil"
 
-#: ../libpurple/protocols/jabber/presence.c:422
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Ukjent feil i tilstedeværelse"
 
-#: ../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 "Skap nytt samtalerom"
 
-#: ../libpurple/protocols/jabber/presence.c:505
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr "Du er i ferd med å lage et nytt rom. Ønsker du å endre innstillingene, eller bruke standardinnstillingene?"
+#: ../libpurple/protocols/jabber/presence.c:510
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Du er i ferd med å lage et nytt rom. Ønsker du å endre innstillingene, eller "
+"bruke standardinnstillingene?"
 
-#: ../libpurple/protocols/jabber/presence.c:511
+#: ../libpurple/protocols/jabber/presence.c:516
+#, fuzzy
 msgid "_Configure Room"
-msgstr "_Konfigurer rom"
+msgstr "Konfigurer rom"
 
-#: ../libpurple/protocols/jabber/presence.c:512
+#: ../libpurple/protocols/jabber/presence.c:517
 #, fuzzy
 msgid "_Accept Defaults"
 msgstr "Aksepter standardinstillinger"
 
-#: ../libpurple/protocols/jabber/presence.c:554
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "Feil i gruppesamtale %s"
 
-#: ../libpurple/protocols/jabber/presence.c:558
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Klarte ikke bli med i gruppesamtale %s"
@@ -6594,8 +6524,9 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/usermood.c:183
 #: ../libpurple/protocols/jabber/usernick.c:78
+#, fuzzy
 msgid "Set"
-msgstr "Sett"
+msgstr "_Sett"
 
 #: ../libpurple/protocols/jabber/usermood.c:191
 #, fuzzy
@@ -6613,10 +6544,12 @@ msgstr "Vennligst skriv inn nytt navn fo
 msgstr "Vennligst skriv inn nytt navn for gruppen."
 
 #: ../libpurple/protocols/jabber/usernick.c:77
-msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:100
+#: ../libpurple/protocols/jabber/usernick.c:99
 #, fuzzy
 msgid "Set Nickname..."
 msgstr "Kallenavn"
@@ -6631,229 +6564,265 @@ msgstr "Velg fil"
 msgid "Select an action"
 msgstr "Velg fil"
 
-#: ../libpurple/protocols/msn/contact.c:207
-#, fuzzy
-msgid "Unable to connect to contact server"
-msgstr "Kan ikke koble til tjener."
-
-#: ../libpurple/protocols/msn/contact.c:954
-#, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Legg til i adresseboka"
-
-#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Synkronisasjonsproblem med 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. Do you want this buddy to be added?"
-msgstr "%s er på den lokale lista innenfor gruppa \"%s\", men ikke på tjenerlista. Ønsker du at denne kontakten skal bli lagt til?"
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s er på den lokale lista innenfor gruppa \"%s\", men ikke på tjenerlista. "
+"Ønsker du at denne kontakten skal bli lagt 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 to be added?"
-msgstr "%s er på den lokale lista, men ikke på tjenerlista. Ønsker du at denne kontakten skal bli lagt til?"
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s er på den lokale lista, men ikke på tjenerlista. Ønsker du at denne "
+"kontakten skal bli lagt til?"
 
 #: ../libpurple/protocols/msn/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "Kunne ikke tolke beskjed."
 
 #: ../libpurple/protocols/msn/error.c:41
-#, fuzzy
+#, fuzzy, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksfeil (sannsynligvis en Gaim-bug)"
 
 #: ../libpurple/protocols/msn/error.c:46
+#, c-format
 msgid "Invalid e-mail address"
 msgstr "Ugyldig epostadresse"
 
 #: ../libpurple/protocols/msn/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "Brukeren eksisterer ikke"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, fuzzy
+#, fuzzy, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Fullstending domenenavn mangler"
 
 #: ../libpurple/protocols/msn/error.c:56
+#, fuzzy, c-format
 msgid "Already logged in"
 msgstr "Allerede logget inn"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, fuzzy
+#, fuzzy, c-format
 msgid "Invalid screen name"
 msgstr "Ugyldig brukernavn"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, fuzzy
+#, fuzzy, c-format
 msgid "Invalid friendly name"
 msgstr "Ugyldig kallenavn"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, fuzzy
+#, fuzzy, c-format
 msgid "List full"
 msgstr "Listen er full"
 
 #: ../libpurple/protocols/msn/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Du er allerede der"
 
 #: ../libpurple/protocols/msn/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "Ikke på listen"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "Brukeren er avlogget"
 
 #: ../libpurple/protocols/msn/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Du er allerede i modusen"
 
 #: ../libpurple/protocols/msn/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Du er allerede i den andre listen"
 
 #: ../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 "Brukeren er ikke i gruppen"
 
 #: ../libpurple/protocols/msn/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Gruppenavnet er for langt"
 
 #: ../libpurple/protocols/msn/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kan ikke fjerne gruppe null"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, fuzzy
+#, fuzzy, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Prøvde å legge en kontakt til i en ikke-eksisterende gruppe"
 
 #: ../libpurple/protocols/msn/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Feil med switchboard-tjenesten"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, fuzzy
+#, fuzzy, c-format
 msgid "Notify transfer failed"
 msgstr "Overføring av varsling feilet"
 
 #: ../libpurple/protocols/msn/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Du har ikke fylt inn alle nødvendige felt"
 
 #: ../libpurple/protocols/msn/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "For mange treff på en FND"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
+#, c-format
 msgid "Not logged in"
 msgstr "Ikke pålogget"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service temporarily unavailable"
 msgstr "Tjenesten midlertidig uttilgjengelig"
 
 #: ../libpurple/protocols/msn/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Feil på databasetjeneren"
 
 #: ../libpurple/protocols/msn/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Kommando deaktivert"
 
 #: ../libpurple/protocols/msn/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Filoperasjonsfeil"
 
 #: ../libpurple/protocols/msn/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Feil ved minneallokering"
 
 #: ../libpurple/protocols/msn/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Feil CHL-verdi sendt til tjener"
 
 #: ../libpurple/protocols/msn/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Tjeneren er opptatt"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Tjeneren er ikke tilgjengelig"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, fuzzy
+#, fuzzy, c-format
 msgid "Peer notification server down"
 msgstr "Varslingstjeneren er ikke tilgjengelig"
 
 #: ../libpurple/protocols/msn/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Kunne ikke koble til databasen"
 
 #: ../libpurple/protocols/msn/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Tjeneren er på vei nei (redde seg den som kan)"
 
 #: ../libpurple/protocols/msn/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Feil: kunne ikke koble til"
 
 #: ../libpurple/protocols/msn/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametre er enten ukjent eller ikke tillatt"
 
 #: ../libpurple/protocols/msn/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Kunne ikke skrive"
 
 #: ../libpurple/protocols/msn/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Sesjonsoverlast"
 
 #: ../libpurple/protocols/msn/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "Brukeren er for aktiv"
 
 #: ../libpurple/protocols/msn/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "For mange sesjoner"
 
 #: ../libpurple/protocols/msn/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Passport-konto er ikke blitt verifisert"
 
 #: ../libpurple/protocols/msn/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Ugyldig 'friend'-fil"
 
 #: ../libpurple/protocols/msn/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Uventet"
 
 #: ../libpurple/protocols/msn/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Visningsnavnet endres for raskt"
 
 #: ../libpurple/protocols/msn/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Tjeneren er for opptatt"
 
@@ -6861,28 +6830,33 @@ msgstr "Tjeneren er for opptatt"
 #: ../libpurple/protocols/oscar/oscar.c:1380
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1380
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#, c-format
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
 #: ../libpurple/protocols/msn/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Ikke tillatt når avlogget"
 
 #: ../libpurple/protocols/msn/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Nye brukere vil ikke bli godtatt"
 
 #: ../libpurple/protocols/msn/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport for barn, men har ikke foreldregodkjenning"
 
 #: ../libpurple/protocols/msn/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-konto er ikke blitt verifisert enda"
 
 #: ../libpurple/protocols/msn/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
@@ -6914,395 +6888,401 @@ msgstr "Det nye MSN-kallenavnet er for l
 msgid "Your new MSN friendly name is too long."
 msgstr "Det nye MSN-kallenavnet er for langt."
 
-#: ../libpurple/protocols/msn/msn.c:285
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Sett kallenavn."
 
-#: ../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 navnet som andre MSN-kompiser vil se deg som."
 
-#: ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Sett telefonnummer (hjemme)."
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Sett telefonnummer (arbeid)."
 
-#: ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Sett mobiltelefonnummer"
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillat tekstmeldinger via MSN"
 
-#: ../libpurple/protocols/msn/msn.c:354
-msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
-msgstr "Ønsker du å tillate eller forby kontakter å sende deg tekstmeldinger via MSN?"
+#: ../libpurple/protocols/msn/msn.c:351
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+"Ønsker du å tillate eller forby kontakter å sende deg tekstmeldinger via MSN?"
 
-#: ../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 "Forby"
 
-#: ../libpurple/protocols/msn/msn.c:377
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Det kan hende denne Hotmail kontoen ikke er aktiv."
 
-#: ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Send tekstmelding"
 
-#: ../libpurple/protocols/msn/msn.c:405
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Send"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:549
 #, fuzzy
-msgid "Current media"
-msgstr "Pålogget på"
+msgid "Has you"
+msgstr "Har deg"
 
-#: ../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:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3077
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Be Right Back"
 msgstr "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 "Opptatt"
 
-#: ../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
+#, fuzzy
 msgid "On the Phone"
 msgstr "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
+#, fuzzy
 msgid "Out to Lunch"
 msgstr "Ute til lunsj"
 
-#: ../libpurple/protocols/msn/msn.c:697
+#: ../libpurple/protocols/msn/msn.c:619
 #, fuzzy
 msgid "Set Friendly Name..."
 msgstr "Sett kallenavn"
 
-#: ../libpurple/protocols/msn/msn.c:702
+#: ../libpurple/protocols/msn/msn.c:624
+#, fuzzy
 msgid "Set Home Phone Number..."
-msgstr "Sett telefonnummer (hjemme)..."
+msgstr "Sett telefonnummer (hjemme)"
 
-#: ../libpurple/protocols/msn/msn.c:706
+#: ../libpurple/protocols/msn/msn.c:628
+#, fuzzy
 msgid "Set Work Phone Number..."
-msgstr "Sett telefonnummer (arbeid)..."
+msgstr "Sett telefonnummer (arbeid)"
 
-#: ../libpurple/protocols/msn/msn.c:710
+#: ../libpurple/protocols/msn/msn.c:632
+#, fuzzy
 msgid "Set Mobile Phone Number..."
-msgstr "Sett telefonnummer (mobil)..."
+msgstr "Sett mobiltelefonnummer"
 
-#: ../libpurple/protocols/msn/msn.c:716
+#: ../libpurple/protocols/msn/msn.c:638
 #, fuzzy
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Bruk/ikke bruk mobile enheter"
 
-#: ../libpurple/protocols/msn/msn.c:721
+#: ../libpurple/protocols/msn/msn.c:643
 #, fuzzy
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Tillate/forby tekstmeldinger"
 
-#: ../libpurple/protocols/msn/msn.c:732
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Ã…pne Hotmail Inbox"
 
-#: ../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 gruppesamtale"
 
-#: ../libpurple/protocols/msn/msn.c:804
+#: ../libpurple/protocols/msn/msn.c:726
+#, fuzzy
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr "SSL-støtte kreves for MSN. Vennligst installer et støttet SSL-bibliotek."
+msgstr ""
+"SSL-støtte kreves for MSN, vennligst installer et støttet SSL-bibliotek. Se "
+"http://gaim.sf.net/faq-ssl.php for mer informasjon."
 
-#: ../libpurple/protocols/msn/msn.c:832
+#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr "Klarte ikke koble til tjener."
 
-#: ../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 ikke hente profil"
 
-#: ../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
 #, fuzzy
 msgid "General"
 msgstr "Kjønn"
 
-#: ../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 "Sted"
 
-#: ../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 "Hobbyer 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 "Noen ord om meg"
 
-#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1731
+#: ../libpurple/protocols/msn/msn.c:1621
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Sivilstatus"
 
-#: ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1622
+#, fuzzy
 msgid "Interests"
-msgstr "Interesser"
+msgstr "Sett _inn"
 
-#: ../libpurple/protocols/msn/msn.c:1733
+#: ../libpurple/protocols/msn/msn.c:1623
+#, fuzzy
 msgid "Pets"
-msgstr "Dyr"
+msgstr "Porter"
 
-#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1624
+#, fuzzy
 msgid "Hometown"
-msgstr "Hjemby"
+msgstr "Maskin ukjent"
 
-#: ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
-msgstr "Mote"
+msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
-msgstr "Humor"
+msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
-msgstr "Musikk"
+msgstr ""
 
-#: ../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 "Yndlingssitat"
 
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1646
+#, fuzzy
 msgid "Contact Info"
-msgstr "Kontaktinformasjon"
+msgstr "Kontoinformasjon"
 
-#: ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1647
 #, fuzzy
 msgid "Personal"
 msgstr "Tittel"
 
-#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libpurple/protocols/msn/msn.c:1651
 #, fuzzy
 msgid "Home Phone"
 msgstr "Hjemmeside"
 
-#: ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1652
 #, fuzzy
 msgid "Home Phone 2"
 msgstr "Sett telefonnummer (hjemme)"
 
-#: ../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 "Hjemstedsadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1654
 #, fuzzy
 msgid "Personal Mobile"
 msgstr "Tittel"
 
-#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1655
 #, fuzzy
 msgid "Home Fax"
 msgstr "Hjemmeside"
 
-#: ../libpurple/protocols/msn/msn.c:1766
+#: ../libpurple/protocols/msn/msn.c:1656
 #, fuzzy
 msgid "Personal E-Mail"
 msgstr "Tittel"
 
-#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msn/msn.c:1657
 #, fuzzy
 msgid "Personal IM"
 msgstr "Tittel"
 
-#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr ""
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
 msgstr ""
 
-#: ../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 "Tittel"
 
-#: ../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
 #, fuzzy
 msgid "Profession"
 msgstr "Framdrift"
 
-#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libpurple/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Work Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msn/msn.c:1682
 #, fuzzy
 msgid "Work Phone 2"
 msgstr "Sett telefonnummer (arbeid)"
 
-#: ../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
 #, fuzzy
 msgid "Work Mobile"
 msgstr "Send til mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1685
 #, fuzzy
 msgid "Work Pager"
 msgstr "Hjemmeside"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1687
 #, fuzzy
 msgid "Work E-Mail"
 msgstr "E-post"
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msn/msn.c:1689
 #, fuzzy
 msgid "Start Date"
 msgstr "Fylke/stat"
 
-#: ../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 "Favoritt-ting"
 
-#: ../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 "Hjemmeside"
 
-#: ../libpurple/protocols/msn/msn.c:1969
+#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr "Brukeren har ikke opprettet en offentlig profil"
 
-#: ../libpurple/protocols/msn/msn.c:1970
-msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
-msgstr "MSN klarte ikke å finne brukerens profil. Dette betyr enten at brukeren ikke eksisterer, eller at brukeren ikke har opprettet en offentlig profil"
+#: ../libpurple/protocols/msn/msn.c:1860
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"MSN klarte ikke å finne brukerens profil. Dette betyr enten at brukeren ikke "
+"eksisterer, eller at brukeren ikke har opprettet en offentlig profil"
 
-#: ../libpurple/protocols/msn/msn.c:1974
+#: ../libpurple/protocols/msn/msn.c:1864
 #, fuzzy
-msgid "Could not find any information in the user's profile. The user most likely does not exist."
-msgstr "Gaim klarte ikke finne noen informasjon i brukerens profil. Antakelig eksisterer brukeren ikke."
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+"Gaim klarte ikke finne noen informasjon i brukerens profil. Antakelig "
+"eksisterer brukeren ikke."
 
-#: ../libpurple/protocols/msn/msn.c:1982
+#: ../libpurple/protocols/msn/msn.c:1872
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profil URL"
@@ -7317,153 +7297,132 @@ msgstr "Profil URL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2269
-#: ../libpurple/protocols/msn/msn.c:2271
+#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
 #, fuzzy
-msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Novel GroupWise Messenger protolltillegg"
+msgid "MSN Protocol Plugin"
+msgstr "AIM/ICQ-protokolltillegg"
 
-#: ../libpurple/protocols/msn/msn.c:2306
+#: ../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 testtjener"
 
-#: ../libpurple/protocols/msn/msn.c:2316
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2324
+#: ../libpurple/protocols/msn/msn.c:2212
 #, fuzzy
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: nudge en kontakt for å få deres oppmerksomhet"
 
-#: ../libpurple/protocols/msn/nexus.c:137
-msgid "Windows Live ID authentication:Unable to connect"
-msgstr ""
+#: ../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 "Kunne ikke koble til"
 
-#: ../libpurple/protocols/msn/nexus.c:275
-#, fuzzy
-msgid "Windows Live ID authentication Failed"
-msgstr "Autentisering feilet"
-
-#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s er ikke et gyldig navn på en 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 "Ukjent 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
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s har sendt deg en beskjed"
-
-#: ../libpurple/protocols/msn/notification.c:843
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
-msgid "Unknown error (%d)"
-msgstr "Ukjent feil (%d)"
-
-#: ../libpurple/protocols/msn/notification.c:844
-#: ../libpurple/protocols/sametime/sametime.c:4425
-#, fuzzy
-msgid "Unable to add user"
-msgstr "Klarte ikke forby brukeren %s"
-
-#: ../libpurple/protocols/msn/notification.c:904
-#, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Klarte ikke legge til bruker 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 ikke blokkere brukeren 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 ikke tillate bruker 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 "%s kunne ikke bli lagt til kontaktlista, fordi din kontaktliste er full."
+msgstr ""
+"%s kunne ikke bli lagt til kontaktlista, fordi din kontaktliste 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 ikke et gyldig passport-konto"
 
-#: ../libpurple/protocols/msn/notification.c:934
+#: ../libpurple/protocols/msn/notification.c:528
 #, fuzzy
 msgid "Service Temporarily Unavailable."
 msgstr "Tjenesten midlertidig uttilgjengelig"
 
-#: ../libpurple/protocols/msn/notification.c:1272
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Kunne ikke endre navn på gruppe"
 
-#: ../libpurple/protocols/msn/notification.c:1327
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Kunne ikke slette gruppe"
 
-#: ../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 automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgstr[0] ""
-"MSN-tjeneren vil stenge ned pga. vedlikeholdsarbeid i løpet av %d minutt. Du vil da bli frakoblet, så vennligst avslutt eventuelle samtaler før det.\n"
+"MSN-tjeneren vil stenge ned pga. vedlikeholdsarbeid i løpet av %d minutt. Du "
+"vil da bli frakoblet, så vennligst avslutt eventuelle samtaler før det.\n"
 "\n"
 "Etter at vedlikeholdsarbeidet er ferdig, kan du logge på igjen."
 msgstr[1] ""
-"MSN-tjeneren vil stenge ned pga. vedlikeholdsarbeid i løpet av %d minutter. Du vil da bli frakoblet, så vennligst avslutt eventuelle samtaler før det.\n"
+"MSN-tjeneren vil stenge ned pga. vedlikeholdsarbeid i løpet av %d minutter. "
+"Du vil da bli frakoblet, så vennligst avslutt eventuelle samtaler før det.\n"
 "\n"
 "Etter at vedlikeholdsarbeidet er ferdig, kan du logge på igjen."
 
-#: ../libpurple/protocols/msn/oim.c:141
-#, fuzzy
-msgid "Unable to connect to OIM server"
-msgstr "Kan ikke koble til tjener."
-
-#: ../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 "Kunne ikke koble til"
-
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "Feil ved skriving"
@@ -7481,55 +7440,59 @@ msgstr ""
 "Tilkoplingsfeil fra %s tjener (%s):\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:336
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Vår protokoll er ikke støttet av tjeneren"
 
-#: ../libpurple/protocols/msn/session.c:340
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Feil under tolkning av HTTP."
 
-#: ../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 ble logget av fordi du har logget på et annet sted."
 
-#: ../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-tjenerene er midlertidig utilgjengelig.Vennligst prøv igjen senere."
+msgstr ""
+"MSN-tjenerene er midlertidig utilgjengelig.Vennligst prøv igjen senere."
 
-#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-tjenerne vil bli utilgjengelig en liten stund."
 
-#: ../libpurple/protocols/msn/session.c:359
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Klarte ikke autentisere: %s"
 
-#: ../libpurple/protocols/msn/session.c:364
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "Din MSN-kontaktliste er midlertidig utilgjengelig. Vennligst prøv igjen senere."
+#: ../libpurple/protocols/msn/session.c:325
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"Din MSN-kontaktliste er midlertidig utilgjengelig. Vennligst prøv igjen "
+"senere."
 
-#: ../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 "HÃ¥ndtrykk"
 
-#: ../libpurple/protocols/msn/session.c:388
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Starter godkjenning"
 
-#: ../libpurple/protocols/msn/session.c:389
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Henter 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 "Henter kontaktliste"
 
@@ -7551,7 +7514,8 @@ msgid "Message could not be sent, not al
 
 #: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "Meldingen ble ikke sendt, du ikke kan sende meldinger når du er usynlig:"
+msgstr ""
+"Meldingen ble ikke sendt, du ikke kan sende meldinger når du er usynlig:"
 
 #: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
@@ -7567,36 +7531,37 @@ msgstr "Meldingen kunne ikke bli sendt, 
 msgstr "Meldingen kunne ikke bli sendt, brukeren er frakoblet:"
 
 #: ../libpurple/protocols/msn/switchboard.c:424
-msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 
 #: ../libpurple/protocols/msn/switchboard.c:431
-msgid "Message could not be sent because an error with the switchboard occurred:"
-msgstr "Meldingen kunne ikke bli sendt, da det skjedde en feil med sentralbordet:"
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+"Meldingen kunne ikke bli sendt, da det skjedde en feil med sentralbordet:"
 
 #: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Meldingen kunne ikke bli sendt på grunn av en ukjent feil:"
 
-#: ../libpurple/protocols/msn/userlist.c:243
-#, c-format
+#: ../libpurple/protocols/msn/userlist.c:252
+#, fuzzy, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "%s har lagt deg til i kontaktlisten sin."
+msgstr "Brukeren %s ønsker å legge til %s i kontaktlisten sin."
 
-#: ../libpurple/protocols/msn/userlist.c:312
-#, c-format
+#: ../libpurple/protocols/msn/userlist.c:321
+#, fuzzy, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s har fjernet deg fra sin kontaktliste."
 
-#. 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
 #, fuzzy, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kunne ikke lese fil %s."
 
-#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msn/userlist.c:645
 #, fuzzy
 msgid "The screen name specified is invalid."
 msgstr "Den inntastede SecurID-nøkkelen er ugyldig."
@@ -7610,17 +7575,21 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/myspace/myspace.c:113
-msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
 msgstr ""
 
 #: ../libpurple/protocols/myspace/myspace.c:286
 #, c-format
-msgid "Sorry, passwords over %d characters in length (yours is %d) are not supported by MySpace."
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
 msgstr ""
 
 #. 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 ""
 
@@ -7639,192 +7608,196 @@ msgstr "Logging"
 msgid "Logging in"
 msgstr "Logging"
 
-#: ../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 ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1321
+#: ../libpurple/protocols/myspace/myspace.c:1328
 #, fuzzy
 msgid "New mail messages"
 msgstr "Ny fraværsbeskjed"
 
-#: ../libpurple/protocols/myspace/myspace.c:1322
+#: ../libpurple/protocols/myspace/myspace.c:1329
 msgid "New blog comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1323
+#: ../libpurple/protocols/myspace/myspace.c:1330
 msgid "New profile comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1324
+#: ../libpurple/protocols/myspace/myspace.c:1331
 msgid "New friend requests!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1325
+#: ../libpurple/protocols/myspace/myspace.c:1332
 msgid "New picture comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1355
+#: ../libpurple/protocols/myspace/myspace.c:1360
 msgid "MySpace"
-msgstr "Myspace"
+msgstr ""
 
 #. 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
 #, fuzzy
 msgid "Connected"
 msgstr "Koble til"
 
-#: ../libpurple/protocols/myspace/myspace.c:1549
-#: ../libpurple/protocols/myspace/myspace.c:1551
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/myspace/myspace.c:1556
 #, fuzzy
 msgid "No username set"
 msgstr "Skjermnavn ikke oppgitt."
 
-#: ../libpurple/protocols/myspace/myspace.c:1550
-msgid "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."
+#: ../libpurple/protocols/myspace/myspace.c:1555
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1777
+#: ../libpurple/protocols/myspace/myspace.c:1782
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1970
-#: ../libpurple/protocols/myspace/myspace.c:2004
+#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:2006
 #, fuzzy
 msgid "Failed to add buddy"
 msgstr "Kunne ikke bli med kontakt i samtale"
 
-#: ../libpurple/protocols/myspace/myspace.c:1970
+#: ../libpurple/protocols/myspace/myspace.c:1972
 #, fuzzy
 msgid "'addbuddy' command failed."
 msgstr "Importer kontaktliste fra tjener"
 
-#: ../libpurple/protocols/myspace/myspace.c:2004
-#: ../libpurple/protocols/myspace/myspace.c:2245
+#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:2247
 #, fuzzy
 msgid "persist command failed"
 msgstr "Feil med switchboard-tjenesten"
 
-#: ../libpurple/protocols/myspace/myspace.c:2113
+#: ../libpurple/protocols/myspace/myspace.c:2115
 #, c-format
 msgid "No such user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2114
+#: ../libpurple/protocols/myspace/myspace.c:2116
 #, fuzzy
 msgid "User lookup"
 msgstr "Brukerrom"
 
-#: ../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
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Kunne ikke bli med kontakt i samtale"
 
-#: ../libpurple/protocols/myspace/myspace.c:2226
+#: ../libpurple/protocols/myspace/myspace.c:2228
 msgid "'delbuddy' command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2267
+#: ../libpurple/protocols/myspace/myspace.c:2269
 #, fuzzy
 msgid "blocklist command failed"
 msgstr "Feil med switchboard-tjenesten"
 
-#: ../libpurple/protocols/myspace/myspace.c:2313
+#: ../libpurple/protocols/myspace/myspace.c:2315
 #, fuzzy
 msgid "Invalid input condition"
 msgstr "Fullfører tilkobling"
 
 #. 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
 #, fuzzy
 msgid "Read buffer full"
 msgstr "Køen er full"
 
-#: ../libpurple/protocols/myspace/myspace.c:2400
+#: ../libpurple/protocols/myspace/myspace.c:2402
 #, fuzzy
 msgid "Unparseable message"
 msgstr "Kunne ikke tolke beskjed."
 
-#: ../libpurple/protocols/myspace/myspace.c:2469
+#: ../libpurple/protocols/myspace/myspace.c:2471
 #, fuzzy, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Kunne ikke koble til"
 
-#: ../libpurple/protocols/myspace/myspace.c:2640
+#: ../libpurple/protocols/myspace/myspace.c:2642
 #, fuzzy
 msgid "IM Friends"
 msgstr "Vinduer for direktemeldinger"
 
-#: ../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 on the server-side list)"
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2740
+#: ../libpurple/protocols/myspace/myspace.c:2742
 #, fuzzy
 msgid "Add contacts from server"
 msgstr "Ugyldig svar fra tjener."
 
-#: ../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 venner fra MySpace.com"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2793
+#: ../libpurple/protocols/myspace/myspace.c:2795
 #, fuzzy
 msgid "Importing friends failed"
 msgstr "Ugyldig 'friend'-fil"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2849
+#: ../libpurple/protocols/myspace/myspace.c:2851
 msgid "Find people..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2852
+#: ../libpurple/protocols/myspace/myspace.c:2854
 #, fuzzy
 msgid "Change IM name..."
 msgstr "Bytt passord..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3154
+#: ../libpurple/protocols/myspace/myspace.c:3156
 msgid "myim URL handler"
 msgstr ""
 
-#: ../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 ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3158
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3279
+#: ../libpurple/protocols/myspace/myspace.c:3281
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3282
+#: ../libpurple/protocols/myspace/myspace.c:3284
 #, fuzzy
 msgid "Show headline in status text"
 msgstr "Vis aliasnavn i titteltekster"
 
-#: ../libpurple/protocols/myspace/myspace.c:3287
+#: ../libpurple/protocols/myspace/myspace.c:3289
 #, fuzzy
 msgid "Send emoticons"
 msgstr "Lydinnstillinger"
 
-#: ../libpurple/protocols/myspace/myspace.c:3292
+#: ../libpurple/protocols/myspace/myspace.c:3294
 msgid "Screen resolution (dots per inch)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3295
+#: ../libpurple/protocols/myspace/myspace.c:3297
 #, fuzzy
 msgid "Base font size (points)"
 msgstr "Større skrift"
@@ -7832,12 +7805,13 @@ msgstr "Større skrift"
 #: ../libpurple/protocols/myspace/user.c:95
 #: ../libpurple/protocols/zephyr/zephyr.c:786
 #: ../libpurple/protocols/zephyr/zephyr.c:1204
+#, fuzzy
 msgid "User"
-msgstr "Bruker"
+msgstr "Brukere"
 
 #. 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"
 
@@ -7847,12 +7821,13 @@ msgstr "Avslå"
 msgstr "Avslå"
 
 #: ../libpurple/protocols/myspace/user.c:129
+#, fuzzy
 msgid "Song"
-msgstr "Sang"
+msgstr "_Sortering:"
 
 #: ../libpurple/protocols/myspace/user.c:134
 msgid "Total Friends"
-msgstr "Antall venner"
+msgstr ""
 
 #: ../libpurple/protocols/myspace/user.c:145
 #: ../libpurple/protocols/myspace/user.c:148
@@ -8093,8 +8068,12 @@ msgstr "Kunne ikke kjenne igjen tjeneren
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
 #, fuzzy
-msgid "Your account has been disabled because too many incorrect passwords were entered"
-msgstr "Kontoen din har blitt deaktivert på grunn av for mange ugyldige inntastede passord"
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+"Kontoen din har blitt deaktivert på grunn av for mange ugyldige inntastede "
+"passord"
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
@@ -8122,8 +8101,11 @@ msgstr "Brukeren har blokkert deg"
 msgstr "Brukeren har blokkert deg"
 
 #: ../libpurple/protocols/novell/nmuser.c:1950
-msgid "This evaluation version does not allow more than ten users to log in at one time"
-msgstr "Denne testversjonen tillater ikke mer enn ti samtidige innloggede brukere"
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Denne testversjonen tillater ikke mer enn ti samtidige innloggede brukere"
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
@@ -8139,104 +8121,113 @@ msgstr "PÃ¥logging feilet (%s)"
 msgid "Login failed (%s)."
 msgstr "PÃ¥logging feilet (%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 "Kunne ikke sende beskjed. Klarte ikke hente brukerdetaljer (%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 "Kunne ikke legge til %s til kontaktlisten din (%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 "Kunne ikke sende beskjed (%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 "Kunne ikke invitere bruker (%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 "Klarte ikke sende beskjed til %s. Kunne ikke sette opp konferansen (%s)."
+msgstr ""
+"Klarte ikke sende beskjed til %s. Kunne ikke sette opp 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 "Klarte ikke sende beskjed. Kunne ikke sette opp 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 creating folder (%s)."
-msgstr "Klarte ikke flytte brukeren %s til mappe %s i lista på tjenersiden. En feil oppsto under opprettelse av mappe (%s)."
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+"Klarte ikke flytte brukeren %s til mappe %s i lista på tjenersiden. En feil "
+"oppsto under opprettelse 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 list (%s)."
-msgstr "Klarte ikke legge til %s i kontaktlista. En feil oppsto under opprettelse i lista på tjenersiden (%s)."
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+"Klarte ikke legge til %s i kontaktlista. En feil oppsto under opprettelse i "
+"lista på tjenersiden (%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 "Kunne ikke hente detaljer for brukeren %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 "Kunne ikke legge til bruker til privatliste (%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 "Kunne ikke legge til %s til nektingsliste (%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 "Kunne ikke legge til %s til tillatelsesliste (%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 "Kunne ikke fjerne %s fra privatliste (%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 "Klarte ikke endre personsvernsinstillinger på tjenersiden (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1014
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Klarte ikke opprette 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 kommunikasjon med tjener, stenger forbindelse."
 
-#: ../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 "Tittel"
 
 # VAR: E-post
-#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1504
+#: ../libpurple/protocols/novell/novell.c:1502
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Brukerid"
@@ -8247,41 +8238,41 @@ msgstr "Brukerid"
 #. 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 navn"
 
-#: ../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 "Klarte ikke opprette SSL-forbindelse med tjeneren."
 
-#: ../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 "Kan ikke koble til tjener."
 
-#: ../libpurple/protocols/novell/novell.c:1737
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "Venter 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 har blitt invitert til denne samtalen."
 
-#: ../libpurple/protocols/novell/novell.c:1900
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Invitasjon til samtale"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8292,34 +8283,43 @@ msgstr ""
 "\n"
 "Sent: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1903
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Ønsker du å bli med i samtalen?"
 
-#: ../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 ble logget av fordi du har logget på med dette skjermnavnet et annet sted."
+msgstr ""
+"Du ble logget av fordi du har logget på med dette skjermnavnet et annet sted."
 
-#: ../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."
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ser ut til å være  frakoplet, og mottok ikke meldingen du sendte."
 
 #. TODO: Would be nice to prompt if not set!
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2172
-msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
-msgstr "Klarte ikke kople til tjener, skriv inn adressen til tjeneren du ønsker å kople til."
+#: ../libpurple/protocols/novell/novell.c:2167
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr ""
+"Klarte ikke kople til tjener, skriv inn adressen til tjeneren du ønsker å "
+"kople 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 ikke 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 konferansen har blitt stengt, ingen flere meldinger kan bli sendt."
+msgstr ""
+"Denne konferansen har blitt stengt, ingen flere meldinger kan bli sendt."
 
 #. *< type
 #. *< ui_requirement
@@ -8331,51 +8331,43 @@ msgstr "Denne konferansen har blitt sten
 #. *< 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 "Novel GroupWise Messenger protolltillegg"
 
-#: ../libpurple/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Tjeneradresse"
 
-#: ../libpurple/protocols/novell/novell.c:3554
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Tjenerport"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
-#: ../libpurple/protocols/yahoo/yahoo.c:2635
-#: ../libpurple/protocols/yahoo/ycht.c:481
-#: ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116
-#: ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325
-#: ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/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
 #, fuzzy
 msgid "Server closed the connection."
 msgstr "Feil: kunne ikke koble til"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2462
-#: ../libpurple/protocols/yahoo/yahoo.c:2629
-#: ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128
-#: ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337
-#: ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c: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
 #, fuzzy, c-format
 msgid ""
 "Lost connection with server:\n"
 "%s"
 msgstr "Du har blitt koblet fra tjeneren."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/proxy.c:1145
-#: ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349
-#: ../libpurple/proxy.c:1421
+#: ../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
 #, fuzzy
 msgid "Received invalid data on connection with server."
@@ -8414,7 +8406,7 @@ msgstr "IRC-protokolltillegg"
 msgstr "IRC-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 "Tegnkoding:"
@@ -8549,18 +8541,25 @@ msgstr "Ikke mens du er på AOL"
 msgstr "Ikke mens du er på AOL"
 
 #: ../libpurple/protocols/oscar/oscar.c:348
-msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
 msgstr ""
 
 # Lusete klient :P
 #: ../libpurple/protocols/oscar/oscar.c:457
 #, fuzzy, c-format
-msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
-msgstr "(Det oppsto en feil under mottak av denne meldingen. Kontakten du snakker til har sannsynligvis en lusete klient.)"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+"(Det oppsto en feil under mottak av denne meldingen. Kontakten du snakker "
+"til har sannsynligvis en lusete klient.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639
-#: ../pidgin/gtkutils.c:2387
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
 #: ../pidgin/gtkutils.c:2417
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
@@ -8583,7 +8582,7 @@ msgstr "Samtale"
 msgstr "Samtale"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6008
+#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr "Laste ned fil"
 
@@ -8656,48 +8655,49 @@ msgstr "Kamera"
 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 "Tilgjengelig for samtale"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5813
+#: ../libpurple/protocols/oscar/oscar.c:5815
+#, c-format
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5799
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#, c-format
 msgid "Occupied"
 msgstr "Opptatt"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
-#, fuzzy
+#, fuzzy, c-format
 msgid "Web Aware"
 msgstr "Web-oppmerksom"
 
-#: ../libpurple/protocols/oscar/oscar.c:737
-#: ../libpurple/protocols/qq/qq.c:183
+#: ../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
-#: ../pidgin/gtkdocklet.c:446
-#: ../pidgin/gtkstatusbox.c:1060
+#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr "Usynlig"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
+#, c-format
 msgid "Online"
 msgstr "PÃ¥logget"
 
 #: ../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 "Advarselsnivåer"
 
@@ -8735,19 +8735,25 @@ msgstr "Fullfører tilkobling"
 
 #: ../libpurple/protocols/oscar/oscar.c:1260
 #, fuzzy, c-format
-msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Klarte ikke logge på: Kunne ikke logge på som %s fordi skjermnavnet er ugyldig. Skjermnavn må enten starte med en bokstav og kun inneholde tall, bokstaver, og mellomrom, eller bare inneholde tall."
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Klarte ikke logge på: Kunne ikke logge på som %s fordi skjermnavnet er "
+"ugyldig. Skjermnavn må enten starte med en bokstav og kun inneholde tall, "
+"bokstaver, og mellomrom, eller bare inneholde tall."
 
 #: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2104
+#: ../libpurple/protocols/yahoo/yahoo.c:2105
 #, fuzzy
 msgid "Invalid screen name."
 msgstr "Ugyldig brukernavn,"
 
 #: ../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."
 
@@ -8762,13 +8768,18 @@ msgstr "AOL Instant Messenger-tjenesten 
 
 #: ../libpurple/protocols/oscar/oscar.c:1366
 #: ../libpurple/protocols/oscar/oscar.c:1377
-msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
-msgstr "Du har koblet til og koblet fra for hurtig. Vent ti minutter og prøv igjen. Hvis du fortsetter å prøve nå, vil du måtte vente enda lenger."
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Du har koblet til og koblet fra for hurtig. Vent ti minutter og prøv igjen. "
+"Hvis du fortsetter å prøve nå, vil du måtte vente enda lenger."
 
 #: ../libpurple/protocols/oscar/oscar.c:1371
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Klientversjonen av programmet er for gammel. Vennligst oppgrader her: %s"
+msgstr ""
+"Klientversjonen av programmet er for gammel. Vennligst oppgrader her: %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:1410
 msgid "Could Not Connect"
@@ -8794,19 +8805,23 @@ msgstr "Tast inn det sekssifrede tallet 
 #. * 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
+#, fuzzy
 msgid "_OK"
 msgstr "_OK"
 
 #: ../libpurple/protocols/oscar/oscar.c:1491
 #: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
-msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
-msgstr "Du kan bli frakoblet ganske snart. Du vil kanskje bruke TOC inntil dette er ordnet. Sjekk %s for oppdateringer."
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+"Du kan bli frakoblet ganske snart. Du vil kanskje bruke TOC inntil dette er "
+"ordnet. Sjekk %s for oppdateringer."
 
 #: ../libpurple/protocols/oscar/oscar.c:1494
 #: ../libpurple/protocols/oscar/oscar.c:1537
@@ -8817,7 +8832,9 @@ msgid "You may be disconnected shortly. 
 #: ../libpurple/protocols/oscar/oscar.c:1622
 #, fuzzy, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Du kan bli frakoblet ganske snart. Du vil kanskje bruke TOC inntil dette er ordnet. Sjekk %s for oppdateringer."
+msgstr ""
+"Du kan bli frakoblet ganske snart. Du vil kanskje bruke TOC inntil dette er "
+"ordnet. Sjekk %s for oppdateringer."
 
 #: ../libpurple/protocols/oscar/oscar.c:1625
 #, fuzzy
@@ -8833,50 +8850,55 @@ msgstr "Kunne ikke lage ny tilkobling."
 msgid "Unable to initialize connection"
 msgstr "Kunne ikke lage ny tilkobling."
 
-#: ../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 "Vennligst godkjenn meg slik at jeg kan legge deg til i kontaktlisten min."
+msgstr ""
+"Vennligst godkjenn meg slik at jeg kan legge deg til i kontaktlisten min."
 
-#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr "Beskjed i godkjenningsforespørsel:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2227
+#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr "Vennligst godkjenn 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 grunn spesifisert."
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2279
 msgid "Authorization Denied Message:"
 msgstr "Godkjenning nektet, grunn:"
 
-#: ../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 following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"Brukeren %u har avslått din forespørsel om å bli lagt til i din kontaktliste med følgende grunn:\n"
+"Brukeren %u har avslått din forespørsel om å bli lagt til i din kontaktliste "
+"med følgende grunn:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2408
 msgid "ICQ authorization denied."
 msgstr "ICQ-godkjenning avslått."
 
 #. 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 "Brukeren %u har godtatt din forespørsel om å bli lagt til i kontaktlisten din."
+msgstr ""
+"Brukeren %u har godtatt din forespørsel om å bli lagt til i kontaktlisten "
+"din."
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8889,7 +8911,7 @@ msgstr ""
 "Fra: %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"
@@ -8902,7 +8924,7 @@ msgstr ""
 "Fra: %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"
@@ -8915,60 +8937,69 @@ msgstr ""
 "Beskjed:\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-brukeren %u har sent deg en kontakt: %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 "Ønsker du å legge denne kontakten til i kontaktlisten din?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467
-#: ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#, fuzzy
 msgid "_Add"
-msgstr "_Legg til"
+msgstr "Legg til"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2472
+#, fuzzy
 msgid "_Decline"
-msgstr "_Avslå"
+msgstr "Avslå"
 
-#: ../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 har gått glipp av %hu beskjed fra %s fordi den var ugyldig."
 msgstr[1] "Du har gått glipp av %hu beskjeder fra %s fordi de var ugyldige."
 
-#: ../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 har gått glipp av %hu beskjed fra %s fordi den var for stor."
 msgstr[1] "Du har gått glipp av %hu beskjeder fra %s fordi de var for store."
 
-#: ../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."
-msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "Du har gått glipp av %hu beskjed fra %s fordi hastighetsgrensen har blitt overskredet."
-msgstr[1] "Du har gått glipp av %hu beskjeder fra %s fordi hastighetsgrensen har blitt overskredet."
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+"Du har gått glipp av %hu beskjed fra %s fordi hastighetsgrensen har blitt "
+"overskredet."
+msgstr[1] ""
+"Du har gått glipp av %hu beskjeder fra %s fordi hastighetsgrensen har blitt "
+"overskredet."
 
-#: ../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 har gått glipp av %hu beskjed fra %s fordi vedkommende var for ond."
-msgstr[1] "Du har gått glipp av %hu beskjeder fra %s fordi vedkommende var for ond."
+msgstr[0] ""
+"Du har gått glipp av %hu beskjed fra %s fordi vedkommende var for ond."
+msgstr[1] ""
+"Du har gått glipp av %hu beskjeder fra %s fordi vedkommende var for ond."
 
-#: ../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 har gått glipp av %hu beskjed fra %s fordi du er for ond."
 msgstr[1] "Du har gått glipp av %hu beskjeder fra %s fordi du er for ond."
 
-#: ../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."
@@ -8976,465 +9007,559 @@ msgstr[1] "Du har gått glipp av %hu bes
 msgstr[1] "Du har gått glipp av %hu beskjeder fra %s, ingen grunn oppgitt."
 
 #. 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 "Kunne ikke sende beskjed: %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 "Ukjent grunn."
 
-#: ../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 "Kunne ikke sende beskjed til %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "User information not available: %s"
 msgstr "Brukerinformasjon er ikke tilgjengelig: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2892
+#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Online Since"
 msgstr "PÃ¥logget siden"
 
-#: ../libpurple/protocols/oscar/oscar.c:2897
+#: ../libpurple/protocols/oscar/oscar.c:2901
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Medlem siden"
 
-#: ../libpurple/protocols/oscar/oscar.c:2932
+#: ../libpurple/protocols/oscar/oscar.c:2936
 #, fuzzy
 msgid "Available Message"
 msgstr "Tilstedebeskjed:"
 
-#: ../libpurple/protocols/oscar/oscar.c:3040
+#: ../libpurple/protocols/oscar/oscar.c:3044
 msgid "Your AIM connection may be lost."
 msgstr "AIM-tilkoblingen kan være brutt."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3228
-msgid "[Unable to display a message from this user because it contained invalid characters.]"
-msgstr "[Klarte ikke vise en melding fra denne brukeren da den inneholdt ugyldige tegn.]"
+#: ../libpurple/protocols/oscar/oscar.c:3232
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+"[Klarte ikke vise en melding fra denne brukeren da den inneholdt ugyldige "
+"tegn.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3392
-msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
-msgstr "Den siste kommandoen ble ikke utført fordi du har overskredet hastighetsgrensen. Vennligst vent 10 sekunder og prøv igjen."
+#: ../libpurple/protocols/oscar/oscar.c:3396
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
+msgstr ""
+"Den siste kommandoen ble ikke utført fordi du har overskredet "
+"hastighetsgrensen. Vennligst vent 10 sekunder 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 har blitt koblet fra samtalegruppen %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 "Personlig hjemmeside"
 
-#: ../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 "Hjemmeside"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Information"
 msgstr "Arbeid ekstra info"
 
-#: ../libpurple/protocols/oscar/oscar.c:3873
+#: ../libpurple/protocols/oscar/oscar.c:3877
 msgid "Pop-Up Message"
 msgstr "Varslingsbeskjed"
 
-#: ../libpurple/protocols/oscar/oscar.c:3913
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:3917
+#, fuzzy, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
-msgstr[0] "Det følgende skjermnavnet er assosierte med %s"
+msgstr[0] "De følgende skjermnavnene er assosierte med %s"
 msgstr[1] "De følgende skjermnavnene er assosierte med %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3918
+#: ../libpurple/protocols/oscar/oscar.c:3922
+#, fuzzy
 msgid "Screen name"
-msgstr "Skjermnavn"
+msgstr "_Skjermnavn"
 
-#: ../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 resultater funnet for e-postadresse %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 motta en e-post hvor du blir bedt om å bekrefte %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3967
+#: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
 msgstr "Kontobekreftelse forespurt"
 
-#: ../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 differs from the original."
-msgstr "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte skjermnavnet er forskjellig fra det opprinnelige."
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+"Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
+"skjermnavnet er forskjellig fra det opprinnelige."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, fuzzy, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte skjermnavnet er for langt."
+msgstr ""
+"Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
+"skjermnavnet er for langt."
 
-#: ../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 is too long."
-msgstr "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte skjermnavnet er for langt."
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+"Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
+"skjermnavnet 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 request pending for this screen name."
-msgstr "Feil 0x%04x: Kunne ikke endre e-postadressen fordi det finnes en utestående forespørsel for dette skjermnavnet."
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because there is already a "
+"request pending for this screen name."
+msgstr ""
+"Feil 0x%04x: Kunne ikke endre e-postadressen fordi det finnes en utestående "
+"forespørsel for dette skjermnavnet."
 
-#: ../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 too many screen names associated with it."
-msgstr "Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen har for mange skjermnavn assosiert ved seg."
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+"Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen har "
+"for mange skjermnavn assosiert ved 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 invalid."
-msgstr "Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen er ugyldig."
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address is "
+"invalid."
+msgstr ""
+"Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen er "
+"ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Feil 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-postadressen for %s er %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4031
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr "Kontoinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:4214
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr "Ditt direktemeldingsbilde ble ikke sendt. Du må være direkte tilkoplet for å sende direktemeldingsbilder"
+#: ../libpurple/protocols/oscar/oscar.c:4218
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"Ditt direktemeldingsbilde ble ikke sendt. Du må være direkte tilkoplet for å "
+"sende direktemeldingsbilder"
 
-#: ../libpurple/protocols/oscar/oscar.c:4485
+#: ../libpurple/protocols/oscar/oscar.c:4489
 msgid "Unable to set AIM profile."
 msgstr "Kunne ikke sette AIM-profil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4486
-msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
-msgstr "Du har antakeligvis prøvd å lagre profilinformasjon før innloggingsprosedyren var ferdig. Din profil er ennå ikke blitt lagret. Prøv å lagre den igjen når du er ferdig pålogget."
+#: ../libpurple/protocols/oscar/oscar.c:4490
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+"Du har antakeligvis prøvd å lagre profilinformasjon før "
+"innloggingsprosedyren var ferdig. Din profil er ennå ikke blitt lagret. Prøv "
+"å lagre den igjen når du er ferdig pålogget."
 
-#: ../libpurple/protocols/oscar/oscar.c:4500
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, fuzzy, c-format
-msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
-msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
-msgstr[0] "Maksimum profillengde på %d byte har blitt overskredet. Gaim har avkortet den før den ble lagret."
-msgstr[1] "Maksimum profillengde på %d bytes har blitt overskredet. Gaim har avkortet den før den ble lagret."
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+"Maksimum profillengde på %d bytes har blitt overskredet. Gaim har avkortet "
+"den før den ble lagret."
+msgstr[1] ""
+"Maksimum profillengde på %d bytes har blitt overskredet. Gaim har avkortet "
+"den før den ble lagret."
 
-#: ../libpurple/protocols/oscar/oscar.c:4505
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Profile too long."
 msgstr "Profilen er for stor."
 
-#: ../libpurple/protocols/oscar/oscar.c:4550
+#: ../libpurple/protocols/oscar/oscar.c:4554
 #, fuzzy, c-format
-msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
-msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
-msgstr[0] "Maksimumslengden på %d bytes for fraværsbeskjeder har blitt overskredet. Gaim har avkortet den."
-msgstr[1] "Maksimumslengden på %d bytes for fraværsbeskjeder har blitt overskredet. Gaim har avkortet den."
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+"Maksimumslengden på %d bytes for fraværsbeskjeder har blitt overskredet. "
+"Gaim har avkortet den."
+msgstr[1] ""
+"Maksimumslengden på %d bytes for fraværsbeskjeder har blitt overskredet. "
+"Gaim har avkortet den."
 
-#: ../libpurple/protocols/oscar/oscar.c:4555
+#: ../libpurple/protocols/oscar/oscar.c:4559
 msgid "Away message too long."
 msgstr "Fraværsbeskjeden er for lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4624
+#: ../libpurple/protocols/oscar/oscar.c:4628
 #, fuzzy, c-format
-msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Klarte ikke legge til kontakten %s fordi skjermnavnet er ugyldig. Skjernavn må enten starte med en bokstav og inneholde kun bokstaver, tall, og mellomrom, eller bare inneholde nummer."
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Klarte ikke legge til kontakten %s fordi skjermnavnet er ugyldig. Skjernavn "
+"må enten starte med en bokstav og inneholde kun bokstaver, tall, og "
+"mellomrom, eller bare inneholde nummer."
 
-#: ../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 "Kunne ikke legge til"
 
-#: ../libpurple/protocols/oscar/oscar.c:4735
+#: ../libpurple/protocols/oscar/oscar.c:4739
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kunne ikke hente kontaktliste"
 
-#: ../libpurple/protocols/oscar/oscar.c:4736
+#: ../libpurple/protocols/oscar/oscar.c:4740
 #, fuzzy
-msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few hours."
-msgstr "Gaim klarte ikke å hente kontaktlisten din fra AIM-tjenerne. Kontaktlisten er ikke tapt, og vil sannsynligvis bli tilgjengelig i løpet av få timer."
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few hours."
+msgstr ""
+"Gaim klarte ikke å hente kontaktlisten din fra AIM-tjenerne. Kontaktlisten "
+"er ikke tapt, og vil sannsynligvis bli tilgjengelig i løpet av få timer."
 
-#: ../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 "Ugrupperte"
 
-#: ../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 list.  Please remove one and try again."
-msgstr "Kunne ikke legge til kontakten %s fordi du har for mange kontakter i listen. Vennligst fjern en og prøv igjen."
+msgid ""
+"Could not add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+"Kunne ikke legge til kontakten %s fordi du har for mange kontakter i listen. "
+"Vennligst fjern en 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 "(uten navn)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5068
+#: ../libpurple/protocols/oscar/oscar.c:5072
 #, fuzzy, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Din kommando feilet av ukjent årsak."
 
-#: ../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 want to add them?"
-msgstr "Brukeren %s har gitt deg tillatelse til å legge deg til i kontaktlisten sin. Ønsker du å legge til vedkommende?"
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr ""
+"Brukeren %s har gitt deg tillatelse til å legge deg til i kontaktlisten sin. "
+"Ønsker du å legge til vedkommende?"
 
-#: ../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 "Brukeren %s har akseptert din forespørsel om å bli lagt til i kontaktlisten din."
+msgstr ""
+"Brukeren %s har akseptert din forespørsel om å bli lagt til i kontaktlisten "
+"din."
 
-#: ../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 following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"Brukeren %s har avslått din forespørsel om å bli lagt til i din kontaktliste med følgende grun:\n"
+"Brukeren %s har avslått din forespørsel om å bli lagt til i din kontaktliste "
+"med følgende grun:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5264
 msgid "Authorization Denied"
 msgstr "Ikke godkjent"
 
-#: ../libpurple/protocols/oscar/oscar.c:5296
+#: ../libpurple/protocols/oscar/oscar.c:5300
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Utveksling:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5336
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Invalid chat name specified."
 msgstr "Ugyldig gruppesamtalenavn oppgitt."
 
-#: ../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 "Ditt direktemeldingsbilde ble ikke sendt. Du kan ikke sende direktemeldingsbilder i AIM-samtalegrupper."
+msgstr ""
+"Ditt direktemeldingsbilde ble ikke sendt. Du kan ikke sende "
+"direktemeldingsbilder i AIM-samtalegrupper."
 
-#: ../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 "Fraværsbeskjed"
 
-#: ../libpurple/protocols/oscar/oscar.c:5572
+#: ../libpurple/protocols/oscar/oscar.c:5574
+#, fuzzy
 msgid "<i>(retrieving)</i>"
-msgstr "<i>(mottar)</i>"
+msgstr " <i>(registrert)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5772
+#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5880
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kontaktkommentar for %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr "Kontaktkommentar:"
 
-#: ../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 valgt å åpne en direktemelding til %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/oscar/oscar.c:5934
 #, fuzzy
-msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
-msgstr "Dette vil avsløre din IP-adresse til mottakeren, og medføre en (minimal) sikkerhetsrisiko. Ønsker du å fortsette?"
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Dette vil avsløre din IP-adresse til mottakeren, og medføre en (minimal) "
+"sikkerhetsrisiko. Ønsker du å fortsette?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5940
 #: ../libpurple/protocols/oscar/peer.c:1045
 #, fuzzy
 msgid "C_onnect"
 msgstr "Koble til"
 
-#: ../libpurple/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:5975
 #, fuzzy
 msgid "Get AIM Info"
 msgstr "Hent informasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:5979
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
 msgstr "Rediger kontaktkommentar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5987
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr "Hent statusbeskjed"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
 msgstr "Direkte samtale"
 
-#: ../libpurple/protocols/oscar/oscar.c:6022
+#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr "Spør på nytt om godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6081
+#: ../libpurple/protocols/oscar/oscar.c:6083
 #, fuzzy
 msgid "Require authorization"
 msgstr "Spør om godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6084
+#: ../libpurple/protocols/oscar/oscar.c:6086
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6091
 #, fuzzy
 msgid "ICQ Privacy Options"
 msgstr "Proxyinnstillinger"
 
-#: ../libpurple/protocols/oscar/oscar.c:6108
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
 msgstr "Den nye formateringen 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 "Skjermnavn-formatering kan bare endre på store/små bokstaver og mellomrom."
+msgstr ""
+"Skjermnavn-formatering kan bare endre på store/små bokstaver og mellomrom."
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "Change Address To:"
 msgstr "Endre adresse 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 venter ikke 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 "Du venter på godkjenning fra disse kontaktene"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
-msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
-msgstr "Du kan spørre om godkjenning på nytt hos disse kontaktene ved å høyreklikke på dem og velge \"Spør på nytt om godkjenning\"."
+#: ../libpurple/protocols/oscar/oscar.c:6214
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"Du kan spørre om godkjenning på nytt hos disse kontaktene ved å høyreklikke "
+"på dem og velge \"Spør på nytt om godkjenning\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6229
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by E-Mail"
 msgstr "Finn kontakt etter e-post"
 
-#: ../libpurple/protocols/oscar/oscar.c:6230
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by e-mail address"
-msgstr "Søk etter en kontakt ved hjelp av e-postadresse"
+msgstr "Kontaktsøk etter e-postadresse"
 
-#: ../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-postadressen til den du søker etter."
 
-#: ../libpurple/protocols/oscar/oscar.c:6234
+#: ../libpurple/protocols/oscar/oscar.c:6236
+#, fuzzy
 msgid "_Search"
-msgstr "_Søk"
+msgstr "Søk"
 
-#: ../libpurple/protocols/oscar/oscar.c:6392
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Set User Info (URL)..."
 msgstr "Sett brukerinfo (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Change Password (URL)"
 msgstr "Endre passord (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6407
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfigurer beskjedvideresending (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6417
+#: ../libpurple/protocols/oscar/oscar.c:6419
 #, fuzzy
 msgid "Set Privacy Options..."
 msgstr "Vis flere valg"
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6424
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr "Bekrefte konto"
 
-#: ../libpurple/protocols/oscar/oscar.c:6428
+#: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Vis nåværende registrert adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Endre nåværende registrert adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6439
+#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis kontakter som venter på godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6445
+#: ../libpurple/protocols/oscar/oscar.c:6447
+#, fuzzy
 msgid "Search for Buddy by E-Mail Address..."
-msgstr "Søk etter kontakter ved hjelp av e-postadresser..."
+msgstr "Vennesøk etter e-postadresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6450
+#: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
 msgstr "Vennesøk etter informasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:6518
+#: ../libpurple/protocols/oscar/oscar.c:6520
 #, fuzzy
 msgid "Use recent buddies group"
 msgstr "Brukeren er ikke i gruppen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6521
+#: ../libpurple/protocols/oscar/oscar.c:6523
+#, fuzzy
 msgid "Show how long you have been idle"
-msgstr "Vis hvor lenge du har vært inaktiv"
+msgstr "Lar deg manuelt sette hvor lenge du har vært borte."
 
-#: ../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)"
@@ -9446,12 +9571,12 @@ msgstr "Spør %s om å kople til oss på
 msgstr "Spør %s om å kople til oss på %s:%hu for direktesamtale."
 
 #: ../libpurple/protocols/oscar/peer.c:782
-#, c-format
+#, fuzzy, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "Forsøker å kople til %s:%hu."
+msgstr "Forsøker å kople til %s på %s:%hu for direktesamtale."
 
 #: ../libpurple/protocols/oscar/peer.c:856
-#, fuzzy
+#, fuzzy, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Forsøker å kople til %s på %s:%hu for direktesamtale."
 
@@ -9461,8 +9586,14 @@ msgstr "%s har akkurat spurt om direkte 
 msgstr "%s har akkurat spurt om direkte tilkobling til %s"
 
 #: ../libpurple/protocols/oscar/peer.c:1037
-msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
-msgstr "Dette krever at det opprettes en direkte tilkobling mellom de to datamaskinene, men er nødvendig for å sende bilder. Dette kan være en (minimal) sikkerhetsrisiko fordi mottakeren da ser IP-adressen din."
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+"Dette krever at det opprettes en direkte tilkobling mellom de to "
+"datamaskinene, men er nødvendig for å sende bilder. Dette kan være en "
+"(minimal) sikkerhetsrisiko fordi mottakeren da ser IP-adressen din."
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
 #, fuzzy
@@ -9479,163 +9610,186 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:47
+#, fuzzy
 msgid "Country/Region"
 msgstr "Land"
 
 #: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
-msgstr "Fylke/stat"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
-msgstr "Horoskoptegn"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
-msgstr "Stjernetegn"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
-msgstr "Blodtype"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:54
+#, fuzzy
 msgid "College"
-msgstr "Universitet"
+msgstr "_Lukk"
 
 #: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "E-post"
 
 #: ../libpurple/protocols/qq/buddy_info.c:57
+#, fuzzy
 msgid "Zipcode"
 msgstr "Postnummer"
 
 #: ../libpurple/protocols/qq/buddy_info.c:58
+#, fuzzy
 msgid "Cellphone Number"
-msgstr "Mobilnummer"
+msgstr "Telefonnummer"
 
 #: ../libpurple/protocols/qq/buddy_info.c:59
+#, fuzzy
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
-msgstr "Vannmannen"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
+#, fuzzy
 msgid "Pisces"
-msgstr "Fiskene"
+msgstr "Bilder"
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
+#, fuzzy
 msgid "Aries"
-msgstr "Væren"
+msgstr "Adresse"
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
+#, fuzzy
 msgid "Taurus"
-msgstr "Tyren"
+msgstr "Tyrkisk"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
+#, fuzzy
 msgid "Gemini"
-msgstr "Tvillingen"
+msgstr "Tysk"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
+#, fuzzy
 msgid "Cancer"
-msgstr "Krepsen"
+msgstr "_Avbryt"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
-msgstr "Løven"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
-msgstr "Jomfruen"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
-msgstr "Vekten"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:66
+#, fuzzy
 msgid "Scorpio"
-msgstr "Skorpionen"
+msgstr "Abonnement"
 
 #: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
-msgstr "Skytten"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
-msgstr "Steinbukken"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:71
-
+#, fuzzy
 msgid "Rat"
-msgstr "Rotte"
+msgstr "Direkte"
 
 #: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
-msgstr "Okse"
+msgstr ""
 
 #
 #: ../libpurple/protocols/qq/buddy_info.c:71
+#, fuzzy
 msgid "Tiger"
-msgstr "Tiger"
+msgstr "Tid"
 
 #: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
-msgstr "Hare"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
-msgstr "Drage"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
+#, fuzzy
 msgid "Snake"
-msgstr "Slange"
+msgstr "Lagre"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
+#, fuzzy
 msgid "Horse"
-msgstr "Hest"
+msgstr "Porter"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
-msgstr "Geit"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
+#, fuzzy
 msgid "Monkey"
-msgstr "Ape"
+msgstr "Ingen"
 
 #: ../libpurple/protocols/qq/buddy_info.c:73
+#, fuzzy
 msgid "Rooster"
-msgstr "Hane"
+msgstr "Registrer"
 
 #: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
-msgstr "Hund"
+msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:73
+#, fuzzy
 msgid "Pig"
-msgstr "Gris"
+msgstr "Ping"
 
 #: ../libpurple/protocols/qq/buddy_info.c:78
+#, fuzzy
 msgid "Other"
-msgstr "Andre"
+msgstr "Opera"
 
 #: ../libpurple/protocols/qq/buddy_info.c:481
 #: ../libpurple/protocols/qq/buddy_info.c:482
+#, fuzzy
 msgid "Modify my information"
-msgstr "Endre min informasjon"
+msgstr "Kontaktinformasjon"
 
 #: ../libpurple/protocols/qq/buddy_info.c:483
+#, fuzzy
 msgid "Update my information"
-msgstr "Oppdater min informasjon"
+msgstr "Brukerinformasjon"
 
 #: ../libpurple/protocols/qq/buddy_info.c:507
+#, fuzzy
 msgid "Your information has been updated"
-msgstr "Din informasjon har blitt oppdatert."
+msgstr "Passordet ditt har blitt endret."
 
 #: ../libpurple/protocols/qq/buddy_info.c:560
 #, c-format
-msgid "Setting custom faces is not currently supported. Please choose an image from %s."
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
 msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_info.c:577
@@ -9655,8 +9809,9 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_opt.c:212
+#, fuzzy
 msgid "Reject request"
-msgstr "Avslå forespørsel"
+msgstr "Uventet forespørsel"
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
@@ -9765,9 +9920,9 @@ msgstr ""
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
 #: ../libpurple/protocols/qq/sys_msg.c:193
-#, c-format
+#, fuzzy, c-format
 msgid "Reason: %s"
-msgstr "Grunn: %s"
+msgstr "Brukere på %s: %s"
 
 #: ../libpurple/protocols/qq/group_im.c:136
 #: ../libpurple/protocols/qq/group_im.c:183
@@ -9839,7 +9994,8 @@ msgid "This group does not allow others 
 #: ../libpurple/protocols/qq/group_join.c:82
 #, fuzzy
 msgid "This group does not allow others to join"
-msgstr "Denne testversjonen tillater ikke mer enn ti samtidige innloggede brukere"
+msgstr ""
+"Denne testversjonen tillater ikke mer enn ti samtidige innloggede brukere"
 
 #: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
@@ -9871,7 +10027,7 @@ msgid "Code [0x%02X]: %s"
 #: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
-msgstr "Kode [0x%02X]: %s"
+msgstr ""
 
 #: ../libpurple/protocols/qq/group_network.c:93
 #, fuzzy
@@ -9932,14 +10088,13 @@ msgstr "Feil: kunne ikke koble til"
 msgid "Error requesting login token"
 msgstr "Feil: kunne ikke koble til"
 
-#: ../libpurple/protocols/qq/login_logout.c:488
+#: ../libpurple/protocols/qq/login_logout.c:486
 #, fuzzy
 msgid "Unable to login, check debug log"
 msgstr "Kunne ikke logge på AIM"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139
-#: ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -10023,8 +10178,7 @@ msgstr "Tjenerinformasjon"
 msgid "Set My Information"
 msgstr "Tjenerinformasjon"
 
-#: ../libpurple/protocols/qq/qq.c:536
-#: ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Bytt passord"
 
@@ -10038,8 +10192,9 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/qq/qq.c:584
+#, fuzzy
 msgid "Block this buddy"
-msgstr "Blokker denne kontakten"
+msgstr "Blokker brukeren"
 
 #. *< type
 #. *< ui_requirement
@@ -10051,8 +10206,7 @@ msgstr "Blokker denne kontakten"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725
-#: ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 #, fuzzy
 msgid "QQ Protocol\tPlugin"
 msgstr "IRC-protokolltillegg"
@@ -10084,9 +10238,9 @@ msgstr "Filsending feilet"
 msgstr "Filsending feilet"
 
 #: ../libpurple/protocols/qq/send_file.c:736
-#, c-format
+#, fuzzy, c-format
 msgid "%d canceled the transfer of %s"
-msgstr "%d avbrøt overføringen av %s"
+msgstr "%s avbrøt overføringen av %s"
 
 #: ../libpurple/protocols/qq/sendqueue.c:123
 #, fuzzy
@@ -10138,9 +10292,9 @@ msgstr "%s ønsker å sende deg en fil."
 msgstr "%s ønsker å sende deg en fil."
 
 #: ../libpurple/protocols/qq/sys_msg.c:239
-#, c-format
+#, fuzzy, c-format
 msgid "Message: %s"
-msgstr "Beskjed: %s"
+msgstr "Beskjed:"
 
 #: ../libpurple/protocols/qq/sys_msg.c:261
 #, fuzzy, c-format
@@ -10163,9 +10317,9 @@ msgstr "<b>Bruker:</b> %s<br>"
 msgstr "<b>Bruker:</b> %s<br>"
 
 #: ../libpurple/protocols/sametime/sametime.c:1293
-#, c-format
+#, fuzzy, c-format
 msgid "Info for Group %s"
-msgstr "Info for gruppe %s"
+msgstr "Info for %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:1295
 #, fuzzy
@@ -10221,7 +10375,8 @@ msgstr "Tjenester på nett"
 
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
@@ -10267,21 +10422,23 @@ msgid "Microphone"
 
 #: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
-msgstr "Mikrofon"
+msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
-msgstr "Høytalere"
+msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3231
+#, fuzzy
 msgid "Video Camera"
-msgstr "Videokamera"
+msgstr "Videosamtale"
 
 #
 #: ../libpurple/protocols/sametime/sametime.c:3269
 #: ../libpurple/protocols/sametime/sametime.c:4145
+#, fuzzy
 msgid "Supports"
-msgstr "Støtter"
+msgstr "støtte"
 
 #: ../libpurple/protocols/sametime/sametime.c:3274
 #: ../libpurple/protocols/sametime/sametime.c:4119
@@ -10296,7 +10453,9 @@ msgstr "Velg en konferanseserver å spø
 
 #: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
-msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3385
@@ -10326,7 +10485,10 @@ msgstr "Start konferanse"
 
 #: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
-msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3471
@@ -10343,8 +10505,7 @@ msgstr ""
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3586
-#: ../pidgin/gtkconv.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr "Tema:"
 
@@ -10355,7 +10516,9 @@ msgstr "Kobler til SILC-tjener"
 
 #: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
-msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:3641
@@ -10368,15 +10531,14 @@ msgstr "Kobler til SILC-tjener"
 msgid "No Sametime Community Server Specified"
 msgstr "Kobler til SILC-tjener"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:4323
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
 msgid "Connect"
 msgstr "Koble til"
 
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
-msgstr "Ukjent (0x%04x)<br>"
+msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:4137
 #, fuzzy
@@ -10385,6 +10547,7 @@ msgstr "Hastighet til klient"
 
 #: ../libpurple/protocols/sametime/sametime.c:4301
 #: ../libpurple/protocols/sametime/sametime.c:5506
+#, fuzzy
 msgid "User Name"
 msgstr "Brukernavn"
 
@@ -10399,8 +10562,12 @@ msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, fuzzy, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
-msgstr "Men enn en bruker ble funnet med det samme navnet. Velg den korrekte brukeren fra lista for å legge til kontaktlista."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"Men enn en bruker ble funnet med det samme navnet. Velg den korrekte "
+"brukeren fra lista for å legge til kontaktlista."
 
 #: ../libpurple/protocols/sametime/sametime.c:4334
 #, fuzzy
@@ -10414,9 +10581,16 @@ msgstr "Klarte ikke legge til bruker på
 
 #: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
-msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
 msgstr ""
 
+#: ../libpurple/protocols/sametime/sametime.c:4425
+#, fuzzy
+msgid "Unable to add user"
+msgstr "Klarte ikke forby brukeren %s"
+
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, fuzzy, c-format
 msgid ""
@@ -10491,7 +10665,10 @@ msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5394
@@ -10506,7 +10683,9 @@ msgstr "Kunne ikke lese fra nettverket"
 
 #: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
-msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5480
@@ -10515,7 +10694,9 @@ msgstr "Legg til i adresseboka"
 msgstr "Legg til i adresseboka"
 
 #: ../libpurple/protocols/sametime/sametime.c:5481
-msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5530
@@ -10525,15 +10706,18 @@ msgstr "Søkeresultater"
 
 #: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
 msgstr ""
 
-#: ../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økeresultater"
 
 #: ../libpurple/protocols/sametime/sametime.c:5563
+#, fuzzy
 msgid "No matches"
 msgstr "Ingen treff"
 
@@ -10543,16 +10727,20 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5568
+#, fuzzy
 msgid "No Matches"
 msgstr "Ingen treff"
 
 #
 #: ../libpurple/protocols/sametime/sametime.c:5605
+#, fuzzy
 msgid "Search for a user"
-msgstr "Søk etter en bruker"
+msgstr "_Søk etter:"
 
 #: ../libpurple/protocols/sametime/sametime.c:5606
-msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5609
@@ -10668,8 +10856,11 @@ msgstr "Fjerntliggende bruker kan ikke n
 #: ../libpurple/protocols/silc/buddy.c:298
 #: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
-msgstr "Nøkkelavtaleforespørsel motatt fra %s. Ønsker du å gjennomføre nøkkelavtalen?"
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Nøkkelavtaleforespørsel motatt fra %s. Ønsker du å gjennomføre nøkkelavtalen?"
 
 #: ../libpurple/protocols/silc/buddy.c:302
 #: ../libpurple/protocols/silc10/buddy.c:299
@@ -10776,8 +10967,13 @@ msgstr "Ikke tillit til kontakten %s"
 
 #: ../libpurple/protocols/silc/buddy.c:726
 #: ../libpurple/protocols/silc10/buddy.c:738
-msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
-msgstr "Du kan ikke motta kontaktvarslinger før du importerer hans/hennes offentlige nøkkel. Du kan bruke Hent offentlig nøkkel-kommandoen for å få den offentlige nøkkelen."
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"Du kan ikke motta kontaktvarslinger før du importerer hans/hennes offentlige "
+"nøkkel. Du kan bruke Hent offentlig nøkkel-kommandoen for å få den "
+"offentlige nøkkelen."
 
 #. Open file selector to select the public key.
 #: ../libpurple/protocols/silc/buddy.c:1059
@@ -10793,13 +10989,18 @@ msgstr "Kontakten %s er ikke tilgjengeli
 
 #: ../libpurple/protocols/silc/buddy.c:1073
 #: ../libpurple/protocols/silc10/buddy.c:1081
-msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
-msgstr "For å legge til kontakten må du importere hans/hennes offentlige nøkkel. Trykk Import for å importere en offentlig nøkkel."
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"For å legge til kontakten må du importere hans/hennes offentlige nøkkel. "
+"Trykk Import for å importere en offentlig nøkkel."
 
 #: ../libpurple/protocols/silc/buddy.c:1077
 #: ../libpurple/protocols/silc10/buddy.c:1085
+#, fuzzy
 msgid "_Import..."
-msgstr "_Importer..."
+msgstr "Importer..."
 
 #: ../libpurple/protocols/silc/buddy.c:1183
 #: ../libpurple/protocols/silc10/buddy.c:1181
@@ -10808,13 +11009,21 @@ msgstr "Velg korrekt bruker"
 
 #: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:1183
-msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
-msgstr "Mer enn en bruker ble funnet med den samme offentlige nøkkelen. Velg den korrekte brukeren fra lista for å legge til kontaktlista."
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"Mer enn en bruker ble funnet med den samme offentlige nøkkelen. Velg den "
+"korrekte brukeren fra lista for å legge til kontaktlista."
 
 #: ../libpurple/protocols/silc/buddy.c:1187
 #: ../libpurple/protocols/silc10/buddy.c:1185
-msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
-msgstr "Men enn en bruker ble funnet med det samme navnet. Velg den korrekte brukeren fra lista for å legge til kontaktlista."
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+"Men enn en bruker ble funnet med det samme navnet. Velg den korrekte "
+"brukeren fra lista for å legge til kontaktlista."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
 #: ../libpurple/protocols/silc10/buddy.c:1474
@@ -11094,7 +11303,7 @@ msgstr "<br><b>Kanaltema:</b><br> %s"
 # Urk... moduser?
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, fuzzy
+#, fuzzy, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanalmoduser:</b> "
 
@@ -11136,8 +11345,19 @@ msgstr "Liste over offentlige nøkler ti
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../libpurple/protocols/silc10/chat.c:413
-msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
-msgstr "Kanalgodkjenning er brukt for å sikre kanalen fra uautorisert tilgang. Autentifikasjonen kan være basert på en nøkkelsetning og digitale signaturer. Dersom nøkkelsetning er valgt, er dette krevd for å bli med. Dersom digitale signaturer er valgt, så kan kun brukere hvis offentlige nøkkler er listet bli med."
+#, c-format
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"Kanalgodkjenning er brukt for å sikre kanalen fra uautorisert tilgang. "
+"Autentifikasjonen kan være basert på en nøkkelsetning og digitale "
+"signaturer. Dersom nøkkelsetning er valgt, er dette krevd for å bli med. "
+"Dersom digitale signaturer er valgt, så kan kun brukere hvis offentlige "
+"nøkkler er listet bli med."
 
 #: ../libpurple/protocols/silc/chat.c:444
 #: ../libpurple/protocols/silc/chat.c:445
@@ -11193,7 +11413,8 @@ msgid "Set user limit on channel. Set to
 #: ../libpurple/protocols/silc/chat.c:743
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr "Velg brukergrense til kanalen. Velg null for å nullstille brukergrense."
+msgstr ""
+"Velg brukergrense til kanalen. Velg null for å nullstille brukergrense."
 
 #: ../libpurple/protocols/silc/chat.c:907
 #: ../libpurple/protocols/silc10/chat.c:891
@@ -11258,7 +11479,8 @@ msgstr "Velg hemmelig kanal"
 #: ../libpurple/protocols/silc/chat.c:1045
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr "Du må bli med i %s-kanalen før du kan bli med i den private gruppa"
 
 #: ../libpurple/protocols/silc/chat.c:1047
@@ -11294,20 +11516,13 @@ msgstr "Ukjent kommando:"
 msgid "Unknown command"
 msgstr "Ukjent kommando:"
 
-#: ../libpurple/protocols/silc/ft.c:85
-#: ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104
-#: ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112
-#: ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120
-#: ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277
-#: ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288
-#: ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89
-#: ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
 #: ../libpurple/protocols/silc10/ft.c:96
 #: ../libpurple/protocols/silc10/ft.c:100
 #: ../libpurple/protocols/silc10/ft.c:104
@@ -11319,16 +11534,11 @@ msgstr "Sikret filoverføring"
 msgid "Secure File Transfer"
 msgstr "Sikret filoverføring"
 
-#: ../libpurple/protocols/silc/ft.c:86
-#: ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105
-#: ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113
-#: ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121
-#: ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93
-#: ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
 #: ../libpurple/protocols/silc10/ft.c:101
 #: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
@@ -11339,13 +11549,11 @@ msgstr "Frakoblet."
 msgid "Remote disconnected"
 msgstr "Frakoblet."
 
-#: ../libpurple/protocols/silc/ft.c:106
-#: ../libpurple/protocols/silc10/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: ../libpurple/protocols/silc/ft.c:110
-#: ../libpurple/protocols/silc10/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Nøkkelavtale feilet"
 
@@ -11359,34 +11567,28 @@ msgstr "Tilkopling feilet"
 msgid "Creating connection failed"
 msgstr "Tilkopling feilet"
 
-#: ../libpurple/protocols/silc/ft.c:122
-#: ../libpurple/protocols/silc10/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 #, fuzzy
 msgid "File transfer session does not exist"
 msgstr "Filoverføringsøkt eksisterer ikke"
 
-#: ../libpurple/protocols/silc/ft.c:273
-#: ../libpurple/protocols/silc10/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Ingen filoverføringsøkt aktiv"
 
-#: ../libpurple/protocols/silc/ft.c:278
-#: ../libpurple/protocols/silc10/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Filoverføring allerede avbrutt"
 
-#: ../libpurple/protocols/silc/ft.c:283
-#: ../libpurple/protocols/silc10/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Kunne ikke gjennomføre nøkkelavtale for filoverføring"
 
-#: ../libpurple/protocols/silc/ft.c:289
-#: ../libpurple/protocols/silc10/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Kunne ikke starte filoverføring"
 
-#: ../libpurple/protocols/silc/ft.c:426
-#: ../libpurple/protocols/silc10/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Kan ikke sende fil"
 
@@ -11394,8 +11596,7 @@ msgstr ""
 msgid "Error occurred"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:533
-#: ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
@@ -11434,8 +11635,7 @@ msgstr "Du har blitt sparket av <I>%s</I
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Du har blitt sparket av <I>%s</I> av <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:718
-#: ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
 #: ../libpurple/protocols/silc/ops.c:728
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
@@ -11444,8 +11644,7 @@ msgstr "Du har blitt drept av %s (%s)"
 msgid "You have been killed by %s (%s)"
 msgstr "Du har blitt drept av %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749
-#: ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
 #: ../libpurple/protocols/silc/ops.c:759
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
@@ -11541,8 +11740,9 @@ msgstr "Offentlig nøkkelbabbelavtrykk"
 
 #: ../libpurple/protocols/silc/ops.c:1292
 #: ../libpurple/protocols/silc10/ops.c:1298
+#, fuzzy
 msgid "_More..."
-msgstr "_Mer..."
+msgstr "Mer..."
 
 #: ../libpurple/protocols/silc/ops.c:1369
 #: ../libpurple/protocols/silc/silc.c:1077
@@ -11701,20 +11901,21 @@ msgstr "Nøkkelsetning kreves"
 msgid "Passphrase required"
 msgstr "Nøkkelsetning kreves"
 
-#: ../libpurple/protocols/silc/pk.c:98
-#: ../libpurple/protocols/silc10/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
-msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
-msgstr "Mottok %s's offentlige nøkkel, men din lokale kopi stemmer ikke overens med denne nøkkelen. Ønsker du fremdeles å akseptere denne nøkkelen?"
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"Mottok %s's offentlige nøkkel, men din lokale kopi stemmer ikke overens med "
+"denne nøkkelen. Ønsker du fremdeles å akseptere denne nøkkelen?"
 
-#: ../libpurple/protocols/silc/pk.c:103
-#: ../libpurple/protocols/silc10/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Mottok %s's offentlige nøkkel. Ønsker du å akseptere denne nøkkelen?"
 
-#: ../libpurple/protocols/silc/pk.c:107
-#: ../libpurple/protocols/silc10/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11723,21 +11924,18 @@ msgstr ""
 "%s\n"
 msgstr ""
 
-#: ../libpurple/protocols/silc/pk.c:110
-#: ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
 #: ../libpurple/protocols/silc10/pk.c:116
 #: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Bekreft offentlig nøkkel"
 
-#: ../libpurple/protocols/silc/pk.c:115
-#: ../libpurple/protocols/silc10/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 #, fuzzy
 msgid "_View..."
 msgstr "Vis..."
 
-#: ../libpurple/protocols/silc/pk.c:140
-#: ../libpurple/protocols/silc10/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Ustøttet offentlig nøkkeltype"
 
@@ -11760,8 +11958,11 @@ msgstr "Nøkkelutveksling feilet"
 #: ../libpurple/protocols/silc/silc.c:238
 #: ../libpurple/protocols/silc10/ops.c:1714
 #, fuzzy
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "Fortsettelse av løsnet økt misslyktes. Trykk Kople til på nytt for å lage en ny forbindelse"
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Fortsettelse av løsnet økt misslyktes. Trykk Kople til på nytt for å lage en "
+"ny forbindelse"
 
 #: ../libpurple/protocols/silc/silc.c:265
 #: ../libpurple/protocols/silc/silc.c:311
@@ -11781,7 +11982,7 @@ msgstr "Kobler til SILC-tjener"
 msgstr "Kobler til SILC-tjener"
 
 #: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not load SILC key pair"
 msgstr "Kunne ikke laste den offentlige nøkkelen"
 
@@ -11813,13 +12014,14 @@ msgstr "Dit nåværende humør"
 msgstr "Dit nåværende humør"
 
 #: ../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"
 
 #: ../libpurple/protocols/silc/silc.c:755
 #: ../libpurple/protocols/silc10/silc.c:666
+#, fuzzy
 msgid "In love"
 msgstr "Forelsket"
 
@@ -11884,8 +12086,9 @@ msgstr "Din VCard-fil"
 
 #
 #: ../libpurple/protocols/silc/silc.c:812
+#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "Tidssone (UTC)"
+msgstr "Tidssone"
 
 #: ../libpurple/protocols/silc/silc.c:816
 #: ../libpurple/protocols/silc/silc.c:817
@@ -11896,8 +12099,14 @@ msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:818
 #: ../libpurple/protocols/silc10/silc.c:731
-msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
-msgstr "Du kan la andre brukere se din tilkoblingsstatusinformasjon og din personlige informasjon. Fyll inn informasjonen du ønsker at andre skal se om deg."
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+"Du kan la andre brukere se din tilkoblingsstatusinformasjon og din "
+"personlige informasjon. Fyll inn informasjonen du ønsker at andre skal se om "
+"deg."
 
 #: ../libpurple/protocols/silc/silc.c:859
 #: ../libpurple/protocols/silc/silc.c:865
@@ -11949,8 +12158,9 @@ msgstr "Nøkkelavtale feilet"
 
 #: ../libpurple/protocols/silc/silc.c:996
 #: ../libpurple/protocols/silc10/silc.c:907
+#, fuzzy
 msgid "Key length"
-msgstr "Nøkkellengde"
+msgstr "Nøkkellengde: \t%d biter\n"
 
 #: ../libpurple/protocols/silc/silc.c:998
 #: ../libpurple/protocols/silc10/silc.c:909
@@ -12057,7 +12267,8 @@ msgid "join &lt;channel&gt; [&lt;passwor
 #: ../libpurple/protocols/silc/silc.c:1666
 #: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;channel&gt; [&lt;password&gt;]:  Join en samtale på dette nettverket"
+msgstr ""
+"join &lt;channel&gt; [&lt;password&gt;]:  Join en samtale på dette nettverket"
 
 #: ../libpurple/protocols/silc/silc.c:1670
 #: ../libpurple/protocols/silc10/silc.c:1599
@@ -12073,12 +12284,14 @@ msgid "msg &lt;nick&gt; &lt;message&gt;:
 #: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;nick&gt; &lt;message&gt;:  Send en privat beskjed til en bruker"
+msgstr ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send en privat beskjed til en bruker"
 
 #: ../libpurple/protocols/silc/silc.c:1682
 #: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;nick&gt; [&lt;message&gt;]:  Send en privat beskjed til en bruker"
+msgstr ""
+"query &lt;nick&gt; [&lt;message&gt;]:  Send en privat beskjed til en bruker"
 
 #: ../libpurple/protocols/silc/silc.c:1686
 #: ../libpurple/protocols/silc10/silc.c:1615
@@ -12117,13 +12330,21 @@ msgstr "whowas &lt;nick&gt;:  Vis nick i
 
 #: ../libpurple/protocols/silc/silc.c:1716
 #: ../libpurple/protocols/silc10/silc.c:1645
-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
-msgstr "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Forandre eller vis kanal modus"
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Forandre eller vis "
+"kanal modus"
 
 #: ../libpurple/protocols/silc/silc.c:1720
 #: ../libpurple/protocols/silc10/silc.c:1649
-msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
-msgstr "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Forandre nick modus på kanal"
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Forandre nick modus "
+"på kanal"
 
 #: ../libpurple/protocols/silc/silc.c:1724
 #: ../libpurple/protocols/silc10/silc.c:1653
@@ -12137,8 +12358,12 @@ msgstr "oper &lt;nick&gt; [-pubkey]:  FÃ
 
 #: ../libpurple/protocols/silc/silc.c:1732
 #: ../libpurple/protocols/silc10/silc.c:1661
-msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
-msgstr "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  inviter nick eller legg til/fjern fra kanalens invitasjonsliste"
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  inviter nick eller legg til/fjern "
+"fra kanalens invitasjonsliste"
 
 #: ../libpurple/protocols/silc/silc.c:1736
 #: ../libpurple/protocols/silc10/silc.c:1665
@@ -12158,7 +12383,8 @@ msgid "getkey &lt;nick|server&gt;:  Retr
 #: ../libpurple/protocols/silc/silc.c:1748
 #: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;nick|server&gt;:  Få klientens eller serverens offentlige nøkkel"
+msgstr ""
+"getkey &lt;nick|server&gt;:  Få klientens eller serverens offentlige nøkkel"
 
 #: ../libpurple/protocols/silc/silc.c:1752
 #: ../libpurple/protocols/silc10/silc.c:1681
@@ -12177,8 +12403,12 @@ msgstr "users &lt;channel&gt;:  Vis bruk
 
 #: ../libpurple/protocols/silc/silc.c:1765
 #: ../libpurple/protocols/silc10/silc.c:1694
-msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
-msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  Vis spesifiserte brukere i kanalen/kanlaene"
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  Vis "
+"spesifiserte brukere i kanalen/kanlaene"
 
 #. *< type
 #. *< ui_requirement
@@ -12201,8 +12431,7 @@ msgstr "Secure Internet Live Conferencin
 msgstr "Secure Internet Live Conferencing (SILC) Protokoll"
 
 #: ../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"
 
@@ -12290,7 +12519,7 @@ msgstr "Brukernavn: \t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:359
-#, c-format
+#, fuzzy, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-post: \t\t%s\n"
 
@@ -12325,9 +12554,9 @@ msgstr "Nøkkellengde: \t%d biter\n"
 msgstr "Nøkkellengde: \t%d biter\n"
 
 #: ../libpurple/protocols/silc/util.c:372
-#, c-format
+#, fuzzy, c-format
 msgid "Version: \t%s\n"
-msgstr "Versjon: \t%s\n"
+msgstr "Organisasjon: \t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:369
@@ -12381,20 +12610,19 @@ msgstr "Terminal"
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284
-#: ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:288
-#: ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
-msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:302
-#: ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr ""
 
@@ -12403,46 +12631,53 @@ msgstr "Ingen tjenerstatistikk tilgjenge
 msgstr "Ingen tjenerstatistikk tilgjengelig"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, fuzzy
+#, fuzzy, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Feil versjon, vennligst oppgrader din klient"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Fjernliggende part støtter eller stoler ikke på ikke din offentlige nøkkel"
+msgstr ""
+"Fjernliggende part støtter eller stoler ikke på ikke din offentlige nøkkel"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
-#, fuzzy
+#, fuzzy, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fjerntliggende part støtter ikke foreslått KE-gruppe"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Fjerntliggende part støtter ikke foreslått krypteringsmetode"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
-#, fuzzy
+#, fuzzy, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fjerntliggende part støtter ikke foreslått PKCS"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, fuzzy
+#, fuzzy, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fjerntliggende part støtter ikke foreslått nøkkelfunksjon"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fjerntliggende part støtter ikke foreslått HMAC"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Ugyldig signatur"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Ugyldig informasjonskapsel"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Autentisering feilet"
 
@@ -12467,38 +12702,39 @@ msgstr "Kunne ikke laste den offentlige 
 
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
+#, fuzzy
 msgid "Could not write"
-msgstr "Kunne ikke skrive"
+msgstr "Kunne ikke sende"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1531
+#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr "Kunne ikke koble til"
 
-#: ../libpurple/protocols/simple/simple.c:1061
+#: ../libpurple/protocols/simple/simple.c:1059
 #, fuzzy
 msgid "Unknown server response."
 msgstr "Ukjent feil."
 
-#: ../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
 #, fuzzy
 msgid "Could not create listen socket"
 msgstr "Kunne ikke opprette socket"
 
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 #, fuzzy
 msgid "Couldn't resolve host"
 msgstr "Kunne ikke koble til"
 
-#: ../libpurple/protocols/simple/simple.c:1679
+#: ../libpurple/protocols/simple/simple.c:1677
 #, fuzzy
 msgid "Could not resolve hostname"
 msgstr "Kan ikke finne datamaskinnavnet."
 
-#: ../libpurple/protocols/simple/simple.c:1696
+#: ../libpurple/protocols/simple/simple.c:1694
 #, fuzzy
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "IRC-kallenavn kan ikke inneholde mellomrom"
@@ -12511,43 +12747,43 @@ msgstr "IRC-kallenavn kan ikke inneholde
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1870
 #, fuzzy
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SILC-protokolltillegg"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1873
+#: ../libpurple/protocols/simple/simple.c:1871
 #, fuzzy
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SILC-protokolltillegg"
 
-#: ../libpurple/protocols/simple/simple.c:1901
+#: ../libpurple/protocols/simple/simple.c:1899
 #, fuzzy
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publiser status (NB: alle kan se deg)"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1905
 #, fuzzy
 msgid "Use UDP"
 msgstr "Brukerid"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1907
 #, fuzzy
 msgid "Use proxy"
 msgstr "Ingen proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:1909
 #, fuzzy
 msgid "Proxy"
 msgstr "Ingen proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1911
 #, fuzzy
 msgid "Auth User"
 msgstr "AP-bruker"
 
-#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/simple/simple.c:1913
 #, fuzzy
 msgid "Auth Domain"
 msgstr "Automatisk"
@@ -12593,6 +12829,7 @@ msgstr "Advarsel %s er ikke tillatt."
 msgstr "Advarsel %s er ikke tillatt."
 
 #: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "En beskjed ble forkastet. Du overskrider tjenerens fartsgrense."
 
@@ -12617,38 +12854,47 @@ msgstr "Du gikk glipp av en beskjed fra 
 msgstr "Du gikk glipp av en beskjed fra %s fordi den ble sendt for raskt."
 
 #: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Feil."
 
 #: ../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 "Trenger flere parametre."
 
 #: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogtjenesten er midlertidig utilgjengelig."
 
 #: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "E-mail lookup restricted."
 msgstr "E-postoppslag er begrenset."
 
 #: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Nøkkelord 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 "Brukeren har ingen kataloginformasjon."
 
 #: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "Land ikke støttet."
 
@@ -12658,21 +12904,28 @@ msgstr "Ukjent feil: %s."
 msgstr "Ukjent feil: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, fuzzy
+#, fuzzy, c-format
 msgid "Incorrect screen name or password."
 msgstr "Feil kallenavn eller passord."
 
 #: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Tjenesten er midlertidig utilgjengelig."
 
 #: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Advarselsnivået ditt er satt for høyt for å logge inn."
 
 #: ../libpurple/protocols/toc/toc.c:558
-msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
-msgstr "Du har koblet til og koblet fra for hurtig. Vent ti minutter og prøv igjen. Hvis du fortsetter å prøve nå, vil du måtte vente enda lenger."
+#, c-format
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
+msgstr ""
+"Du har koblet til og koblet fra for hurtig. Vent ti minutter og prøv igjen. "
+"Hvis du fortsetter å prøve nå, vil du måtte vente enda lenger."
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -12705,11 +12958,10 @@ msgstr "Passordet er endret."
 msgid "Password Change Successful"
 msgstr "Passordet er endret."
 
-#: ../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:"
+msgstr "Gruppe:"
 
 #: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
@@ -12728,10 +12980,8 @@ msgstr "Filoverføringen mislyktes - san
 msgid "File transfer failed; other side probably canceled."
 msgstr "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden."
 
-#: ../libpurple/protocols/toc/toc.c:1878
-#: ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042
-#: ../libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Kunne ikke koble til for dataoverføring."
 
@@ -12740,8 +12990,9 @@ msgstr "Kunne ikke skrive filhode. Filen
 msgstr "Kunne ikke skrive filhode. Filen vil ikke bli overført."
 
 #: ../libpurple/protocols/toc/toc.c:2175
+#, fuzzy
 msgid "Save As..."
-msgstr "Lagre som..."
+msgstr "Lagre ikon som..."
 
 #: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
@@ -12765,223 +13016,253 @@ msgstr "%s venter på at du skal sende d
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306
-#: ../libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolltillegg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
+#: ../libpurple/protocols/yahoo/yahoo.c:782
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:840
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Din Yahoo!-beskjed ble ikke 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
 #, fuzzy
 msgid "Authorization denied message:"
 msgstr "Godkjenning nektet, grunn:"
 
-#: ../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 following reason: %s."
-msgstr "%s har (tilbakevirkende) avslått din forespørsel om å bli lagt til i kontaktlisten med følgende grunn: %s."
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+"%s har (tilbakevirkende) avslått din forespørsel om å bli lagt til i "
+"kontaktlisten med følgende grunn: %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 (tilbakevirkende) avslått din forespørsel om å bli lagt til i kontaktlisten din."
+msgstr ""
+"%s har (tilbakevirkende) avslått din forespørsel om å bli lagt til i "
+"kontaktlisten din."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr "Legge til kontakt avslått"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1993
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 #, fuzzy, c-format
-msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
-msgstr "Yahoo-tjeneren har forespurt bruk av en ukjent autentiseringsmetode. Denne versjonen av Gaim vil antakeligvis ikke være i stand til å logge på Yahoo. Sjekk %s for oppdateringer."
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+"Yahoo-tjeneren har forespurt bruk av en ukjent autentiseringsmetode. Denne "
+"versjonen av Gaim vil antakeligvis ikke være i stand til å logge på Yahoo. "
+"Sjekk %s for oppdateringer."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!-autentisering feilet"
 
-#: ../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 \"Yes\" will remove and ignore the buddy."
-msgstr "Du forsøkte å ignorere %s, men vedkommende er i kontaktlisten din. Hvis du klikker på \"Ja\" vil kontakten fjernes og ignoreres."
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+"Du forsøkte å ignorere %s, men vedkommende er i kontaktlisten din. Hvis du "
+"klikker på \"Ja\" vil kontakten fjernes og ignoreres."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
 msgstr "Ignorere kontakt?"
 
-#: ../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 "Din konto har blitt låst, vennligst logg inn på Yahoo! nettsiden"
 
-#: ../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 feilkode %d.\n"
 "Om du logger inn på Yahoo! sin nettside, kan dette  kansje løse problemet"
 
-#: ../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 "Kunne ikke legge til kontakt %s i gruppen %s i tjenerlisten på konto %s."
+msgstr ""
+"Kunne ikke legge til kontakt %s i gruppen %s i tjenerlisten på konto %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2188
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr "Kunne ikke legge kontakt til tjenerens kontaktliste"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
+#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2650
+#: ../libpurple/protocols/yahoo/yahoo.c:2651
 #, fuzzy
 msgid "Received unexpected HTTP response from server."
 msgstr "Ugyldig svar fra tjener."
 
-#: ../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 "Problem ved tilkobling"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2700
+#: ../libpurple/protocols/yahoo/yahoo.c:2701
 #, fuzzy, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr "Samtaler med %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2725
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3080
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#, fuzzy
 msgid "Not at Home"
 msgstr "Ikke hjemme"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3082
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#, fuzzy
 msgid "Not at Desk"
 msgstr "Ikke ved skrivebordet"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3084
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#, fuzzy
 msgid "Not in Office"
 msgstr "Ikke 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"
 
-#: ../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 "Ikke på tjenerlisten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
-#: ../libpurple/protocols/yahoo/yahoo.c:3290
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 #, fuzzy
 msgid "Appear Online"
 msgstr "Lat som avlogget"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3311
+#: ../libpurple/protocols/yahoo/yahoo.c:3236
+#: ../libpurple/protocols/yahoo/yahoo.c:3312
 #, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "Lat som avlogget"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
+#: ../libpurple/protocols/yahoo/yahoo.c:3254
 #, fuzzy
 msgid "Presence"
 msgstr "Innstillinger"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3296
+#: ../libpurple/protocols/yahoo/yahoo.c:3297
 msgid "Appear Offline"
 msgstr "Lat som avlogget"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3305
+#: ../libpurple/protocols/yahoo/yahoo.c:3306
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Lat som avlogget"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3353
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr "Bli med i samtalegruppe"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3359
+#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr "Start konferanse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3387
+#: ../libpurple/protocols/yahoo/yahoo.c:3388
 #, fuzzy
 msgid "Presence Settings"
 msgstr "Skjulte Innstillinger"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3393
+#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
 msgstr "Start kruseduller"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 #, fuzzy
 msgid "Activate which ID?"
 msgstr "Aktiver hvilken ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Join whom in chat?"
 msgstr "Bli med hvem i samtalegruppe?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3517
+#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr "Aktiver ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3521
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 #, fuzzy
 msgid "Join User in Chat..."
 msgstr "Bli med bruker i samtalegruppe..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3526
+#: ../libpurple/protocols/yahoo/yahoo.c:3527
 #, fuzzy
 msgid "Open Inbox"
 msgstr "Ã…pne Hotmail Inbox"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4135
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 #, fuzzy
+msgid "Buzz"
+msgstr "Buzz!!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#, fuzzy
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;rom&gt; [vert]:  Bli med i en gruppesamtale på denne serveren"
+msgstr ""
+"join: &lt;rom&gt; [vert]:  Bli med i en gruppesamtale på denne serveren"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4140
+#: ../libpurple/protocols/yahoo/yahoo.c:4141
 #, fuzzy
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Vis kanaler på dette nettverket"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4148
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Forespør en bruker om å starte en Doodle session"
 
@@ -12995,62 +13276,62 @@ msgstr "doodle: Forespør en bruker om Ã
 #. *< 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
 #, fuzzy
 msgid "Pager server"
 msgstr "Proxytjener"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4388
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 #, fuzzy
 msgid "Japan Pager server"
 msgstr "Japansk personsøker-adresse:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4391
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr "Personsøker-port:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 #, fuzzy
 msgid "File transfer server"
 msgstr "Filoverføringsvert"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 #, fuzzy
 msgid "Japan file transfer server"
 msgstr "Japansk filoverføringsvert"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr "Filoverføringsport"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 #, fuzzy
 msgid "Chat room locale"
 msgstr "Samtaleromslisteadresse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4414
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 #, fuzzy
 msgid "Chat room list URL"
 msgstr "Samtaleromslisteadresse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 #, fuzzy
 msgid "Yahoo Chat port"
 msgstr "Yahoo Japan"
@@ -13083,13 +13364,20 @@ msgstr "Yahoo!-profil"
 msgstr "Yahoo!-profil"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
-msgstr "Beklager, profiler som er markert med vokseninnhold er for tiden ikke støttet."
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+"Beklager, profiler som er markert med vokseninnhold er for tiden ikke "
+"støttet."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 #, fuzzy
-msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
-msgstr "Hvis du ønsker å vise denne profilen, må du åpne denne lenken i en nettleser"
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr ""
+"Hvis du ønsker å vise denne profilen, må du åpne denne lenken i en nettleser"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
@@ -13123,6 +13411,7 @@ msgstr "Kul lenke 3"
 msgstr "Kul lenke 3"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
+#, fuzzy
 msgid "Last Update"
 msgstr "Sist oppdatert"
 
@@ -13133,16 +13422,31 @@ msgstr "Brukerinformasjon for %s er ikke
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 #, fuzzy
-msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
-msgstr "Beklager, men denne profilen ser ut til å være i et språk som for øyeblikket ikke er støttet."
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr ""
+"Beklager, men denne profilen ser ut til å være i et språk som for øyeblikket "
+"ikke er støttet."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
-msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
-msgstr "Kunne ikke hente ned brukerens profil. Dette er mest sannsynlig et midlertidig server-problem. Vennligst prøv igjen senere."
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"Kunne ikke hente ned brukerens profil. Dette er mest sannsynlig et "
+"midlertidig server-problem. Vennligst prøv igjen senere."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
-msgstr "Kunne ikke hente ned brukerens profil. Dette betyr sannsynligvis at brukeren ikke eksisterer, men merk at Yahoo! noen ganger ikke greier å finne en brukers profil. Om du vet at brukeren eksisterer, vennligst prøv igjen senere."
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"Kunne ikke hente ned brukerens profil. Dette betyr sannsynligvis at brukeren "
+"ikke eksisterer, men merk at Yahoo! noen ganger ikke greier å finne en "
+"brukers profil. Om du vet at brukeren eksisterer, vennligst prøv igjen "
+"senere."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
@@ -13163,13 +13467,15 @@ msgstr "Kunne ikke bli med i samtalegrup
 
 #. -6
 #: ../libpurple/protocols/yahoo/yahoochat.c:441
+#, fuzzy
 msgid "Unknown room"
-msgstr "Ukjent rom"
+msgstr "Ukjent feil"
 
 #. -15
 #: ../libpurple/protocols/yahoo/yahoochat.c:444
+#, fuzzy
 msgid "Maybe the room is full"
-msgstr "Kanskje rommet er fullt"
+msgstr "Kanskje rommet er fullt?"
 
 #. -35
 #: ../libpurple/protocols/yahoo/yahoochat.c:447
@@ -13178,7 +13484,9 @@ msgstr "Ikke tilgjengelig"
 msgstr "Ikke tilgjengelig"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:451
-msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:534
@@ -13229,8 +13537,12 @@ msgstr "Du har blitt koblet fra tjeneren
 
 #: ../libpurple/protocols/zephyr/zephyr.c:354
 #, fuzzy
-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
-msgstr "(Det oppstod en feil under konverteringen av denne beskjeden.\t Sjekk 'encoding'-innstillingen i kontooppsettet)"
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(Det oppstod en feil under konverteringen av denne beskjeden.\t Sjekk "
+"'encoding'-innstillingen i kontooppsettet)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, fuzzy, c-format
@@ -13281,7 +13593,8 @@ msgid "instance &lt;instance&gt;: Set th
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instance &lt;instance&gt;: Sett hendelse som skal brukes for denne klassen"
+msgstr ""
+"instance &lt;instance&gt;: Sett hendelse som skal brukes for denne klassen"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
@@ -13289,26 +13602,35 @@ msgid "topic &lt;instance&gt;: Set the i
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;instance&gt;: Sett hendelse som skal brukes for denne klassen"
+msgstr ""
+"topic &lt;instance&gt;: Sett hendelse som skal brukes for denne klassen"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "ub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join en ny samtale"
+msgstr ""
+"ub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join en ny samtale"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2727
-msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2733
-msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2739
-msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2744
@@ -13373,9 +13695,7 @@ msgstr ""
 msgid "Exposure"
 msgstr ""
 
-#: ../libpurple/proxy.c:459
-#: ../libpurple/proxy.c:894
-#: ../libpurple/proxy.c:1049
+#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
 #: ../libpurple/proxy.c:1617
 #, fuzzy, c-format
 msgid ""
@@ -13388,9 +13708,7 @@ msgstr ""
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 
-#: ../libpurple/proxy.c:698
-#: ../libpurple/proxy.c:744
-#: ../libpurple/proxy.c:780
+#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
 #: ../libpurple/proxy.c:792
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
@@ -13415,26 +13733,29 @@ msgstr "Kan ikke finne datamaskinnavnet.
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
 #: ../libpurple/request.h:1378
+#, fuzzy
 msgid "_Yes"
-msgstr "_Ja"
+msgstr "Ja"
 
 #: ../libpurple/request.h:1378
+#, fuzzy
 msgid "_No"
-msgstr "_Nei"
+msgstr "Nei"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
 #: ../libpurple/request.h:1398
+#, fuzzy
 msgid "_Accept"
-msgstr "_Godta"
+msgstr "Godta"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
 #: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
-msgstr "Jeg er ikke her akkurat nå"
+msgstr ""
 
 #: ../libpurple/savedstatuses.c:535
 #, fuzzy
@@ -13456,19 +13777,19 @@ msgstr "%s hentet informasjon om deg"
 msgid "%s has requested your attention!"
 msgstr "%s hentet informasjon om deg"
 
-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:796
 #, fuzzy, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr "Brukeren '%s' inviterer %s til samtalerom: '%s\n"
 
-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:801
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Brukeren '%s' inviterer %s til samtalerom: '%s\n"
 
-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
 msgstr "Aksepter samtaleinvitasjon?"
 
@@ -13496,180 +13817,180 @@ msgstr "Enhet"
 msgid "Unset"
 msgstr "Enhet"
 
-#: ../libpurple/status.c:156
-#: ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#, fuzzy
 msgid "Do not disturb"
 msgstr "Ikke forstyrr"
 
 #: ../libpurple/status.c:159
+#, fuzzy
 msgid "Extended away"
 msgstr "Utvidet borte"
 
 #: ../libpurple/status.c:160
+#, fuzzy
 msgid "Mobile"
-msgstr "Mobil"
+msgstr "Mobiltelefon"
 
 #: ../libpurple/status.c:609
-#, c-format
+#, fuzzy, c-format
 msgid "%s changed status from %s to %s"
-msgstr "%s har endret status fra %s til %s"
+msgstr "%s har endret kanaltema til: %s"
 
-#: ../libpurple/status.c:612
-#, c-format
-msgid "%s (%s) changed status from %s to %s"
-msgstr "%s (%s) har endret status fra %s til %s"
-
-#: ../libpurple/status.c:623
-#, c-format
+#: ../libpurple/status.c:619
+#, fuzzy, c-format
 msgid "%s is now %s"
-msgstr "%s er nå %s"
+msgstr "%s heter nå %s"
 
-#: ../libpurple/status.c:625
-#, c-format
-msgid "%s (%s) is now %s"
-msgstr "%s (%s) er nå %s"
-
-#: ../libpurple/status.c:631
-#, c-format
+#: ../libpurple/status.c:624
+#, fuzzy, c-format
 msgid "%s is no longer %s"
-msgstr "%s er ikke lenger %s"
+msgstr "%s er tilbake."
 
-#: ../libpurple/status.c:633
+#: ../libpurple/status.c:1234
 #, c-format
-msgid "%s (%s) is no longer %s"
-msgstr "%s (%s) er ikke lenger %s"
-
-#: ../libpurple/status.c:1244
-#, c-format
 msgid "%s became idle"
 msgstr "%s har blitt inaktiv"
 
-#: ../libpurple/status.c:1261
+#: ../libpurple/status.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s har blitt aktiv"
 
-#: ../libpurple/status.c:1324
-#, c-format
+#: ../libpurple/status.c:1314
+#, fuzzy, c-format
 msgid "+++ %s became idle"
 msgstr "%s har blitt inaktiv"
 
-#: ../libpurple/status.c:1326
-#, c-format
+#: ../libpurple/status.c:1316
+#, fuzzy, c-format
 msgid "+++ %s became unidle"
 msgstr "%s har blitt aktiv"
 
-#: ../libpurple/util.c:701
+#: ../libpurple/util.c:718
 #, c-format
 msgid "%x %X"
-msgstr "%x %X"
+msgstr ""
 
-#: ../libpurple/util.c:2705
-#, c-format
+#: ../libpurple/util.c:2722
+#, fuzzy, c-format
 msgid "Error Reading %s"
-msgstr "Feil ved lesing av %s"
+msgstr ""
+"Klarte ikke lese %s:\n"
+"%s\n"
 
-#: ../libpurple/util.c:2706
-#, c-format
-msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
-msgstr "Det oppstod en feil under lesing av %s. Den har ikke blitt lastet, og den gamle filen ble flyttet til %s~."
+#: ../libpurple/util.c:2723
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Det oppstod en feil under innlasting av kontaktlisten din. Den har ikke "
+"blitt lastet, og den gamle filen ble flyttet til blist.xml~."
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3223
 msgid "Calculating..."
 msgstr "Beregner..."
 
-#: ../libpurple/util.c:3209
+#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr "Ukjent."
 
-#: ../libpurple/util.c:3235
-#, c-format
+#: ../libpurple/util.c:3252
+#, fuzzy, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "%d sekund"
-msgstr[1] "%d sekunder"
+msgstr[0] "sekund"
+msgstr[1] "sekunder"
 
-#: ../libpurple/util.c:3247
-#, c-format
+#: ../libpurple/util.c:3264
+#, fuzzy, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "%d dag"
-msgstr[1] "%d dager"
+msgstr[0] "dag"
+msgstr[1] "dager"
 
-#: ../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 timer"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libpurple/util.c:3261
-#, c-format
+#: ../libpurple/util.c:3278
+#, fuzzy, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "%d time"
-msgstr[1] "%d timer"
+msgstr[0] "time"
+msgstr[1] "timer"
 
-#: ../libpurple/util.c:3269
-#, c-format
+#: ../libpurple/util.c:3286
+#, fuzzy, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "%s, %d minutt"
-msgstr[1] "%s, %d minutter"
+msgstr[0] "minutt"
+msgstr[1] "minutter"
 
-#: ../libpurple/util.c:3275
-#, c-format
+#: ../libpurple/util.c:3292
+#, fuzzy, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "%d minutt"
-msgstr[1] "%d minutter"
+msgstr[0] "minutt"
+msgstr[1] "minutter"
 
-#: ../libpurple/util.c:3535
+#: ../libpurple/util.c:3552
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr "Kunne ikke åpne %s: Omdirigert for mange ganger"
+msgstr ""
 
-#: ../libpurple/util.c:3572
-#: ../libpurple/util.c:3868
-#, c-format
+#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#, fuzzy, c-format
 msgid "Unable to connect to %s"
-msgstr "Kan ikke koble til %s"
+msgstr "Kan ikke koble til tjener."
 
-#: ../libpurple/util.c:3695
+#: ../libpurple/util.c:3712
 #, c-format
-msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3730
-#, c-format
+#: ../libpurple/util.c:3747
+#, fuzzy, c-format
 msgid "Error reading from %s: %s"
-msgstr "Feil ved lesing fra %s: %s"
+msgstr ""
+"Klarte ikke lese %s:\n"
+"%s\n"
 
-#: ../libpurple/util.c:3761
-#, c-format
+#: ../libpurple/util.c:3778
+#, fuzzy, c-format
 msgid "Error writing to %s: %s"
-msgstr "Feil ved skriving til %s: %s"
+msgstr ""
+"Klarte ikke skrive %s:\n"
+"%s\n"
 
-#: ../libpurple/util.c:3786
-#, c-format
+#: ../libpurple/util.c:3803
+#, fuzzy, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "Kan ikke koble til %s: %s"
+msgstr "Kan ikke koble til tjener."
 
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "Lynmeldingsklient"
 
 #: ../pidgin.desktop.in.h:2
+#, fuzzy
 msgid "Pidgin Internet Messenger"
-msgstr "Pidgin Lynmeldingsklient"
+msgstr "Lynmeldingsklient"
 
 #: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Send lynmeldinger over flere protokoller"
 
 #: ../pidgin/eggtrayicon.c:129
+#, fuzzy
 msgid "Orientation"
-msgstr "Orientering"
+msgstr "Organisasjon"
 
 #: ../pidgin/eggtrayicon.c:130
 msgid "The orientation of the tray."
@@ -13681,20 +14002,24 @@ msgstr "Innloggingsvalg"
 msgstr "Innloggingsvalg"
 
 #: ../pidgin/gtkaccount.c:428
+#, fuzzy
 msgid "Pro_tocol:"
-msgstr "Pro_tokoll:"
+msgstr "Protokoll:"
 
 #: ../pidgin/gtkaccount.c:439
+#, fuzzy
 msgid "Screen _name:"
-msgstr "Skjerm_navn:"
+msgstr "Skjermnavn:"
 
 #: ../pidgin/gtkaccount.c:529
+#, fuzzy
 msgid "_Local alias:"
-msgstr "_Lokalt alias:"
+msgstr "Lokale brukere"
 
 #: ../pidgin/gtkaccount.c:533
+#, fuzzy
 msgid "Remember pass_word"
-msgstr "Husk pass_ord"
+msgstr "Husk passord"
 
 #. Build the user options frame.
 #: ../pidgin/gtkaccount.c:591
@@ -13702,8 +14027,9 @@ msgstr "Brukervalg"
 msgstr "Brukervalg"
 
 #: ../pidgin/gtkaccount.c:604
+#, fuzzy
 msgid "New _mail notifications"
-msgstr "_Varsling om ny e-post"
+msgstr "Varsling om ny e-post"
 
 #. Buddy icon
 #: ../pidgin/gtkaccount.c:609
@@ -13717,8 +14043,9 @@ msgstr "%s brukervalg"
 msgstr "%s brukervalg"
 
 #: ../pidgin/gtkaccount.c:936
+#, fuzzy
 msgid "Use GNOME Proxy Settings"
-msgstr "Bruk GNOMEs proxyinnstilinger"
+msgstr "Bruk globale proxyinnstilinger"
 
 #: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
@@ -13740,8 +14067,8 @@ msgstr "SOCKS 5"
 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 innstillinger fra miljøet"
 
@@ -13763,18 +14090,15 @@ msgstr "Proxyinnstillinger"
 msgid "Proxy Options"
 msgstr "Proxyinnstillinger"
 
-#: ../pidgin/gtkaccount.c:1044
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
-msgstr "Proxy_type:"
+msgstr "Proxytype:"
 
-#: ../pidgin/gtkaccount.c:1053
-#: ../pidgin/gtkprefs.c:1228
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
-msgstr "_Vert:"
+msgstr "Adresse:"
 
-#: ../pidgin/gtkaccount.c:1057
-#: ../pidgin/gtkprefs.c:1246
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -13782,39 +14106,41 @@ msgstr "_Brukernavn:"
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: ../pidgin/gtkaccount.c:1072
-#: ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
-msgstr "Pa_ssord:"
+msgstr "Passord:"
 
 #: ../pidgin/gtkaccount.c:1195
+#, fuzzy
 msgid "Unable to save new account"
-msgstr "Kan ikke lagre ny konto"
+msgstr "Kunne ikke lage ny tilkobling."
 
 #: ../pidgin/gtkaccount.c:1196
 msgid "An account already exists with the specified criteria."
-msgstr "En konto eksisterer allerede med de spesifiserte kriteriene."
+msgstr ""
 
 #: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Legg til konto"
 
 #: ../pidgin/gtkaccount.c:1492
+#, fuzzy
 msgid "_Basic"
-msgstr "_Generell"
+msgstr "Tilbake"
 
 #: ../pidgin/gtkaccount.c:1499
 msgid "Create this new account on the server"
-msgstr "Opprett denne nye kontoen på tjeneren"
+msgstr ""
 
 #: ../pidgin/gtkaccount.c:1515
+#, fuzzy
 msgid "_Advanced"
-msgstr "_Avansert"
+msgstr "_Avbryt"
 
-#: ../pidgin/gtkaccount.c:1973
-#: ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#, fuzzy
 msgid "Enabled"
-msgstr "Aktivert"
+msgstr "Feilet."
 
 #: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
@@ -13825,296 +14151,270 @@ msgid ""
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add</b> button below and configure your first account. If you want %s to "
+"connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 
-#: ../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 "_Beskjed:"
-
-#: ../pidgin/gtkblist.c:924
+#: ../pidgin/gtkblist.c:767
 msgid "Join a Chat"
 msgstr "Bli med i en samtalegruppe"
 
-#: ../pidgin/gtkblist.c:945
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
-msgstr "Vennligst skriv inn informasjon om samtalegruppen du ønsker å bli med i.\n"
+#: ../pidgin/gtkblist.c:788
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Vennligst skriv inn informasjon om samtalegruppen du ønsker å bli med i.\n"
 
-#: ../pidgin/gtkblist.c:956
-#: ../pidgin/gtkblist.c:6188
-#: ../pidgin/gtkpounce.c:539
+#. 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:"
+msgstr "Konto:"
 
-#: ../pidgin/gtkblist.c:1245
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
+#, fuzzy
 msgid "_Block"
-msgstr "_Blokker"
+msgstr "Blokker"
 
-#: ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1088
+#, fuzzy
 msgid "Un_block"
-msgstr "_Ta bort blokkering"
+msgstr "Blokker"
 
-#: ../pidgin/gtkblist.c:1288
-msgid "Move to"
-msgstr "Flytt til"
-
-#: ../pidgin/gtkblist.c:1328
+#: ../pidgin/gtkblist.c:1139
 msgid "Get _Info"
-msgstr "Hent _informasjon"
+msgstr "_Info"
 
-#: ../pidgin/gtkblist.c:1331
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "Direkte_melding"
 
-#: ../pidgin/gtkblist.c:1337
-msgid "_Send File..."
-msgstr "_Send fil..."
+#: ../pidgin/gtkblist.c:1148
+#, fuzzy
+msgid "_Send File"
+msgstr "Send fil"
 
-#: ../pidgin/gtkblist.c:1344
-msgid "Add Buddy _Pounce..."
-msgstr "Legg til _kontaktvarsling..."
+#: ../pidgin/gtkblist.c:1155
+#, fuzzy
+msgid "Add Buddy _Pounce"
+msgstr "Legg til kompisvarsling"
 
-#: ../pidgin/gtkblist.c:1349
-#: ../pidgin/gtkblist.c:1353
-#: ../pidgin/gtkblist.c:1468
-#: ../pidgin/gtkblist.c:1491
+#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
+#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
 msgid "View _Log"
 msgstr "Vis _logg"
 
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Hide when offline"
-msgstr "Ikke tillatt når avlogget"
-
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Show when offline"
-msgstr "Ikke tillatt når avlogget"
-
-#: ../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 "_Alias..."
 
-#: ../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 "Fje_rn"
 
-#: ../pidgin/gtkblist.c:1434
-msgid "Add _Buddy..."
-msgstr "Legg til _kontakt"
+#: ../pidgin/gtkblist.c:1238
+msgid "Add a _Buddy"
+msgstr "Legg til kompis"
 
-#: ../pidgin/gtkblist.c:1437
-msgid "Add C_hat..."
-msgstr "Legg til _samtale"
+#: ../pidgin/gtkblist.c:1241
+msgid "Add a C_hat"
+msgstr "Legg til samtalegruppe"
 
-#: ../pidgin/gtkblist.c:1440
+#: ../pidgin/gtkblist.c:1244
 msgid "_Delete Group"
-msgstr "_Slett gruppe"
+msgstr "Slett gruppe"
 
-#: ../pidgin/gtkblist.c:1442
+#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr "End_re navn"
 
 #. join button
-#: ../pidgin/gtkblist.c:1462
-#: ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
-msgstr "_Bli med"
+msgstr "_Bli med i samtalegruppe"
 
-#: ../pidgin/gtkblist.c:1464
+#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
 msgstr "Automatisk pålogging"
 
-#: ../pidgin/gtkblist.c:1466
-#, fuzzy
-msgid "Persistent"
-msgstr "Serbisk"
-
-#: ../pidgin/gtkblist.c:1504
-#: ../pidgin/gtkblist.c:1527
+#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
 msgid "_Collapse"
 msgstr "_Lukk"
 
-#: ../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
+#, fuzzy
 msgid "/Tools/Mute Sounds"
-msgstr "/Verktøy/Skru av lyder"
+msgstr "Skru av lyder"
 
-#: ../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."
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
 msgstr "Du er ikke pålogget med noen kontoer som kan legge til den kontakten."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3067
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr "/_Kontakter"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kontakter/_Ny direktemelding..."
 
-#: ../pidgin/gtkblist.c:3069
+#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kontakter/_Bli med i samtalegruppe..."
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:2872
 msgid "/Buddies/Get User _Info..."
 msgstr "/Kontakter/_Hent brukerinfo..."
 
-#: ../pidgin/gtkblist.c:3071
+#: ../pidgin/gtkblist.c:2873
 msgid "/Buddies/View User _Log..."
-msgstr "/Kontakter/Vis bruker_logg..."
+msgstr "/Kontakter/Hent bruker_logg..."
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:2875
+#, fuzzy
 msgid "/Buddies/Show"
-msgstr "/Kontakter/Vis"
+msgstr "/Kontakter/L_ogge av"
 
-#: ../pidgin/gtkblist.c:3074
+#: ../pidgin/gtkblist.c:2876
+#, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Kontakter/Vis/_Avloggede kontakter"
+msgstr "/Kontakter/_Vis avloggede kontakter"
 
-#: ../pidgin/gtkblist.c:3075
+#: ../pidgin/gtkblist.c:2877
+#, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Kontakter/Vis/_Tomme grupper"
+msgstr "/Kontakter/Vis _tomme grupper"
 
-#: ../pidgin/gtkblist.c:3076
+#: ../pidgin/gtkblist.c:2878
+#, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Kontakter/Vis/Kontakt_detaljer"
+msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: ../pidgin/gtkblist.c:3077
+#: ../pidgin/gtkblist.c:2879
+#, fuzzy
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Kontakter/Vis/_Fraværstid"
+msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: ../pidgin/gtkblist.c:3078
+#: ../pidgin/gtkblist.c:2880
+#, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Kontakter/Vis/_Protokollikoner"
+msgstr "/Kontakter/Vis _tomme grupper"
 
-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:2881
+#, fuzzy
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Kontakter/_Sorter kontakter"
+msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
-msgstr "/Kontakter/_Legg til kontakt..."
+msgstr "/Kontakter/_Legg til kompis..."
 
-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kontakter/Legg til _samtalegruppe..."
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr "/Kontakter/Legg til _gruppe..."
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr "/Kontakter/_Avslutt"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:2890
+#, fuzzy
 msgid "/_Accounts"
-msgstr "/_Kontoer"
+msgstr "Kontoer"
 
-#: ../pidgin/gtkblist.c:3089
-#: ../pidgin/gtkblist.c:6889
+#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
 #, fuzzy
-msgid "/Accounts/Manage"
-msgstr "/Kontoer"
+msgid "/Accounts/Add\\/Edit"
+msgstr "Kontoer"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr "/_Verktøy"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:2895
+#, fuzzy
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Verktøy/_Kompisvarsling"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:2896
+#, fuzzy
 msgid "/Tools/_Certificates"
-msgstr "/Verktøy/_Sertifikater"
+msgstr "/Verktøy/_Innstillinger"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:2897
 #, fuzzy
 msgid "/Tools/Plu_gins"
 msgstr "/Verktøy/Handlinger for tillegg"
 
-#: ../pidgin/gtkblist.c:3096
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr "/Verktøy/_Innstillinger"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Sikkerhet"
 
-#: ../pidgin/gtkblist.c:3099
+#: ../pidgin/gtkblist.c:2901
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringer..."
 
-#: ../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
+#, fuzzy
 msgid "/Tools/System _Log"
-msgstr "/Verktøy/System_logg"
+msgstr "/Verktøy/_Vis systemlogg"
 
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:2905
+#, fuzzy
 msgid "/Tools/Mute _Sounds"
-msgstr "/Verktøy/_Skru av lyder"
+msgstr "Skru av lyder"
 
 #. 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/_Avlusningsvindu"
 
-#: ../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"
@@ -14123,643 +14423,699 @@ msgstr ""
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:3218
+#: ../pidgin/gtkblist.c:3020
+#, fuzzy
 msgid "Buddy Alias"
-msgstr "Kontaktalias"
+msgstr "Kontaktliste"
 
-#: ../pidgin/gtkblist.c:3247
+#: ../pidgin/gtkblist.c:3049
+#, fuzzy
 msgid "Logged In"
-msgstr "Logget inn"
+msgstr "Logget ut"
 
-#: ../pidgin/gtkblist.c:3293
+#: ../pidgin/gtkblist.c:3095
+#, fuzzy
 msgid "Last Seen"
-msgstr "Sist sett"
+msgstr "Etternavn:"
 
-#: ../pidgin/gtkblist.c:3314
+#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
-msgstr "Skummelt"
+msgstr ""
 
-#: ../pidgin/gtkblist.c:3316
+#: ../pidgin/gtkblist.c:3118
 msgid "Awesome"
-msgstr "Fantastisk"
+msgstr ""
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3120
 msgid "Rockin'"
-msgstr "Rocker"
+msgstr ""
 
-#: ../pidgin/gtkblist.c:3657
-#, c-format
+#: ../pidgin/gtkblist.c:3453
+#, fuzzy, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "Inaktiv %dd %dh %02dm"
+msgstr "Inaktiv (%dt%02dm) "
 
-#: ../pidgin/gtkblist.c:3659
-#, c-format
+#: ../pidgin/gtkblist.c:3455
+#, fuzzy, c-format
 msgid "Idle %dh %02dm"
-msgstr "Inaktiv %dh %02dm"
+msgstr "Inaktiv (%dt%02dm) "
 
-#: ../pidgin/gtkblist.c:3661
-#, c-format
+#: ../pidgin/gtkblist.c:3457
+#, fuzzy, c-format
 msgid "Idle %dm"
-msgstr "Inaktiv %dm"
+msgstr "Inaktiv (%dm) "
 
-#: ../pidgin/gtkblist.c:3806
+#: ../pidgin/gtkblist.c:3602
+#, fuzzy
 msgid "/Buddies/New Instant Message..."
-msgstr "/Kontakter/Ny direktemelding..."
+msgstr "/Kontakter/_Ny direktemelding..."
 
-#: ../pidgin/gtkblist.c:3807
-#: ../pidgin/gtkblist.c:3840
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Join a Chat..."
-msgstr "/Kontakter/Bli med i samtalegruppe..."
+msgstr "/Kontakter/_Bli med i samtalegruppe..."
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3604
+#, fuzzy
 msgid "/Buddies/Get User Info..."
-msgstr "/Kontakter/Hent brukerinfo..."
+msgstr "/Kontakter/_Hent brukerinfo..."
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3605
+#, fuzzy
 msgid "/Buddies/Add Buddy..."
-msgstr "/Kontakter/Legg til kontakt..."
+msgstr "/Kontakter/_Legg til kompis..."
 
-#: ../pidgin/gtkblist.c:3810
-#: ../pidgin/gtkblist.c:3843
+#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#, fuzzy
 msgid "/Buddies/Add Chat..."
-msgstr "/Kontakter/Legg til samtalegruppe..."
+msgstr "/Kontakter/Legg til _samtalegruppe..."
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3607
+#, fuzzy
 msgid "/Buddies/Add Group..."
-msgstr "/Kontakter/Legg til gruppe..."
+msgstr "/Kontakter/Legg til _gruppe..."
 
-#: ../pidgin/gtkblist.c:3846
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Privacy"
-msgstr "/Verktøy/Blokkeringer"
+msgstr "/Verktøy/Blo_kkeringer"
 
-#: ../pidgin/gtkblist.c:3849
+#: ../pidgin/gtkblist.c:3645
 msgid "/Tools/Room List"
-msgstr "/Verktøy/Romliste"
+msgstr "/Verktøy/_Romliste"
 
-#: ../pidgin/gtkblist.c:3944
-#: ../pidgin/gtkdocklet.c:153
-#, c-format
+#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#, fuzzy, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d ulest beskjed fra %s\n"
-msgstr[1] "%d uleste beskjeder fra %s\n"
+msgstr[0] "Melding fra %s"
+msgstr[1] "Melding fra %s"
 
-#: ../pidgin/gtkblist.c:4104
+#: ../pidgin/gtkblist.c:3822
+#, fuzzy
 msgid "Manually"
-msgstr "Manuelt"
+msgstr "Egendefinert"
 
-#: ../pidgin/gtkblist.c:4107
+#: ../pidgin/gtkblist.c:3824
+#, fuzzy
+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 loggstørrelse"
 
-#: ../pidgin/gtkblist.c:4313
-#: ../pidgin/gtkconn.c:180
-#, c-format
+#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#, fuzzy, c-format
 msgid "%s disconnected"
-msgstr "%s koblet fra"
+msgstr "Frakoblet."
 
-#: ../pidgin/gtkblist.c:4349
-#, c-format
+#: ../pidgin/gtkblist.c:4067
+#, fuzzy, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s koblet fra: %s</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%s har blitt koplet fra.</span>\n"
+"\n"
+"%s\n"
+"%s"
 
-#: ../pidgin/gtkblist.c:4501
+#: ../pidgin/gtkblist.c:4219
+#, fuzzy
 msgid "<b>Username:</b>"
-msgstr "<b>Brukernavn:</b>"
+msgstr ""
+"\n"
+"<b>Advart:</b>"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4226
+#, fuzzy
 msgid "<b>Password:</b>"
-msgstr "<b>Passord:</b>"
+msgstr "<b>_Passord:</b>"
 
-#: ../pidgin/gtkblist.c:4519
+#: ../pidgin/gtkblist.c:4237
 #, fuzzy
 msgid "_Login"
 msgstr "Innlogging"
 
-#: ../pidgin/gtkblist.c:4602
+#: ../pidgin/gtkblist.c:4320
+#, fuzzy
 msgid "/Accounts"
-msgstr "/Kontoer"
+msgstr "Kontoer"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:4334
 #, 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 able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
 msgstr ""
 
 #. 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
+#, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Kontakter/Vis/Avloggede kontakter"
+msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: ../pidgin/gtkblist.c:4882
+#: ../pidgin/gtkblist.c:4600
+#, fuzzy
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Kontakter/Vis/Tomme grupper"
+msgstr "/Kontakter/Vis tomme grupper"
 
-#: ../pidgin/gtkblist.c:4888
+#: ../pidgin/gtkblist.c:4606
+#, fuzzy
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Kontakter/Vis/Kontaktdetaljer"
+msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: ../pidgin/gtkblist.c:4891
+#: ../pidgin/gtkblist.c:4609
+#, fuzzy
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Kontakter/Vis/Fraværstider"
+msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: ../pidgin/gtkblist.c:4894
+#: ../pidgin/gtkblist.c:4612
+#, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Kontakter/Vis/Protokollikoner"
+msgstr "/Kontakter/Vis tomme grupper"
 
-#: ../pidgin/gtkblist.c:5796
-msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr "Vennligst skriv inn skjermnavnet til den personen som du vil legge til i kontaktlisten din. I tillegg kan du skrive inn et alias, eller kallenavn, for kontakten. Aliaset vil bli vist i stedet for skjermnavnet der det er mulig.\n"
+#: ../pidgin/gtkblist.c:5507
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"Vennligst skriv inn skjermnavnet til den personen som du vil legge til i "
+"kontaktlisten din. I tillegg kan du skrive inn et alias, eller kallenavn, "
+"for kontakten. Aliaset vil bli vist i stedet for skjermnavnet der det er "
+"mulig.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:5819
-msgid "A_ccount:"
-msgstr "K_onto:"
-
 #. End of account box
-#: ../pidgin/gtkblist.c:5831
+#: ../pidgin/gtkblist.c:5542
+#, fuzzy
 msgid "_Screen name:"
-msgstr "_Skjermnavn:"
+msgstr "_Skjermnavn"
 
-#: ../pidgin/gtkblist.c:5853
-#: ../pidgin/gtkblist.c:6209
+#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#, fuzzy
 msgid "A_lias:"
-msgstr "A_lias:"
+msgstr "Alias:"
 
-#: ../pidgin/gtkblist.c:6121
+#: ../pidgin/gtkblist.c:5826
 msgid "This protocol does not support chat rooms."
 msgstr "Denne protokollversjonen støtter ikke samtalerom"
 
-#: ../pidgin/gtkblist.c:6137
-msgid "You are not currently signed on with any protocols that have the ability to chat."
+#: ../pidgin/gtkblist.c:5842
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
 msgstr "Du er ikke pålogget med noen protokoller som støtter samtalegrupper."
 
-#: ../pidgin/gtkblist.c:6178
-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
-msgstr "Vennligst skriv inn et aliasnavn og annen informasjon for samtalegruppen.\n"
-
-#: ../pidgin/gtkblist.c:6237
-msgid "Autojoin when account becomes online."
+#: ../pidgin/gtkblist.c:5883
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
 msgstr ""
+"Vennligst skriv inn et aliasnavn og annen informasjon for samtalegruppen.\n"
 
-#: ../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 "Vennligst skriv inn navnet på gruppen som skal legges til."
 
-#: ../pidgin/gtkblist.c:6909
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/Kontoer/"
+msgstr ""
 
-#: ../pidgin/gtkblist.c:6933
+#: ../pidgin/gtkblist.c:6633
+#, fuzzy
 msgid "_Edit Account"
-msgstr "_Rediger konto"
+msgstr "Konto:"
 
-#: ../pidgin/gtkblist.c:6946
-#: ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
 msgid "No actions available"
 msgstr "Ingen handlinger tilgjengelig"
 
-#: ../pidgin/gtkblist.c:6954
+#: ../pidgin/gtkblist.c:6654
+#, fuzzy
 msgid "_Disable"
-msgstr "_Deaktiver"
+msgstr "Synlig"
 
-#: ../pidgin/gtkblist.c:6966
+#
+#: ../pidgin/gtkblist.c:6666
+#, fuzzy
 msgid "Enable Account"
-msgstr "Aktiver konto"
+msgstr "Konto"
 
-#: ../pidgin/gtkblist.c:6972
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Kontoer/Aktiver konto"
+msgstr ""
 
-#: ../pidgin/gtkblist.c:7021
+#: ../pidgin/gtkblist.c:6721
+#, fuzzy
 msgid "/Tools"
-msgstr "/Verktøy"
+msgstr "/_Verktøy"
 
-#: ../pidgin/gtkblist.c:7091
+#: ../pidgin/gtkblist.c:6791
+#, fuzzy
 msgid "/Buddies/Sort Buddies"
-msgstr "/Kontakter/Sorter kontakter"
+msgstr "/Kontakter/Vis _avloggede kontakter"
 
 #. Widget creation function
 #: ../pidgin/gtkcertmgr.c:530
+#, fuzzy
 msgid "SSL Servers"
-msgstr "SSL-tjenere"
+msgstr "Tjener"
 
-#: ../pidgin/gtkconn.c:181
+#: ../pidgin/gtkconn.c:180
 #, fuzzy, c-format
 msgid ""
 "%s\n"
 "\n"
-"%s will not attempt to reconnect the account until you correct the error and re-enable the account."
-msgstr "%s ble avkoblet pga. en feil. %s Kontoen har blitt avstengt. Korriger feilen og slå på kontoen for å tilkoble."
+"%s will not attempt to reconnect the account until you correct the error and "
+"re-enable the account."
+msgstr ""
+"%s ble avkoblet pga. en feil. %s Kontoen har blitt avstengt. Korriger feilen "
+"og slå på kontoen for å tilkoble."
 
-#: ../pidgin/gtkconv.c:523
+#: ../pidgin/gtkconv.c:482
+#, fuzzy
 msgid "Unknown command."
-msgstr "Ukjent kommando."
+msgstr "Ukjent kommando:"
 
-#: ../pidgin/gtkconv.c:795
-#: ../pidgin/gtkconv.c:821
+#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#, fuzzy
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Denne kontakten er ikke på den samme protokollen som denne samtalegruppa"
+msgstr "Denne vennen er ikke på den samme protokollen som denne samtalegruppa"
 
-#: ../pidgin/gtkconv.c:815
-msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr "Du er ikke pålogget pålogget med en konto som kan invitere denne kontakten."
+#: ../pidgin/gtkconv.c:774
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"Du er ikke pålogget pålogget med en konto som kan invitere denne kameraten."
 
-#: ../pidgin/gtkconv.c:868
+#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
-msgstr "Inviter kontakten inn i samtalerom"
+msgstr "Inviter kamerat inn i samtalerom"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:898
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
-msgstr "Vennligst skriv inn navnet på brukeren som du vil invitere, og en eventuell invitasjonsbeskjed."
+#: ../pidgin/gtkconv.c:857
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Vennligst skriv inn navnet på brukeren som du vil invitere, og en eventuell "
+"invitasjonsbeskjed."
 
-#: ../pidgin/gtkconv.c:919
+#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
-msgstr "_Kontakt:"
+msgstr "Kontakt:"
 
-#: ../pidgin/gtkconv.c:930
-#: ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
-msgstr "_Beskjed:"
+msgstr "Beskjed:"
 
-#: ../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 "Kunne ikke ikke åpne fil."
+msgstr "Klarte ikke åpne fil."
 
-#: ../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 "Lagre 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 "Fjern ignorer"
 
-#: ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../pidgin/gtkconv.c:1698
+#: ../pidgin/gtkconv.c:1645
 #, fuzzy
 msgid "Get Away Message"
 msgstr "Ny fraværsbeskjed"
 
-#: ../pidgin/gtkconv.c:1721
+#: ../pidgin/gtkconv.c:1668
+#, fuzzy
 msgid "Last said"
-msgstr "Sa sist"
+msgstr "Etternavn:"
 
-#: ../pidgin/gtkconv.c:2665
+#: ../pidgin/gtkconv.c:2606
 msgid "Unable to save icon file to disk."
 msgstr "Kan ikke lagre ikonfil til disk."
 
-#: ../pidgin/gtkconv.c:2716
+#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr "Lagre 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 "Lagre ikon som..."
 
-#: ../pidgin/gtkconv.c:2780
+#: ../pidgin/gtkconv.c:2721
+#, fuzzy
 msgid "Set Custom Icon..."
-msgstr "Velg eget ikon..."
+msgstr "Egendefinert"
 
-#: ../pidgin/gtkconv.c:2793
+#
+#: ../pidgin/gtkconv.c:2734
+#, fuzzy
 msgid "Remove Custom Icon"
-msgstr "Ta bort eget ikon"
+msgstr "Fje_rn kontakt"
 
-#: ../pidgin/gtkconv.c:2924
+#: ../pidgin/gtkconv.c:2861
 msgid "Show All"
-msgstr "Vis alle"
+msgstr ""
 
 #. 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 direktemelding..."
 
-#: ../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 logg..."
 
-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr "/Samtale/_Lagre som..."
 
-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:2892
+#, fuzzy
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Samtale/_Tøm tilbakeblikk"
+msgstr "/Samtale/Tøm"
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/Se_nd fil..."
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Legg til _kompisvarsling"
 
-#: ../pidgin/gtkconv.c:2962
+#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr "/Samtale/_Hent info"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/Samtale/_Inviter..."
 
-#: ../pidgin/gtkconv.c:2966
+#: ../pidgin/gtkconv.c:2903
+#, fuzzy
 msgid "/Conversation/M_ore"
-msgstr "/Samtale/M_ere"
+msgstr "/Samtale/L_ukk"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2907
+#, fuzzy
 msgid "/Conversation/Al_ias..."
-msgstr "/Samtale/Al_ias..."
+msgstr "/Samtale/Alias..."
 
-#: ../pidgin/gtkconv.c:2972
+#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/Samtale/_Blokker..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2911
+#, fuzzy
 msgid "/Conversation/_Unblock..."
-msgstr "/Samtale/_Fjern blokkering..."
+msgstr "/Samtale/_Blokker..."
 
-#: ../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/_Fjern..."
 
-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Samtale/Sett inn len_ke..."
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Samtale/Sett inn bild_e..."
 
-#: ../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 "/_Brukervalg"
 
-#: ../pidgin/gtkconv.c:2996
+#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr "/Brukervalg/Slå på _logging"
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr "/Brukervalg/Slå på l_yder"
 
-#: ../pidgin/gtkconv.c:2999
+#: ../pidgin/gtkconv.c:2936
+#, fuzzy
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Brukervalg/Vis _formateringsverktøy"
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:2937
+#, fuzzy
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Brukervalg/Vis _tidsstempler"
+msgstr "/Brukervalg/Vis tidsstempler"
 
-#: ../pidgin/gtkconv.c:3124
+#: ../pidgin/gtkconv.c:3061
+#, fuzzy
 msgid "/Conversation/More"
-msgstr "/Samtale/Mere"
+msgstr "/Samtale/L_ukk"
 
-#: ../pidgin/gtkconv.c:3180
+#: ../pidgin/gtkconv.c:3117
+#, fuzzy
 msgid "/Options"
-msgstr "/Brukervalg"
+msgstr "/_Brukervalg"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. 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
+#, fuzzy
 msgid "/Conversation"
-msgstr "/Samtale"
+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 kompisvarsling..."
 
-#: ../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/Alias..."
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr "/Samtale/Blokker..."
 
-#: ../pidgin/gtkconv.c:3289
+#: ../pidgin/gtkconv.c:3226
+#, fuzzy
 msgid "/Conversation/Unblock..."
-msgstr "/Samtale/Fjern blokkering..."
+msgstr "/Samtale/Blokker..."
 
-#: ../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/Sett inn lenke"
 
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Insert Image..."
 msgstr "/Samtale/Sett inn bilde..."
 
-#: ../pidgin/gtkconv.c:3313
+#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr "/Brukervalg/Slå på logging"
 
-#: ../pidgin/gtkconv.c:3316
+#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr "/Brukervalg/Slå på lyder"
 
-#: ../pidgin/gtkconv.c:3329
+#: ../pidgin/gtkconv.c:3266
+#, fuzzy
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Brukervalg/Vis formateringsverktøy"
 
-#: ../pidgin/gtkconv.c:3332
+#: ../pidgin/gtkconv.c:3269
 msgid "/Options/Show Timestamps"
 msgstr "/Brukervalg/Vis tidsstempler"
 
-#: ../pidgin/gtkconv.c:3409
-#: ../pidgin/gtkconv.c:3451
+#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
 msgstr "Brukeren skriver en melding..."
 
-#: ../pidgin/gtkconv.c:3454
+#: ../pidgin/gtkconv.c:3391
+#, fuzzy
 msgid "User has typed something and stopped"
-msgstr "Brukeren har skrevet noe og pauset"
+msgstr "Brukeren har skrevet noe og tatt pause"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3637
-#: ../pidgin/gtkconv.c:8103
-msgid "S_end To"
-msgstr "S_end til"
+#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
+#, fuzzy
+msgid "_Send To"
+msgstr "Send som"
 
-#: ../pidgin/gtkconv.c:4349
+#: ../pidgin/gtkconv.c:4286
+#, fuzzy
 msgid "_Send"
-msgstr "_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 brukere 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 personer i rommet"
 
-#: ../pidgin/gtkconv.c:6550
-#: ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#, fuzzy
 msgid "Typing"
-msgstr "Skriver"
+msgstr "Ping"
 
-#: ../pidgin/gtkconv.c:6554
+#: ../pidgin/gtkconv.c:6490
+#, fuzzy
 msgid "Stopped Typing"
-msgstr "Stoppet å skrive"
+msgstr "Ping"
 
-#: ../pidgin/gtkconv.c:6557
+#: ../pidgin/gtkconv.c:6493
 #, fuzzy
 msgid "Nick Said"
 msgstr "Kallenavn"
 
-#: ../pidgin/gtkconv.c:6560
-#: ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#, fuzzy
 msgid "Unread Messages"
-msgstr "Uleste beskjeder"
+msgstr "Send beskjed"
 
-#: ../pidgin/gtkconv.c:6563
+#: ../pidgin/gtkconv.c:6499
+#, fuzzy
 msgid "New Event"
-msgstr "Ny hendelse"
+msgstr "Hendelse"
 
-#: ../pidgin/gtkconv.c:7654
+#: ../pidgin/gtkconv.c:7572
 #, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "%s har lukket samtalevinduet."
 
-#: ../pidgin/gtkconv.c:7817
+#: ../pidgin/gtkconv.c:7736
+#, fuzzy
 msgid "Confirm close"
-msgstr "Bekrefte lukking"
+msgstr "Bekrefte konto"
 
-#: ../pidgin/gtkconv.c:7849
+#: ../pidgin/gtkconv.c:7768
+#, fuzzy
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Du har uleste beskjeder. Er du sikker på at du vil lukke vinduet?"
+msgstr "Er du sikker på at du vil slette %s?"
 
-#: ../pidgin/gtkconv.c:8436
+#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
-msgstr "Lukk andre faner"
+msgstr ""
 
-#: ../pidgin/gtkconv.c:8442
+#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
-msgstr "Lukk alle faner"
+msgstr ""
 
-#: ../pidgin/gtkconv.c:8450
+#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:8456
+#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
-msgstr "Lukk denne fanen"
+msgstr ""
 
-#: ../pidgin/gtkconv.c:8951
+#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr "Lukk samtalen"
 
-#: ../pidgin/gtkconv.c:9553
+#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
-msgstr "Sist opprettede vindu"
+msgstr "Sist lagde vindu"
 
-#: ../pidgin/gtkconv.c:9555
+#: ../pidgin/gtkconv.c:9479
 msgid "Separate IM and Chat windows"
 msgstr "Skill direktemeldings- og gruppesamtalevinduer."
 
-#: ../pidgin/gtkconv.c:9557
-#: ../pidgin/gtkprefs.c:1417
+#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr "Nytt vindu"
 
-#: ../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"
 
@@ -14768,8 +15124,9 @@ msgstr "Lagre avlusningslogg"
 msgstr "Lagre avlusningslogg"
 
 #: ../pidgin/gtkdebug.c:582
+#, fuzzy
 msgid "Invert"
-msgstr "Inverter"
+msgstr "Sett _inn"
 
 #: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
@@ -14777,74 +15134,70 @@ msgid "_Icon Only"
 
 #: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
-msgstr "Bare _ikon"
+msgstr ""
 
 #: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
-msgstr "Bare _tekst"
+msgstr ""
 
 #: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
-msgstr "_BÃ¥de ikon og tekst"
+msgstr ""
 
 #: ../pidgin/gtkdebug.c:775
+#, fuzzy
 msgid "Filter"
-msgstr "Filter"
+msgstr "Feilet."
 
 #: ../pidgin/gtkdebug.c:794
+#, fuzzy
 msgid "Right click for more options."
-msgstr "Høyreklikk for flere valg"
+msgstr "Vis flere valg"
 
 #: ../pidgin/gtkdebug.c:824
 msgid "Level "
-msgstr "Nivå"
+msgstr ""
 
-#: ../pidgin/gtkdebug.c:825
-#: ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr ""
 
 #: ../pidgin/gtkdebug.c:833
+#, fuzzy
 msgid "All"
-msgstr "Alle"
+msgstr "Tillat"
 
 #: ../pidgin/gtkdebug.c:834
 msgid "Misc"
-msgstr "Diverse"
+msgstr ""
 
 #: ../pidgin/gtkdebug.c:836
+#, fuzzy
 msgid "Warning"
-msgstr "Advarsel"
+msgstr "Advar"
 
 #: ../pidgin/gtkdebug.c:837
+#, fuzzy
 msgid "Error "
 msgstr "Feil"
 
 #: ../pidgin/gtkdebug.c:838
+#, fuzzy
 msgid "Fatal Error"
-msgstr "Alvorlig feil"
+msgstr "Intern feil"
 
-#: ../pidgin/gtkdialogs.c:72
-#: ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "hovedutvikler"
 
-#: ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77
-#: ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79
-#: ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81
-#: ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83
-#: ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
 #: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr "utvikler"
@@ -14854,13 +15207,13 @@ msgstr "støtte"
 msgid "support"
 msgstr "støtte"
 
+#
 #: ../pidgin/gtkdialogs.c:88
 #, fuzzy
 msgid "support/QA"
 msgstr "støtte"
 
-#: ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "utvikler og vevansvarlig"
 
@@ -14872,14 +15225,15 @@ msgstr "windows-versjon"
 msgid "win32 port"
 msgstr "windows-versjon"
 
-#: ../pidgin/gtkdialogs.c:109
-#: ../pidgin/gtkdialogs.c:110
+#
+#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "ansvarlig"
 
 #: ../pidgin/gtkdialogs.c:111
+#, fuzzy
 msgid "libfaim maintainer"
-msgstr "libfaim-ansvarlig"
+msgstr "tidligere libfaim-ansvarlig"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
 #: ../pidgin/gtkdialogs.c:114
@@ -14887,79 +15241,76 @@ msgstr "hacker og sjåfør (avslappet fy
 msgstr "hacker og sjåfør (avslappet fyr)"
 
 #: ../pidgin/gtkdialogs.c:115
+#, fuzzy
 msgid "XMPP developer"
-msgstr "XMPP-utvikler"
+msgstr "utvikler"
 
+#
 #: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "opprinnelig laget av"
 
 #: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
-msgstr "Afrikaans"
+msgstr ""
 
-#: ../pidgin/gtkdialogs.c:134
+#
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#, fuzzy
 msgid "Arabic"
-msgstr "Arabisk"
+msgstr "Amharisk"
 
 #: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:136
-#: ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr ""
 
+#
 #: ../pidgin/gtkdialogs.c:142
+#, fuzzy
 msgid "Bosnian"
-msgstr "Bosnisk"
+msgstr "Estisk"
 
-#: ../pidgin/gtkdialogs.c:143
-#: ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../pidgin/gtkdialogs.c:147
-#: ../pidgin/gtkdialogs.c:148
+#
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "Dansk"
 
-#: ../pidgin/gtkdialogs.c:149
-#: ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "Tysk"
 
-#: ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
 #: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:154
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
-msgstr "Gresk"
+msgstr ""
 
 #: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
@@ -14977,52 +15328,48 @@ msgstr ""
 msgid "Esperanto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:160
-#: ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "Spansk"
 
+#
 #: ../pidgin/gtkdialogs.c:161
+#, fuzzy
 msgid "Estonian"
 msgstr "Estisk"
 
-#: ../pidgin/gtkdialogs.c:162
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
 #: ../pidgin/gtkdialogs.c:166
 #, fuzzy
 msgid "Persian"
 msgstr "Serbisk"
 
-#: ../pidgin/gtkdialogs.c:167
-#: ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "Finsk"
 
-#: ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "Fransk"
 
-#: ../pidgin/gtkdialogs.c:169
-#: ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:239
+#
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:242
+#, fuzzy
 msgid "Galician"
-msgstr "Galisisk"
+msgstr "Italiensk"
 
-#: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr ""
 
@@ -15030,8 +15377,7 @@ msgstr ""
 msgid "Gujarati Language Team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:173
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "Hebraisk"
 
@@ -15039,31 +15385,29 @@ msgstr "Hindi"
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "Ungarsk"
 
 #: ../pidgin/gtkdialogs.c:176
+#, fuzzy
 msgid "Indonesian"
-msgstr "Indonesisk"
+msgstr "Makedons"
 
-#: ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:242
+#
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../pidgin/gtkdialogs.c:178
-#: ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
-#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#, fuzzy
 msgid "Georgian"
-msgstr "Georgisk"
+msgstr "Tysk"
 
 #: ../pidgin/gtkdialogs.c:179
 #, fuzzy
@@ -15071,330 +15415,378 @@ msgstr "Aktive oversettere"
 msgstr "Aktive oversettere"
 
 #: ../pidgin/gtkdialogs.c:180
+#, fuzzy
 msgid "Kannada"
-msgstr "Kannada"
+msgstr "Bannlyst"
 
 #: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
 #: ../pidgin/gtkdialogs.c:184
+#, fuzzy
 msgid "Kurdish"
-msgstr "Kurdisk"
+msgstr "Tyrkisk"
 
 #: ../pidgin/gtkdialogs.c:185
-#: ../pidgin/gtkdialogs.c:249
-#: ../pidgin/gtkdialogs.c:250
+msgid "Lao"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "Makedons"
 
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
+#, fuzzy
 msgid "Bokmål Norwegian"
-msgstr "Norsk Bokmål"
+msgstr "Norsk"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:192
 #, fuzzy
 msgid "Dutch, Flemish"
 msgstr "Nederlansk, flamsk"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:193
+#, fuzzy
 msgid "Norwegian Nynorsk"
-msgstr "Norsk Nynorsk"
+msgstr "Norsk"
 
-#: ../pidgin/gtkdialogs.c:192
-#: ../pidgin/gtkdialogs.c:193
-#: ../pidgin/gtkdialogs.c:194
-#: ../pidgin/gtkdialogs.c:253
+#
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese-Brazil"
 msgstr "Portugisisk (Brasil)"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:199
+#, fuzzy
 msgid "Pashto"
-msgstr "Pashto"
+msgstr "Bilde"
 
-#: ../pidgin/gtkdialogs.c:198
+#
+#: ../pidgin/gtkdialogs.c:200
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: ../pidgin/gtkdialogs.c:199
-#: ../pidgin/gtkdialogs.c:254
-#: ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../pidgin/gtkdialogs.c:200
-#: ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:256
-#: ../pidgin/gtkdialogs.c:257
-#: ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: ../pidgin/gtkdialogs.c:203
+#
+#: ../pidgin/gtkdialogs.c:205
 msgid "Albanian"
 msgstr "Albansk"
 
-#: ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:205
-#: ../pidgin/gtkdialogs.c:260
-#: ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:262
-#: ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:267
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:209
+#, fuzzy
 msgid "Tamil"
-msgstr "Tamil"
+msgstr "Terminal"
 
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "Dravidisk"
 
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
-msgstr "Thai"
+msgstr ""
 
-#: ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "Forenklet kinesisk"
 
-#: ../pidgin/gtkdialogs.c:213
-#: ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
-#: ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
 #
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "Amharisk"
 
-#: ../pidgin/gtkdialogs.c:353
-#, c-format
+#: ../pidgin/gtkdialogs.c:357
+#, fuzzy, c-format
 msgid "About %s"
-msgstr "Om %s"
+msgstr "Om Gaim"
 
-#: ../pidgin/gtkdialogs.c:396
+#: ../pidgin/gtkdialogs.c:400
 #, c-format
-msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:414
+#: ../pidgin/gtkdialogs.c:418
+#, fuzzy, 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>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim på irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:419
+#: ../pidgin/gtkdialogs.c:423
+#, fuzzy
 msgid "Current Developers"
-msgstr "Tidligere utviklere"
+msgstr "tidligere utviklere"
 
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:438
 msgid "Crazy Patch Writers"
-msgstr "Folk som har bidratt med rettelser"
+msgstr "folk som har bidratt med rettelser"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:453
 msgid "Retired Developers"
 msgstr "tidligere utviklere"
 
-#: ../pidgin/gtkdialogs.c:464
+#: ../pidgin/gtkdialogs.c:468
+#, fuzzy
 msgid "Retired Crazy Patch Writers"
-msgstr "\"Pensjonerte\" folk som har bidratt med rettelser"
+msgstr "folk som har bidratt med rettelser"
 
-#: ../pidgin/gtkdialogs.c:479
+#: ../pidgin/gtkdialogs.c:483
 msgid "Artists"
-msgstr "Artister"
+msgstr ""
 
-#: ../pidgin/gtkdialogs.c:494
+#: ../pidgin/gtkdialogs.c:498
 msgid "Current Translators"
 msgstr "Aktive oversettere"
 
-#: ../pidgin/gtkdialogs.c:514
+#: ../pidgin/gtkdialogs.c:518
 msgid "Past Translators"
 msgstr "Tidligere oversettere"
 
-#: ../pidgin/gtkdialogs.c:532
+#: ../pidgin/gtkdialogs.c:536
 #, fuzzy
 msgid "Debugging Information"
 msgstr "Brukerinformasjon"
 
-#: ../pidgin/gtkdialogs.c:902
+#: ../pidgin/gtkdialogs.c:906
 msgid "Get User Info"
 msgstr "Hent brukerinfo"
 
-#: ../pidgin/gtkdialogs.c:904
-msgid "Please enter the screen name or alias of the person whose info you would like to view."
-msgstr "Vennligst skriv inn skjermnavnet eller aliaset til den personen du vil se informasjon om."
+#: ../pidgin/gtkdialogs.c:908
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"Vennligst skriv inn skjermnavnet til den personen du vil se informasjon om."
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:998
+#, fuzzy
 msgid "View User Log"
-msgstr "Se på brukerlogg"
+msgstr "Hent brukerlogg"
 
-#: ../pidgin/gtkdialogs.c:996
-msgid "Please enter the screen name or alias of the person whose log you would like to view."
-msgstr "Vennligst skriv inn skjermnavnet eller aliaset til den personen du vil se loggen til."
+#: ../pidgin/gtkdialogs.c:1000
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+"Vennligst skriv inn skjermnavnet til den personen du vil se loggen til."
 
-#: ../pidgin/gtkdialogs.c:1016
+#
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
-#: ../pidgin/gtkdialogs.c:1017
+#
+#: ../pidgin/gtkdialogs.c:1021
 msgid "Enter an alias for this contact."
-msgstr "Vennligst skriv inn et alias for denne kontakten."
+msgstr "Vennligst skriv inn aliasnavn for denne kontakten."
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1043
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Oppgi et alias for %s."
 
-#: ../pidgin/gtkdialogs.c:1041
+#: ../pidgin/gtkdialogs.c:1045
 msgid "Alias Buddy"
 msgstr "Alias for kontakt"
 
-#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1066
 msgid "Alias Chat"
 msgstr "Samtalealias"
 
-#: ../pidgin/gtkdialogs.c:1063
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Enter an alias for this chat."
 msgstr "Vennligst skriv inn aliasnavn for denne samtalegruppa."
 
-#: ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1106
 #, fuzzy, c-format
-msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
-msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
-msgstr[0] "Er du sikker på at du vil fjerne kontakten som inneholder %s og %d andre kontakter fra kontaktlisten din?"
-msgstr[1] "Er du sikker på at du vil fjerne kontakten som inneholder %s og %d andre kontakter fra kontaktlisten din?"
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"Er du sikker på at du vil fjerne kontakten som inneholder %s og %d andre "
+"kontakter fra kontaktlisten din?"
+msgstr[1] ""
+"Er du sikker på at du vil fjerne kontakten som inneholder %s og %d andre "
+"kontakter fra kontaktlisten din?"
 
-#: ../pidgin/gtkdialogs.c:1110
+#
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Remove Contact"
-msgstr "Fjern kontakt"
+msgstr "Fje_rn kontakt"
 
-#: ../pidgin/gtkdialogs.c:1113
+#
+#: ../pidgin/gtkdialogs.c:1117
+#, fuzzy
 msgid "_Remove Contact"
 msgstr "Fje_rn kontakt"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1148
 #, fuzzy, c-format
-msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
-msgstr "Er du sikker på at du vil fjerne gruppen %s med alle medlemmer fra kontaktlisten din?"
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"Er du sikker på at du vil fjerne gruppen %s med alle medlemmer fra "
+"kontaktlisten din?"
 
-#: ../pidgin/gtkdialogs.c:1151
+#: ../pidgin/gtkdialogs.c:1155
 #, fuzzy
 msgid "Merge Groups"
 msgstr "Fjern gruppe"
 
-#: ../pidgin/gtkdialogs.c:1154
+#: ../pidgin/gtkdialogs.c:1158
 #, fuzzy
 msgid "_Merge Groups"
 msgstr "Slett gruppe"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1208
 #, c-format
-msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
-msgstr "Er du sikker på at du vil fjerne gruppen %s med alle medlemmer fra kontaktlisten din?"
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"Er du sikker på at du vil fjerne gruppen %s med alle medlemmer fra "
+"kontaktlisten din?"
 
-#: ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1211
 msgid "Remove Group"
 msgstr "Fjern gruppe"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1214
+#, fuzzy
 msgid "_Remove Group"
-msgstr "Fje_rn gruppe"
+msgstr "Fjern gruppe"
 
-#: ../pidgin/gtkdialogs.c:1243
+#: ../pidgin/gtkdialogs.c:1247
 #, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Er du sikker på at du vil fjerne %s fra kontaktlisten din?"
 
-#: ../pidgin/gtkdialogs.c:1246
+#: ../pidgin/gtkdialogs.c:1250
 msgid "Remove Buddy"
 msgstr "Fjern kontakt"
 
-#: ../pidgin/gtkdialogs.c:1249
+#: ../pidgin/gtkdialogs.c:1253
 msgid "_Remove Buddy"
 msgstr "Fje_rn kontakt"
 
-#: ../pidgin/gtkdialogs.c:1270
+#: ../pidgin/gtkdialogs.c:1274
 #, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
-msgstr "Er du sikker på at du vil fjerne samtalegruppen %s fra kontaktlisten din?"
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"Er du sikker på at du vil fjerne samtalegruppen %s fra kontaktlisten din?"
 
-#: ../pidgin/gtkdialogs.c:1273
+#: ../pidgin/gtkdialogs.c:1277
 msgid "Remove Chat"
 msgstr "Fjern samtalegruppe"
 
-#: ../pidgin/gtkdialogs.c:1276
+#: ../pidgin/gtkdialogs.c:1280
+#, fuzzy
 msgid "_Remove Chat"
-msgstr "_Fjern samtalegruppe"
+msgstr "Fjern samtalegruppe"
 
 #: ../pidgin/gtkdocklet.c:150
+#, fuzzy
 msgid "Right-click for more unread messages...\n"
-msgstr "Høyreklikk for flere uleste beskjeder...\n"
+msgstr "Vis flere valg"
 
 #: ../pidgin/gtkdocklet.c:435
+#, fuzzy
 msgid "Change Status"
-msgstr "Endre status"
+msgstr "Endre adresse til:"
 
 #: ../pidgin/gtkdocklet.c:487
+#, fuzzy
 msgid "Show Buddy List"
-msgstr "Vis kontaktliste"
+msgstr "Kontaktliste"
 
+#
 #: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "Ny melding..."
@@ -15403,22 +15795,24 @@ msgstr "Skru av lyder"
 msgid "Mute Sounds"
 msgstr "Skru av lyder"
 
+#
 #: ../pidgin/gtkdocklet.c:535
 #, fuzzy
-msgid "Blink on New Message"
-msgstr "Blink ved nye beskjeder"
+msgid "Blink on new message"
+msgstr "Ny melding..."
 
 #: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "Avslutt"
 
 #: ../pidgin/gtkft.c:154
+#, fuzzy
 msgid "Not started"
-msgstr "Ikke startet"
+msgstr "Ikke støttet"
 
 #: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
-msgstr "<b>Mottas som:</b>"
+msgstr "<b>Mottar som:</b>"
 
 #: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
@@ -15441,27 +15835,28 @@ msgstr "En feil oppsto under åpningen a
 msgstr "En feil oppsto under åpningen av filen"
 
 #: ../pidgin/gtkft.c:540
-#, c-format
+#, fuzzy, c-format
 msgid "Error launching %s: %s"
-msgstr "Feil under start av %s: %s"
+msgstr "Feil under starting av kommando: <b>%s</b>:%s"
 
 #: ../pidgin/gtkft.c:549
-#, c-format
+#, fuzzy, c-format
 msgid "Error running %s"
-msgstr "Feil ved kjøring av %s"
+msgstr "Klarte ikke bli med i gruppesamtale %s"
 
 #: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
-msgstr "Prosessen returnerte feilkode %d"
+msgstr ""
 
 #: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Filnavn:"
 
 #: ../pidgin/gtkft.c:698
+#, fuzzy
 msgid "Local File:"
-msgstr "Lokal fil"
+msgstr "Lokale brukere"
 
 #: ../pidgin/gtkft.c:700
 msgid "Speed:"
@@ -15477,20 +15872,21 @@ msgid "Close this window when all transf
 
 #: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
-msgstr "Lukk dette vinduet når alle overføringene er _fullført"
+msgstr ""
 
 #: ../pidgin/gtkft.c:794
+#, fuzzy
 msgid "C_lear finished transfers"
-msgstr "_Fjern fullførte overføringer"
+msgstr "Fjern fullførte overføringer"
 
 #. "Download Details" arrow
 #: ../pidgin/gtkft.c:803
+#, fuzzy
 msgid "File transfer _details"
-msgstr "Skjul overførings_detaljer"
+msgstr "Skjul overføringsdetaljer"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pause"
 
@@ -15500,11 +15896,12 @@ msgstr "_Fortsett"
 msgstr "_Fortsett"
 
 #: ../pidgin/gtkimhtml.c:816
+#, fuzzy
 msgid "Paste as Plain _Text"
-msgstr "Lim inn som ren _tekst"
+msgstr "Li_m inn som tekst"
 
-#: ../pidgin/gtkimhtml.c:833
-#: ../pidgin/gtkimhtmltoolbar.c:1195
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#, fuzzy
 msgid "_Reset formatting"
 msgstr "_Fjern formatering"
 
@@ -15514,7 +15911,7 @@ msgid "Color to draw hyperlinks."
 
 #: ../pidgin/gtkimhtml.c:1374
 msgid "Color to draw hyperlinks."
-msgstr "Fargen som lenker skal ha"
+msgstr "Farge på lenker"
 
 #: ../pidgin/gtkimhtml.c:1377
 #, fuzzy
@@ -15526,17 +15923,18 @@ msgstr "Farge på lenker"
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Farge på lenker"
 
+#
 #: ../pidgin/gtkimhtml.c:1598
 msgid "_Copy E-Mail Address"
-msgstr "_Kopier e-postadresse"
+msgstr "Kopier e-postadresse"
 
 #: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
-msgstr "_Ã…pne lenke i nettleser"
+msgstr "Ã…pne i nettleser"
 
 #: ../pidgin/gtkimhtml.c:1620
 msgid "_Copy Link Location"
-msgstr "_Kopier lenkemål"
+msgstr "Kopier snarvei"
 
 #: ../pidgin/gtkimhtml.c:3369
 msgid ""
@@ -15559,35 +15957,32 @@ msgstr ""
 "GÃ¥r tilbake til PNG."
 
 #: ../pidgin/gtkimhtml.c:3401
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span size='larger' weight='bold'>Feil ved lagring av bilde</span>\n"
+"<span weight=\"bold\" size=\"larger\">Du har e-post!</span>\n"
 "\n"
 "%s"
 
 #: ../pidgin/gtkimhtml.c:3404
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
-msgstr ""
-"Feil ved lagring av bilde\n"
-"\n"
-"%s"
+msgstr "Feil under lagring av bilde: %s"
 
-#: ../pidgin/gtkimhtml.c:3482
-#: ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
 msgid "Save Image"
 msgstr "Lagre bilde"
 
 #: ../pidgin/gtkimhtml.c:3522
+#, c-format
 msgid "_Save Image..."
-msgstr "_Lagre bilde..."
+msgstr "Lagre bilde..."
 
 #: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
@@ -15606,24 +16001,29 @@ msgstr "_URL"
 msgstr "_URL"
 
 #: ../pidgin/gtkimhtmltoolbar.c:418
+#, fuzzy
 msgid "_Description"
-msgstr "_Beskrivelse"
+msgstr "Beskrivelse"
 
 #: ../pidgin/gtkimhtmltoolbar.c:421
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
-msgstr "Vennligst skriv inn URL og beskrivelse av lenka du vil sette inn. Beskrivelsesfeltet er valgfritt."
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Vennligst skriv inn URL og beskrivelse av lenka du vil sette inn. "
+"Beskrivelsesfeltet er valgfritt."
 
 #: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Vennligst skriv inn URL og beskrivelse av lenka du vil sette inn. Beskrivelsesfeltet er valgfritt."
+msgstr ""
+"Vennligst skriv inn URL og beskrivelse av lenka du vil sette inn. "
+"Beskrivelsesfeltet er valgfritt."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430
-#: ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "Sett inn lenke"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434
-#: ../pidgin/gtkimhtmltoolbar.c:1263
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr "Sett _inn"
 
@@ -15632,8 +16032,7 @@ msgstr "Klarte ikke å lagre bilde: %s\n
 msgid "Failed to store image: %s\n"
 msgstr "Klarte ikke å lagre bilde: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540
-#: ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "Sett inn bilde"
 
@@ -15646,8 +16045,7 @@ msgstr "Smil!"
 msgid "Smile!"
 msgstr "Smil!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846
-#: ../pidgin/gtkimhtmltoolbar.c:1220
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
 #, fuzzy
 msgid "_Font"
 msgstr "Konto:"
@@ -15661,18 +16059,15 @@ msgstr ""
 msgid "Ungroup Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088
-#: ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Fet"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089
-#: ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090
-#: ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Understrek"
 
@@ -15681,8 +16076,9 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtmltoolbar.c:1093
+#, fuzzy
 msgid "Increase Font Size"
-msgstr "Øk skriftstørrelse"
+msgstr "Ignorer skriftstørrelser"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Decrease Font Size"
@@ -15693,10 +16089,12 @@ msgstr "Skrifttype"
 msgstr "Skrifttype"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1097
+#, fuzzy
 msgid "Background Color"
 msgstr "Bakgrunnsfarge"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1098
+#, fuzzy
 msgid "Foreground Color"
 msgstr "Forgrunnsfarge"
 
@@ -15711,110 +16109,143 @@ msgstr "Sett inn bilde"
 msgstr "Sett inn bilde"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1104
+#, fuzzy
 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+#, fuzzy
 msgid "<b>_Bold</b>"
-msgstr "<b>_Uthev</b>"
+msgstr "<b>_Passord:</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1180
+#, fuzzy
 msgid "<i>_Italic</i>"
-msgstr "<i>_Kursiv</i>"
+msgstr " <i>(irc-operatør)</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1181
+#, fuzzy
 msgid "<u>_Underline</u>"
-msgstr "<u>_Understrek</u>"
+msgstr "Understrek"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+#, fuzzy
 msgid "<span size='larger'>_Larger</span>"
-msgstr "<span size='larger'>_Større</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
+#: ../pidgin/gtkimhtmltoolbar.c:1185
+#, fuzzy
 msgid "_Normal"
-msgstr "_Normal"
+msgstr "Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr "<span size='smaller'>_Mindre</span>"
+msgstr ""
 
 #. 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:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1191
 #, fuzzy
 msgid "_Font face"
 msgstr "Skrifttype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1192
+#, fuzzy
 msgid "Foreground _color"
-msgstr "Forgrunns_farge"
+msgstr "Forgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtmltoolbar.c:1193
+#, fuzzy
 msgid "Bac_kground color"
-msgstr "Ba_kgrunnsfarge"
+msgstr "Bakgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1271
+#: ../pidgin/gtkimhtmltoolbar.c:1270
+#, fuzzy
+msgid "_Smiley"
+msgstr "Smil!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1276
+#, fuzzy
 msgid "_Image"
-msgstr "_Bilde"
+msgstr "Lagre bilde"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1277
+#: ../pidgin/gtkimhtmltoolbar.c:1282
+#, fuzzy
 msgid "_Link"
-msgstr "_Lenke"
+msgstr "_Bli med i samtalegruppe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1283
+#: ../pidgin/gtkimhtmltoolbar.c:1288
 msgid "_Horizontal rule"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1305
-msgid "_Smile!"
-msgstr "_Smil!"
-
 #: ../pidgin/gtklog.c:293
 #, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
 msgstr ""
 
 #: ../pidgin/gtklog.c:304
 #, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
 msgstr ""
 
 #: ../pidgin/gtklog.c:309
 #, fuzzy, c-format
-msgid "Are you sure you want to permanently delete the system log which started at %s?"
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
 msgstr "Er du sikker på at du vil slette \"%s\"?"
 
 #: ../pidgin/gtklog.c:453
-#, c-format
+#, fuzzy, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Samtale i %s på %s</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Du har e-post!</span>\n"
+"\n"
+"%s"
 
 #: ../pidgin/gtklog.c:456
-#, c-format
+#, fuzzy, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Samtale med %s på %s</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Du har e-post!</span>\n"
+"\n"
+"%s"
 
 #: ../pidgin/gtklog.c:503
 msgid "%B %Y"
-msgstr "%B %Y"
+msgstr ""
 
 #: ../pidgin/gtklog.c:550
-msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
-msgstr "System hendelser vil bare bli logget om \"Logg alle status forandringer til system logg\" har blitt slått på."
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"System hendelser vil bare bli logget om \"Logg alle status forandringer til "
+"system logg\" har blitt slått på."
 
 #: ../pidgin/gtklog.c:554
-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
-msgstr "Direktemeldinger vil bare bli logget om \"Logg alle direktemeldinger\" har blitt slått på."
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Direktemeldinger vil bare bli logget om \"Logg alle direktemeldinger\" har "
+"blitt slått på."
 
 #: ../pidgin/gtklog.c:557
 #, fuzzy
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "Samtaler vil bare bli logget om \"Logg alle samtaler\" har blitt slått på."
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Samtaler vil bare bli logget om \"Logg alle samtaler\" har blitt slått på."
 
 #: ../pidgin/gtklog.c:561
 msgid "No logs were found"
@@ -15831,12 +16262,11 @@ msgstr "Etter loggstørrelse"
 msgstr "Etter loggstørrelse"
 
 #: ../pidgin/gtklog.c:709
-#, c-format
+#, fuzzy, c-format
 msgid "Conversations in %s"
-msgstr "Samtaler i %s"
+msgstr "Samtaler med %s"
 
-#: ../pidgin/gtklog.c:717
-#: ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
 #, c-format
 msgid "Conversations with %s"
 msgstr "Samtaler med %s"
@@ -15846,9 +16276,9 @@ msgstr "Systemlogg"
 msgstr "Systemlogg"
 
 #: ../pidgin/gtkmain.c:386
-#, c-format
+#, fuzzy, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%s %s. Prøv '%s -h' for mer informasjon.\n"
+msgstr "Gaim %s. Prøv '%s -h' for mer informasjon.\n"
 
 #: ../pidgin/gtkmain.c:388
 #, c-format
@@ -15863,14 +16293,13 @@ msgid ""
 "  -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 ""
 
-#: ../pidgin/gtkmain.c:516
+#: ../pidgin/gtkmain.c:512
 #, 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"
@@ -15891,54 +16320,59 @@ msgstr ""
 
 #. 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
+#, fuzzy
 msgid "Pidgin"
-msgstr "Pidgin"
+msgstr "Paging"
 
 #: ../pidgin/gtknotify.c:349
+#, fuzzy
 msgid "Open All Messages"
-msgstr "Ã…pne alle beskjeder"
+msgstr "Send beskjed"
 
 #: ../pidgin/gtknotify.c:402
+#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-post!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Du har e-post!</span>\n"
+"\n"
+"%s"
 
-#: ../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 beskjed."
 msgstr[1] "%s har %d nye beskjeder."
 
-#: ../pidgin/gtknotify.c:562
+#: ../pidgin/gtknotify.c:564
 #, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
-msgstr[0] "<b>%d ny e-post.</b>"
-msgstr[1] "<b>%d nye e-poster.</b>"
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../pidgin/gtknotify.c:989
 #, fuzzy, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Nettleserkommandoen <b>%s</b> er ugyldig."
 
-#: ../pidgin/gtknotify.c:991
-#: ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016
-#: ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
+#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
 msgid "Unable to open URL"
 msgstr "Kunne ikke åpne URL"
 
-#: ../pidgin/gtknotify.c:1001
-#: ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
 #, fuzzy, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Feil under starting av kommando: <b>%s</b>:%s"
 
 #: ../pidgin/gtknotify.c:1145
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Klarte ikke å starte en nettleser fordi 'Manuell' nettleserkommando er valgt, men ingen kommando for denne har blitt satt."
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"Klarte ikke å starte en nettleser fordi 'Manuell' nettleserkommando er "
+"valgt, men ingen kommando for denne har blitt satt."
 
 #: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
@@ -15954,15 +16388,17 @@ msgstr "Tillegg"
 msgstr "Tillegg"
 
 #: ../pidgin/gtkplugin.c:400
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
 "<span weight=\"bold\">Website:</span>\t\t%s\n"
 "<span weight=\"bold\">Filename:</span>\t\t%s"
 msgstr ""
-"%s%s<span weight=\"bold\">Skrevet av:</span>\t%s\n"
-"<span weight=\"bold\">Hjemmeside:</span>\t\t%s\n"
-"<span weight=\"bold\">Filnavn:</span>\t\t%s"
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Skrevet av:</span>\t%s\n"
+"<span weight=\"bold\">Webside:</span>\t\t%s\n"
+"<span weight=\"bold\">Filnavn:</span>\t%s"
 
 #: ../pidgin/gtkplugin.c:410
 #, c-format
@@ -15987,52 +16423,62 @@ msgstr "Velg fil"
 
 #. Create the "Pounce on Whom" frame.
 #: ../pidgin/gtkpounce.c:532
+#, fuzzy
 msgid "Pounce on Whom"
-msgstr "Varsling for hvem"
+msgstr "Varsling for"
 
 #: ../pidgin/gtkpounce.c:559
 msgid "_Buddy name:"
-msgstr "_Kontaktnavn:"
+msgstr "Kontaktnavn:"
 
 #: ../pidgin/gtkpounce.c:593
+#, fuzzy
 msgid "Si_gns on"
-msgstr "Lo_gger på"
+msgstr "PÃ¥lo_gging"
 
 #: ../pidgin/gtkpounce.c:595
+#, fuzzy
 msgid "Signs o_ff"
-msgstr "Logger _av"
+msgstr "Logg _av"
 
 #: ../pidgin/gtkpounce.c:597
+#, fuzzy
 msgid "Goes a_way"
-msgstr "GÃ¥r _vekk"
+msgstr "Kontakt forsvinner"
 
 #: ../pidgin/gtkpounce.c:599
+#, fuzzy
 msgid "Ret_urns from away"
-msgstr "_Returnerer fra fravær"
+msgstr "_Returnere fra fravær"
 
 #: ../pidgin/gtkpounce.c:601
+#, fuzzy
 msgid "Becomes _idle"
-msgstr "Blir _inaktiv"
+msgstr "%s har blitt inaktiv"
 
 #: ../pidgin/gtkpounce.c:603
+#, fuzzy
 msgid "Is no longer i_dle"
-msgstr "Er ikke lenger i_naktiv"
+msgstr "%s er ikke lenger inaktiv"
 
 #: ../pidgin/gtkpounce.c:605
+#, fuzzy
 msgid "Starts _typing"
-msgstr "S_tarter å skrive"
+msgstr "Venn s_tarter å skrive"
 
 #: ../pidgin/gtkpounce.c:607
 msgid "P_auses while typing"
-msgstr "P_auser under skriving"
+msgstr ""
 
 #: ../pidgin/gtkpounce.c:609
+#, fuzzy
 msgid "Stops t_yping"
-msgstr "Stopper å _skrive"
+msgstr "Venn slutter å skrive til deg"
 
 #: ../pidgin/gtkpounce.c:611
+#, fuzzy
 msgid "Sends a _message"
-msgstr "Sender en _beskjed"
+msgstr "Send _beskjed"
 
 #: ../pidgin/gtkpounce.c:654
 #, fuzzy
@@ -16050,19 +16496,21 @@ msgid "E_xecute a command"
 
 #: ../pidgin/gtkpounce.c:660
 msgid "E_xecute a command"
-msgstr "_Kjør en kommando"
+msgstr "Kjør en kommando"
 
 #: ../pidgin/gtkpounce.c:662
 msgid "P_lay a sound"
-msgstr "Spi_ll av en lyd"
+msgstr "Spill av en lyd"
 
 #: ../pidgin/gtkpounce.c:668
+#, fuzzy
 msgid "Brows_e..."
 msgstr "_Bla gjennom..."
 
 #: ../pidgin/gtkpounce.c:670
+#, fuzzy
 msgid "Br_owse..."
-msgstr "Bla _gjennom..."
+msgstr "_Bla gjennom..."
 
 #: ../pidgin/gtkpounce.c:671
 msgid "Pre_view"
@@ -16083,8 +16531,9 @@ msgstr "Varsle når"
 
 #: ../pidgin/gtkprefs.c:386
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+#, fuzzy
 msgid "Default"
-msgstr "Forvalgt"
+msgstr "Gnome-standard"
 
 #: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
@@ -16092,11 +16541,15 @@ msgid "Install Theme"
 
 #: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
-msgstr "Installer tema"
+msgstr ""
 
 #: ../pidgin/gtkprefs.c:697
-msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
-msgstr "Velg smilefjes-temaet du vil bruke fra listen nedenfor. Nye temaer kan installeres ved å dra og slippe dem over temalisten."
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"Velg smilefjes-temaet du vil bruke fra listen nedenfor. Nye temaer kan "
+"installeres ved å dra og slippe dem over temalisten."
 
 #: ../pidgin/gtkprefs.c:732
 msgid "Icon"
@@ -16112,26 +16565,28 @@ msgstr "System-trayikon"
 msgstr "System-trayikon"
 
 #: ../pidgin/gtkprefs.c:899
+#, fuzzy
 msgid "On unread messages"
-msgstr "Ved uleste beskjeder"
+msgstr "Send _beskjed"
 
 #: ../pidgin/gtkprefs.c:904
+#, fuzzy
 msgid "Conversation Window Hiding"
 msgstr "Samtalevinduer for direktemeldinger"
 
 #: ../pidgin/gtkprefs.c:905
+#, fuzzy
 msgid "_Hide new IM conversations:"
-msgstr "_Gjem nye direktemeldingssamtaler"
+msgstr "Lukk samtalen"
 
-#: ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 msgid "When away"
 msgstr "Når fraværende"
 
 #. All the tab options!
 #: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
-msgstr "Faner"
+msgstr ""
 
 #: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
@@ -16142,8 +16597,9 @@ msgstr "Vis _lukkeknapp på faner"
 msgstr "Vis _lukkeknapp på faner"
 
 #: ../pidgin/gtkprefs.c:935
+#, fuzzy
 msgid "_Placement:"
-msgstr "_Plassering"
+msgstr "ExtPlacement"
 
 #: ../pidgin/gtkprefs.c:937
 msgid "Top"
@@ -16170,185 +16626,196 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:950
+#, fuzzy
 msgid "N_ew conversations:"
-msgstr "Ny_e samtaler:"
+msgstr "Lukk samtalen"
 
 #: ../pidgin/gtkprefs.c:995
+#, fuzzy
 msgid "Show _formatting on incoming messages"
-msgstr "Vis _formateringsverktøy på innkommende beskjeder"
+msgstr "Vis formateringsverktøylinje"
 
-#: ../pidgin/gtkprefs.c:997
-msgid "Close IMs immediately when the tab is closed"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:998
+#, fuzzy
 msgid "Show _detailed information"
-msgstr "Vis _detaljert informasjon"
+msgstr "Profilinformasjon"
 
-#: ../pidgin/gtkprefs.c:1002
+#: ../pidgin/gtkprefs.c:1000
 msgid "Enable buddy ic_on animation"
 msgstr "Slå på _animasjoner i kontaktikoner"
 
-#: ../pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1007
 msgid "_Notify buddies that you are typing to them"
-msgstr "_Varsle kontakter når skriver til dem"
+msgstr "Varsle kontakter når skriver til dem"
 
-#: ../pidgin/gtkprefs.c:1012
+#: ../pidgin/gtkprefs.c:1010
+#, fuzzy
 msgid "Highlight _misspelled words"
-msgstr "Marker _feilstavede ord"
+msgstr "Marker stavefeil"
 
-#: ../pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1017
+#, fuzzy
 msgid "F_lash window when IMs are received"
-msgstr "B_link vinduet når nye direktemeldinger mottas"
+msgstr "_Blink vinduet når nye beskjeder mottas"
 
-#: ../pidgin/gtkprefs.c:1021
+#: ../pidgin/gtkprefs.c:1019
+#, fuzzy
 msgid "Minimi_ze new conversation windows"
-msgstr "Mini_mer nye samtalevinduer"
+msgstr "Samtalevinduer for direktemeldinger"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1023
+#, fuzzy
 msgid "Font"
 msgstr "Skrifttype"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1025
 msgid "Use document font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1027
 msgid "Use font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1031
+#: ../pidgin/gtkprefs.c:1029
 #, fuzzy
 msgid "Conversation _font:"
 msgstr "Samtaler"
 
-#: ../pidgin/gtkprefs.c:1045
+#: ../pidgin/gtkprefs.c:1043
 msgid "Default Formatting"
 msgstr "Standardformatering"
 
-#: ../pidgin/gtkprefs.c:1064
+#: ../pidgin/gtkprefs.c:1062
 #, fuzzy
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
-msgstr "Slik vil dine utgående meldinger se ut når du bruker protokoller som støtter formatering :)"
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+"Slik vil dine utgående meldinger se ut når du bruker protokoller som støtter "
+"formatering :)"
 
-#: ../pidgin/gtkprefs.c:1130
+#: ../pidgin/gtkprefs.c:1128
+#, fuzzy
 msgid "ST_UN server:"
-msgstr "ST_UN-tjener:"
+msgstr "_Tjener:"
 
-#: ../pidgin/gtkprefs.c:1142
+#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">Eksempel: stunserver.org</span>"
+msgstr ""
 
-#: ../pidgin/gtkprefs.c:1146
+#: ../pidgin/gtkprefs.c:1144
+#, fuzzy
 msgid "_Autodetect IP address"
 msgstr "Finn IP-adresse _automatisk"
 
-#: ../pidgin/gtkprefs.c:1155
+#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
-msgstr "Offentlig _IP:"
+msgstr "Offentlig _IP (ved NAT):"
 
-#: ../pidgin/gtkprefs.c:1184
+#: ../pidgin/gtkprefs.c:1182
 msgid "Ports"
 msgstr "Porter"
 
-#: ../pidgin/gtkprefs.c:1187
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manuellt spesifiser et intervall av porter å lytte på"
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1188
+#, fuzzy
 msgid "_Start port:"
 msgstr "_Startport:"
 
-#: ../pidgin/gtkprefs.c:1197
+#: ../pidgin/gtkprefs.c:1195
+#, fuzzy
 msgid "_End port:"
 msgstr "_Sluttport:"
 
-#: ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkprefs.c:1203
 msgid "Proxy Server"
 msgstr "Proxytjener"
 
-#: ../pidgin/gtkprefs.c:1209
+#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr "Ingen proxy"
 
-#: ../pidgin/gtkprefs.c:1265
+#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr "_Bruker:"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1328
 msgid "Seamonkey"
-msgstr "Seamonkey"
+msgstr ""
 
-#: ../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:1333
+#: ../pidgin/gtkprefs.c:1331
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1332
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1333
 #, fuzzy
 msgid "GNOME Default"
 msgstr "Gnome-standard"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1334
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1338
+#: ../pidgin/gtkprefs.c:1336
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1339
+#: ../pidgin/gtkprefs.c:1337
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1348
+#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr "Egendefinert"
 
-#: ../pidgin/gtkprefs.c:1401
+#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr "Valg av nettleser"
 
-#: ../pidgin/gtkprefs.c:1405
+#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1411
 msgid "_Open link in:"
 msgstr "_Ã…pne lenke i:"
 
-#: ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkprefs.c:1413
 msgid "Browser default"
 msgstr "Standard for nettleser"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1414
 msgid "Existing window"
 msgstr "Eksisterende vindu"
 
-#: ../pidgin/gtkprefs.c:1418
+#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
-msgstr "Ny fane"
+msgstr "Ny tab"
 
-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16357,64 +16824,72 @@ msgstr ""
 "_Egendefinert:\n"
 "(%s for URL)"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1470
+#, fuzzy
 msgid "Log _format:"
 msgstr "Logg_format:"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1475
+#, fuzzy
 msgid "Log all _instant messages"
-msgstr "Logg alle d_irektemeldinger"
+msgstr "Logg alle direktemeldinger"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all c_hats"
-msgstr "Logg alle s_amtaler"
+msgstr "Logg alle samtaler"
 
-#: ../pidgin/gtkprefs.c:1481
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
-msgstr "Logg alle _status endinger til systemlogg"
+msgstr "Logg alle status endinger til systemlogg"
 
-#: ../pidgin/gtkprefs.c:1627
+#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr "Lydvalg"
 
-#: ../pidgin/gtkprefs.c:1637
+#: ../pidgin/gtkprefs.c:1635
+#, fuzzy, c-format
 msgid "Quietest"
-msgstr "Stillest"
+msgstr "Avslutt"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1637
+#, fuzzy, c-format
 msgid "Quieter"
-msgstr "Stillere"
+msgstr "Avslutt"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1639
+#, fuzzy, c-format
 msgid "Quiet"
-msgstr "Stille"
+msgstr "Avslutt"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1643
+#, fuzzy, c-format
 msgid "Loud"
-msgstr "Høy"
+msgstr "Last"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1645
+#, fuzzy, c-format
 msgid "Louder"
-msgstr "Høyere"
+msgstr "time"
 
-#: ../pidgin/gtkprefs.c:1649
+#: ../pidgin/gtkprefs.c:1647
+#, fuzzy, c-format
 msgid "Loudest"
-msgstr "Høyest"
+msgstr "Lyder"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
 msgstr "Konsollpip"
 
-#: ../pidgin/gtkprefs.c:1724
+#: ../pidgin/gtkprefs.c:1722
 #, fuzzy
 msgid "No sounds"
 msgstr "Lyder"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16423,85 +16898,91 @@ msgstr ""
 "_Program for lydavspilling\n"
 "(%s for filnavn)"
 
-#: ../pidgin/gtkprefs.c:1759
+#
+#: ../pidgin/gtkprefs.c:1757
 msgid "Sounds when conversation has _focus"
 msgstr "Lyder når samtalevinduet har _fokus"
 
-#: ../pidgin/gtkprefs.c:1761
+#: ../pidgin/gtkprefs.c:1759
+#, fuzzy
 msgid "Enable sounds:"
-msgstr "Aktiver lyder:"
+msgstr "Feilet."
 
-#: ../pidgin/gtkprefs.c:1772
+#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
-msgstr "Volum:"
+msgstr ""
 
-#: ../pidgin/gtkprefs.c:1852
+#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr "Spill av"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1927
 #, fuzzy
 msgid "_Report idle time:"
 msgstr "Vis inaktiv tid"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1941
 msgid "_Auto-reply:"
 msgstr "_Automatisk svar"
 
-#: ../pidgin/gtkprefs.c:1947
+#: ../pidgin/gtkprefs.c:1945
+#, fuzzy
 msgid "When both away and idle"
-msgstr "Når både fraværende og inaktiv"
+msgstr "Når fraværende og inaktiv"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
 msgstr "Automatisk fraværsmarkering"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:1953
+#, fuzzy
 msgid "Change status when _idle"
-msgstr "Endre status hvis _inaktiv"
+msgstr "Sett som borte når inaktiv"
 
-#: ../pidgin/gtkprefs.c:1959
+#: ../pidgin/gtkprefs.c:1957
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "Antall minutter før fraværsmarkert:"
 
-#: ../pidgin/gtkprefs.c:1967
+#: ../pidgin/gtkprefs.c:1965
+#, fuzzy
 msgid "Change _status to:"
-msgstr "Endre _status til:"
+msgstr "Endre adresse til:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1986
 msgid "Status at Startup"
-msgstr "Status ved oppstart"
+msgstr ""
 
-#: ../pidgin/gtkprefs.c:1990
+#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1996
+#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2032
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2034
 msgid "Smiley Themes"
 msgstr "Smilefjes-tema"
 
-#: ../pidgin/gtkprefs.c:2043
+#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr "Nettleser"
 
-#: ../pidgin/gtkprefs.c:2047
+#: ../pidgin/gtkprefs.c:2045
+#, fuzzy
 msgid "Status / Idle"
-msgstr "Status / inaktiv"
+msgstr "Borte / inaktiv"
 
 #: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
@@ -16536,8 +17017,7 @@ msgstr "Sett sikkerhet for:"
 msgid "Set privacy for:"
 msgstr "Sett sikkerhet for:"
 
-#: ../pidgin/gtkprivacy.c:557
-#: ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
 msgid "Permit User"
 msgstr "Tillat bruker"
 
@@ -16547,12 +17027,13 @@ msgid "Please enter the name of the user
 
 #: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Vennligst skriv inn navnet på brukeren som du vil skal kunne kontakte deg."
+msgstr ""
+"Vennligst skriv inn navnet på brukeren som du vil skal kunne kontakte deg."
 
-#: ../pidgin/gtkprivacy.c:562
-#: ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#, fuzzy
 msgid "_Permit"
-msgstr "_Tillat"
+msgstr "Tillat"
 
 #: ../pidgin/gtkprivacy.c:568
 #, c-format
@@ -16564,8 +17045,7 @@ msgstr "Er du sikker på at du vil at %s
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Er du sikker på at du vil at %s skal kunne kontakte deg?"
 
-#: ../pidgin/gtkprivacy.c:599
-#: ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr "Blokker bruker"
 
@@ -16601,16 +17081,16 @@ msgid "Overwrite"
 
 #: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
-msgstr "Overskriv"
+msgstr ""
 
 #: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr ""
 
-#: ../pidgin/gtkrequest.c:1650
-#: ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#, fuzzy
 msgid "Select Folder..."
-msgstr "Velg mappe..."
+msgstr "Velg tekstfarge"
 
 #. Create the window.
 #: ../pidgin/gtkroomlist.c:375
@@ -16624,8 +17104,9 @@ msgstr "Hent Liste"
 
 #. add button
 #: ../pidgin/gtkroomlist.c:451
+#, fuzzy
 msgid "_Add Chat"
-msgstr "_Legg til samtale"
+msgstr "Legg til samtale"
 
 #: ../pidgin/gtksavedstatuses.c:337
 #, fuzzy
@@ -16633,27 +17114,29 @@ msgstr "Er du sikker på at du vil slett
 msgstr "Er du sikker på at du vil slette %s?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620
-#: ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#, fuzzy
 msgid "_Use"
-msgstr "_Bruk"
+msgstr "Bruk"
 
 #: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Tittel allerede i bruk. Du må velge en unik tittel."
 
 #: ../pidgin/gtksavedstatuses.c:970
+#, fuzzy
 msgid "Different"
-msgstr "Forskjellig"
+msgstr "Avdeling"
 
 #: ../pidgin/gtksavedstatuses.c:1159
+#, fuzzy
 msgid "_Title:"
-msgstr "_Tittel"
+msgstr "Tittel"
 
-#: ../pidgin/gtksavedstatuses.c:1178
-#: ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#, fuzzy
 msgid "_Status:"
-msgstr "_Status:"
+msgstr "Status:"
 
 #. Different status message expander
 #: ../pidgin/gtksavedstatuses.c:1210
@@ -16666,9 +17149,9 @@ msgstr "Lagre & bruk"
 msgstr "Lagre & bruk"
 
 #: ../pidgin/gtksavedstatuses.c:1480
-#, c-format
+#, fuzzy, c-format
 msgid "Status for %s"
-msgstr "Status for %s"
+msgstr "Status: %s"
 
 #: ../pidgin/gtkstatusbox.c:664
 #, fuzzy
@@ -16677,54 +17160,55 @@ msgid "Google Talk"
 
 #: ../pidgin/gtkutils.c:632
 msgid "Google Talk"
-msgstr "Google Talk"
+msgstr ""
 
-#: ../pidgin/gtkutils.c:1399
-#: ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
 #, fuzzy, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "En ukjent påloggingsfeil har inntruffet: %s."
 
-#: ../pidgin/gtkutils.c:1402
-#: ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
 #, fuzzy
 msgid "Failed to load image"
 msgstr "Klarte ikke å lagre bilde: %s\n"
 
 #: ../pidgin/gtkutils.c:1498
-#, c-format
+#, fuzzy, c-format
 msgid "Cannot send folder %s."
-msgstr "Kan ikke sende mappe %s"
+msgstr "Kan ikke sende fil"
 
 #: ../pidgin/gtkutils.c:1499
 #, fuzzy, c-format
-msgid "%s cannot transfer a folder. You will need to send the files within individually."
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
 msgstr "Gaim kan ikke overføre en mappe. Du må sende filene inni hver for seg"
 
-#: ../pidgin/gtkutils.c:1531
-#: ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
 #: ../pidgin/gtkutils.c:1550
 #, fuzzy
 msgid "You have dragged an image"
 msgstr "Du har tastet inn et ugyldig brukernavn"
 
 #: ../pidgin/gtkutils.c:1532
-msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
-msgstr "Du kan sende dette bildet som filoverføring, sett det inn i denne bekjeden eller bruk det som kompis ikon for denne brukeren."
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"Du kan sende dette bildet som filoverføring, sett det inn i denne bekjeden "
+"eller bruk det som kompis ikon for denne brukeren."
 
-#: ../pidgin/gtkutils.c:1538
-#: ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 #, fuzzy
 msgid "Set as buddy icon"
 msgstr "Vis kontaktikoner"
 
-#: ../pidgin/gtkutils.c:1539
-#: ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#, fuzzy
 msgid "Send image file"
-msgstr "Send bildefil"
+msgstr "Send beskjed"
 
-#: ../pidgin/gtkutils.c:1540
-#: ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
 #, fuzzy
 msgid "Insert in message"
 msgstr "Sett inn bilde"
@@ -16736,12 +17220,20 @@ msgstr "Ønsker du å bli med i samtalen
 
 #: ../pidgin/gtkutils.c:1551
 #, fuzzy
-msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
-msgstr "Du kan sende dette bildet som filoverføring, sett det inn i denne bekjeden eller bruk det som kompis ikon for denne brukeren."
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"Du kan sende dette bildet som filoverføring, sett det inn i denne bekjeden "
+"eller bruk det som kompis ikon for denne brukeren."
 
 #: ../pidgin/gtkutils.c:1552
-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
-msgstr "Du kan sette inn dette bildet i beskjed eller bruke det som kompis ikon for denne brukeren"
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"Du kan sette inn dette bildet i beskjed eller bruke det som kompis ikon for "
+"denne brukeren"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
@@ -16754,7 +17246,9 @@ msgstr "Kan ikke sende fil"
 msgstr "Kan ikke sende fil"
 
 #: ../pidgin/gtkutils.c:1610
-msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
 msgstr ""
 
 #: ../pidgin/gtkutils.c:2345
@@ -16790,29 +17284,33 @@ msgstr "Klarte ikke å lagre bilde: %s\n
 
 #: ../pidgin/gtkutils.c:2793
 #, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
-#: ../pidgin/gtkwhiteboard.c:754
-#: ../pidgin/gtkwhiteboard.c:773
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
+#, fuzzy
 msgid "Save File"
-msgstr "Lagre fil"
+msgstr "Lagre fil..."
 
 #: ../pidgin/gtkwhiteboard.c:861
+#, fuzzy
 msgid "Select color"
-msgstr "Velg farge"
+msgstr "Velg tekstfarge"
 
 #: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
 #: ../pidgin/pidginstock.c:89
+#, fuzzy
 msgid "Close _tabs"
-msgstr "Lukk _faner"
+msgstr "L_ukk"
 
 #: ../pidgin/pidginstock.c:91
+#, fuzzy
 msgid "_Get Info"
-msgstr "_Hent informasjon"
+msgstr "Hent informasjon"
 
 #: ../pidgin/pidginstock.c:92
 msgid "_Invite"
@@ -16839,16 +17337,16 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+#, fuzzy
 msgid "none"
-msgstr "ingen"
+msgstr "Alle"
 
 #: ../pidgin/plugins/cap/cap.c:450
 #, fuzzy
 msgid "Display Statistics"
 msgstr "Vis advarsler om tidsavbrudd"
 
-#: ../pidgin/plugins/cap/cap.c:462
-#: ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 #, fuzzy
 msgid "Response Probability:"
 msgstr "Svaret gikk tapt"
@@ -16863,10 +17361,9 @@ msgstr ""
 msgid "Maximum response timeout:"
 msgstr ""
 
-#: ../pidgin/plugins/cap/cap.c:817
-#: ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831
-#: ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#, fuzzy
 msgid "minutes"
 msgstr "minutter"
 
@@ -16898,16 +17395,20 @@ msgstr ""
 
 #. *  summary
 #: ../pidgin/plugins/cap/cap.c:939
-msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
 msgstr ""
 
 #: ../pidgin/plugins/contact_priority.c:61
+#, fuzzy
 msgid "Buddy is idle"
-msgstr "Kontakt er inaktiv"
+msgstr "Kontakt er inaktiv:"
 
 #: ../pidgin/plugins/contact_priority.c:62
+#, fuzzy
 msgid "Buddy is away"
-msgstr "Kontakt er borte"
+msgstr "Kontakt er borte:"
 
 #: ../pidgin/plugins/contact_priority.c:63
 #, fuzzy
@@ -16916,19 +17417,23 @@ msgstr "Kontakt er borte:"
 
 #. Not used yet.
 #: ../pidgin/plugins/contact_priority.c:66
+#, fuzzy
 msgid "Buddy is mobile"
-msgstr "Kontakt er mobil"
+msgstr "Kontakt er inaktiv:"
 
 #: ../pidgin/plugins/contact_priority.c:68
+#, fuzzy
 msgid "Buddy is offline"
-msgstr "Kontakt er avlogget"
+msgstr "Kontakt er avlogget:"
 
 #: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Verdier for bruk når..."
 
 #: ../pidgin/plugins/contact_priority.c:118
-msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
 msgstr ""
 
 #: ../pidgin/plugins/contact_priority.c:125
@@ -16954,21 +17459,26 @@ msgstr "Kontaktprioritet"
 #. *< version
 #. *< summary
 #: ../pidgin/plugins/contact_priority.c:190
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Lar deg kontrollere verdiene for de ulike tilstandene kontakter kan være i."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Lar deg kontrollere verdiene for de ulike tilstandene kontakter kan være i."
 
 #. *< description
 #: ../pidgin/plugins/contact_priority.c:192
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr "Lar deg endre vektingen for inaktiv/borte/avlogget for kontakter i kontaktprioritetsutregninger."
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Lar deg endre vektingen for inaktiv/borte/avlogget for kontakter i "
+"kontaktprioritetsutregninger."
 
 #: ../pidgin/plugins/convcolors.c:23
 #, fuzzy
 msgid "Conversation Colors"
 msgstr "/Samtale/L_ukk"
 
-#: ../pidgin/plugins/convcolors.c:25
-#: ../pidgin/plugins/convcolors.c:26
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 #, fuzzy
 msgid "Customize colors in the conversation window"
 msgstr "Samtalevinduer for direktemeldinger"
@@ -16989,18 +17499,19 @@ msgstr "Send beskjed"
 msgstr "Send beskjed"
 
 #: ../pidgin/plugins/convcolors.c:85
+#, fuzzy
 msgid "Sent Messages"
-msgstr "Sendte beskjeder"
+msgstr "Send beskjed"
 
 #: ../pidgin/plugins/convcolors.c:86
+#, fuzzy
 msgid "Received Messages"
-msgstr "Mottatte beskjeder"
+msgstr "Send beskjed"
 
-#: ../pidgin/plugins/convcolors.c:210
-#: ../pidgin/plugins/pidginrc.c:245
-#, c-format
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#, fuzzy, c-format
 msgid "Select Color for %s"
-msgstr "Velg farge for %s"
+msgstr "Velg tekstfarge"
 
 #: ../pidgin/plugins/convcolors.c:310
 #, fuzzy
@@ -17026,7 +17537,9 @@ msgstr "Samtaleplassering"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 #: ../pidgin/plugins/extplacement.c:105
-msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
 msgstr ""
 
 #: ../pidgin/plugins/extplacement.c:111
@@ -17035,7 +17548,9 @@ msgid "Separate IM and Chat windows when
 
 #: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Separere direktemeldings- og chattevinduer når programet plasserer etter nummer"
+msgstr ""
+"Separere direktemeldings- og chattevinduer når programet plasserer etter "
+"nummer"
 
 #. *< type
 #. *< ui_requirement
@@ -17056,8 +17571,12 @@ msgstr "Flere plasseringsmuligheter for 
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "Begrens det maksimale antallet samtaler per vindu, og eventuelt separering av direktemeldinger og chat"
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Begrens det maksimale antallet samtaler per vindu, og eventuelt separering "
+"av direktemeldinger og chat"
 
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
@@ -17119,7 +17638,9 @@ msgid "Select a person from your address
 #. Add the label.
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
-msgstr "Velg en person fra adresseboken som er vist under, eller legg til en ny person"
+msgstr ""
+"Velg en person fra adresseboken som er vist under, eller legg til en ny "
+"person"
 
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:301
@@ -17140,13 +17661,18 @@ msgstr "Velg Kompis"
 
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid "Select a person from your address book to add this buddy to, or create a new person."
-msgstr "Velg en person fra adresseboka for å legge til denne kontakten, eller lag en ny kontakt."
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Velg en person fra adresseboka for å legge til denne kontakten, eller lag en "
+"ny kontakt."
 
 #. Add the expander
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:431
+#, fuzzy
 msgid "User _details"
-msgstr "_Brukerdetaljer"
+msgstr "Skjul brukerdetaljer"
 
 #. "Associate Buddy" button
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:484
@@ -17155,8 +17681,9 @@ msgstr "_Assosier kompis"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
+#, fuzzy
 msgid "Unable to send e-mail"
-msgstr "Klarte ikke å sende e-post"
+msgstr "Kunne ikke sende e-post"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
@@ -17171,6 +17698,7 @@ msgstr "Legg til i adresseboka"
 msgstr "Legg til i adresseboka"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
+#, fuzzy
 msgid "Send E-Mail"
 msgstr "Send E-post"
 
@@ -17201,8 +17729,9 @@ msgstr "Evolution-integrasjon"
 #. *  description
 #: ../pidgin/plugins/gevolution/gevolution.c:530
 #: ../pidgin/plugins/gevolution/gevolution.c:532
+#, fuzzy
 msgid "Provides integration with Evolution."
-msgstr "Tilbyr integrasjon med Evolution"
+msgstr "Tilbyr integrasjon med Ximian Evolution"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
@@ -17210,7 +17739,9 @@ msgid "Please enter the buddy's screen n
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the buddy's screen name and account type below."
-msgstr "Venligst tast inn kontaktens brukernavn og hvilken protokoll kontakten finnes på under."
+msgstr ""
+"Venligst tast inn kontaktens brukernavn og hvilken protokoll kontakten "
+"finnes på under."
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
@@ -17262,7 +17793,7 @@ msgstr ""
 "\n"
 "<b>Inaktiv:</b>"
 
-#: ../pidgin/plugins/history.c:192
+#: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Historikk"
 
@@ -17280,8 +17811,7 @@ msgstr "Minimer til ikon når borte"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85
-#: ../pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Minimer kontaktlisten og samtalene når du er markert som borte."
 
@@ -17295,15 +17825,15 @@ msgid "Adds a small box to the buddy lis
 
 #: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Legger til en liten boks i kontaktlista som viser om du har fått e-post."
+msgstr ""
+"Legger til en liten boks i kontaktlista som viser om du har fått e-post."
 
 #: ../pidgin/plugins/markerline.c:23
 #, fuzzy
 msgid "Markerline"
 msgstr "Understrek"
 
-#: ../pidgin/plugins/markerline.c:25
-#: ../pidgin/plugins/markerline.c:26
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr ""
 
@@ -17311,19 +17841,19 @@ msgstr ""
 msgid "Draw Markerline in "
 msgstr ""
 
-#: ../pidgin/plugins/markerline.c:250
-#: ../pidgin/plugins/notify.c:682
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "Vinduer for direktemeldinger"
 
 #
-#: ../pidgin/plugins/markerline.c:254
-#: ../pidgin/plugins/notify.c:689
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_Samtalevinduer"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
 msgstr ""
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
@@ -17361,7 +17891,7 @@ msgid "_Apply"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
-msgstr "_Bruk"
+msgstr "Bruk"
 
 #. *< type
 #. *< ui_requirement
@@ -17377,7 +17907,9 @@ msgstr ""
 
 #. *  summary
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -17472,8 +18004,7 @@ msgstr "Beskjedvarsling"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910
-#: ../pidgin/plugins/notify.c:912
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Lar deg bli varslet om uleste meldinger på flere vis."
 
@@ -17525,41 +18056,52 @@ msgstr ""
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:69
+#: ../pidgin/plugins/pidginrc.c:73
 #, fuzzy
 msgid "Conversation Entry"
 msgstr "Samtaler"
 
-#: ../pidgin/plugins/pidginrc.c:70
+#: ../pidgin/plugins/pidginrc.c:74
 #, fuzzy
+msgid "Conversation History"
+msgstr "Samtaler Historie"
+
+#: ../pidgin/plugins/pidginrc.c:75
+#, fuzzy
+msgid "Log Viewer"
+msgstr "Log Viser"
+
+#: ../pidgin/plugins/pidginrc.c:76
+#, fuzzy
 msgid "Request Dialog"
 msgstr "Anmodnings Dialog"
 
-#: ../pidgin/plugins/pidginrc.c:71
+#: ../pidgin/plugins/pidginrc.c:77
 #, fuzzy
 msgid "Notify Dialog"
 msgstr "Bruk varsling for"
 
-#: ../pidgin/plugins/pidginrc.c:247
+#: ../pidgin/plugins/pidginrc.c:253
+#, fuzzy
 msgid "Select Color"
-msgstr "Velg farge"
+msgstr "Velg tekstfarge"
 
-#: ../pidgin/plugins/pidginrc.c:294
-#, fuzzy
+#: ../pidgin/plugins/pidginrc.c:300
+#, fuzzy, c-format
 msgid "Select Interface Font"
 msgstr "Velg skrifttype"
 
-#: ../pidgin/plugins/pidginrc.c:297
+#: ../pidgin/plugins/pidginrc.c:303
 #, fuzzy, c-format
 msgid "Select Font for %s"
 msgstr "Velg skrifttype"
 
-#: ../pidgin/plugins/pidginrc.c:365
+#: ../pidgin/plugins/pidginrc.c:371
 #, fuzzy
 msgid "GTK+ Interface Font"
 msgstr "Valg for grensesnitt"
 
-#: ../pidgin/plugins/pidginrc.c:385
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Tekst Tema Snarvei"
 
@@ -17583,41 +18125,40 @@ msgstr "GTK+ Tekst Tema Snarvei"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
+#: ../pidgin/plugins/pidginrc.c:428
 #, fuzzy
 msgid "Interface colors"
 msgstr "Ignorer farger"
 
-#: ../pidgin/plugins/pidginrc.c:446
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:467
+#: ../pidgin/plugins/pidginrc.c:473
 #, fuzzy
 msgid "Fonts"
 msgstr "Kontoer"
 
-#: ../pidgin/plugins/pidginrc.c:491
+#: ../pidgin/plugins/pidginrc.c:497
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Styre Gaim fra kontrollfil"
 
-#: ../pidgin/plugins/pidginrc.c:496
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:505
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:538
+#: ../pidgin/plugins/pidginrc.c:544
 #, fuzzy
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Gaim GTK+ Tema Kontroll"
 
-#: ../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 "Gir tilgang til vanlig brukte gtkrc innstillinger"
 
@@ -17631,12 +18172,18 @@ msgstr "Lar deg sende direktekommandoer 
 
 #: ../pidgin/plugins/raw.c:178
 #, fuzzy
-msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "Lar deg sende direktekommandoer til tekstbaserte protokoller (Jabber, MSN, IRC, TOC). Trykk 'Enter' for å sende, og sjekk avlusningsvinduet."
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Lar deg sende direktekommandoer til tekstbaserte protokoller (Jabber, MSN, "
+"IRC, TOC). Trykk 'Enter' for å sende, og sjekk avlusningsvinduet."
 
 #: ../pidgin/plugins/relnot.c:71
 #, fuzzy, c-format
-msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
 msgstr "Du bruker Gaim versjon %s. Den nåværende versjonen er %s.<hr>"
 
 #: ../pidgin/plugins/relnot.c:79
@@ -17646,8 +18193,7 @@ msgstr ""
 "<b> Endringslogg: </b>\n"
 "%s<br><br>"
 
-#: ../pidgin/plugins/relnot.c:84
-#: ../pidgin/plugins/relnot.c:85
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Ny versjon tilgjengelig"
 
@@ -17670,8 +18216,11 @@ msgstr "Sjekker periodisk for nye utgave
 
 #. *  description
 #: ../pidgin/plugins/relnot.c:148
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "Sjekker periodisk for nye versjoner, og gir endringslista til brukeren."
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Sjekker periodisk for nye versjoner, og gir endringslista til brukeren."
 
 #: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
@@ -17735,8 +18284,7 @@ msgstr "Teksterstatter"
 msgid "Text replacement"
 msgstr "Teksterstatter"
 
-#: ../pidgin/plugins/spellchk.c:2372
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstatter tekst i utgående beskjeder etter regler som du bestemmer."
 
@@ -17746,8 +18294,7 @@ msgstr "Erstatter tekst i utgående besk
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74
-#: ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Rullende kontaktliste"
 
@@ -17755,8 +18302,7 @@ msgstr "Rullende kontaktliste"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357
-#: ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "En horisontalt rullende versjon av kontaktlisten."
 
@@ -17794,16 +18340,19 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr ""
 
 #: ../pidgin/plugins/timestamp_format.c:33
+#, fuzzy
 msgid "Show dates in..."
-msgstr "Vis datoer i..."
+msgstr "Vis flere valg"
 
 #: ../pidgin/plugins/timestamp_format.c:38
+#, fuzzy
 msgid "Co_nversations:"
-msgstr "Sa_mtaler:"
+msgstr "Samtaler"
 
 #: ../pidgin/plugins/timestamp_format.c:40
 #: ../pidgin/plugins/timestamp_format.c:49
@@ -17840,7 +18389,9 @@ msgstr ""
 
 #. *  description
 #: ../pidgin/plugins/timestamp_format.c:156
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
 msgstr ""
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
@@ -17909,11 +18460,13 @@ msgid ""
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 #, fuzzy
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Dette tillegget gjør at samtalevinduene og kontaktlisten blir delvis gjennomsiktige.\n"
+"Dette tillegget gjør at samtalevinduene og kontaktlisten blir delvis "
+"gjennomsiktige.\n"
 "\n"
 "* Merk: du må ha Windows 2000 eller Windows XP for at denne skal virke."
 
@@ -17927,9 +18480,9 @@ msgstr "Oppstart"
 msgstr "Oppstart"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:312
-#, c-format
+#, fuzzy, c-format
 msgid "_Start %s on Windows startup"
-msgstr "_Start %s når Windows starter"
+msgstr "Start Gaim når Windows starter"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
@@ -17963,8 +18516,11 @@ msgstr "Innstillinger som er spesifikke 
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 #, fuzzy
-msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "Gir spesifikke innstillinger for Windows Gaim, slik som kontaktliste docking og samtale blinking."
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+"Gir spesifikke innstillinger for Windows Gaim, slik som kontaktliste docking "
+"og samtale blinking."
 
 #: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
@@ -17976,13 +18532,13 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746
-#: ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
 #: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr ""
 
 #: ../pidgin/plugins/xmppconsole.c:753
+#, fuzzy
 msgid "Account: "
 msgstr "Konto:"
 
@@ -18015,3 +18571,1666 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Offline buddies"
+#~ msgstr "Dimme ned inaktive kontakter"
+
+#, fuzzy
+#~ msgid "Sort"
+#~ msgstr "Port"
+
+#, fuzzy
+#~ msgid "By Status"
+#~ msgstr "Etter status"
+
+#, fuzzy
+#~ msgid "By Log Size"
+#~ msgstr "Etter loggstørrelse"
+
+#, fuzzy
+#~ msgid "Unable to connect to contact server"
+#~ msgstr "Kan ikke koble til tjener."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Kunne ikke hente kontaktliste"
+
+#, fuzzy
+#~ msgid "Current media"
+#~ msgstr "Pålogget på"
+
+#, fuzzy
+#~ msgid "Windows Live Messenger Protocol Plugin"
+#~ msgstr "Novel GroupWise Messenger protolltillegg"
+
+#, fuzzy
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Normal autentisering feilet"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s ønsker å sende deg en fil."
+
+#, fuzzy
+#~ msgid "Unknown error (%d)"
+#~ msgstr "Ukjent feil"
+
+#, fuzzy
+#~ msgid "Unable to connect to OIM server"
+#~ msgstr "Kan ikke koble til tjener."
+
+#, fuzzy
+#~ msgid "%s (%s) changed status from %s to %s"
+#~ msgstr "%s har endret kanaltema til: %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is now %s"
+#~ msgstr "%s heter nå %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is no longer %s"
+#~ msgstr "%s er tilbake."
+
+#, fuzzy
+#~ msgid "_Merge"
+#~ msgstr "Beskjed:"
+
+#, fuzzy
+#~ msgid "_Send File..."
+#~ msgstr "_Send fil"
+
+#, fuzzy
+#~ msgid "Add Buddy _Pounce..."
+#~ msgstr "Legg til kompisvarsling"
+
+#, fuzzy
+#~ msgid "Hide when offline"
+#~ msgstr "Ikke tillatt når avlogget"
+
+#, fuzzy
+#~ msgid "Show when offline"
+#~ msgstr "Ikke tillatt når avlogget"
+
+#, fuzzy
+#~ msgid "Add _Buddy..."
+#~ msgstr "Legg til kontakt"
+
+#, fuzzy
+#~ msgid "Add C_hat..."
+#~ msgstr "Legg til samtale"
+
+#, fuzzy
+#~ msgid "Persistent"
+#~ msgstr "Tillat"
+
+#, fuzzy
+#~ msgid "/Accounts/Manage"
+#~ msgstr "Kontoer"
+
+#, fuzzy
+#~ msgid "A_ccount:"
+#~ msgstr "Konto:"
+
+#, fuzzy
+#~ msgid "S_end To"
+#~ msgstr "Send som"
+
+#~ msgid "Gaim Internet Messenger"
+#~ msgstr "Gaim lynmeldingsklient"
+
+#~ msgid "Hide Disconnect Errors"
+#~ msgstr "Skjul frakoblingsfeil"
+
+#~ msgid "Hide Login Errors"
+#~ msgstr "Skjul påloggningsfeil"
+
+#, fuzzy
+#~ msgid "Hide Reconnecting Dialog"
+#~ msgstr "Skjul frakoblingsfeil"
+
+#~ msgid "When you are kicked offline, this reconnects you."
+#~ msgstr ""
+#~ "Dette tillegget vil koble deg til på nytt dersom du mister forbindelsen."
+
+#~ msgid "Use last matching buddy"
+#~ msgstr "Bruk samme kontakt som sist"
+
+#, fuzzy
+#~ msgid ""
+#~ "The buddy with the lowest score is the buddy who will have priority in "
+#~ "the contact.\n"
+#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
+#~ "used to be\n"
+#~ "the built-in order: active, idle, away, away + idle, offline."
+#~ msgstr ""
+#~ "Kompisen med den laveste verdien er den som er prioritert i kontakten.\n"
+#~ "Standardverdiene (frakoblet = 4, fraværende = 2, og ingen aktivitet = 1)\n"
+#~ "vil tilsvare det som var den innebygde rekkefølgen:\n"
+#~ "aktiv -> ingen aktivitet -> fraværende -> fraværende og ingen aktivitet -"
+#~ "> ikke pålogget."
+
+#~ msgid "Gaim"
+#~ msgstr "Gaim"
+
+#~ msgid "Gaim - Signed off"
+#~ msgstr "Gaim - Avlogget"
+
+#~ msgid "Gaim - Away"
+#~ msgstr "Gaim - Borte"
+
+#~ msgid "Join A Chat..."
+#~ msgstr "Bli med i samtalegruppe..."
+
+#~ msgid "Displays an icon for Gaim in the system tray."
+#~ msgstr "Viser et ikon for gaim i systemtray."
+
+#~ msgid ""
+#~ "Displays a system tray icon (in GNOME, KDE or Windows for example) to "
+#~ "show the current status of Gaim, allow fast access to commonly used "
+#~ "functions, and to toggle display of the buddy list or login window. Also "
+#~ "allows messages to be queued until the icon is clicked, similar to ICQ."
+#~ msgstr ""
+#~ "Bruker et beskjedvarslings-applet (f.eks. i GNOME eller KDE) for å vise "
+#~ "Gaims status, gi hurtig tilgang til ofte brukte funksjoner, og for å "
+#~ "fjerne/vise kontaktlisten og påloggingsvinduet. Muliggjør også kølegging "
+#~ "av beskjeder helt til ikonet klikkes, a la ICQ."
+
+#, fuzzy
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "Utvider-størrelse"
+
+#~ msgid "The specified buddy was not found in the Evolution Contacts."
+#~ msgstr "Kompisen ble ikke funnet i adresseboka til Evolution"
+
+#~ msgid ""
+#~ "When a new conversation is opened this plugin will insert the last "
+#~ "conversation into the current conversation.\n"
+#~ "\n"
+#~ "The history plugin requires logging be enabled. Logging can be enabled "
+#~ "from Tools -> Preferences -> Logging. Enabling logs for instant messages "
+#~ "and/or chats will activate history for the same conversation type(s)."
+#~ msgstr ""
+#~ "Når en ny samtale er åpnet vil dette tillegget sette inn siste samtale i "
+#~ "den pågående samtalen.\n"
+#~ "\n"
+#~ "Historie tillegget krever at logging er slått på. Logging kan bli satt på "
+#~ "gjennom Verktøy -> Innstillinger -> Logging. Å slå på logger for "
+#~ "lynmeldinger og/eller prat vil aktivere historie for den samme "
+#~ "samtaletypen."
+
+#~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+#~ "\">http://gaim.sourceforge.net</a>."
+#~ msgstr ""
+#~ "Du kan finne versjon %s her:<br><a href=\"http://gaim.sourceforge.net/"
+#~ "\">http://gaim.sourceforge.net</a>."
+
+#~ msgid "Delay"
+#~ msgstr "Sett inn hvert"
+
+#~ msgid "WinGaim Options"
+#~ msgstr "WinGaim Innstilinger"
+
+#~ msgid ""
+#~ "%d buddy from group %s was not removed because its account was not logged "
+#~ "in.  This buddy and the group were not removed.\n"
+#~ msgid_plural ""
+#~ "%d buddies from group %s were not removed because their accounts were not "
+#~ "logged in.  These buddies and the group were not removed.\n"
+#~ msgstr[0] ""
+#~ "%d kontakt fra gruppen %s ble ikke fjernet fordi kontaktens konto ikke "
+#~ "var innlogget. Denne kontakten (og gruppen) ble ikke fjernet.\n"
+#~ msgstr[1] ""
+#~ "%d kontakter fra gruppen %s ble ikke fjernet fordi kontoene deres ikke "
+#~ "var innlogget. Disse kontaktene (og gruppen) ble ikke fjernet.\n"
+
+#~ msgid "Group not removed"
+#~ msgstr "Gruppe ikke fjernet"
+
+#~ msgid "(+%d more)"
+#~ msgstr "(+%d flere)"
+
+#~ msgid " left the room (%s)."
+#~ msgstr " forlot rommet (%s)."
+
+#~ msgid "Screen Name:"
+#~ msgstr "Skjermnavn:"
+
+#~ msgid "Buddy icon:"
+#~ msgstr "Kontaktikon:"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Do you wish to add him or her to your buddy list?"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Ønsker du å legge vedkommende til i din kontaktliste?"
+
+#~ msgid "_Alias Buddy..."
+#~ msgstr "_Alias for kontakt..."
+
+#
+#, fuzzy
+#~ msgid "Alias Contact..."
+#~ msgstr "Kontaktalias..."
+
+#~ msgid "/Tools/Account Ac_tions"
+#~ msgstr "/Verktøy/_Handlinger for kontoer"
+
+#~ msgid "/Tools/A_ccounts"
+#~ msgstr "/Verktøy/K_ontoer"
+
+#
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Contact Alias:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Kontaktalias:</b>"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Alias:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Alias:</b>"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Nickname:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Kallenavn:</b>"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Logged In:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>PÃ¥logget:</b> "
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Offline"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Status:</b> Avlogget"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Description:</b> Spooky"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Beskrivelse:</b> Skummel"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Awesome"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Status:</b> Fantastisk"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Rockin'"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Status:</b> Rockin'"
+
+#~ msgid "/Tools/Buddy Pounce"
+#~ msgstr "/Verktøy/Kompisvarsel"
+
+#~ msgid "/Tools/Account Actions"
+#~ msgstr "/Verktøy/_Handlinger for kontoe"
+
+# Lot "me" stå, var usikker på om denne brukes "teknisk"
+# (denne meldingen kommer opp når du skriver "debug version"
+# - da byttes "me" ut med kallenavn)
+#~ msgid "me is using Gaim v%s."
+#~ msgstr "me bruker Gaim v%s."
+
+#, fuzzy
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "Vis kontaktikoner"
+
+#, fuzzy
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "Vis kontaktikoner"
+
+#~ msgid "IM the user"
+#~ msgstr "Send beskjed til bruker"
+
+#~ msgid "Ignore the user"
+#~ msgstr "Ignorer bruker"
+
+#~ msgid "Get the user's information"
+#~ msgstr "Hent brukerinformasjon"
+
+#, fuzzy
+#~ msgid "Jabber developer"
+#~ msgstr "tidligere jabber-utvikler"
+
+#, fuzzy
+#~ msgid ""
+#~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
+#~ "<BR><BR>"
+#~ msgstr ""
+#~ "Gaim er en modulbasert klient for direktemeldinger som kan bruke AIM, "
+#~ "MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, "
+#~ "og Gadu-Gadu samtidig. Programmet er bygget på Gtk+ og er lisensiert "
+#~ "under GPL.<BR><BR>"
+
+#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim på irc.freenode.net<BR><BR>"
+
+#~ msgid "Active Developers"
+#~ msgstr "Aktive utviklere"
+
+#~ msgid "_Keep the dialog open"
+#~ msgstr "Hold dialogen åpen"
+
+#~ msgid "Smaller font size"
+#~ msgstr "Mindre skrift"
+
+#~ msgid "Insert link"
+#~ msgstr "Sett inn lenke"
+
+#~ msgid "Insert image"
+#~ msgstr "Sett inn bilde"
+
+#, fuzzy
+#~ msgid "Conversation in %s on %s"
+#~ msgstr "Samtaler med %s"
+
+#~ msgid "<span weight=\"bold\">From:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">Fra:</span> %s\n"
+
+#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">Emne:</span> %s\n"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Du har e-post!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+
+#~ msgid "Error launching <b>%s</b>: %s"
+#~ msgstr "Feil under starting av kommando: <b>%s</b>:%s"
+
+#~ msgid "A_way"
+#~ msgstr "_Borte"
+
+#~ msgid "_Idle"
+#~ msgstr "_Inaktiv"
+
+#~ msgid "Retur_n from idle"
+#~ msgstr "Retur_ner fra inaktivitet"
+
+#~ msgid "Pounce Action"
+#~ msgstr "Varslingsmåte"
+
+#~ msgid "Bro_wse..."
+#~ msgstr "Bla _gjennom"
+
+#~ msgid "Sav_e this pounce after activation"
+#~ msgstr "Lagre denne varslingen etter aktivering"
+
+#~ msgid "Remove Buddy Pounce"
+#~ msgstr "Fjern kompisvarsling"
+
+#~ msgid "Send unknown \"_slash\" commands as messages"
+#~ msgstr "Send ukjente \"skråstreks\"-kommandoer som meldinger"
+
+#~ msgid "Show buddy _icons"
+#~ msgstr "Vis kontaktikoner"
+
+#~ msgid "Tab Options"
+#~ msgstr "Fanevalg"
+
+#~ msgid "_Sounds while away"
+#~ msgstr "Lyder når du er fraværsmarkert"
+
+#~ msgid "_Queue new messages when away"
+#~ msgstr "Når borte, legg nye beskjeder i kø"
+
+#, fuzzy
+#~ msgid "Custom status"
+#~ msgstr "Etter status"
+
+#~ msgid ""
+#~ "Unable to play sound because the 'Command' sound method has been chosen, "
+#~ "but no command has been set."
+#~ msgstr ""
+#~ "Kunne ikke spille av lyd fordi du har valgt at et eksternt program skal "
+#~ "spille av lyd, men ikke spesifisert navnet på programmet."
+
+#~ msgid ""
+#~ "Unable to play sound because the configured sound command could not be "
+#~ "launched: %s"
+#~ msgstr ""
+#~ "Kunne ikke spille av lyd fordi det konfigurerte avspillingsprogrammet "
+#~ "ikke kunne startes: %s"
+
+#~ msgid "_Warn"
+#~ msgstr "Advar"
+
+#~ msgid ""
+#~ "You can send this image as a file transfer or embed it into this message, "
+#~ "or use it as the buddy icon for this user."
+#~ msgstr ""
+#~ "Du kan sende dette bildet som filoverføring, sett det inn i denne "
+#~ "bekjeden eller bruk det som kompis ikon for denne brukeren."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Status:</b> Fantastisk"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Message:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>%s:</b> %s"
+
+#, fuzzy
+#~ msgid "Could't open file"
+#~ msgstr "Kan ikke sende fil"
+
+#, fuzzy
+#~ msgid "Change password"
+#~ msgstr "Bytt passord"
+
+#~ msgid "<b>%s:</b> %s"
+#~ msgstr "<b>%s:</b> %s"
+
+#~ msgid "<b>%s:</b> %s<br>"
+#~ msgstr "<b>%s:</b> %s<br>"
+
+#~ msgid "Realname"
+#~ msgstr "Virkelig navn"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "Kan ikke bli med i %s:"
+
+#~ msgid ""
+#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+#~ "account properties"
+#~ msgstr ""
+#~ "Tjeneren krever TSL/SSL for innlogging. Velg \"Bruk TLS hvis tilgjengelig "
+#~ "\" i kontoalternativer."
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber-feil"
+
+#, fuzzy
+#~ msgid "Search for Jabber users"
+#~ msgstr "Kontaktsøk etter e-postadresse"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "Ugyldig jabber-ID"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "Bytt jabber-passord"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber-protokolltillegg"
+
+#~ msgid "Use TLS if available"
+#~ msgstr "Bruk TLS hvis tilgjengelig"
+
+#~ msgid "The user %s wants to add %s to his or her buddy list."
+#~ msgstr "Brukeren %s ønsker å legge til %s i kontaktlisten sin."
+
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "Du har sent en Nudge!"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>%s:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>%s:</b> %s"
+
+#~ msgid "Hidden"
+#~ msgstr "Usynlig"
+
+#~ msgid "<b>%s:</b> "
+#~ msgstr "<b>%s:</b> "
+
+#~ msgid "MSN Profile"
+#~ msgstr "MSN-profil"
+
+#~ msgid "Login server"
+#~ msgstr "PÃ¥loggingstjener"
+
+#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
+#~ msgstr "Brukeren %s (%s) ønsker å legge til %s i kontaktlisten sin."
+
+#~ msgid "Unable to read header from server"
+#~ msgstr "Kunne ikke lese meldingshode fra tjener"
+
+#~ msgid ""
+#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
+#~ msgstr ""
+#~ "Kunne ikke lese melding fra tjener: %s. Kommando er %hd, lengde er %hd."
+
+#~ msgid "users: %s, files: %s, size: %sGB"
+#~ msgstr "brukere: %s, filer: %s, størrelse %sGB"
+
+#~ msgid "Unable to add \"%s\" to your Napster hotlist"
+#~ msgstr "Kunne ikke legge til \"%s\" i Napster-listen din"
+
+#~ msgid "%s requested a PING"
+#~ msgstr "%s pinget deg"
+
+#~ msgid "NAPSTER Protocol Plugin"
+#~ msgstr "Napster-protokolltillegg"
+
+#
+#~ msgid "Invalid password"
+#~ msgstr "Ugyldig passord"
+
+#~ msgid "Invalid username or password"
+#~ msgstr "Ugyldig brukernavn eller passord"
+
+#~ msgid "Error processing event or response (%s)."
+#~ msgstr "Klarte ikke behandle hendelse eller svar (%s)."
+
+#~ msgid "Direct IM with %s closed"
+#~ msgstr "Direkte samtale med %s stengt"
+
+#~ msgid "Direct IM with %s failed"
+#~ msgstr "Direkte samtale med %s mislyktes"
+
+#~ msgid "Unable to open Direct IM"
+#~ msgstr "Kunne ikke åpne direkte direktesamtale"
+
+#, fuzzy
+#~ msgid "You have lost your connection to chat room %s."
+#~ msgstr "Du har blitt koblet fra samtalegruppen %s."
+
+#~ msgid "Chat is currently unavailable"
+#~ msgstr "Samtalegrupper er for tiden utilgjengelig"
+
+#~ msgid ""
+#~ "Transfer of file %s timed out.\n"
+#~ " Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
+#~ "ICQ."
+#~ msgstr ""
+#~ "Overføring av filen %s timet ut.\n"
+#~ " Forsøk å slå på proxy servere for filoverføringer i Verktøy-"
+#~ ">Innstillinger->AIM/ICQ."
+
+#, fuzzy
+#~ msgid "Unable to log into file transfer proxy."
+#~ msgstr "Kunne ikke skrive fil %s."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to establish listener socket or no AOL proxy connection present."
+#~ msgstr "Kunne ikke etablere lytte-socket."
+
+#~ msgid ""
+#~ "The user %s requires authorization before being added to a buddy list.  "
+#~ "Do you want to send an authorization request?"
+#~ msgstr ""
+#~ "Brukeren %s krever godkjenning før vedkommende legges til i "
+#~ "kontaktlisten. Vil du sende en godkjenningsforespørsel?"
+
+#~ msgid "Request Authorization"
+#~ msgstr "Spør om godkjenning"
+
+#, fuzzy
+#~ msgid ""
+#~ "The user %u wants to add %s to their buddy list for the following "
+#~ "reason:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Brukeren %u ønsker å legge deg til sin kontaktliste og oppgav følgende "
+#~ "grunn:\n"
+#~ "%s"
+
+#~ msgid "Authorization Request"
+#~ msgstr "Godkjenningsforespørsel"
+
+#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+#~ msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+
+#~ msgid "SNAC threw error: %s\n"
+#~ msgstr "SNAC-feil: %s\n"
+
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "Brukerinformasjon for %s er ikke tilgjengelig:"
+
+#~ msgid "Rate limiting error."
+#~ msgstr "Feil ved hastighetsbegrensning."
+
+#~ msgid "You have been signed off for an unknown reason."
+#~ msgstr "Du har blitt logget av, årsak ukjent."
+
+#~ msgid ""
+#~ "Your screen name is currently formatted as follows:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Skjermnavnet ditt er formatert slik:\n"
+#~ "%s"
+
+#~ msgid "Unable to set AIM away message."
+#~ msgstr "Kunne ikke sette fraværsbeskjed for AIM."
+
+#~ msgid ""
+#~ "You have probably requested to set your away message before the login "
+#~ "procedure completed.  You remain in a \"present\" state; try setting it "
+#~ "again when you are fully connected."
+#~ msgstr ""
+#~ "Du har antakeligvis prøvd å sette en fraværsbeskjed før "
+#~ "innloggingsprosedyren var ferdig. Du er fortsatt markert som til stede. "
+#~ "Prøv å gjenta operasjonen når du er ferdig pålogget."
+
+#~ msgid ""
+#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
+#~ "for this is that you have the maximum number of allowed buddies in your "
+#~ "buddy list."
+#~ msgstr ""
+#~ "Kunne ikke legge til kontakten %s pga. en ukjent feil. Den vanligste "
+#~ "årsaken til dette er at du har nådd maksimalgrensen for antall kontakter "
+#~ "i kontaktlisten din."
+
+#, fuzzy
+#~ msgid ""
+#~ "The user %s wants to add %s to their buddy list for the following "
+#~ "reason:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Brukeren %s ønsker å legge deg til i kontaktlisten sin med følgende "
+#~ "grunn:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Hide IP address"
+#~ msgstr "IP-adresse"
+
+#, fuzzy
+#~ msgid "Web aware"
+#~ msgstr "Web-oppmerksom"
+
+#~ msgid "New screen name formatting:"
+#~ msgstr "Ny skjermnavn-formatering:"
+
+#~ msgid "Format Screen Name..."
+#~ msgstr "Formatere skjermnavn..."
+
+#~ msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
+#~ msgstr "Bruk AIM/ICQ proxy server (Saktere/Mer sikkert/Fungerer vanligvis)"
+
+#~ msgid "Auth host"
+#~ msgstr "Autentiseringsadresse:"
+
+#~ msgid "Auth port"
+#~ msgstr "Autentiseringsport:"
+
+#~ msgid "Active"
+#~ msgstr "Aktiv"
+
+#~ msgid ""
+#~ "Could not add the buddy %s because every simple user has to start with "
+#~ "'sip:'."
+#~ msgstr ""
+#~ "Kunne ikke tilføye kompis %s fordi hver enkel bruker må starte med 'sip:'."
+
+#~ msgid "Thomas Butter <butter at uni-mannheim.de>"
+#~ msgstr "Thomas Butter <butter at uni-mannheim.de>"
+
+#~ msgid "EMail"
+#~ msgstr "E-post"
+
+#~ msgid "Instant Messages"
+#~ msgstr "Direktemeldinger"
+
+#~ msgid "Verify all IM message signatures"
+#~ msgstr "Bekreft alle direktemeldingssignaturer"
+
+#~ msgid "Channel Messages"
+#~ msgstr "Kanalmeldinger"
+
+#~ msgid "Digitally sign all channel messages"
+#~ msgstr "Signer alle kanalmeldinger digitalt"
+
+#~ msgid "Verify all channel message signatures"
+#~ msgstr "Bekreft alle kanalmeldingssignaturer"
+
+#, fuzzy
+#~ msgid "Reject watching by other users"
+#~ msgstr "Avvis overvåkning fra andre brukere"
+
+#~ msgid "Block invites"
+#~ msgstr "Blokker invitasjoner"
+
+#, fuzzy
+#~ msgid "Reject online status attribute requests"
+#~ msgstr "Avvis spørsmål om tilkoplingsstatus"
+
+#~ msgid "TOC has sent a PAUSE command."
+#~ msgstr "TOC har sendt en PAUSE-kommando."
+
+#~ msgid ""
+#~ "When this happens, TOC ignores any messages sent to it, and may kick you "
+#~ "off if you send a message. Gaim will prevent anything from going through. "
+#~ "This is only temporary, please be patient."
+#~ msgstr ""
+#~ "NÃ¥r dette skjer, vil TOC ignorere alle beskjeder som blir sendt, og vil "
+#~ "kanskje kaste deg ut hvis du prøver å sende. Gaim vil derfor stoppe alle "
+#~ "utsendelser. Dette er bare midlertidig, vennligst vent."
+
+#~ msgid "Gaim - Save As..."
+#~ msgstr "Gaim - Lagre som..."
+
+#~ msgid "TOC host"
+#~ msgstr "TOC-adresse:"
+
+#~ msgid "TOC port"
+#~ msgstr "TOC-port:"
+
+#, fuzzy
+#~ msgid "Message (optional) :"
+#~ msgstr "Beskjedvarsling"
+
+#~ msgid ""
+#~ "The normal authentication method has failed. This means either your "
+#~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
+#~ "Gaim will now attempt to log in using Web Messenger authentication, which "
+#~ "will result in reduced functionality and features."
+#~ msgstr ""
+#~ "Den normale autentifikasjonsmekanismen har feilet, noe som enten betyr at "
+#~ "passordet ditt er feil, eller at Yahoo! sin autentifikasjonsmetode har "
+#~ "endret seg. Gaim vil nå forsøke å logge inn ved hjelp av Web Messenger "
+#~ "autentifikasjon, noe som vil føre til redusert funksjonalitet og færre "
+#~ "muligheter"
+
+#~ msgid "Unable to read"
+#~ msgstr "Kunne ikke lese"
+
+#, fuzzy
+#~ msgid "Stealth"
+#~ msgstr "Fylke/stat"
+
+#~ msgid "Pager host"
+#~ msgstr "Personsøker-adresse:"
+
+#, fuzzy
+#~ msgid "YCHT Host"
+#~ msgstr "YCHT-vert"
+
+#, fuzzy
+#~ msgid "YCHT Port"
+#~ msgstr "YCHT-Port"
+
+#~ msgid "<b>IP Address:</b> %s<br>"
+#~ msgstr "<b>IP-adresse:</b> %s <br>"
+
+#~ msgid "(%d message)"
+#~ msgid_plural "(%d messages)"
+#~ msgstr[0] "(%d beskjeder)"
+#~ msgstr[1] "(%d beskjeder)"
+
+#~ msgid "(1 message)"
+#~ msgstr "(1 beskjed)"
+
+#~ msgid "%s came back"
+#~ msgstr "%s kom tilbake"
+
+#, fuzzy
+#~ msgid "Default auto-away"
+#~ msgstr "Automatisk fraværsmarkering"
+
+#~ msgid "g003: Error opening connection.\n"
+#~ msgstr "g003: Feil ved tilkobling.\n"
+
+#, fuzzy
+#~ msgid "Show more buddy details"
+#~ msgstr "Vis brukerdetaljer"
+
+#~ msgid "Gnome Default"
+#~ msgstr "Gnome-standard"
+
+#~ msgid "Away m_essage:"
+#~ msgstr "Fraværsbeskjed:"
+
+#, fuzzy
+#~ msgid "Quit message"
+#~ msgstr "(1 beskjed)"
+
+#~ msgid "Restore Away State On Reconnect"
+#~ msgstr ""
+#~ "Fortsett som fraværende etter at forbindelsen har blitt gjennoprettet"
+
+#~ msgid "Mail Server"
+#~ msgstr "E-posttjener"
+
+#~ msgid "%s (%d new/%d total)"
+#~ msgstr "%s (%d nye/%d totalt)"
+
+#~ msgid "Check Mail"
+#~ msgstr "Sjekk e-post"
+
+#~ msgid "Check e-mail every X seconds.\n"
+#~ msgstr "Sjekk e-post hvert Xte sekund.\n"
+
+#~ msgid "Auto-login"
+#~ msgstr "Automatisk pålogging"
+
+#~ msgid "Signoff"
+#~ msgstr "Logge av"
+
+#~ msgid "_Hide new messages until tray icon is clicked"
+#~ msgstr "Skjul nye beskjeder inntil trayikon klikkes"
+
+#~ msgid "Not connected to AIM"
+#~ msgstr "Ikke tilkoblet til AIM"
+
+#~ msgid "No roomname given."
+#~ msgstr "Romnavn ikke oppgitt."
+
+#~ msgid "Invalid AIM URI"
+#~ msgstr "Ugyldig AIM URI"
+
+#~ msgid ""
+#~ "Failed to assign %s to a socket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikke tilordne %s til en socket:\n"
+#~ "%s"
+
+#~ msgid "Remote Control"
+#~ msgstr "Styre Gaim fra kontrollfil"
+
+#~ msgid "Provides remote control for gaim applications."
+#~ msgstr "Muliggjør fjernstyring for Gaim-applikasjoner."
+
+#~ msgid ""
+#~ "Gives Gaim the ability to be remote-controlled through third-party "
+#~ "applications or through the gaim-remote tool."
+#~ msgstr ""
+#~ "Lar Gaim bli kontrollert fra tredjeparts-applikasjoner eller gjennom "
+#~ "verktøyet gaim-remote."
+
+#~ msgid "Docked _Buddy List is always on top"
+#~ msgstr "Dockable kontaktliste er alltid øverst"
+
+#~ msgid "Away!"
+#~ msgstr "Borte"
+
+#~ msgid "Edit This Message"
+#~ msgstr "Rediger denne meldingen"
+
+#~ msgid "I'm Back!"
+#~ msgstr "Tilbake!"
+
+#~ msgid "Remove Away Message"
+#~ msgstr "Fjern fraværsbeskjed"
+
+#~ msgid "Set All Away"
+#~ msgstr "Marker som borte på alle"
+
+#~ msgid "You cannot save an away message with a blank title"
+#~ msgstr "Du kan ikke lagre en fraværsbeskjed uten tittel"
+
+#~ msgid ""
+#~ "Please give the message a title, or choose \"Use\" to use without saving."
+#~ msgstr ""
+#~ "Vennligst gi beskjeden en tittel, eller velg \"Bruk\" for å bruke uten "
+#~ "lagring."
+
+#~ msgid "You cannot create an empty away message"
+#~ msgstr "Du kan ikke lage en tom fraværsbeskjed"
+
+#~ msgid "Away title: "
+#~ msgstr "Tittel: "
+
+#~ msgid "Buddy List Error"
+#~ msgstr "Feil i kontaktliste"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Størrelse på utvider-pil"
+
+#~ msgid ""
+#~ "Usage: %s command [OPTIONS] [URI]\n"
+#~ "\n"
+#~ "    COMMANDS:\n"
+#~ "       uri                      Handle AIM: URI\n"
+#~ "       away                     Popup the away dialog with the default "
+#~ "message\n"
+#~ "       back                     Remove the away dialog\n"
+#~ "       quit                     Close running copy of Gaim\n"
+#~ "\n"
+#~ "    OPTIONS:\n"
+#~ "       -h, --help [command]     Show help for command\n"
+#~ msgstr ""
+#~ "Bruksmåte: %s kommando [FLAGG] [URI]\n"
+#~ "\n"
+#~ "    KOMMANDOER:\n"
+#~ "       uri                      HÃ¥ndtere AIM-URI\n"
+#~ "       away                      Sprett opp fraværsdialogen med "
+#~ "standardmeldingen\n"
+#~ "       back                     Fjern standardmeldingen\n"
+#~ "       quit                     Lukk Gaim-program som kjører\n"
+#~ "\n"
+#~ "    FLAGG:\n"
+#~ "       -h, --help [kommando]    Vis hjelp for kommando\n"
+
+#~ msgid ""
+#~ "Gaim not running (on session 0)\n"
+#~ "Is the \"Remote Control\" plugin loaded?\n"
+#~ msgstr ""
+#~ "Gaim kjører ikke (på sesjon 0)\n"
+#~ "Er fjernstyringstillegget lastet?\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Using AIM: URIs:\n"
+#~ "Sending an IM to a screen name:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
+#~ "world'\n"
+#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
+#~ "Please note the quoting used above - if you run this from a shell the "
+#~ "'&'\n"
+#~ "needs to be escaped, or the command will stop at that point.\n"
+#~ "Also,the following will just open a conversation window to a screen "
+#~ "name,\n"
+#~ "with no message:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
+#~ "\n"
+#~ "Joining a chat:\n"
+#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
+#~ "...joins the 'PenguinLounge' chat room.\n"
+#~ "\n"
+#~ "Adding a buddy to your buddy list:\n"
+#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
+#~ "...prompts you to add 'Penguin' to your buddy list.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Bruke AIM: URIer:\n"
+#~ "Ã… sende en direktebeskjed til en kontakts skjermnavn:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+#~ "'Penguin' er skjermnavnet vi ønsker å sende direktebeskjed til, og "
+#~ "'hello\n"
+#~ "world' er beskjeden. Tegnet '+' må brukes som erstatning for mellomrom.\n"
+#~ "Merk at hvordan kommandoen over bruker anførselstegn - hvis du starter\n"
+#~ "kommandoen fra et shell, må du passe på å 'escape' tegnet &, ellers vil "
+#~ "resten\n"
+#~ "av linja ignoreres. Hvis du bare ønsker å åpne et samtalevindu til en "
+#~ "kontakt\n"
+#~ "uten å sende noen beskjed først, kan du gjøre slik:\n"
+#~ "\tgaim-remote uri aim:goim?screenname=Penguin\n"
+#~ "\n"
+#~ "For å bli med i en samtale:\n"
+#~ "\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+#~ "...starter en samtale i PenguinLounge-samtalerommet.\n"
+#~ "\n"
+#~ "For å legge til en kontakt i kontaktlisten:\n"
+#~ "\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+#~ "...vil spørre deg om å legge til Penguin i kontaktlisten.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Close running copy of Gaim\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Lukk eksisterende Gaim-program\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mark all accounts as \"away\" with the default message.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Merk alle kontoer som \"fraværende\" med standardmeldingen.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Set all accounts as not away.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sett alle kontoers status til ikke fraværende.\n"
+
+#~ msgid "Show fewer options"
+#~ msgstr "Vis færre valg"
+
+#~ msgid "/Tools/_Away"
+#~ msgstr "/Verktøy/_Borte"
+
+#~ msgid "/Tools/Pl_ugin Actions"
+#~ msgstr "/Verktøy/Handlinger for tillegg"
+
+#~ msgid "Rename Group"
+#~ msgstr "Endre gruppenavn"
+
+#~ msgid "New group name"
+#~ msgstr "Nytt gruppenavn:"
+
+#~ msgid "%d%%"
+#~ msgstr "%d%%"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Account:</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Konto:</b>"
+
+#~ msgid "Warned (%d%%) "
+#~ msgstr "Advart (%d%%) "
+
+#~ msgid "/Tools/Away"
+#~ msgstr "/Verktøy/Borte"
+
+#~ msgid "Send a message to the selected buddy"
+#~ msgstr "Send beskjed til den valgte kontakten"
+
+#~ msgid "Get information on the selected buddy"
+#~ msgstr "Hent informasjon om den valgte kontakten"
+
+#~ msgid "_Chat"
+#~ msgstr "_Gruppesamtale"
+
+#~ msgid "Join a chat room"
+#~ msgstr "Bli med i samtalegruppe"
+
+#~ msgid "_Away"
+#~ msgstr "_Borte"
+
+#~ msgid "Set an away message"
+#~ msgstr "Sett en fraværsbeskjed"
+
+#~ msgid "Done."
+#~ msgstr "Ferdig."
+
+#~ msgid "Signon: "
+#~ msgstr "PÃ¥logging: "
+
+#~ msgid "Signon"
+#~ msgstr "PÃ¥logging"
+
+#~ msgid "Cancel All"
+#~ msgstr "A_vbryt alle"
+
+#
+#~ msgid "_Reconnect"
+#~ msgstr "Kople til på nytt"
+
+#~ msgid "Reason Unknown."
+#~ msgstr "Ukjent årsak."
+
+#
+#~ msgid "Reconnect _All"
+#~ msgstr "Kople til _alle på nytt"
+
+#~ msgid "Get Away Msg"
+#~ msgstr "Hent fraværsbeskjed"
+
+#~ msgid "/Conversation/_Warn..."
+#~ msgstr "/Samtale/A_dvar..."
+
+#~ msgid "/Conversation/A_lias..."
+#~ msgstr "/Samtale/_Alias..."
+
+#~ msgid "/Options/Show T_imestamps"
+#~ msgstr "/Brukervalg/Vis t_idsstempler"
+
+#~ msgid "/Conversation/Warn..."
+#~ msgstr "/Samtale/Advar..."
+
+#~ msgid "Warn the user"
+#~ msgstr "Advar brukeren"
+
+#~ msgid "Send a file to the user"
+#~ msgstr "Send en fil til brukeren"
+
+#~ msgid "Remove the user from your buddy list"
+#~ msgstr "Fjern brukeren fra kontaktlisten din"
+
+#~ msgid "Invite a user"
+#~ msgstr "Inviter en bruker"
+
+#~ msgid "Add the chat to your buddy list"
+#~ msgstr "Legg til samtalen i kontaktlisten din"
+
+#~ msgid "<main>/Conversation/Close"
+#~ msgstr "<main>/Samtale/Lukk"
+
+#~ msgid "former lead developer"
+#~ msgstr "tidligere hovedutvikler"
+
+#~ msgid "former maintainer"
+#~ msgstr "tidligere ansvarlig"
+
+#, fuzzy
+#~ msgid "Azerbaijani"
+#~ msgstr "Serbisk"
+
+#~ msgid "Burmese"
+#~ msgstr "Burmesisk"
+
+#~ msgid "Ukrainian"
+#~ msgstr "Ukrainsk"
+
+#
+#~ msgid "Chinese"
+#~ msgstr "Kinesisk"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+#~ "\n"
+#~ "This will increase %s's warning level and he or she will be subject to "
+#~ "harsher rate limiting.\n"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Advar %s?</span>\n"
+#~ "\n"
+#~ "Dette vil øke advarselsnivået til %s og vedkommende vil måtte tåle "
+#~ "strengere hastighetsbegrensning.\n"
+
+#~ msgid "Warn _anonymously?"
+#~ msgstr "Advar anonymt"
+
+#~ msgid "<b>Anonymous warnings are less severe.</b>"
+#~ msgstr "<b>Anonyme advarsler er mindre betydningsfulle.</b>"
+
+#~ msgid "Show transfer details"
+#~ msgstr "Vis overføringsdetaljer"
+
+#~ msgid "D_isplay remote nicknames if no alias is set"
+#~ msgstr "Vis kallenavn for personer hvis de ikke har noe alias"
+
+#~ msgid "Display"
+#~ msgstr "Vis"
+
+#~ msgid "Show _timestamp on messages"
+#~ msgstr "Vis tidsstempel på beskjeder"
+
+#~ msgid "Ignore font _faces"
+#~ msgstr "Ignorer skrifttyper"
+
+#~ msgid "_Send default formatting with outgoing messages"
+#~ msgstr "_Send standardformatering med utgående meldinger"
+
+#~ msgid "Enter _sends message"
+#~ msgstr "Enter _sender beskjeden"
+
+#~ msgid "Window Closing"
+#~ msgstr "Lukke vindu"
+
+#~ msgid "_Escape closes window"
+#~ msgstr "_ESC lukker vinduet"
+
+#~ msgid "Insertions"
+#~ msgstr "Innsettinger"
+
+#~ msgid "Control-{B/I/U} changes _formatting"
+#~ msgstr "CTRL-{b/i/u/s} endrer _formatering"
+
+#~ msgid "Control-(number) _inserts smileys"
+#~ msgstr "CTRL-(tall) setter _inn smilefjes"
+
+#~ msgid "Show _buttons as:"
+#~ msgstr "Vis knapper som:"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Pictures and text"
+#~ msgstr "Bilder og tekst"
+
+#~ msgid "_Raise window on events"
+#~ msgstr "Flytt vinduet øverst ved hendelser"
+
+#~ msgid "Show _warning levels"
+#~ msgstr "Vis advarselsnivåer"
+
+#~ msgid "Enable \"_slash\" commands"
+#~ msgstr "Skru på \"_skråstreks\"-kommandoer"
+
+#~ msgid "_Raise IM window on events"
+#~ msgstr "Flytt direktemeldingsvindu øverst ved hendelser"
+
+#~ msgid "Raise chat _window on events"
+#~ msgstr "Flytt gruppesamtalevinduet øverst ved hendelser"
+
+#~ msgid "Use _multi-colored screen names in chats"
+#~ msgstr "Bruk _flerfargede brukernavn i samtalegrupper"
+
+#~ msgid "Tab p_lacement:"
+#~ msgstr "_Faneplassering:"
+
+#~ msgid "New conversation _placement:"
+#~ msgstr "Ny samtale_plassering"
+
+#~ msgid "System Logs"
+#~ msgstr "Systemlogging"
+
+#~ msgid "_Enable system log"
+#~ msgstr "Skru på _systemlogg:"
+
+#~ msgid "Log when buddies _sign on/sign off"
+#~ msgstr "Skriv til logg når kontakter logger av/på"
+
+#~ msgid "Log when buddies become _idle/un-idle"
+#~ msgstr "Skriv til logg når kontakter blir aktiv/inaktiv"
+
+#~ msgid "Log when buddies go away/come _back"
+#~ msgstr "Skriv til logg når kontakter blir borte/kommer tilbake"
+
+#~ msgid "Log your _own signons/idleness/awayness"
+#~ msgstr "Skriv egne pålogginger/inaktivitet/bortemarkeringer til logg"
+
+#~ msgid "Idle _time reporting:"
+#~ msgstr "Rapportering av inaktiv _tid:"
+
+#~ msgid "Gaim usage"
+#~ msgstr "Gaim-bruk"
+
+#~ msgid "X usage"
+#~ msgstr "X-bruk"
+
+#~ msgid "Windows usage"
+#~ msgstr "Windows-bruk"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>  %s\n"
+#~ "<span weight=\"bold\">URL:</span>  %s\n"
+#~ "<span weight=\"bold\">File name:</span>  %s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Skrevet av:</span>  %s\n"
+#~ "<span weight=\"bold\">URL:</span>  %s\n"
+#~ "<span weight=\"bold\">Filnavn:</span>  %s"
+
+#~ msgid "Summary"
+#~ msgstr "Oppsummering"
+
+#~ msgid "Details"
+#~ msgstr "Detaljer"
+
+#~ msgid "Message Text"
+#~ msgstr "Beskjeder"
+
+#~ msgid "Shortcuts"
+#~ msgstr "Hurtigtaster"
+
+#~ msgid "Away Messages"
+#~ msgstr "Fraværsbeskjeder"
+
+#~ msgid "Please create an account."
+#~ msgstr "Vennligst lag en konto."
+
+#~ msgid "<b>_Account:</b>"
+#~ msgstr "<b>_Konto:</b>"
+
+#~ msgid "A_ccounts"
+#~ msgstr "Kontoer"
+
+#, fuzzy
+#~ msgid "P_references"
+#~ msgstr "Innstillinger"
+
+#~ msgid "_Sign on"
+#~ msgstr "Logg _på"
+
+#~ msgid ""
+#~ "Gaim %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -a, --acct          display account editor window\n"
+#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
+#~ "specifies\n"
+#~ "                      name of away message to use)\n"
+#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
+#~ "specifies\n"
+#~ "                      account(s) to use, seperated by commas)\n"
+#~ "  -n, --loginwin      don't automatically login; show login window\n"
+#~ "  -u, --user=NAME     use account NAME\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ msgstr ""
+#~ "Gaim %s\n"
+#~ "Bruksmåte: %s [BRUKERVALG]...\n"
+#~ "\n"
+#~ "  -a, --acct          vis redigeringsvindu for kontoer\n"
+#~ "  -w, --away[=MESG]   marker som borte ved pålogging (valgfri MESG er "
+#~ "navnet\n"
+#~ "                      på bortebeskjeden du vil bruke)\n"
+#~ "  -l, --login[=NAME]  logg inn automatisk (valgfri NAME er navnet på\n"
+#~ "                      konto(er) du vil bruke, atskilt av komma)\n"
+#~ "  -n, --loginwin      ikke logg inn automatisk, men vis påloggingsvindu\n"
+#~ "  -u, --user=NAME     bruk kontoen NAME\n"
+#~ "  -f, --file=FILE     bruk filen FILE som konfigurasjonsfil\n"
+#~ "  -d, --debug         skriv avlusningsinfo til stdout\n"
+#~ "  -v, --version       vis versjonsinformasjon og avslutt\n"
+#~ "  -h, --help          vis denne hjelpeteksten og avslutt\n"
+
+#~ msgid "Unable to load preferences"
+#~ msgstr "Kunne ikke åpne innstillinger"
+
+#~ msgid ""
+#~ "Gaim was not able to load your preferences because they are stored in an "
+#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "using the Preferences window."
+#~ msgstr ""
+#~ "Gaim kunne ikke åpne dine instillinger, da de er lagret i et gammelt "
+#~ "format som ikke lenger er i bruk.  Vennligst rekonfigurer dine  "
+#~ "instillinger ved hjelp av innstillingsvinduet"
+
+#~ msgid "Slightly less boring default"
+#~ msgstr "kjedelig standardsvar"
+
+#~ msgid "Available for friends only"
+#~ msgstr "Tilgjengelig bare for venner"
+
+#~ msgid "Away for friends only"
+#~ msgstr "Borte bare for venner"
+
+#~ msgid "Invisible for friends only"
+#~ msgstr "Usynlig bare for venner"
+
+#~ msgid "Error while writing to socket."
+#~ msgstr "Feil under skriving til socket."
+
+#~ msgid "Authentication failed."
+#~ msgstr "Autentisering feilet."
+
+#~ msgid "Unknown Error Code."
+#~ msgstr "Ukjent feilkode."
+
+#~ msgid "Balancer handshake"
+#~ msgstr "Finner ledig tjener"
+
+#~ msgid "Reading server key"
+#~ msgstr "Leser tjenernøkkel"
+
+#~ msgid "Exchanging key hash"
+#~ msgstr "Utveksler nøkkel-hash"
+
+#~ msgid "Critical error in GG library\n"
+#~ msgstr "Kritisk feil i GG-biblioteket\n"
+
+#~ msgid "Unable to ping server"
+#~ msgstr "Kunne ikke pinge tjener"
+
+#~ msgid "Send as message"
+#~ msgstr "Send som beskjed"
+
+#~ msgid "Looking up GG server"
+#~ msgstr "Søker etter GG-tjener"
+
+#~ msgid "Invalid Gadu-Gadu UIN specified"
+#~ msgstr "Ugyldig Gadu-Gadu UIN oppgitt"
+
+#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
+#~ msgstr "Du prøver å sende en beskjed til et ugyldig Gadu-Gadu UIN."
+
+#~ msgid "Couldn't get search results"
+#~ msgstr "Kunne ikke laste ned søkeresultater"
+
+#~ msgid "Sex"
+#~ msgstr "Kjønn"
+
+#~ msgid "Couldn't Import Buddy List from Server"
+#~ msgstr "Kunne ikke importere kontaktliste fra tjeneren"
+
+#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
+#~ msgstr "Kontaktlisten ble overført til Gadu-Gadu-tjeneren"
+
+#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
+#~ msgstr "Kunne ikke overføre kontaktlisten til Gadu-Gadu-tjeneren"
+
+#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
+#~ msgstr "Kontaktlisten ble slettet fra Gadu-Gadu-tjeneren"
+
+#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
+#~ msgstr "Kunne ikke slette kontaktlisten fra Gadu-Gadu-tjeneren"
+
+#~ msgid "Password couldn't be changed"
+#~ msgstr "Passordet kunne ikke endres"
+
+#~ msgid "Error communicating with Gadu-Gadu server"
+#~ msgstr "Feil i kommunikasjonen med Gadu-Gadu-tjeneren"
+
+#~ msgid ""
+#~ "Gaim was unable to complete your request due to a problem communicating "
+#~ "with the Gadu-Gadu HTTP server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim kunne ikke fullføre oppgaven på grunn av kommunikasjonsproblemer med "
+#~ "Gadu-Gadu-HTTP-tjeneren. Vennligst forsøk igjen senere."
+
+#~ msgid "Unable to import Gadu-Gadu buddy list"
+#~ msgstr "Kunne ikke importere Gadu-Gadu-kontaktliste"
+
+#~ msgid ""
+#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
+#~ "try again later."
+#~ msgstr ""
+#~ "Gaim kunne ikke koble til kontaktliste-tjeneren for Gadu-Gadu. Vennligst "
+#~ "forsøk igjen senere."
+
+#~ msgid ""
+#~ "Gaim was unable to connect to the buddy list server.  Please try again "
+#~ "later."
+#~ msgstr ""
+#~ "Gaim kunne ikke koble til kontaktliste-tjeneren. Vennligst forsøk igjen "
+#~ "senere."
+
+#~ msgid "Unable to delete Gadu-Gadu buddy list"
+#~ msgstr "Kunne ikke slette kontaktliste for Gadu-Gadu"
+
+#~ msgid "Unable to access directory"
+#~ msgstr "Fikk ikke tilgang til katalogen"
+
+#~ msgid ""
+#~ "Gaim was unable to search the Directory because it was unable to connect "
+#~ "to the directory server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim kunne ikke søke i katalogen fordi den ikke fikk kontakt med "
+#~ "katalogtjeneren. Vennligst prøv igjen senere."
+
+#~ msgid ""
+#~ "Gaim was unable to change your password due to an error connecting to the "
+#~ "Gadu-Gadu server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim fikk ikke kontakt med Gadu-Gadu-tjeneren og kunne ikke endre "
+#~ "passordet ditt. Vennligst forsøk igjen senere."
+
+#~ msgid "Directory Search"
+#~ msgstr "Katalogsøk"
+
+#~ msgid "Unable to access user profile."
+#~ msgstr "Fikk ikke tilgang til brukerprofilen."
+
+#~ msgid ""
+#~ "Gaim was unable to access this user's profile due to an error connecting "
+#~ "to the directory server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim kunne ikke lese brukerprofilen på grunn av tilkoblingsproblemer mot "
+#~ "katalogtjeneren. Vennligst forsøk igjen senere."
+
+#~ msgid "Gaim encountered an error communicating with the ICQ server."
+#~ msgstr "Det oppstod en feil i kommunikasjonen med ICQ-tjeneren."
+
+#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
+#~ msgstr "Brukeren %s (%s%s%s%s%s) ønsker å bli godkjent av deg."
+
+#~ msgid "Send message through server"
+#~ msgstr "Send beskjed gjennom tjener"
+
+#~ msgid "Nick:"
+#~ msgstr "Kallenavn:"
+
+#~ msgid "Gaim User"
+#~ msgstr "Gaim-bruker"
+
+#~ msgid "File Transfer Aborted"
+#~ msgstr "Filoverføring avbrutt"
+
+#~ msgid "Buddy Information for %s"
+#~ msgstr "Kontaktinformasjon for %s"
+
+#~ msgid "Invalid nickname '%s'"
+#~ msgstr "Ugyldig brukernavn '%s'"
+
+#~ msgid "Jabber Profile"
+#~ msgstr "Jabber-profil"
+
+#
+#~ msgid "Roomlist Error"
+#~ msgstr "Feil ved liste over rom"
+
+#~ msgid "The user %s wants to add you to their buddy list."
+#~ msgstr "Brukeren %s vil legge deg til i sin kontaktliste."
+
+#~ msgid "Display conversation closed notices"
+#~ msgstr "Vis advasler om at samtalen har blitt lukket"
+
+#~ msgid "The conversation has become inactive and timed out."
+#~ msgstr "Samtalen har blitt avsluttet pga. inaktivitet."
+
+#~ msgid ""
+#~ "You were disconnected from the server, because you logged on from a "
+#~ "different location"
+#~ msgstr "Du ble logget av fordi du har logget på et annet sted."
+
+#, fuzzy
+#~ msgid "User Properties"
+#~ msgstr "Brukervalg"
+
+#, fuzzy
+#~ msgid "Transfer of file %s timed out."
+#~ msgstr "Overføring av filen %s er ferdig."
+
+#~ msgid ""
+#~ "You have been disconnected because you have signed on with this screen "
+#~ "name at another location."
+#~ msgstr ""
+#~ "Du ble logget av fordi du har logget på med dette skjermnavnet et annet "
+#~ "sted."
+
+# Gammel "uventet", kansje bedre?
+#, fuzzy
+#~ msgid "Not specified"
+#~ msgstr "Ikke spesifisert"
+
+#~ msgid "ICQ Info for %s"
+#~ msgstr "ICQ-info for %s"
+
+#~ msgid ""
+#~ "Error 0x%04x: Unable to format screen name because the requested screen "
+#~ "name ends in a space."
+#~ msgstr ""
+#~ "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
+#~ "skjermnavnet slutter med et mellomrom."
+
+#~ msgid "I'm doing work and hoping for a distraction--IM me!"
+#~ msgstr "Jeg jobber og håper at noen skal forstyrre - send meg en beskjed!"
+
+#~ msgid "Set Available Message..."
+#~ msgstr "Sett tilstedebeskjed..."
+
+#~ msgid "Failed to leave channel"
+#~ msgstr "Kunne ikke forlate kanalen"
+
+#~ msgid "Basic Profile"
+#~ msgstr "Grunnleggende profil"
+
+#~ msgid "AIM"
+#~ msgstr "AIM"
+
+#~ msgid "ICQ UIN"
+#~ msgstr "ICQ UIN"
+
+#~ msgid "MSN"
+#~ msgstr "MSN"
+
+#~ msgid "Yahoo"
+#~ msgstr "Yahoo"
+
+#~ msgid "I'm From"
+#~ msgstr "Jeg er fra"
+
+#~ msgid "Set your Trepia profile data."
+#~ msgstr "Skriv inn data i din Trepia-profil."
+
+#~ msgid "Visit Homepage"
+#~ msgstr "Besøk hjemmeside"
+
+#~ msgid "Local Users"
+#~ msgstr "Lokale brukere"
+
+#~ msgid "Trepia Protocol Plugin"
+#~ msgstr "Trepia-protokolltillegg"
+
+#~ msgid ""
+#~ "You have been logged off as you have logged in on a different machine or "
+#~ "device."
+#~ msgstr "Du har blitt logget av, da du har logget inn et annet sted"
+
+#~ msgid "Please enter your password"
+#~ msgstr "Skriv inn passord"
+
+#~ msgid "%s logged in."
+#~ msgstr "%s logget inn."
+
+#~ msgid "%s logged out."
+#~ msgstr "%s logget ut."
+
+#~ msgid ""
+#~ "%s has just been warned by %s.\n"
+#~ "Your new warning level is %d%%"
+#~ msgstr ""
+#~ "%s har blitt advart av %s.\n"
+#~ "Ditt nye advarselsnivå er %d%%"
+
+#~ msgid "an anonymous person"
+#~ msgstr "en anonym person"
+
+#~ msgid ""
+#~ "%s has invited %s to the chat room %s:\n"
+#~ "<b>%s</b>"
+#~ msgstr ""
+#~ "Brukeren '%s' inviterer %s til samtalerom: '%s'\n"
+#~ "<b>%s</b>"
+
+#~ msgid "Sorry, I ran out for a bit!"
+#~ msgstr "Borte litt, tilbake om en stund!"
+
+#~ msgid ""
+#~ "Unable to guess the image type based on the file extension supplied.  "
+#~ "Defaulting to PNG."
+#~ msgstr ""
+#~ "Gaim kunne ikke gjette bildetypen ut fra filtypen (siste del av "
+#~ "filnavnet). Antar PNG-format."
+
+#~ msgid "SILC Public Key"
+#~ msgstr "SILC offentlig nøkkel"
+
+#~ msgid "SILC Private Key"
+#~ msgstr "SILC privat nøkkel"
============================================================
--- po/ru.po	c4f03ce8d435abd33977280414ca52af2d1f6368
+++ po/ru.po	aaa079a1979cccceca478ccf651fb2056627b9dd
@@ -9,8 +9,8 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-08-15 11:00+0400\n"
+"POT-Creation-Date: 2007-10-25 11:04+0400\n"
+"PO-Revision-Date: 2007-10-25 16:00+0400\n"
 "Last-Translator: Dmitry Beloglazov <dmaa at users.sf.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgstr ""
 "  -n, --nologin       не входить автоматически\n"
 "  -v, --version       показать текущую версию и выйти\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -59,11 +59,11 @@ msgstr ""
 msgstr ""
 
 #: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:235 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1515
@@ -98,8 +98,8 @@ msgstr ""
 msgid "(You probably forgot to 'make install'.)"
 msgstr ""
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1474 ../pidgin/gtkblist.c:4367
 msgid "Modify Account"
 msgstr "Изменить учётную запись"
 
@@ -129,32 +129,32 @@ msgstr "Псевдоним:"
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:472 ../finch/gntpounce.c:459
+#: ../finch/gntpounce.c:667 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
 #: ../libpurple/account.c:1013 ../libpurple/account.c:1263
 #: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2416
+#: ../libpurple/protocols/jabber/buddy.c:2452
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
 #: ../libpurple/protocols/jabber/jabber.c:1737
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
+#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
+#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/oscar/oscar.c:6148
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -187,29 +187,29 @@ msgstr "Псевдоним:"
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1909
+#: ../pidgin/gtkaccount.c:2496 ../pidgin/gtkblist.c:6321
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:772
+#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
+#: ../pidgin/gtkdialogs.c:1023 ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1158 ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1253 ../pidgin/gtkdialogs.c:1280
 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1108
 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
 #: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
 #: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Отменить"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:472 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
 #: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
 #: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
@@ -217,8 +217,8 @@ msgstr "Сохранить"
 msgid "Save"
 msgstr "Сохранить"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1901
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Вы действительно хотите удалить %s?"
@@ -231,14 +231,14 @@ msgstr "Удалить учётную з
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
 #: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1107 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2326 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Учётные записи"
 
@@ -248,15 +248,16 @@ msgstr "Вы можете включат
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2372
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:713
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2495
+#: ../pidgin/gtkblist.c:6320 ../pidgin/gtkconv.c:1713
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Добавить"
@@ -266,33 +267,33 @@ msgstr "Изменить"
 msgid "Modify"
 msgstr "Изменить"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2442
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s добавил %s в свой список собеседников%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2494
 msgid "Add buddy to your list?"
 msgstr "Добавить собеседника в список?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2552
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s хочет добавить %s в свой список собеседников%s%s"
 
 #: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize buddy?"
 msgstr "Авторизовать собеседника?"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Authorize"
 msgstr "Авторизовать"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
 msgid "Deny"
 msgstr "Отказать"
 
@@ -316,19 +317,19 @@ msgstr "Ошибка добавлениÑ
 msgid "Error adding buddy"
 msgstr "Ошибка добавления собеседника"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2903
+#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Идентификатор пользователя"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
+#: ../libpurple/protocols/msn/msn.c:1509
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1022
+#: ../pidgin/gtkdialogs.c:1046 ../pidgin/gtkdialogs.c:1068
 #: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Псевдоним"
@@ -338,10 +339,11 @@ msgstr "Группа"
 msgstr "Группа"
 
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../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:511 ../pidgin/gtkpounce.c:1275
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Учётная запись"
 
@@ -354,7 +356,7 @@ msgstr "Учётная запись"
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5826
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Добавить собеседника"
@@ -363,15 +365,16 @@ msgstr "Введите информацÐ
 msgid "Please enter buddy information."
 msgstr "Введите информацию о собеседнике."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Чаты"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
+#: ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1690 ../libpurple/protocols/msn/msn.c:1755
+#: ../libpurple/protocols/msn/msn.c:1782
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -383,7 +386,7 @@ msgstr "Присоединяться аÐ
 msgid "Auto-join"
 msgstr "Присоединяться автоматически"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6208
 msgid "Add Chat"
 msgstr "Добавить чат"
 
@@ -405,7 +408,7 @@ msgstr "Группа с таким имÐ
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6317
 msgid "Add Group"
 msgstr "Добавить группу"
 
@@ -429,15 +432,15 @@ msgstr "Изменить настройÐ
 msgid "Edit Settings"
 msgstr "Изменить настройки"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Информация"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Загрузка..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -448,10 +451,10 @@ msgstr "Добавить правило"
 msgstr "Добавить правило"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "Отправить файл"
 
@@ -497,14 +500,14 @@ msgstr "Подтвердить удалÐ
 msgstr "Подтвердить удаление"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Удалить"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2422 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4610
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Список собеседников"
@@ -523,15 +526,15 @@ msgstr "Обратить пометку"
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2399
 #: ../libpurple/protocols/jabber/jabber.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1544
 #: ../libpurple/protocols/jabber/jabber.c:1567
 #: ../libpurple/protocols/jabber/jabber.c:1590
 #: ../libpurple/protocols/jabber/jabber.c:1613
 #: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1517 ../libpurple/protocols/msn/msn.c:1693
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -541,21 +544,21 @@ msgstr "Обратить пометку"
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/bonjour/bonjour.c:354
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2927
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
+#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
 msgid "Idle"
 msgstr "Бездействие"
 
@@ -586,36 +589,26 @@ msgstr ""
 "\n"
 "Последнее появление: %s назад"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Новый..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Сохранённый..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:343 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Модули"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Имя"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Учётная запись"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:766
 msgid "New Instant Message"
 msgstr "Новое мгновенное сообщение"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:768
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
@@ -625,15 +618,15 @@ msgstr ""
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
+#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
 #: ../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:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/oscar/oscar.c:6147
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -650,50 +643,75 @@ msgstr ""
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4366
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:771
+#: ../pidgin/gtkdialogs.c:910 ../pidgin/gtkdialogs.c:1002
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "OK"
 
+#: ../finch/gntblist.c:2270
+msgid "Channel"
+msgstr "Канал"
+
+#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:924
+msgid "Join a Chat"
+msgstr "Присоединиться к чату"
+
+#: ../finch/gntblist.c:2284
+msgid "Please enter the name of the chat you want to join."
+msgstr "Введите имя чата, к которому вы хотите присоединиться."
+
+#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "Присоединиться"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:797
 msgid "Options"
 msgstr "Параметры"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "Отправить мгновенное сообщение..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "Показывать пустые группы"
+#: ../finch/gntblist.c:2334
+msgid "Join Chat..."
+msgstr "Присоединиться к чату..."
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Показывать собеседников не в сети"
+#: ../finch/gntblist.c:2338
+msgid "Show"
+msgstr "Показывать"
 
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Сортировать по статусу"
+#: ../finch/gntblist.c:2343
+msgid "Empty groups"
+msgstr "Пустые группы"
 
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Сортировать по алфавиту"
+#: ../finch/gntblist.c:2349
+msgid "Offline buddies"
+msgstr "Собеседников не в сети"
 
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Сортировать по размеру журнала"
+#: ../finch/gntblist.c:2355
+msgid "Sort"
+msgstr "Сортировать"
 
+#: ../finch/gntblist.c:2360
+msgid "By Status"
+msgstr "По статусу"
+
+#: ../finch/gntblist.c:2364 ../pidgin/gtkblist.c:4151
+msgid "Alphabetically"
+msgstr "По алфавиту"
+
+#: ../finch/gntblist.c:2368
+msgid "By Log Size"
+msgstr "По размеру журнала"
+
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
 msgid "Certificate Import"
-msgstr "Соединяться на порт"
+msgstr "Импорт сертификата"
 
 #: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
@@ -712,7 +730,7 @@ msgid "Certificate Import Error"
 
 #: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "Ошибка импорта сертификата"
 
 #: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
@@ -732,7 +750,7 @@ msgid "Certificate Export Error"
 
 #: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "Ошибка экспорта сертификата"
 
 #: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
@@ -743,9 +761,9 @@ msgstr ""
 msgstr ""
 
 #: ../finch/gntcertmgr.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate for %s"
-msgstr "Статус для %s"
+msgstr "Сертификат для %s"
 
 #: ../finch/gntcertmgr.c:195
 #, c-format
@@ -755,57 +773,62 @@ msgstr ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"Общее имя: %s\n"
+"\n"
+"Отпечаток SHA1:\n"
+"%s"
 
 #: ../finch/gntcertmgr.c:198
+#, fuzzy
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "/Инструменты/_Настройки"
 
 #: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "Действительно удалить сертификат для %s?"
 
 #: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "Подтвердить удаление сертификата"
 
 #: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
 msgid "Certificate Manager"
-msgstr ""
+msgstr "Менеджер сертификатов"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:666
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Имя узла"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Информация"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
+#: ../finch/gntplugin.c:211 ../finch/gntplugin.c:403 ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
 #: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2469
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "Соединение с %s разорвано."
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -814,7 +837,7 @@ msgstr ""
 "and re-enable the account."
 msgstr ""
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4368
 msgid "Re-enable Account"
 msgstr "Повторно включить учётную запись"
 
@@ -822,25 +845,25 @@ msgstr "Нет такой команды
 msgid "No such command."
 msgstr "Нет такой команды."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Синтаксическая ошибка:  Вы ввели неверное количество аргументов для этой "
 "команды."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "Ваша команда не была выполнена по неизвестной причине."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "Эта команда работает только в чатах, не в мгновенных сообщениях."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "Эта команда работает только в мгновенных сообщениях, не в чатах."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "Эта команда не работает с этим протоколом."
 
@@ -861,7 +884,7 @@ msgstr "%s [%s]"
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
 #, c-format
 msgid ""
 "\n"
@@ -874,66 +897,64 @@ msgstr "Ð’Ñ‹ покинули этот Ñ
 msgid "You have left this chat."
 msgstr "Вы покинули этот чат."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Ведение журнала начато. Последующие сообщения в этой беседе будут записаны."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Ведение журнала остановлено. Последующие сообщения в этой беседе не будут "
 "записаны."
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:469
 msgid "Send To"
 msgstr "Адресат"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:513
 msgid "Conversation"
 msgstr "Беседа"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:519
 msgid "Clear Scrollback"
 msgstr "Очистить"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Показывать время сообщений"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:539
 msgid "Add Buddy Pounce..."
 msgstr "Добавить правило..."
 
-#: ../finch/gntconv.c:527
-#, fuzzy
+#: ../finch/gntconv.c:554
 msgid "Enable Logging"
-msgstr "/Параметры/Вести журнал"
+msgstr "Вести журнал"
 
-#: ../finch/gntconv.c:533
-#, fuzzy
+#: ../finch/gntconv.c:560
 msgid "Enable Sounds"
-msgstr "Воспроизводить звуки:"
+msgstr "Воспроизводить звуки"
 
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:766
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:889
 msgid "List of users:\n"
 msgstr "Список пользователей:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "Поддерживаемые параметры отладки:  version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "Нет такой команды (в этом контексте)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -941,7 +962,7 @@ msgstr ""
 "Используйте \"/help &lt;команда&gt;\" для помощи по конкретной команде.\n"
 "Следующие команды доступны в этом контексте:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7688
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -949,12 +970,12 @@ msgstr ""
 "say &lt;сообщение&gt;:  Отправить обычное сообщение, как если бы вы не "
 "использовали команду."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7691
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;действие&gt;:  Отправить действие в стиле IRC собеседнику или в чат."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7694
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -962,43 +983,48 @@ msgstr ""
 "debug &lt;параметр&gt;:  Отправить различную отладочную информацию в текущую "
 "беседу."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7697
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Очистить окно беседы."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7703
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;команда&gt;:  Получить помощь по конкретной команде."
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1163
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Вывести список пользователей в чате."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1168
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Вывести окно модулей."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1171
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Вывести список собеседников."
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1174
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Вывести окно учётных записей."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1177
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Вывести окно отладки."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1180
 msgid "prefs: Show the preference window."
 msgstr "prefs: Вывести окно настроек."
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Вывести окно сохранённых статусов."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "Не удаётся открыть файл."
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Окно отладки"
 
@@ -1006,15 +1032,16 @@ msgstr "Окно отладки"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Очистить"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
+#: ../finch/gntdebug.c:303
+#, fuzzy
+msgid "Filter:"
 msgstr "Фильтр: "
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Пауза"
 
@@ -1051,24 +1078,24 @@ msgstr "Осталось"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/bonjour/bonjour.c:358
 #: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
 #: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/msn/msn.c:597 ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/novell/novell.c:2840
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:2715
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
+#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
 #: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Статус"
@@ -1112,7 +1139,7 @@ msgstr "Завершено"
 msgid "Finished"
 msgstr "Завершено"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:388
 msgid "Transferring"
 msgstr "Передача"
 
@@ -1120,19 +1147,19 @@ msgstr "Адреса e-mail"
 msgid "Emails"
 msgstr "Адреса e-mail"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Вам пришла почта!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:518
 msgid "Sender"
 msgstr "Отправитель"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:525
 msgid "Subject"
 msgstr "Тема"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
@@ -1140,53 +1167,49 @@ msgstr[2] "%s (%s) имеет %d новÑ
 msgstr[1] "%s (%s) имеет %d новых сообщения."
 msgstr[2] "%s (%s) имеет %d новых сообщений."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "Новая почта"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:948
 #, c-format
 msgid "Info for %s"
 msgstr "Информация для %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:949
 msgid "Buddy Information"
 msgstr "Информация о собеседнике"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Продолжить"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "Мгновенное сообщение"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "Присоединиться"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Пригласить"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(нет)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:76 ../finch/gntplugin.c:85
 msgid "ERROR"
-msgstr ""
+msgstr "ОШИБКА"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:76
 msgid "loading plugin failed"
-msgstr ""
+msgstr "не удалось загрузить модуль"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:85
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "не удалось выгрузить модуль"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:130
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1203,19 +1226,42 @@ msgstr ""
 "Веб-сайт: %s\n"
 "Имя файла: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:188
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Модуль необходимо загрузить перед его настройкой."
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:236
 msgid "No configuration options for this plugin."
 msgstr "Этот модуль не имеет настраиваемых параметров."
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:257
+msgid "Error loading plugin"
+msgstr "Ошибка загрузки модуля"
+
+#: ../finch/gntplugin.c:258
+msgid "The selected file is not a valid plugin."
+msgstr "Выбранный файл не является допустимым модулем."
+
+#: ../finch/gntplugin.c:259
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Откройте окно отладки и повторите попытку, чтобы увидеть точное сообщение об "
+"ошибке."
+
+#: ../finch/gntplugin.c:322
+msgid "Select plugin to install"
+msgstr "Выберите модуль для установки"
+
+#: ../finch/gntplugin.c:348
 msgid "You can (un)load plugins from the following list."
 msgstr "Вы можете загружать/выгружать модули из следующего списка."
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:399
+msgid "Install Plugin..."
+msgstr "Установить модуль..."
+
+#: ../finch/gntplugin.c:408
 msgid "Configure Plugin"
 msgstr "Настроить модуль"
 
@@ -1224,8 +1270,8 @@ msgstr "Настроить модуль"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:464 ../finch/gntplugin.c:471 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2069
 msgid "Preferences"
 msgstr "Настройки"
 
@@ -1233,11 +1279,11 @@ msgstr "Введите собеседнÐ
 msgid "Please enter a buddy to pounce."
 msgstr "Введите собеседника для слежения."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Новое правило"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Изменить правило"
 
@@ -1255,7 +1301,7 @@ msgstr "Имя собеседника:"
 msgstr "Имя собеседника:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Выполнять, когда собеседник..."
 
@@ -1300,7 +1346,7 @@ msgstr "Отправляет сообщÐ
 msgstr "Отправляет сообщение"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Действие"
 
@@ -1328,84 +1374,83 @@ msgstr "Выполнять только 
 msgid "Pounce only when my status is not available"
 msgstr "Выполнять только при статусе, отличном от \"Доступен\""
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1288
 msgid "Recurring"
 msgstr "Повторение"
 
 #: ../finch/gntpounce.c:618
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "Не удаётся изменить псевдоним"
+msgstr "Не удаётся создать правило"
 
 #: ../finch/gntpounce.c:619
-#, fuzzy
 msgid "You do not have any accounts."
-msgstr "Вы должны выбрать учётную запись."
+msgstr "У вас нет ни одной учётной записи."
 
 #: ../finch/gntpounce.c:620
+#, fuzzy
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "Вы должны создать учётную запись перед тем, как создавать правило."
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1103
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Вы действительно хотите удалить правило %s для %s?"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1332
 msgid "Buddy Pounces"
 msgstr "Правила"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s начал набор сообщения для вас (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s приостановил набор сообщения для вас (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s в сети (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s перестал бездействовать (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s вернулся (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s прекратил набор сообщения для вас (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1471
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s не в сети (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1473
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s начал бездействовать (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1475
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s отошёл (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1477
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s отправил вам сообщение (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Неизвестное событие слежения. Сообщите об этом!"
@@ -1414,12 +1459,12 @@ msgstr "Основываясь на ис
 msgid "Based on keyboard use"
 msgstr "Основываясь на использовании клавиатуры"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
 msgid "From last sent message"
 msgstr "С момента последней отправки сообщения"
 
 #: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Никогда"
@@ -1469,25 +1514,25 @@ msgstr "Менять статус на"
 msgstr "Менять статус на"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Беседы"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
 msgid "Logging"
 msgstr "Журналы"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "Ещё не реализовано."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1555
 #: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Сохранить файл..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556
 #: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Открыть файл..."
@@ -1532,16 +1577,16 @@ msgstr "Кто-то произносит
 msgid "Someone says your screen name in chat"
 msgstr "Кто-то произносит ваше имя в чате"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:308
 msgid "GStreamer Failure"
 msgstr "Ошибка GStreamer"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:309
 msgid "GStreamer failed to initialize."
 msgstr "Не удалось инициализировать GStreamer."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
+#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1557,7 +1602,7 @@ msgstr "Профили"
 msgid "Profiles"
 msgstr "Профили"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
 msgid "Automatic"
 msgstr "Автоматически"
 
@@ -1565,7 +1610,7 @@ msgstr "Сигнал динамиком"
 msgid "Console Beep"
 msgstr "Сигнал динамиком"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
 msgid "Command"
 msgstr "Команда"
 
@@ -1573,7 +1618,7 @@ msgstr "Нет звука"
 msgid "No Sound"
 msgstr "Нет звука"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
 msgid "Sound Method"
 msgstr "Метод воспроизведения звука"
 
@@ -1591,7 +1636,7 @@ msgstr ""
 "(%s для имени файла)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
 msgid "Sound Options"
 msgstr "Параметры звука"
 
@@ -1600,17 +1645,17 @@ msgstr "Звуки, когда окно 
 msgstr "Звуки, когда окно беседы в фокусе"
 
 #: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Всегда"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
 msgid "Only when available"
 msgstr "Только во время присутствия"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
 msgid "Only when not available"
 msgstr "Только во время отсутствия"
 
@@ -1619,11 +1664,11 @@ msgstr "Громкость(0-100):"
 msgstr "Громкость(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
 msgid "Sound Events"
 msgstr "Звуковые события"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
 msgid "Event"
 msgstr "Событие"
 
@@ -1631,15 +1676,15 @@ msgstr "Файл"
 msgid "File"
 msgstr "Файл"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
 msgid "Test"
 msgstr "Тест"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
 msgid "Reset"
 msgstr "Сброс"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
 msgid "Choose..."
 msgstr "Выбрать..."
 
@@ -1659,7 +1704,7 @@ msgstr "Сохранённые статÑ
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1486
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Название"
@@ -1677,9 +1722,9 @@ msgstr "Тип"
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/bonjour/bonjour.c:270
+#: ../libpurple/protocols/bonjour/bonjour.c:277
+#: ../libpurple/protocols/bonjour/bonjour.c:360
 #: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
 #: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
@@ -1690,26 +1735,29 @@ msgstr "Тип"
 #: ../libpurple/protocols/jabber/jabber.c:1601
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../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
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../libpurple/protocols/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:5608
+#: ../libpurple/protocols/oscar/oscar.c:5826
+#: ../libpurple/protocols/oscar/oscar.c:5840
+#: ../libpurple/protocols/oscar/oscar.c:5856
+#: ../libpurple/protocols/oscar/oscar.c:5863
+#: ../libpurple/protocols/oscar/oscar.c:5870
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
@@ -1763,9 +1811,9 @@ msgid "Certificates"
 
 #: ../finch/gntui.c:85
 msgid "Certificates"
-msgstr ""
+msgstr "Сертификаты"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
 msgid "Sounds"
 msgstr "Звуки"
 
@@ -1775,19 +1823,17 @@ msgstr "Статусы"
 
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "При выгрузке модуля произошли ошибки."
+msgstr "Ошибка загрузки модуля."
 
 #: ../finch/plugins/gntclipboard.c:116
 #, fuzzy
 msgid "Couldn't find X display"
-msgstr "Не удалось открыть файл"
+msgstr "Не удалось найти "
 
 #: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "Не удалось открыть файл"
+msgstr "Не удалось найти окно"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
@@ -1868,16 +1914,16 @@ msgstr "Модуль уведомленÐ
 msgid "Toaster plugin"
 msgstr "Модуль уведомлений"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Беседа с %s на %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Модуль истории требует ведения журнала"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1893,11 +1939,11 @@ msgstr "Gnt-история"
 msgid "GntHistory"
 msgstr "Gnt-история"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Показывает записи недавних бесед в новых беседах."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1949,7 +1995,7 @@ msgstr "Отсутствует модуÐ
 msgstr "Отсутствует модуль протокола для %s"
 
 #: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkblist.c:4363
 msgid "Connection Error"
 msgstr "Ошибка соединения"
 
@@ -1994,16 +2040,16 @@ msgstr "Установить пользÐ
 
 #: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3250 ../pidgin/gtkblist.c:5716
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2013,58 +2059,59 @@ msgstr "список собеседниÐ
 msgid "buddy list"
 msgstr "список собеседников"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(НЕ СОВПАДАЕТ)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr ""
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"Общее имя: %s %s\n"
+"Отпечаток (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Разовая проверка сертификата"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:885
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "Органы сертификации"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1053
 msgid "SSL Peers Cache"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
+#: ../libpurple/certificate.c:1184
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "Принять приглашение в чат?"
+msgstr "Принять сертификат для %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1190
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "Проверка SSL-сертификата"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
-#, fuzzy
+#: ../libpurple/certificate.c:1199
 msgid "Accept"
-msgstr "_Принять"
+msgstr "Принять"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1200 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:90
@@ -2072,15 +2119,16 @@ msgstr "Отвергнуть"
 msgid "Reject"
 msgstr "Отвергнуть"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1201
+#, fuzzy
 msgid "_View Certificate..."
-msgstr ""
+msgstr "Просмотреть сертификат..."
 
 #. Prompt the user to authenticate the certificate
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1301
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2089,14 +2137,14 @@ msgstr ""
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1326
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
 
-#: ../libpurple/certificate.c:1331
+#: ../libpurple/certificate.c:1344
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr ""
@@ -2106,30 +2154,28 @@ msgstr ""
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
-#, fuzzy
+#: ../libpurple/certificate.c:1352 ../libpurple/certificate.c:1421
 msgid "SSL Certificate Error"
-msgstr "Ошибка записи"
+msgstr "Ошибка SSL-сертификата"
 
-#: ../libpurple/certificate.c:1340
-#, fuzzy
+#: ../libpurple/certificate.c:1353
 msgid "Invalid certificate chain"
-msgstr "Неверное название"
+msgstr "Неверная цепочка сертификатов"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1373
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
+#: ../libpurple/certificate.c:1396
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 
-#: ../libpurple/certificate.c:1408
+#: ../libpurple/certificate.c:1413
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2137,12 +2183,12 @@ msgstr ""
 "signature."
 msgstr ""
 
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1422
 msgid "Invalid certificate authority signature"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1886
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2152,12 +2198,17 @@ msgstr ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Общее имя: %s\n"
+"\n"
+"Отпечаток (SHA1): %s\n"
+"\n"
+"Дата активации: %s\n"
+"Дата истечения срока действия: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-#, fuzzy
+#: ../libpurple/certificate.c:1895
 msgid "Certificate Information"
-msgstr "Информация о сервере"
+msgstr "Информация о сертификате"
 
 #: ../libpurple/connection.c:107
 msgid "Registration Error"
@@ -2179,9 +2230,9 @@ msgstr "+++ %s вышел"
 msgstr "+++ %s вышел"
 
 #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/protocols/jabber/buddy.c:2340
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:363
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -2256,7 +2307,7 @@ msgstr "Не удалось получи
 msgid "Failed to get serv name: %s"
 msgstr "Не удалось получить имя сервера: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 
@@ -2272,7 +2323,7 @@ msgstr "Не удаётся отправ
 msgid "Unable to send request to resolver process\n"
 msgstr "Не удаётся отправить запрос разрешителю имён\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2281,8 +2332,8 @@ msgstr ""
 "Ошибка разрешения имени %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Ошибка разрешения имени %s: %d"
@@ -2301,12 +2352,12 @@ msgstr "EOF при чтении из пÑ
 msgid "EOF while reading from resolver process"
 msgstr "EOF при чтении из процесса разрешителя имён"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Ошибка создания нити: %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Причина неизвестна"
 
@@ -2741,14 +2792,14 @@ msgstr "_Сохранить"
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:1456
+#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2297
+#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:6221
+#: ../libpurple/protocols/oscar/oscar.c:6291 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
 msgid "_Cancel"
 msgstr "О_тменить"
 
@@ -2790,8 +2841,8 @@ msgstr ""
 "файлов\n"
 "(только при отсутствии беседы с отправителем)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1766
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "Notes"
 msgstr "Заметки"
 
@@ -3015,111 +3066,119 @@ msgstr ""
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Пользователь не в сети."
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Автоматический отклик отправлен:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s не в сети."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Одно или несколько сообщений могли быть недоставленными."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Вы были отсоединены от сервера."
 
-#: ../libpurple/plugins/log_reader.c:1628
+#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1643
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "Сообщение не может быть отправлено, так как был превышен максимальный размер."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Сообщение не может быть отправлено."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr ""
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "Основные настройки системы чтения журналов"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Быстрое вычисление размера"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Каталог журнала"
 
@@ -3129,21 +3188,21 @@ msgstr "Каталог журнала"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Система чтения журналов"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Включает журналы других клиентов обмена сообщениями в систему просмотра "
 "журналов."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3219,9 +3278,9 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/novell/novell.c:1919
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
@@ -3231,9 +3290,9 @@ msgstr "Да"
 msgstr "Да"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/novell/novell.c:1920
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
@@ -3339,8 +3398,8 @@ msgstr "Проверяет, всё ли 
 msgstr "Проверяет, всё ли работает."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr ""
 
@@ -3350,7 +3409,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3358,8 +3417,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "Предоставляет поддержку SSL посредством GNUTLS."
 
@@ -3369,7 +3428,7 @@ msgstr "Предоставляет поÐ
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3377,8 +3436,8 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Предоставляет поддержку SSL посредством Mozilla NSS."
 
@@ -3464,51 +3523,58 @@ msgstr ""
 "Уведомляет в окне беседы, когда собеседник отходит или возвращается, "
 "начинает или перестаёт бездействовать."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Загрузчик модулей Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Предоставляет поддержку модулей на языке Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
+#: ../libpurple/protocols/bonjour/bonjour.c:107
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr ""
+
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:124
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Не удаётся прослушивать входящие соединения\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:149
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Не удаётся установить соединение с локальным mDNS-сервером. Он работает?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/bonjour/bonjour.c:670
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Имя"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/bonjour/bonjour.c:367
+#: ../libpurple/protocols/bonjour/bonjour.c:673
 #: ../libpurple/protocols/gg/gg.c:627
 #: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Фамилия"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:371
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3517,13 +3583,13 @@ msgstr "E-mail"
 msgid "E-Mail"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:374
+#: ../libpurple/protocols/bonjour/bonjour.c:679
 msgid "AIM Account"
 msgstr "Учётная запись AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:377
+#: ../libpurple/protocols/bonjour/bonjour.c:682
 msgid "XMPP Account"
 msgstr "Учётная запись XMPP"
 
@@ -3537,16 +3603,16 @@ msgstr "Учётная запись XMPP
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:481
+#: ../libpurple/protocols/bonjour/bonjour.c:483
 msgid "Bonjour Protocol Plugin"
 msgstr "Модуль протокола Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:624
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/bonjour/bonjour.c:676
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/jabber/jabber.c:932
 #: ../libpurple/protocols/silc/silc.c:770
@@ -3566,32 +3632,32 @@ msgstr "%s закрыл беседу."
 msgstr "%s закрыл беседу."
 
 #: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:662
+#: ../libpurple/protocols/bonjour/jabber.c:680
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не удаётся отправить сообщение, не удалось начать беседу."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:585
 msgid "Cannot open socket"
 msgstr "Не удаётся открыть сокет"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:593
 msgid "Error setting socket options"
 msgstr "Ошибка установки параметров сокета"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:617
 msgid "Could not bind socket to port"
 msgstr "Не удалось связать сокет с портом"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:625
 msgid "Could not listen on socket"
 msgstr "Не удалось осуществить прослушивание сокета"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "Неверные настройки прокси"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3689,8 +3755,8 @@ msgstr "Заполните следуюÑ
 #: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
 #: ../libpurple/protocols/gg/gg.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Город"
@@ -3699,9 +3765,9 @@ msgstr "Год рождения"
 msgid "Year of birth"
 msgstr "Год рождения"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1695
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../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
@@ -3714,14 +3780,14 @@ msgstr "Мужчина или женщи
 msgstr "Мужчина или женщина"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Мужчина"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3781,26 +3847,26 @@ msgstr "Добавить к чату..."
 msgstr "Добавить к чату..."
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5658
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Не в сети"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/novell/novell.c:2821
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Доступен"
 
@@ -3809,32 +3875,32 @@ msgstr "Доступен"
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
+#: ../libpurple/protocols/oscar/oscar.c:4562
+#: ../libpurple/protocols/oscar/oscar.c:5686
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1941
 #: ../pidgin/gtkstatusbox.c:1058
 #, c-format
 msgid "Away"
 msgstr "Отошёл"
 
 #: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/oscar/oscar.c:2714
+#: ../libpurple/protocols/oscar/oscar.c:3714
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3845,7 +3911,7 @@ msgstr "Год рождения"
 msgstr "Год рождения"
 
 #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/oscar/oscar.c:3926
 msgid "Unable to display the search results."
 msgstr "Не удаётся отобразить результаты поиска."
 
@@ -3889,7 +3955,7 @@ msgstr "Не удалось устано
 msgid "Connection failed."
 msgstr "Не удалось установить соединение."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:622
 msgid "Blocked"
 msgstr "Заблокирован"
 
@@ -4027,7 +4093,7 @@ msgstr "MOTD для %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/myspace/myspace.c:2361
 msgid "Server has disconnected"
 msgstr "Сервер разорвал соединение"
 
@@ -4053,14 +4119,14 @@ msgstr "Псевдонимы IRC не м
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/msn/session.c:386
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/simple/simple.c:1732
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Соединение"
@@ -4074,20 +4140,20 @@ msgstr "Поддержка SSL недоÑ
 #. TODO: try other ports if in auto mode, then save
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/myspace/myspace.c:318
+#: ../libpurple/protocols/simple/simple.c:465
+#: ../libpurple/protocols/simple/simple.c:1647
 msgid "Couldn't create socket"
 msgstr "Не удалось создать сокет"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/myspace/myspace.c:2474
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "Не удалось соединиться с узлом"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "Read error"
 msgstr "Ошибка чтения"
 
@@ -4127,22 +4193,22 @@ msgstr "Наименее плохой м
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../libpurple/protocols/msn/msn.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:6725
 #: ../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:1896
+#: ../libpurple/protocols/simple/simple.c:1919
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Сервер"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:6728
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4214,7 +4280,7 @@ msgstr " <i>(идентифицировÐ
 msgstr " <i>(идентифицирован)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3715
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4313,28 +4379,28 @@ msgstr "Только по приглаш
 msgid "Invitation only"
 msgstr "Только по приглашению"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Вы были удалены оператором %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Удалён оператором %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "режим (%s %s) установлен %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "Неверный псевдоним"
 
-#: ../libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:913
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4342,7 +4408,7 @@ msgstr ""
 "Выбранный вами псевдоним был отвергнут сервером. Вероятно, он содержит "
 "недопустимые символы."
 
-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:918
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4350,44 +4416,44 @@ msgstr ""
 "Выбранное вами имя учётной записи было отвергнуто сервером. Вероятно, оно "
 "содержит недопустимые символы."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "Не удаётся изменить псевдоним"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "Не удалось изменить псевдоним"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Вы покинули канал%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "Ошибка: неверный PONG с сервера"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Ответ PING -- задержка: %lu секунд"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Не удаётся присоединиться к %s: Требуется регистрация."
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Не удаётся присоединиться к каналу"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Псевдоним или канал временно недоступен."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
@@ -4491,7 +4557,7 @@ msgstr ""
 "канале."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой псевдоним."
 
@@ -4597,21 +4663,21 @@ msgstr ""
 "whowas &lt;псевдоним&gt;:  Получить информацию о пользователе, вышедшем из "
 "сети."
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Время ответа от %s: %lu секунд"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "Ответ CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:632
+#: ../libpurple/protocols/irc/parse.c:636 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -4626,14 +4692,12 @@ msgstr "Неизвестная ошибÐ
 
 #: ../libpurple/protocols/jabber/adhoccommands.c:139
 #: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "Команда отключена"
+msgstr ""
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
-#, fuzzy
+#: ../libpurple/protocols/jabber/adhoccommands.c:176
 msgid "execute"
-msgstr "Не предусмотрено"
+msgstr "выполнить"
 
 #: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
@@ -4777,15 +4841,15 @@ msgstr "Должность"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/oscar/oscar.c:3764
 msgid "Birthday"
 msgstr "Дата рождения"
 
 #: ../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:3116
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3314
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Описание"
@@ -4819,9 +4883,8 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
 msgid "Service Discovery Info"
-msgstr "Установить информацию каталога"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
@@ -4836,9 +4899,8 @@ msgstr "Дополнительный аÐ
 
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
 msgid "Multi-User Chat"
-msgstr "Псевдоним чата"
+msgstr "Многопользовательский чат"
 
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
@@ -4853,9 +4915,8 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
 msgid "Ad-Hoc Commands"
-msgstr "Команда"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
@@ -4874,45 +4935,38 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:837
 #: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
 msgid "XHTML-IM"
-msgstr "HTML"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
 msgid "In-Band Registration"
-msgstr "Ошибка регистрации"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
 msgid "User Location"
-msgstr "Местоположение"
+msgstr "Местоположение пользователя"
 
 #: ../libpurple/protocols/jabber/buddy.c:843
 #: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
 msgid "User Avatar"
-msgstr "Поиск пользователей"
+msgstr "Аватара пользователя"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "Уведомление о статусе собеседника"
+msgstr "Уведомления о состоянии чата"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
 msgid "Software Version"
-msgstr "Неподдерживаемая версия"
+msgstr "Версия программного обеспечения"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
 msgid "Stream Initiation"
-msgstr "Ориентация"
+msgstr "Создание потока"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
@@ -4956,21 +5010,18 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-#, fuzzy
 msgid "Reachability Address"
-msgstr "Адрес e-mail"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
 msgid "User Profile"
-msgstr "Профиль"
+msgstr "Профиль пользователя"
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-#, fuzzy
 msgid "Jingle"
-msgstr "Присоединиться"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
@@ -4979,9 +5030,8 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
 msgid "User Nickname"
-msgstr "Имя пользователя"
+msgstr "Псевдоним пользователя"
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
@@ -5000,9 +5050,8 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
 msgid "Jingle Video"
-msgstr "Живое видео"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
@@ -5023,27 +5072,23 @@ msgstr "Файл публичного к
 
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
 msgid "User Chatting"
-msgstr "Параметры пользователя"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-#, fuzzy
 msgid "User Browsing"
-msgstr "Режимы пользователя"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-#, fuzzy
 msgid "User Gaming"
-msgstr "Имя пользователя"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-#, fuzzy
 msgid "User Viewing"
-msgstr "Предел количества пользователей"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
@@ -5097,7 +5142,7 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Capabilities"
 msgstr "Возможности"
 
@@ -5124,8 +5169,8 @@ msgstr "Отчество"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
 #: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5144,112 +5189,112 @@ msgstr "Логотип"
 msgid "Logo"
 msgstr "Логотип"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Показаться для"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Временно скрыться от"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Отменить уведомление о присутствии"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "(Повторно) Запросить авторизацию"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
+#: ../libpurple/protocols/jabber/buddy.c:1988
 #, fuzzy
 msgid "Log In"
 msgstr "В сети"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
+#: ../libpurple/protocols/jabber/buddy.c:1992
 #, fuzzy
 msgid "Log Out"
 msgstr "Записывать чаты"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/buddy.c:2038
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Готов пообщаться"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Расширенный \"Отошёл\""
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
+#: ../libpurple/protocols/jabber/buddy.c:2044
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../libpurple/protocols/oscar/oscar.c:5862
 #: ../libpurple/protocols/sametime/sametime.c:3297
 #, c-format
 msgid "Do Not Disturb"
 msgstr "Не беспокоить"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/oscar/oscar.c:3726
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "Следующее является результатами вашего поиска"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2322
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2342
 msgid "Directory Query Failed"
 msgstr "Не удалось опросить каталог"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2343
 msgid "Could not query the directory server."
 msgstr "Не удалось опросить сервер каталога."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Инструкции сервера: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2384
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "E-Mail Address"
 msgstr "Адрес e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2414
 msgid "Search for XMPP users"
 msgstr "Искать пользователей XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2415
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5261,24 +5306,24 @@ msgstr "Искать"
 msgid "Search"
 msgstr "Искать"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2430
 msgid "Invalid Directory"
 msgstr "Неверный каталог"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2447
 msgid "Enter a User Directory"
 msgstr "Введите каталог пользователей"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Select a user directory to search"
 msgstr "Выберите каталог пользователей для поиска"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2451
 msgid "Search Directory"
 msgstr "Поиск в каталоге"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5346
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Комната:"
@@ -5389,9 +5434,9 @@ msgstr "Ошибка чтения"
 msgstr "Ошибка чтения"
 
 #: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5456,8 +5501,8 @@ msgstr "Уже зарегистрироÐ
 msgstr "Уже зарегистрировано"
 
 #: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "State"
 msgstr "Область"
 
@@ -5515,9 +5560,8 @@ msgstr "Зарегистрировать
 msgstr "Зарегистрировать новую учётную запись XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
 msgid "Change Registration"
-msgstr "Менять статус на"
+msgstr "Изменить регистрацию"
 
 #: ../libpurple/protocols/jabber/jabber.c:1120
 #: ../libpurple/protocols/jabber/jabber.c:1121
@@ -5535,12 +5579,11 @@ msgstr "Инициализация поÑ
 msgstr "Инициализация потока"
 
 #: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "Инициализация потока"
+msgstr "Инициализация SSL/TLS"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:392
 msgid "Authenticating"
 msgstr "Аутентификация"
 
@@ -5553,7 +5596,7 @@ msgstr "Повторная инициаÐ
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5656
 msgid "Not Authorized"
 msgstr "Не авторизован"
 
@@ -5594,7 +5637,7 @@ msgstr "Подписка"
 #: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/jabber/jabber.c:1602
 #: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
+#: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1212
 #: ../libpurple/protocols/silc10/buddy.c:1557
@@ -5607,9 +5650,8 @@ msgstr "Настроение"
 #: ../libpurple/protocols/jabber/jabber.c:1580
 #: ../libpurple/protocols/jabber/jabber.c:1603
 #: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
 msgid "Mood Text"
-msgstr "Группа крови"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/jabber.c:1535
 #: ../libpurple/protocols/jabber/jabber.c:1558
@@ -5722,7 +5764,7 @@ msgstr "Введите новый пар
 msgstr "Введите новый пароль"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6442
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -5730,7 +5772,7 @@ msgstr "Установить пользÐ
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/oscar/oscar.c:6453
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -5975,86 +6017,104 @@ msgstr "Не удаётся выгнат
 msgid "Unable to ping user %s"
 msgstr "Не удаётся выгнать пользователя %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+#: ../libpurple/protocols/jabber/jabber.c:2203
+#: ../libpurple/protocols/jabber/jabber.c:2214
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2209
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
+#: ../libpurple/protocols/jabber/jabber.c:2240
 #, fuzzy, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
 "Не удаётся отправить файл для %s, пользователь не поддерживает приём файлов"
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:2262
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+msgid "Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2263
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#, c-format
+msgid "%s has buzzed you!"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2264
+#: ../libpurple/protocols/yahoo/yahoo.c:4123
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2296
 msgid "config:  Configure a chat room."
 msgstr "config:  Настроить комнату."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Настроить комнату."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "part [room]:  Leave the room."
 msgstr "part [комната]:  Покинуть комнату."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2314
 msgid "register:  Register with a chat room."
 msgstr "register:  Зарегистрировать комнату."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2320
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [новая тема]:  Просмотреть или изменить тему."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;пользователь&gt; [комната]:  Выгнать пользователя из комнаты."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#: ../libpurple/protocols/jabber/jabber.c:2332
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2338
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;пользователь&gt; [сообщение]:  Пригласить пользователя в комнату."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;комната&gt; [сервер]:  Присоединиться к чату на этом сервере."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2356
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;пользователь&gt; [комната]:  Удалить пользователя из комнаты."
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;пользователь&gt; &lt;сообщение&gt;:  Отправить пользователю личное "
 "сообщение."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2372
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
@@ -6080,7 +6140,7 @@ msgid "Require SSL/TLS"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:210
 msgid "Require SSL/TLS"
-msgstr ""
+msgstr "Требовать SSL/TLS"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
@@ -6091,8 +6151,8 @@ msgstr "Разрешить идентиÑ
 msgstr "Разрешить идентификацию простым текстом через нешифрованные потоки"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/myspace/myspace.c:3283
+#: ../libpurple/protocols/simple/simple.c:1925
 msgid "Connect port"
 msgstr "Соединяться на порт"
 
@@ -6100,7 +6160,7 @@ msgstr "Соединяться на по
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
+#: ../libpurple/protocols/myspace/myspace.c:3280
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -6135,12 +6195,6 @@ msgstr "Ошибка сообщения 
 msgid "XMPP Message Error"
 msgstr "Ошибка сообщения XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s в сети."
-
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6150,16 +6204,16 @@ msgstr "Ошибка разбора XML"
 msgid "XML Parse error"
 msgstr "Ошибка разбора XML"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:423
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:504
+#: ../libpurple/protocols/jabber/presence.c:505
 msgid "Create New Room"
 msgstr "Создать новую комнату"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:506
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6167,20 +6221,20 @@ msgstr ""
 "Вы создаёте новую комнату. Хотите настроить её или принять установки по "
 "умолчанию?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:512
 msgid "_Configure Room"
 msgstr "_Настроить комнату"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:513
 msgid "_Accept Defaults"
 msgstr "_Принять установки по умолчанию"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:555
 #, c-format
 msgid "Error in chat %s"
 msgstr "Ошибка в чате %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Ошибка присоединения к чату %s"
@@ -6222,26 +6276,23 @@ msgstr "Выбрать ресурс"
 msgid "Select a Resource"
 msgstr "Выбрать ресурс"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
-msgstr "Режимы пользователя"
+msgstr ""
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
 msgid "Set"
-msgstr "_Установить"
+msgstr "Установить"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
-msgstr "Отправить мгновенное сообщение..."
+msgstr ""
 
 #: ../libpurple/protocols/jabber/usernick.c:76
 #, fuzzy
@@ -6259,27 +6310,36 @@ msgstr ""
 "something appropriate."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:99
+#: ../libpurple/protocols/jabber/usernick.c:100
 #, fuzzy
 msgid "Set Nickname..."
 msgstr "Псевдоним"
 
 #: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
 msgid "Actions"
-msgstr "Действие"
+msgstr "Действия"
 
 #: ../libpurple/protocols/jabber/xdata.c:380
 #, fuzzy
 msgid "Select an action"
 msgstr "Выбрать файл"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:163
+#, fuzzy
+msgid "Unable to connect to contact server"
+msgstr "Не удаётся соединиться с сервером."
+
+#: ../libpurple/protocols/msn/contact.c:923
+#, fuzzy
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Не удаётся загрузить список собеседников"
+
+#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Проблема с синхронизацией списка собеседников в %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6288,7 +6348,7 @@ msgstr ""
 "%s в локальном списке в группе \"%s\", но не в списке на сервере. Хотите "
 "добавить этого собеседника?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6537,10 +6597,10 @@ msgstr "Сервер слишком за
 msgstr "Сервер слишком занят"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
+#: ../libpurple/protocols/oscar/oscar.c:1383
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 #, c-format
 msgid "Authentication failed"
 msgstr "Аутентификация завершилась неудачно"
@@ -6585,9 +6645,9 @@ msgstr ""
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s в сети."
+msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:132
 #, c-format
@@ -6598,365 +6658,369 @@ msgstr "Ваше новое дружес
 msgid "Your new MSN friendly name is too long."
 msgstr "Ваше новое дружеское имя MSN слишком велико."
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:286
 msgid "Set your friendly name."
 msgstr "Введите ваше дружеское имя."
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:287
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Это имя, под которым вас будут видеть другие пользователи MSN."
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:305
 msgid "Set your home phone number."
 msgstr "Введите номер вашего домашнего телефона."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Set your work phone number."
 msgstr "Введите номер вашего рабочего телефона."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339
 msgid "Set your mobile phone number."
 msgstr "Введите номер вашего мобильного телефона."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:355
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:361
 msgid "Allow"
 msgstr "Разрешить"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362
 msgid "Disallow"
 msgstr "Запретить"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378
 msgid "This Hotmail account may not be active."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:404
 msgid "Send a mobile message."
 msgstr "Отправить мобильное сообщение."
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406
 msgid "Page"
 msgstr "Страница"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr ""
+#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:643 ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:657 ../libpurple/protocols/msn/msn.c:663
+#: ../libpurple/protocols/msn/msn.c:669
+#, fuzzy
+msgid "Current media"
+msgstr "Текущий маркер"
 
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Скоро вернусь"
 
-#: ../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/msn/msn.c:655 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
 #: ../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:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Занят"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Разговариваю по телефону"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "Пошёл перекусить"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "Set Friendly Name..."
 msgstr "Ввести дружеское имя..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:703
 msgid "Set Home Phone Number..."
 msgstr "Ввести номер домашнего телефона..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:707
 msgid "Set Work Phone Number..."
 msgstr "Ввести номер рабочего телефона..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:711
 msgid "Set Mobile Phone Number..."
 msgstr "Ввести номер мобильного телефона..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:717
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Разрешить/запретить мобильные устройства..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:722
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Разрешить/запретить мобильные страницы..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:733
 msgid "Open Hotmail Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:757
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:767
+#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "Создать _чат"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:805
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL."
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:833
 msgid "Failed to connect to server."
 msgstr "Не удалось соединиться с сервером."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1621 ../libpurple/protocols/msn/msn.c:1964
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Ошибка загрузки профиля"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1687 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Основные"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1694
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Возраст"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1696
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Занятость"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1697
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1480
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Местоположение"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1702 ../libpurple/protocols/msn/msn.c:1894
+#: ../libpurple/protocols/msn/msn.c:1900 ../libpurple/protocols/msn/msn.c:1907
 msgid "Hobbies and Interests"
 msgstr "Хобби и интересы"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1708 ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1834 ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1849 ../libpurple/protocols/msn/msn.c:1856
 msgid "A Little About Me"
 msgstr "Немного о себе"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1725
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1727
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Брачный статус"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1728
 msgid "Interests"
 msgstr "Интересы"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1729
 msgid "Pets"
 msgstr "Домашние животные"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1730
 msgid "Hometown"
 msgstr "Родной город"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1731
 msgid "Places Lived"
 msgstr "Места проживания"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1732
 msgid "Fashion"
 msgstr "Мода"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1733
 msgid "Humor"
 msgstr "Юмор"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1734
 msgid "Music"
 msgstr "Музыка"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1735 ../libpurple/protocols/msn/msn.c:1916
+#: ../libpurple/protocols/msn/msn.c:1922
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Любимая цитата"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1752
 msgid "Contact Info"
 msgstr "Контактная информация"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1753
 msgid "Personal"
 msgstr "Персональное"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1757
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1758
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1760
 msgid "Personal Mobile"
 msgstr "Персональный мобильный телефон"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Home Fax"
 msgstr "Домашний факс"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1762
 msgid "Personal E-Mail"
 msgstr "Персональный e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1763
 msgid "Personal IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1765
 msgid "Anniversary"
 msgstr ""
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1781
 msgid "Work"
 msgstr "Работа"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Название работы"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Company"
 msgstr "Компания"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Отдел"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1786
 msgid "Profession"
 msgstr "Профессия"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1787
 msgid "Work Phone"
 msgstr "Рабочий телефон"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1788
 msgid "Work Phone 2"
 msgstr "Рабочий телефон 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Address"
 msgstr "Рабочий адрес"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1790
 msgid "Work Mobile"
 msgstr "Рабочий мобильный телефон"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Work Pager"
 msgstr "Рабочий пейджер"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work Fax"
 msgstr "Рабочий факс"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Work E-Mail"
 msgstr "Рабочий e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1794
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1795
 msgid "Start Date"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1865 ../libpurple/protocols/msn/msn.c:1871
+#: ../libpurple/protocols/msn/msn.c:1878 ../libpurple/protocols/msn/msn.c:1885
 msgid "Favorite Things"
 msgstr "Любимые вещи"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1930
 msgid "Last Updated"
 msgstr "Последнее обновление"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1941
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1965
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:1966
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/msn/msn.c:1970
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:1978
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL профиля"
@@ -6971,101 +7035,105 @@ msgstr "URL профиля"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "Модуль протокола MSN"
+#: ../libpurple/protocols/msn/msn.c:2265 ../libpurple/protocols/msn/msn.c:2267
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Модуль протокола Windows Live Messenger"
 
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2302
 msgid "Use HTTP Method"
 msgstr "Использовать метод HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2199
+#: ../libpurple/protocols/msn/msn.c:2307
 #, fuzzy
 msgid "HTTP Method Server"
 msgstr "Тестовый сервер IPC"
 
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2312
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2320
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
-#: ../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 "Не удаётся установить соединение"
+#: ../libpurple/protocols/msn/nexus.c:137
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr ""
 
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:272
+#, fuzzy
+msgid "Windows Live ID authentication Failed"
+msgstr "Ошибка: Аутентификация завершилась неудачно"
+
+#: ../libpurple/protocols/msn/notification.c:185
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s не является допустимой группой."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:371
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s на %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
+#, fuzzy, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s отправил вам сообщение"
+
+#: ../libpurple/protocols/msn/notification.c:836
 #, c-format
+msgid "Unknown error (%d)"
+msgstr "Неизвестная ошибка (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Не удаётся добавить пользователя"
+
+#: ../libpurple/protocols/msn/notification.c:897
+#, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Не удаётся добавить пользователя на %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Не удаётся заблокировать пользователя на %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Не удаётся допустить пользователя на %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s не может быть добавлен, так как список собеседников полон."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s не является допустимой паспортной учётной записью."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
 msgid "Service Temporarily Unavailable."
 msgstr "Служба временно недоступна."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1263
 msgid "Unable to rename group"
 msgstr "Не удаётся переименовать группу"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1318
 msgid "Unable to delete group"
 msgstr "Не удаётся удалить группу"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1934
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7085,6 +7153,30 @@ msgstr[2] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: ../libpurple/protocols/msn/oim.c:142
+#, fuzzy
+msgid "Unable to connect to OIM server"
+msgstr "Не удаётся соединиться с сервером."
+
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Не удаётся установить соединение"
+
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "Ошибка записи"
@@ -7102,57 +7194,57 @@ msgstr ""
 "Ошибка соединения от сервера %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:338
 msgid "Our protocol is not supported by the server."
 msgstr "Наш протокол не поддерживается сервером."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:342
 msgid "Error parsing HTTP."
 msgstr "Ошибка разбора HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/msn/session.c:346
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Вы подключены из другого места."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:351
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Серверы MSN временно недоступны. Повторите попытку позже."
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:356
 msgid "The MSN servers are going down temporarily."
 msgstr "Серверы MSN временно выключаются."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:361
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Не удаётся аутентифицировать: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:366
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Ваш список собеседников MSN временно недоступен. Повторите попытку позже."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msn/session.c:389
 msgid "Handshaking"
 msgstr "Согласование"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:390
 msgid "Starting authentication"
 msgstr "Запуск аутентификации"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:391
 msgid "Getting cookie"
 msgstr "Получение данных"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:393
 msgid "Sending cookie"
 msgstr "Отправка данных"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:394
 msgid "Retrieving buddy list"
 msgstr "Загрузка списка собеседников"
 
@@ -7168,64 +7260,67 @@ msgstr "Пошёл перекусить"
 msgid "Out To Lunch"
 msgstr "Пошёл перекусить"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Сообщение могло быть не отправлено, так как истекло время ожидания:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:406
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "Сообщение не может быть отправлено, не разрешено при статусе \"Невидимый\":"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:410
 msgid "Message could not be sent because the user is offline:"
 msgstr "Сообщение не может быть отправлено, так как пользователь не в сети:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:414
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "Сообщение не может быть отправлено, так как произошла ошибка соединения:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 "Сообщение не может быть отправлено, так как отправка происходит слишком "
 "быстро:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:422
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 
-#: ../libpurple/protocols/msn/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:429
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Сообщение не может быть отправлено, так как произошла ошибка коммутационной "
 "панели:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:437
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Сообщение могло быть не отправлено, так как произошла неизвестная ошибка:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s добавил вас в свой список собеседников."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s удалил вас из своего списка собеседников."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Не удаётся добавить \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "Указанный идентификатор пользователя недопустим."
 
@@ -7253,214 +7348,212 @@ msgstr ""
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1810
 msgid "MySpaceIM Error"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:349
+#: ../libpurple/protocols/myspace/myspace.c:350
 #, fuzzy
 msgid "Reading challenge"
 msgstr "Ошибка чтения"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
+#: ../libpurple/protocols/myspace/myspace.c:356
 #, fuzzy
 msgid "Unexpected challenge length from server"
 msgstr "Неверный запрос с сервера"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
+#: ../libpurple/protocols/myspace/myspace.c:360
 #, fuzzy
 msgid "Logging in"
 msgstr "Журналы"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1293
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:1335
 #, fuzzy
 msgid "New mail messages"
 msgstr "Отправить сообщение"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1336
 msgid "New blog comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1337
 msgid "New profile comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1338
 msgid "New friend requests!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New picture comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "MySpace"
 msgstr ""
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
+#: ../libpurple/protocols/myspace/myspace.c:1550
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Соединение установлено"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
+#: ../libpurple/protocols/myspace/myspace.c:1561
+#: ../libpurple/protocols/myspace/myspace.c:1563
 #, fuzzy
 msgid "No username set"
 msgstr "Нет имени"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
+#: ../libpurple/protocols/myspace/myspace.c:1562
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/myspace.c:1789
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "Процесс возвратил код ошибки %d"
+msgstr "Ошибка протокола, код %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1981
+#: ../libpurple/protocols/myspace/myspace.c:2015
 msgid "Failed to add buddy"
-msgstr "Не удалось присоединиться к собеседнику в чате"
+msgstr "Не удалось добавить собеседника"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:1981
 #, fuzzy
 msgid "'addbuddy' command failed."
 msgstr "Загрузить список собеседников из файла..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2015
+#: ../libpurple/protocols/myspace/myspace.c:2252
 #, fuzzy
 msgid "persist command failed"
 msgstr "Ошибка коммутационной панели"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2120
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "Нет такого пользователя: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:2121
 #, fuzzy
 msgid "User lookup"
 msgstr "Комнаты пользователя"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2233
+#: ../libpurple/protocols/myspace/myspace.c:2252
+#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "Failed to remove buddy"
-msgstr "Не удалось присоединиться к собеседнику в чате"
+msgstr "Не удалось удалить собеседника"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2233
 msgid "'delbuddy' command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2274
 #, fuzzy
 msgid "blocklist command failed"
 msgstr "Ошибка коммутационной панели"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
+#: ../libpurple/protocols/myspace/myspace.c:2320
 #, fuzzy
 msgid "Invalid input condition"
 msgstr "Завершение установления соединения"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+#: ../libpurple/protocols/myspace/myspace.c:2338
+#: ../libpurple/protocols/myspace/myspace.c:2369
 #, fuzzy
 msgid "Read buffer full"
 msgstr "Очередь полна"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:2407
 #, fuzzy
 msgid "Unparseable message"
 msgstr "Не удаётся сделать разбор сообщения"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
+#: ../libpurple/protocols/myspace/myspace.c:2476
 #, fuzzy, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Не удалось соединиться с узлом"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
+#: ../libpurple/protocols/myspace/myspace.c:2647
 #, fuzzy
 msgid "IM Friends"
 msgstr "Окна _мгновенных сообщений"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2747
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:2748
 #, fuzzy
 msgid "Add contacts from server"
 msgstr "Неверный отклик от сервера."
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2800
+#: ../libpurple/protocols/myspace/myspace.c:2865
 msgid "Add friends from MySpace.com"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:2801
 #, fuzzy
 msgid "Importing friends failed"
 msgstr "Не удалось передать уведомление"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
+#: ../libpurple/protocols/myspace/myspace.c:2857
 #, fuzzy
 msgid "Find people..."
 msgstr "Найти собеседников..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
+#: ../libpurple/protocols/myspace/myspace.c:2860
 #, fuzzy
 msgid "Change IM name..."
 msgstr "Изменить пароль..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3162
 msgid "myim URL handler"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3163
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3164
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3287
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3290
 msgid "Show headline in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
+#: ../libpurple/protocols/myspace/myspace.c:3295
 #, fuzzy
 msgid "Send emoticons"
 msgstr "Параметры звука"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3300
 msgid "Screen resolution (dots per inch)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3303
 msgid "Base font size (points)"
 msgstr ""
 
@@ -7470,174 +7563,195 @@ msgstr "Пользователь"
 msgid "User"
 msgstr "Пользователь"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2979
 msgid "Profile"
 msgstr "Профиль"
 
-#: ../libpurple/protocols/myspace/user.c:124
+#: ../libpurple/protocols/myspace/user.c:128
 #, fuzzy
 msgid "Headline"
 msgstr "_Имя:"
 
-#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/myspace/user.c:133
 #, fuzzy
 msgid "Song"
 msgstr "Звуки"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:141
+#, fuzzy
 msgid "Total Friends"
-msgstr ""
+msgstr "Окна _мгновенных сообщений"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
+#: ../libpurple/protocols/myspace/user.c:159
 #, fuzzy
 msgid "Client Version"
 msgstr "Закрыть беседу"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, fuzzy, c-format
 msgid "%s has zapped you!"
 msgstr "%s в сети."
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, fuzzy, c-format
 msgid "%s has whacked you!"
 msgstr "Пользователь заблокировал вас"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:59
 msgid "Torch"
-msgstr "Тема"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
 msgid "%s has torched you!"
-msgstr "Пользователь заблокировал вас"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s в сети."
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s в сети."
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
 msgid "Slap"
-msgstr "Сонный"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s в сети."
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
 msgid "Goose"
-msgstr "Ушёл"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s отошёл."
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "Goosing %s..."
-msgstr "Поиск %s"
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
 msgid "High-five"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:76
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s в сети."
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:81
 msgid "Punk"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:81
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s в сети."
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:90
 msgid "Raspberry"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:90
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s в сети."
+msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
 msgstr ""
@@ -7776,42 +7890,42 @@ msgstr "Не удалось войти Ð
 msgid "Login failed (%s)."
 msgstr "Не удалось войти в сеть (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Не удаётся отправить сообщение. Не удалось получить подробности для "
 "пользователя (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:398
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Не удаётся добавить %s в список собеседников (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Не удаётся отправить сообщение (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Не удаётся пригласить пользователя (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Не удаётся отправить сообщение для %s. Не удалось создать конференцию (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:539
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Не удаётся отправить сообщение. Не удалось создать конференцию (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7820,7 +7934,7 @@ msgstr ""
 "Не удаётся переместить пользователя %s в папку %s в списке на стороне "
 "сервера. Ошибка при создании папки (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:634
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7829,62 +7943,62 @@ msgstr ""
 "Не удаётся добавить %s в список собеседников. Ошибка создания папки в списке "
 "на стороне сервера (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:707
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Не удалось получить подробности для пользователя %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Не удаётся добавить пользователя в список конфиденциальности (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Не удаётся добавить %s в список запрета (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Не удаётся добавить %s в список допуска (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Не удаётся удалить %s из списка конфиденциальности (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 "Не удаётся изменить установки конфиденциальности на стороне сервера (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Не удаётся создать конференцию (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
 msgstr "Ошибка связи с сервером. Закрытие соединения."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "Номер телефона"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Звание"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/novell/novell.c:1504
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Пользовательский ID"
@@ -7895,41 +8009,41 @@ msgstr "Пользовательский
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr "Полное Имя"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Конференция GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1670
 msgid "Unable to make SSL connection to server."
 msgstr "Не удаётся установить SSL-соединение с сервером."
 
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
 msgstr "Не удаётся соединиться с сервером."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
 msgstr "Ожидание отклика..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s был приглашён к этой беседе."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "Приглашение к беседе"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7940,16 +8054,15 @@ msgstr ""
 "\n"
 "Отправлено: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "Хотите присоединиться к беседе?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2017
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Вы были отключены, так как вошли с другой машины."
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2074
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7961,7 +8074,7 @@ msgstr ""
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2172
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7969,11 +8082,11 @@ msgstr ""
 "Не удаётся соединиться с сервером. Введите адрес сервера, с которым вы "
 "хотите соединиться."
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2200
 msgid "Error. SSL support is not installed."
 msgstr "Ошибка. Поддержка SSL не установлена."
 
-#: ../libpurple/protocols/novell/novell.c:2504
+#: ../libpurple/protocols/novell/novell.c:2509
 #, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
@@ -7990,33 +8103,33 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Модуль протокола Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "Адрес сервера"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "Порт сервера"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
+#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "Сервер разорвал соединение."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8025,10 +8138,10 @@ msgstr ""
 "Соединение с сервером потеряно:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
+#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
+#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr "При соединении с сервером получены недопустимые данные."
 
@@ -8063,36 +8176,43 @@ msgstr "Модуль протокола 
 msgstr "Модуль протокола ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "Удалённый пользователь разорвал соединение."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "Удалённый пользователь отклонил ваш запрос."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Соединение с удалённым пользователем потеряно:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "При соединении с удалённым пользователем получены недопустимые данные."
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Не удалось установить соединение с удалённым пользователем."
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Прямое соединение установлено"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -8212,8 +8332,8 @@ msgstr ""
 "кодировки, либо клиент %s содержит ошибки.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2391
+#: ../pidgin/gtkutils.c:2421
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Значок собеседника"
@@ -8235,7 +8355,7 @@ msgstr "Чат"
 msgstr "Чат"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6064
 msgid "Get File"
 msgstr "Получить файл"
 
@@ -8308,19 +8428,19 @@ msgstr "Камера"
 msgstr "Камера"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:5834
 #, c-format
 msgid "Free For Chat"
 msgstr "Готов пообщаться"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
+#: ../libpurple/protocols/oscar/oscar.c:5869
 #, c-format
 msgid "Not Available"
 msgstr "Недоступен"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
+#: ../libpurple/protocols/oscar/oscar.c:5855
 #, c-format
 msgid "Occupied"
 msgstr "Занят"
@@ -8332,8 +8452,8 @@ msgstr "Статус на веб-стрÐ
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 #, c-format
 msgid "Invisible"
 msgstr "Невидимый"
@@ -8344,13 +8464,13 @@ msgstr "В сети"
 msgstr "В сети"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
 msgid "IP Address"
 msgstr "IP-адрес"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Warning Level"
 msgstr "Уровень предупреждения"
 
@@ -8389,7 +8509,7 @@ msgstr "Завершение устанÐ
 msgid "Finalizing connection"
 msgstr "Завершение установления соединения"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
+#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8397,29 +8517,29 @@ msgstr ""
 "and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Неверный идентификатор пользователя."
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1048
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Неправильный пароль."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid "Your account is currently suspended."
 msgstr "Ваша учётная запись сейчас заблокирована."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1364
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Служба AOL Instant Messenger временно недоступна."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1380
 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."
@@ -8427,44 +8547,44 @@ msgstr ""
 "Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
 "попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#: ../libpurple/protocols/oscar/oscar.c:1374
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Версия клиента, которой вы пользуетесь, слишком стара. Обновите до %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1413
 msgid "Could Not Connect"
 msgstr "Не удалось установить соединение"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "Получена авторизация"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1439
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1453
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:2247
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:6220 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8473,54 +8593,54 @@ msgstr ""
 "Соединение с вами вскоре может быть разорвано. Возможно, вы захотите "
 "использовать TOC, пока это не будет исправлено. Смотрите обновления на %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:1540
 msgid "Unable to get a valid AIM login hash."
 msgstr "Не удаётся получить допустимый хэш входа AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Соединение с вами вскоре может быть разорвано. Смотрите обновления на %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1628
 msgid "Unable to get a valid login hash."
 msgstr "Не удаётся получить допустимый хэш входа."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1658
 msgid "Password sent"
 msgstr "Пароль отправлен"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1714
 msgid "Unable to initialize connection"
 msgstr "Не удаётся инициализировать соединение"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2205
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2245
 msgid "Authorization Request Message:"
 msgstr "Сообщение запроса авторизации:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2246
 msgid "Please authorize me!"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2287
+#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:5315
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Причина не указана."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2294
 msgid "Authorization Denied Message:"
 msgstr "Сообщение отказа в авторизации:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2422
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8531,18 +8651,18 @@ msgstr ""
 "следующей причине:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2423
 msgid "ICQ authorization denied."
 msgstr "В авторизации ICQ отказано."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2430
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Пользователь %u дал своё согласие добавить его в ваш список собеседников."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2438
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8555,7 +8675,7 @@ msgstr ""
 "От: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2446
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8568,7 +8688,7 @@ msgstr ""
 "От: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2454
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8581,24 +8701,24 @@ msgstr ""
 "Сообщение:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Пользователь ICQ %u отправил вам собеседника: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2481
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Хотите добавить этого собеседника в список собеседников?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2486 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Добавить"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2487
 msgid "_Decline"
 msgstr "_Отклонить"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, 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."
@@ -8606,7 +8726,7 @@ msgstr[2] "Вы не получили %h
 msgstr[1] "Вы не получили %hu сообщения от %s, так как они были некорректны."
 msgstr[2] "Вы не получили %hu сообщений от %s, так как они были некорректны."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2620
 #, 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."
@@ -8617,7 +8737,7 @@ msgstr[2] ""
 msgstr[2] ""
 "Вы не получили %hu сообщений от %s, так как они были слишком велики."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2629
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8630,7 +8750,7 @@ msgstr[2] ""
 msgstr[2] ""
 "Вы не получили %hu сообщений от %s, так как был превышен предел оценки."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2638
 #, 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."
@@ -8641,7 +8761,7 @@ msgstr[2] ""
 msgstr[2] ""
 "Вы не получили %hu сообщений от %s, потому что он слишком надоедлив."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2647
 #, 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."
@@ -8652,7 +8772,7 @@ msgstr[2] ""
 msgstr[2] ""
 "Вы не получили %hu сообщений от %s, потому что вы слишком надоедливы."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2656
 #, 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."
@@ -8661,47 +8781,47 @@ msgstr[2] "Вы не получили %h
 msgstr[2] "Вы не получили %hu сообщений от %s по неизвестной причине."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2811
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Не удаётся отправить сообщение: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2880
 msgid "Unknown reason."
 msgstr "Причина неизвестна."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
+#: ../libpurple/protocols/oscar/oscar.c:2814
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Не удаётся отправить сообщение для %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2880
 #, c-format
 msgid "User information not available: %s"
 msgstr "Пользовательская информация недоступна: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Online Since"
 msgstr "В сети с"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2916
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Член с"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2951
 msgid "Available Message"
 msgstr "Статусное сообщение"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3059
 msgid "Your AIM connection may be lost."
 msgstr "Ваше соединение AIM может быть потеряно."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3247
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8709,7 +8829,7 @@ msgstr ""
 "[Не удаётся отобразить сообщение от этого пользователя, так как оно содержит "
 "недопустимые символы.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8717,53 +8837,53 @@ msgstr ""
 "Последнее предпринятое вами действие не может быть выполнено, так как вы "
 "превысили предел. Подождите 10 секунд и попытайтесь снова."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3494
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Вы были отсоединены от чата %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3744
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Personal Web Page"
 msgstr "Персональная Web-страница"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3798
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Дополнительная информация"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3819
 msgid "Zip Code"
 msgstr "Индекс"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Division"
 msgstr "Отдел"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Position"
 msgstr "Должность"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3833
 msgid "Web Page"
 msgstr "Web-страница"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "Work Information"
 msgstr "Информация о работе"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Pop-Up Message"
 msgstr "Всплывающее сообщение"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3932
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -8771,30 +8891,30 @@ msgstr[2] "Следующие идент
 msgstr[1] "Следующие идентификаторы пользователей соотнесены с %s"
 msgstr[2] "Следующие идентификаторы пользователей соотнесены с %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3937
 msgid "Screen name"
 msgstr "Идентификатор пользователя"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3963
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ничего не найдено для адреса e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3984
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Вы должны получить e-mail с просьбой подтвердить %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3986
 msgid "Account Confirmation Requested"
 msgstr "Запрошено подтверждение учётной записи"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
+#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid "Error Changing Account Info"
 msgstr "Ошибка изменения информации об учётной записи"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8803,14 +8923,14 @@ msgstr ""
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя отличается от оригинального."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как он недопустим."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8819,7 +8939,7 @@ msgstr ""
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя слишком велик."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8828,7 +8948,7 @@ msgstr ""
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как для этого "
 "идентификатора пользователя уже есть ожидающий запрос."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8837,7 +8957,7 @@ msgstr ""
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как с заданным адресом "
 "соотнесено слишком много идентификаторов пользователей."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8846,32 +8966,32 @@ msgstr ""
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как заданный адрес "
 "неверен."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Ошибка 0x%04x: Неизвестная ошибка."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4048
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Адрес e-mail для %s: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4050
 msgid "Account Info"
 msgstr "Информация об учётной записи"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4233
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Ваше изображение не было отправлено. Вы должны иметь прямое соединение для "
 "отправки изображений."
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4504
 msgid "Unable to set AIM profile."
 msgstr "Не удаётся установить профиль AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4505
 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 "
@@ -8881,7 +9001,7 @@ msgstr ""
 "входа. Ваш профиль остаётся неустановленным; попытайтесь установить его ещё "
 "раз, когда будете полностью подключены."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4519
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8896,11 +9016,11 @@ msgstr[2] ""
 msgstr[2] ""
 "Максимальный размер профиля в %d байт был превышен. Профиль был урезан."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4524
 msgid "Profile too long."
 msgstr "Профиль слишком велик."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4569
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8918,11 +9038,11 @@ msgstr[2] ""
 "Максимальный размер сообщения об отсутствии в %d байт был превышен. "
 "Сообщение об отсутствии было урезано."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4574
 msgid "Away message too long."
 msgstr "Сообщение об отсутствии слишком велико."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4647
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8930,17 +9050,17 @@ msgstr ""
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4649
+#: ../libpurple/protocols/oscar/oscar.c:5101
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Unable To Add"
 msgstr "Не удаётся добавить"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4768
 msgid "Unable To Retrieve Buddy List"
 msgstr "Не удаётся загрузить список собеседников"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4769
 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."
@@ -8949,15 +9069,15 @@ msgstr ""
 "собеседников не потерян и, вероятно, станет доступен в течение нескольких "
 "часов."
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4951
+#: ../libpurple/protocols/oscar/oscar.c:4953
+#: ../libpurple/protocols/oscar/oscar.c:5181
+#: ../libpurple/protocols/oscar/oscar.c:5182
+#: ../libpurple/protocols/oscar/oscar.c:5187
 msgid "Orphans"
 msgstr "Сироты"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5099
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8966,17 +9086,17 @@ msgstr ""
 "Не удалось добавить собеседника %s, так как в списке собеседников слишком "
 "много собеседников. Удалите один и попытайтесь снова."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5099
+#: ../libpurple/protocols/oscar/oscar.c:5114
 msgid "(no name)"
 msgstr "(нет имени)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5113
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Не удалось добавить собеседника %s по неизвестной причине."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8985,22 +9105,22 @@ msgstr ""
 "Пользователь %s разрешил добавить его в ваш список собеседников. Хотите "
 "добавить его?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5238
 msgid "Authorization Given"
 msgstr "Авторизация дана"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Пользователь %s разрешил добавить его в ваш список собеседников."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Granted"
 msgstr "Авторизация дана"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5315
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9011,53 +9131,53 @@ msgstr ""
 "следующей причине:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5316
 msgid "Authorization Denied"
 msgstr "В авторизации отказано"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5352
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Обмен:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5392
 msgid "Invalid chat name specified."
 msgstr "Указано неверное имя чата."
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5461
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Изображение не было отправлено. Вы не можете отправлять изображения в чатах "
 "AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5623
+#: ../libpurple/protocols/oscar/oscar.c:5628
 msgid "Away Message"
 msgstr "Сообщение об отсутствии"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5628
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(загрузка)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5828
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5936
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Комментарий собеседника для %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5937
 msgid "Buddy Comment:"
 msgstr "Комментарий собеседника:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5984
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Вы выбрали открытие прямого соединения с %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5988
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9065,66 +9185,66 @@ msgstr ""
 "Так как это раскроет ваш IP-адрес, это можно считать угрозой безопасности. "
 "Хотите продолжить?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5994
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "_Установить соединение"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6029
 msgid "Get AIM Info"
 msgstr "Получить информацию AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6035
 msgid "Edit Buddy Comment"
 msgstr "Изменить комментарий собеседника"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6043
 msgid "Get Status Msg"
 msgstr "Получить сообщение о статусе"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6056
 msgid "Direct IM"
 msgstr "Прямое соединение"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6078
 msgid "Re-request Authorization"
 msgstr "Повторный запрос авторизации"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6137
 msgid "Require authorization"
 msgstr "Требовать авторизацию"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6140
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Статус на веб-страницах (вызывает появление СПАМА!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6145
 msgid "ICQ Privacy Options"
 msgstr "Параметры конфиденциальности ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "The new formatting is invalid."
 msgstr "Новое форматирование недопустимо."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Форматирование идентификатора пользователя может влиять только на регистр "
 "букв и пробелы."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6218
 msgid "Change Address To:"
 msgstr "Изменить адрес на:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>вы не ожидаете авторизацию</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6267
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Вы ожидаете авторизацию от следующих собеседников"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6268
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9132,73 +9252,73 @@ msgstr ""
 "Вы можете запросить авторизацию от этих собеседников повторно, щёлкнув на "
 "них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6285
 msgid "Find Buddy by E-Mail"
 msgstr "Найти собеседника по e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "Search for a buddy by e-mail address"
 msgstr "Искать собеседника по адресу e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6287
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Введите адрес e-mail собеседника, которого вы ищете."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6290
 msgid "_Search"
 msgstr "_Искать"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6448
 msgid "Set User Info (URL)..."
 msgstr "Установить пользовательскую информацию (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Change Password (URL)"
 msgstr "Изменить пароль (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6463
 msgid "Configure IM Forwarding (URL)"
 msgstr "Настроить перенаправление сообщений (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Set Privacy Options..."
 msgstr "Установить параметры конфиденциальности..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Confirm Account"
 msgstr "Подтвердить учётную запись"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Показать текущий зарегистрированный адрес e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6488
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Изменить текущий зарегистрированный адрес e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6495
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Показать собеседников без авторизации"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6501
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Искать собеседника по адресу e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6506
 msgid "Search for Buddy by Information"
 msgstr "Искать собеседника по информации"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6574
 msgid "Use recent buddies group"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6577
 msgid "Show how long you have been idle"
 msgstr "Показывать, как долго вы бездействовали"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6732
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9206,27 +9326,27 @@ msgstr ""
 "Всегда использовать прокси-сервер ICQ для передачи файлов\n"
 "(медленнее, но не раскрывает ваш IP-адрес)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Попытка соединения с %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
+#: ../libpurple/protocols/oscar/peer.c:858
 #, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Попытка соединения через прокси-сервер."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s только что запросил прямое соединение с %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
+#: ../libpurple/protocols/oscar/peer.c:1039
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -9385,28 +9505,28 @@ msgstr "Другое"
 msgid "Other"
 msgstr "Другое"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Изменить мою информацию"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Обновить мою информацию"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Ваша информация была обновлена"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
 msgstr ""
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr ""
 
@@ -9675,7 +9795,7 @@ msgstr "Ошибка запроса ма
 msgid "Error requesting login token"
 msgstr "Ошибка запроса маркера входа"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:488
 msgid "Unable to login, check debug log"
 msgstr ""
 
@@ -10046,7 +10166,7 @@ msgstr ""
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4434
 msgid "Topic:"
 msgstr "Тема:"
 
@@ -10069,7 +10189,7 @@ msgstr ""
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4368
 msgid "Connect"
 msgstr "Установить соединение"
 
@@ -10121,10 +10241,6 @@ msgstr ""
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Не удаётся добавить пользователя"
-
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -10239,7 +10355,7 @@ msgstr ""
 "можете добавить этих пользователей в список собеседников или отправить им "
 "сообщения с помощью кнопок действия ниже."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:762
 msgid "Search Results"
 msgstr "Результаты поиска"
 
@@ -11479,7 +11595,7 @@ msgstr "Ваше текущее наст
 msgstr "Ваше текущее настроение"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
 #, c-format
 msgid "Normal"
 msgstr "Нормально"
@@ -11879,7 +11995,7 @@ msgstr "Протокол Secure Internet
 msgstr "Протокол Secure Internet Live Conferencing (SILC)"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
 msgid "Network"
 msgstr "Сеть"
 
@@ -12137,36 +12253,36 @@ msgstr "Не удалось загруз
 msgstr "Не удалось загрузить пару ключей SILC: %s"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:417
 msgid "Could not write"
 msgstr "Не удалось записать"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:439
+#: ../libpurple/protocols/simple/simple.c:1545
 msgid "Could not connect"
 msgstr "Не удалось установить соединение"
 
-#: ../libpurple/protocols/simple/simple.c:1059
+#: ../libpurple/protocols/simple/simple.c:1062
 #, fuzzy
 msgid "Unknown server response."
 msgstr "Причина неизвестна."
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1621
+#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1685
 msgid "Could not create listen socket"
 msgstr "Не удалось создать сокет для прослушивания"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1602
 msgid "Couldn't resolve host"
 msgstr "Не удалось разрешить имя узла"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1693
 msgid "Could not resolve hostname"
 msgstr "Не удалось разрешить имя узла"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1710
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 "Идентификаторы пользователей SIP не могут содержать пробелы или символы @"
@@ -12179,36 +12295,36 @@ msgstr ""
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Модуль протокола SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1894
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Модуль протокола SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:1922
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:1928
 msgid "Use UDP"
 msgstr "Использовать UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1930
 msgid "Use proxy"
 msgstr "Использовать прокси"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1932
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:1934
 msgid "Auth User"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1936
 msgid "Auth Domain"
 msgstr ""
 
@@ -12382,8 +12498,8 @@ msgstr "Пароль изменён ус
 msgid "Password Change Successful"
 msgstr "Пароль изменён успешно"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5925
+#: ../pidgin/gtkblist.c:6281
 msgid "_Group:"
 msgstr "_Группа:"
 
@@ -12445,25 +12561,25 @@ msgstr "Модуль протокола 
 msgid "TOC Protocol Plugin"
 msgstr "Модуль протокола TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ваше сообщение Yahoo! не отправлено."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Системное сообщение Yahoo! для %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Сообщение отказа в авторизации:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12471,16 +12587,16 @@ msgstr ""
 msgstr ""
 "%s (повторно) не разрешил добавить его в ваш список по следующей причине: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s (повторно) не разрешил добавить его в ваш список."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "В добавлении собеседника отказано"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12488,62 +12604,62 @@ msgstr ""
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Аутентификация Yahoo! завершилась неудачно"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Игнорировать собеседника?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Ваша учётная запись заблокирована, войдите с веб-сайта Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Неизвестная ошибка номер %d. Вход с веб-сайта Yahoo! может исправить это."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Не удалось добавить собеседника %s в группу %s в список на сервере учётной "
 "записи %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "Не удалось добавить собеседника в список на сервере"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "Получен непредвиденный HTTP-отклик от сервера."
 
-#: ../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/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Проблема с соединением"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12552,7 +12668,7 @@ msgstr ""
 "Соединение с %s потеряно:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12561,112 +12677,103 @@ msgstr ""
 "Не удалось установить соединение с %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Не дома"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Не за столом"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Не в офисе"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "В отпуске"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "Вышел"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Не в списке на сервере"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "Присутствие"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "Вероятно не в сети"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Присоединиться в чате"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Создать конференцию"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "Настройки присутствия"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "Какой ID активировать?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Join whom in chat?"
 msgstr "К кому присоединиться в чате?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Активировать ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Присоединиться к пользователю в чате..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;комната&gt;:  Присоединиться к чату в сети Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4143
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Вывести список комнат в сети Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4151
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -12680,56 +12787,56 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
 #: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4362
 msgid "Yahoo Protocol Plugin"
 msgstr "Модуль протокола Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Pager server"
 msgstr "Сервер пейджера"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Japan Pager server"
 msgstr "Сервер пейджера Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Pager port"
 msgstr "Порт пейджера"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "File transfer server"
 msgstr "Сервер передачи файлов"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan file transfer server"
 msgstr "Сервер передачи файлов Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "File transfer port"
 msgstr "Порт передачи файлов"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Chat room locale"
 msgstr "Языковой формат чата"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Ignore conference and chatroom invitations"
 msgstr "Игнорировать приглашения в конференции и чаты"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Chat room list URL"
 msgstr "URL списка чатов"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat server"
 msgstr "Сервер чата Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "Yahoo Chat port"
 msgstr "Порт чата Yahoo"
 
@@ -13070,8 +13177,8 @@ msgstr ""
 msgid "Exposure"
 msgstr ""
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13080,28 +13187,28 @@ msgstr ""
 "Не удаётся создать сокет:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Ошибка соединения с HTTP-прокси %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Доступ запрещён: прокси-сервер HTTP запрещает туннелирование порта %d."
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "Ошибка разрешения имени %s"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "Не удалось разрешить имя узла"
 
@@ -13149,7 +13256,7 @@ msgstr ""
 msgid "%s has requested your attention!"
 msgstr ""
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13158,38 +13265,38 @@ msgstr ""
 "%s приглашает %s в чат %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s приглашает %s в чат %s\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Принять приглашение в чат?"
 
 #: ../libpurple/sslconn.c:164
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "Не удалось установить соединение"
+msgstr "Не удалось установить SSL-соединение"
 
 #: ../libpurple/sslconn.c:166
+#, fuzzy
 msgid "SSL Handshake Failed"
-msgstr "Не удалось выполнить согласование SSL"
+msgstr "Не удалось произвести передачу файлов"
 
 #: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr ""
 
 #: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "Неизвестная ошибка"
+msgstr "Неизвестная ошибка SSL"
 
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Не установлен"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Не беспокоить"
 
@@ -13206,47 +13313,62 @@ msgstr "%s изменил статус Ñ
 msgid "%s changed status from %s to %s"
 msgstr "%s изменил статус с %s на %s"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:612
 #, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) изменил статус с %s на %s"
+
+#: ../libpurple/status.c:623
+#, c-format
 msgid "%s is now %s"
 msgstr "%s теперь %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:625
 #, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) теперь %s"
+
+#: ../libpurple/status.c:631
+#, c-format
 msgid "%s is no longer %s"
 msgstr "%s больше не %s"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:633
 #, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) больше не %s"
+
+#: ../libpurple/status.c:1244
+#, c-format
 msgid "%s became idle"
 msgstr "%s начал бездействовать"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1261
 #, c-format
 msgid "%s became unidle"
 msgstr "%s перестал бездействовать"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1324
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s начал бездействовать"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1326
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s перестал бездействовать"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:701
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2706
 #, c-format
 msgid "Error Reading %s"
 msgstr "Ошибка чтения %s"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2707
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13255,15 +13377,15 @@ msgstr ""
 "Произошла ошибка при чтении %s. Файл не был загружен, а старый файл был "
 "переименован в %s~."
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3207
 msgid "Calculating..."
 msgstr "Подсчёт..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3210
 msgid "Unknown."
 msgstr "Неизвестно."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3236
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -13271,7 +13393,7 @@ msgstr[2] "%d секунд"
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3248
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -13279,7 +13401,7 @@ msgstr[2] "%d дней"
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3256
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -13287,7 +13409,7 @@ msgstr[2] "%s, %d часов"
 msgstr[1] "%s, %d часа"
 msgstr[2] "%s, %d часов"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -13295,7 +13417,7 @@ msgstr[2] "%d часов"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -13303,7 +13425,7 @@ msgstr[2] "%s, %d минут"
 msgstr[1] "%s, %d минуты"
 msgstr[2] "%s, %d минут"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -13311,34 +13433,34 @@ msgstr[2] "%d минут"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3536
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3573 ../libpurple/util.c:3869
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Не удаётся соединиться с %s"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3696
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3731
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Ошибка чтения из %s: %s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3762
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Ошибка записи в %s: %s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3787
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Не удаётся соединиться с %s: %s"
@@ -13355,11 +13477,11 @@ msgstr "Обмен мгновеннымÐ
 msgid "Send instant messages over multiple protocols"
 msgstr "Обмен мгновенными сообщениями с использованием множества протоколов"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Ориентация"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Ориентация лотка."
 
@@ -13428,7 +13550,7 @@ msgstr "SOCKS 5"
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
 msgid "Use Environmental Settings"
 msgstr "Использовать настройки окружения"
 
@@ -13450,15 +13572,15 @@ msgstr "Параметры прокси"
 msgid "Proxy Options"
 msgstr "Параметры прокси"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
 msgid "Proxy _type:"
 msgstr "Т_ип прокси:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
 msgid "_Host:"
 msgstr "_Узел:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
 msgid "_Port:"
 msgstr "П_орт:"
 
@@ -13466,44 +13588,43 @@ msgstr "_Имя пользователя
 msgid "_Username:"
 msgstr "_Имя пользователя:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
 msgid "Pa_ssword:"
 msgstr "Па_роль:"
 
 #: ../pidgin/gtkaccount.c:1195
-#, fuzzy
 msgid "Unable to save new account"
-msgstr "Не удаётся создать соединение"
+msgstr "Не удаётся сохранить новую учётную запись"
 
 #: ../pidgin/gtkaccount.c:1196
 msgid "An account already exists with the specified criteria."
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1474
 msgid "Add Account"
 msgstr "Добавить учётную запись"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1493
 msgid "_Basic"
 msgstr "_Основные"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1500
 msgid "Create this new account on the server"
-msgstr ""
+msgstr "Создать эту новую учётную запись на сервере"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1516
 msgid "_Advanced"
 msgstr "_Дополнительные"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1974 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2002
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2202
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13527,252 +13648,275 @@ msgstr ""
 "учётных записей позже через меню <b>Учётные записи->Добавить/Изменить</b> "
 "окна списка собеседников."
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "Присоединиться к чату"
+#: ../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] ""
+msgstr[2] ""
 
-#: ../pidgin/gtkblist.c:788
+#: ../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 "Сооб_щение:"
+
+#: ../pidgin/gtkblist.c:945
+msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 "Введите соответствующую информацию о чате, к которому вы хотели бы "
 "присоединиться.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6242
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "У_чётная запись:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Блокировать"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1245
 msgid "Un_block"
 msgstr "Раз_блокировать"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1288
+msgid "Move to"
+msgstr "Переместить в"
+
+#: ../pidgin/gtkblist.c:1328
 msgid "Get _Info"
 msgstr "_Информация"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "Мгновенное сооб_щение"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Отправить файл"
+#: ../pidgin/gtkblist.c:1337
+msgid "_Send File..."
+msgstr "_Отправить файл..."
 
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "Добавить п_равило"
+#: ../pidgin/gtkblist.c:1344
+msgid "Add Buddy _Pounce..."
+msgstr "Добавить п_равило..."
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
 msgid "View _Log"
 msgstr "Просмотреть _журнал"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1359
+msgid "Hide when offline"
+msgstr "Скрывать, когда не в сети"
+
+#: ../pidgin/gtkblist.c:1359
+msgid "Show when offline"
+msgstr "Показывать, когда не в сети"
+
+#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
 msgid "_Alias..."
 msgstr "_Псевдоним..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "Добавить _собеседника"
+#: ../pidgin/gtkblist.c:1434
+msgid "Add _Buddy..."
+msgstr "Добавить _собеседника..."
 
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "Добавить _чат"
+#: ../pidgin/gtkblist.c:1437
+msgid "Add C_hat..."
+msgstr "Добавить _чат..."
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1440
 msgid "_Delete Group"
 msgstr "_Удалить группу"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1442
 msgid "_Rename"
 msgstr "Пере_именовать"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "П_рисоединиться"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1464
 msgid "Auto-Join"
 msgstr "Присоединяться автоматически"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1466
+msgid "Persistent"
+msgstr "Непрерывающийся"
+
+#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
 msgid "_Collapse"
 msgstr "_Свернуть"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1532
 msgid "_Expand"
 msgstr "Р_азвернуть"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
+#: ../pidgin/gtkblist.c:4929 ../pidgin/gtkblist.c:4942
 msgid "/Tools/Mute Sounds"
 msgstr "/Инструменты/Отключить звуки"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4919
+#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Вы не подключены с учётной записью, позволяющей добавить этого собеседника."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3067
 msgid "/_Buddies"
 msgstr "/_Собеседники"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Собеседники/Новое мгновенное сооб_щение..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Собеседники/Присоединиться к _чату..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Get User _Info..."
 msgstr "/Собеседники/Получить пользовательскую _информацию..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/View User _Log..."
 msgstr "/Собеседники/Просмотреть _журнал пользователя..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/_Собеседники"
+#: ../pidgin/gtkblist.c:3073
+msgid "/Buddies/Sh_ow"
+msgstr "/Собеседники/_Показывать"
 
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
+#: ../pidgin/gtkblist.c:3074
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Собеседники/Показывать собеседников _не в сети"
+msgstr "/Собеседники/Показывать/Собеседников _не в сети"
 
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
+#: ../pidgin/gtkblist.c:3075
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Собеседники/Показывать п_устые группы"
+msgstr "/Собеседники/Показывать/П_устые группы"
 
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
+#: ../pidgin/gtkblist.c:3076
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Собеседники/Показывать _подробности о собеседнике"
+msgstr "/Собеседники/Показывать/_Подробности о собеседниках"
 
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
+#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Собеседники/Показывать _время бездействия"
+msgstr "/Собеседники/Показывать/_Время бездействия"
 
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
+#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Собеседники/Показывать п_устые группы"
+msgstr "/Собеседники/Показывать/_Значки протоколов"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Собеседники/_Сортировать собеседников"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3081
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Собеседники/_Добавить собеседника..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Add C_hat..."
 msgstr "/Собеседники/Добавить ч_ат..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Add _Group..."
 msgstr "/Собеседники/Добавить _группу..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/_Quit"
 msgstr "/Собеседники/В_ыйти"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3088
 msgid "/_Accounts"
 msgstr "/_Учётные записи"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Учётные записи/Добавить\\/Изменить"
+#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6943
+msgid "/Accounts/Manage"
+msgstr "/Учётные записи/Управление"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Tools"
 msgstr "/_Инструменты"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3093
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Инструменты/_Слежение за собеседниками"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
+#: ../pidgin/gtkblist.c:3094
 msgid "/Tools/_Certificates"
-msgstr "/Инструменты/_Настройки"
+msgstr "/Инструменты/С_ертификаты"
 
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3095
 msgid "/Tools/Plu_gins"
 msgstr "/Инструменты/_Модули"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3096
 msgid "/Tools/Pr_eferences"
 msgstr "/Инструменты/_Настройки"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3097
 msgid "/Tools/Pr_ivacy"
 msgstr "/Инструменты/К_онфиденциальность"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3099
 msgid "/Tools/_File Transfers"
 msgstr "/Инструменты/Передача _файлов"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3100
 msgid "/Tools/R_oom List"
 msgstr "/Инструменты/Список _комнат"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3101
 msgid "/Tools/System _Log"
 msgstr "/Инструменты/Системный _журнал"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/Mute _Sounds"
 msgstr "/Инструменты/Отключить _звуки"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3105
 msgid "/_Help"
 msgstr "/_Помощь"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3106
 msgid "/Help/Online _Help"
 msgstr "/Помощь/Помощь в _сети"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3107
 msgid "/Help/_Debug Window"
 msgstr "/Помощь/Окно _отладки"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
 msgid "/Help/_About"
 msgstr "/Помощь/О _программе"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3140
 #, c-format
 msgid ""
 "\n"
@@ -13781,78 +13925,79 @@ msgstr ""
 "\n"
 "<b>Учётная запись:</b> %s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3218
 msgid "Buddy Alias"
 msgstr "Псевдоним собеседника"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3247
 msgid "Logged In"
 msgstr "В сети"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3293
 msgid "Last Seen"
 msgstr "Последнее появление"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3314
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3316
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3318
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3657
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Бездействует %dд %dч %02dм"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3659
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Бездействует %dч %02dм"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3661
 #, c-format
 msgid "Idle %dm"
 msgstr "Бездействует %dм"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3814
 msgid "/Buddies/New Instant Message..."
 msgstr "/Собеседники/Новое мгновенное сообщение..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3815 ../pidgin/gtkblist.c:3848
 msgid "/Buddies/Join a Chat..."
 msgstr "/Собеседники/Присоединиться к чату..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3816
 msgid "/Buddies/Get User Info..."
 msgstr "/Собеседники/Получить пользовательскую информацию..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3817
 msgid "/Buddies/Add Buddy..."
 msgstr "/Собеседники/Добавить собеседника..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3818 ../pidgin/gtkblist.c:3851
 msgid "/Buddies/Add Chat..."
 msgstr "/Собеседники/Добавить чат..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3819
 msgid "/Buddies/Add Group..."
 msgstr "/Собеседники/Добавить группу..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3854
 msgid "/Tools/Privacy"
 msgstr "/Инструменты/Конфиденциальность"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3857
 msgid "/Tools/Room List"
 msgstr "/Инструменты/Список комнат"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3989 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -13860,94 +14005,85 @@ msgstr[2] "%d непрочитанных
 msgstr[1] "%d непрочитанных сообщения от %s\n"
 msgstr[2] "%d непрочитанных сообщений от %s\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4149
 msgid "Manually"
 msgstr "Вручную"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "По алфавиту"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4152
 msgid "By status"
 msgstr "По статусу"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4153
 msgid "By log size"
 msgstr "По размеру журнала"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4358 ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "Соединение с %s разорвано"
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4393
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">Соединение с %s разорвано: %s</span>"
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4545
 msgid "<b>Username:</b>"
 msgstr "<b>Имя пользователя:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4552
 msgid "<b>Password:</b>"
 msgstr "<b>Пароль:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4563
 msgid "_Login"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4646
 msgid "/Accounts"
 msgstr "/Учётные записи"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4660
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Добро пожаловать в %s!</span>\n"
 "\n"
 "Не включено ни одной учётной записи. Включите ваши учётные записи из окна "
-"<b>Учётные записи</b>, доступного через меню <b>Учётные записи->Добавить/"
-"Изменить</b>. Сделав это, вы сможете войти в сеть, установить свой статус и "
-"начать общение с друзьями."
+"<b>Учётные записи</b>, доступного через меню <b>Учётные записи->Управление</"
+"b>. Сделав это, вы сможете войти в сеть, установить свой статус и начать "
+"общение с друзьями."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
+#: ../pidgin/gtkblist.c:4923
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Собеседники/Показывать собеседников не в сети"
+msgstr "/Собеседники/Показывать/Собеседников не в сети"
 
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
+#: ../pidgin/gtkblist.c:4926
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Собеседники/Показывать пустые группы"
+msgstr "/Собеседники/Показывать/Пустые группы"
 
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
+#: ../pidgin/gtkblist.c:4932
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Собеседники/Показывать подробности о собеседнике"
+msgstr "/Собеседники/Показывать/Подробности о собеседниках"
 
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
+#: ../pidgin/gtkblist.c:4935
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Собеседники/Показывать время бездействия"
+msgstr "/Собеседники/Показывать/Время бездействия"
 
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
+#: ../pidgin/gtkblist.c:4938
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Собеседники/Показывать пустые группы"
+msgstr "/Собеседники/Показывать/Значки протоколов"
 
-#: ../pidgin/gtkblist.c:5507
+#: ../pidgin/gtkblist.c:5850
 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. "
@@ -13958,26 +14094,31 @@ msgstr ""
 "собеседника. Псевдоним будет показываться вместо идентификатора "
 "пользователя, когда это возможно.\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5873
+msgid "A_ccount:"
+msgstr "_Учётная запись:"
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:5885
 msgid "_Screen name:"
 msgstr "_Идентификатор пользователя:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:5907 ../pidgin/gtkblist.c:6263
 msgid "A_lias:"
 msgstr "_Псевдоним:"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6175
 msgid "This protocol does not support chat rooms."
 msgstr "Этот протокол не поддерживает чаты."
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6191
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Вы не подключены по протоколам, имеющим поддержку чатов."
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6232
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -13985,49 +14126,56 @@ msgstr ""
 "Введите псевдоним и соответствующую информацию о чате, который вы хотели бы "
 "добавить в список собеседников.\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6291
+msgid "Autojoin when account becomes online."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6292
+msgid "Hide chat when the window is closed."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6318
 msgid "Please enter the name of the group to be added."
 msgstr "Введите имя добавляемой группы."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6963
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:6987
 msgid "_Edit Account"
 msgstr "_Изменить учётную запись"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7000 ../pidgin/gtkconv.c:3143
 msgid "No actions available"
 msgstr "Нет доступных действий"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7008
 msgid "_Disable"
 msgstr "_Выключить"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7020
 msgid "Enable Account"
 msgstr "Включить учётную запись"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7026
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7075
 msgid "/Tools"
 msgstr "/Инструменты"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7145
 msgid "/Buddies/Sort Buddies"
 msgstr "/Собеседники/Сортировать собеседников"
 
 #. Widget creation function
 #: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
 msgid "SSL Servers"
-msgstr "Сервер"
+msgstr "SSL-серверы"
 
-#: ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkconn.c:181
 #, c-format
 msgid ""
 "%s\n"
@@ -14036,26 +14184,26 @@ msgstr ""
 "re-enable the account."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:482
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "Неизвестная команда."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:774
+#: ../pidgin/gtkconv.c:816
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Вы не подключены с учётной записью, позволяющей пригласить этого собеседника."
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "Пригласить собеседника в чат"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14063,188 +14211,183 @@ msgstr ""
 "Введите имя пользователя, которого вы хотите пригласить, вместе с "
 "необязательным текстом приглашения."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "_Собеседник:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "Сооб_щение:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Не удаётся открыть файл."
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Беседа с %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "Сохранить беседу"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Найти"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Искать:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "Не игнорировать"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1679
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "Получить сообщение об отсутствии"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "Последнее сказанное"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "Не удаётся сохранить файл значка на диск."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "Сохранить значок"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "Анимировать"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "Скрыть значок"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "Сохранить значок как..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "Установить собственный значок..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "Удалить собственный значок"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
 msgstr ""
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/_Беседа"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Беседа/Новое мгновенное сооб_щение..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/Беседа/_Найти..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/Беседа/Просмотреть _журнал"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/Беседа/Со_хранить как..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Беседа/О_чистить"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/Беседа/Отправить _файл..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Беседа/Добавить п_равило..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/Беседа/Получить _информацию"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/Беседа/Приг_ласить..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/Беседа/_Ещё"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/Беседа/_Псевдоним..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/Беседа/_Блокировать..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/Беседа/Раз_блокировать..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/Беседа/_Добавить..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/Беседа/_Удалить..."
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Беседа/Вставить _ссылку..."
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Беседа/Вставить из_ображение..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/Беседа/_Закрыть"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/_Параметры"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/Параметры/Вести _журнал"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/Параметры/Воспроизводить _звуки"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Параметры/Показывать _панели форматирования"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Параметры/Показывать _время сообщений"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/More"
 msgstr "/Беседа/Ещё"
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3187
 msgid "/Options"
 msgstr "/Параметры"
 
@@ -14253,97 +14396,97 @@ msgstr "/Параметры"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3222 ../pidgin/gtkconv.c:3254
 msgid "/Conversation"
 msgstr "/Беседа"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/View Log"
 msgstr "/Беседа/Просмотреть журнал"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3268
 msgid "/Conversation/Send File..."
 msgstr "/Беседа/Отправить файл..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Беседа/Добавить правило..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3278
 msgid "/Conversation/Get Info"
 msgstr "/Беседа/Получить информацию"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Invite..."
 msgstr "/Беседа/Пригласить..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3288
 msgid "/Conversation/Alias..."
 msgstr "/Беседа/Псевдоним..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3292
 msgid "/Conversation/Block..."
 msgstr "/Беседа/Блокировать..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3296
 msgid "/Conversation/Unblock..."
 msgstr "/Беседа/Разблокировать..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3300
 msgid "/Conversation/Add..."
 msgstr "/Беседа/Добавить..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Remove..."
 msgstr "/Беседа/Удалить..."
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3310
 msgid "/Conversation/Insert Link..."
 msgstr "/Беседа/Вставить ссылку..."
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3314
 msgid "/Conversation/Insert Image..."
 msgstr "/Беседа/Вставить изображение..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3320
 msgid "/Options/Enable Logging"
 msgstr "/Параметры/Вести журнал"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Sounds"
 msgstr "/Параметры/Воспроизводить звуки"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3336
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Параметры/Показывать панели форматирования"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Timestamps"
 msgstr "/Параметры/Показывать время сообщений"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3416 ../pidgin/gtkconv.c:3458
 msgid "User is typing..."
 msgstr "Пользователь набирает сообщение..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3461
 msgid "User has typed something and stopped"
 msgstr "Пользователь что-то набрал и остановился"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
+#: ../pidgin/gtkconv.c:3645 ../pidgin/gtkconv.c:8181
+msgid "S_end To"
 msgstr "_Адресат"
 
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4357
 msgid "_Send"
 msgstr "_Отправить"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4470
 msgid "0 people in room"
 msgstr "0 пользователей в комнате"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5844 ../pidgin/gtkconv.c:5965
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -14351,75 +14494,75 @@ msgstr[2] "%d пользователей
 msgstr[1] "%d пользователя в комнате"
 msgstr[2] "%d пользователей в комнате"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6572 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Набирает сообщение"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6576
 msgid "Stopped Typing"
 msgstr "Прекратил набор сообщения"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6579
 msgid "Nick Said"
 msgstr "Произнесено имя"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6582 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Непрочитанные сообщения"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6588
 msgid "New Event"
 msgstr "Новое событие"
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7700
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Очистить все окна бесед."
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7863
 msgid "Confirm close"
 msgstr "Подтвердить закрытие"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7895
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Есть непрочитанные сообщения. Вы действительно хотите закрыть окно?"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8514
 msgid "Close other tabs"
 msgstr "Закрыть другие вкладки"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8520
 msgid "Close all tabs"
 msgstr "Закрыть все вкладки"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8528
 msgid "Detach this tab"
 msgstr "Отделить эту вкладку"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8534
 msgid "Close this tab"
 msgstr "Закрыть эту вкладку"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9039
 msgid "Close conversation"
 msgstr "Закрыть беседу"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9641
 msgid "Last created window"
 msgstr "Последнее созданное окно"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9643
 msgid "Separate IM and Chat windows"
 msgstr "Отдельные окна мгновенных сообщений и чатов"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9645 ../pidgin/gtkprefs.c:1417
 msgid "New window"
 msgstr "Новое окно"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9647
 msgid "By group"
 msgstr "По группе"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9649
 msgid "By account"
 msgstr "По учётной записи"
 
@@ -14620,9 +14763,8 @@ msgstr "Испанский"
 msgstr "Испанский"
 
 #: ../pidgin/gtkdialogs.c:161
-#, fuzzy
 msgid "Estonian"
-msgstr "Боснийский"
+msgstr "Эстонский"
 
 #: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
@@ -14838,7 +14980,7 @@ msgstr "О %s"
 msgstr "О %s"
 
 #: ../pidgin/gtkdialogs.c:400
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
@@ -14853,12 +14995,12 @@ msgstr ""
 "%s - графический модульный клиент обмена сообщениями, основывающийся на "
 "библиотеке libpurple, позволяющей использовать AIM, MSN, Yahoo!, XMPP, ICQ, "
 "IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
-"Gadu-Gadu и QQ одновременно.  Написан с использованием GTK+.<BR><BR>Вы "
-"можете изменять и распространять программу по условиям GPL (версии 2 или "
-"более поздней).  Копия GPL содержится в файле 'COPYING', распространяемом с %"
-"s.  Авторские права на %s принадлежат участникам проекта.  Полный список "
-"участников проекта смотрите в файле 'COPYRIGHT'.  Мы не предоставляем "
-"никаких гарантий на эту программу.<BR><BR>"
+"MySpaceIM, Gadu-Gadu и QQ одновременно.  Написан с использованием GTK+."
+"<BR><BR>Вы можете изменять и распространять программу по условиям GPL "
+"(версии 2 или более поздней).  Копия GPL содержится в файле 'COPYING', "
+"распространяемом с %s.  Авторские права на %s принадлежат участникам "
+"проекта.  Полный список участников проекта смотрите в файле 'COPYRIGHT'.  Мы "
+"не предоставляем никаких гарантий на эту программу.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:418
 #, c-format
@@ -14897,11 +15039,21 @@ msgstr "Отладочная инфорÐ
 msgid "Debugging Information"
 msgstr "Отладочная информация"
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:753 ../pidgin/gtkdialogs.c:892
+#: ../pidgin/gtkdialogs.c:973
+msgid "_Name"
+msgstr "_Имя"
+
+#: ../pidgin/gtkdialogs.c:758 ../pidgin/gtkdialogs.c:897
+#: ../pidgin/gtkdialogs.c:978
+msgid "_Account"
+msgstr "_Учётная запись"
+
+#: ../pidgin/gtkdialogs.c:905
 msgid "Get User Info"
 msgstr "Получить пользовательскую информацию"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:907
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -14909,11 +15061,11 @@ msgstr ""
 "Введите идентификатор пользователя или псевдоним персоны, информацию о "
 "которой вы хотели бы просмотреть."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:997
 msgid "View User Log"
 msgstr "Просмотреть журнал пользователя"
 
-#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:999
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -14921,32 +15073,32 @@ msgstr ""
 "Введите идентификатор пользователя или псевдоним персоны, журнал которой вы "
 "хотели бы просмотреть."
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Contact"
 msgstr "Псевдоним контакта"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this contact."
 msgstr "Введите псевдоним для этого контакта."
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1042
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Введите псевдоним для %s."
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1044
 msgid "Alias Buddy"
 msgstr "Псевдоним собеседника"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Alias Chat"
 msgstr "Псевдоним чата"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1066
 msgid "Enter an alias for this chat."
 msgstr "Введите псевдоним для этого чата."
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1105
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -14964,15 +15116,15 @@ msgstr[2] ""
 "Вы удалите контакт, содержащий %s и %d других собеседников из списка "
 "собеседников. Хотите продолжить?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1113
 msgid "Remove Contact"
 msgstr "Удалить контакт"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1116
 msgid "_Remove Contact"
 msgstr "_Удалить контакт"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1147
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -14980,15 +15132,15 @@ msgstr ""
 msgstr ""
 "Вы добавите содержимое группы %s к содержимому группы %s. Хотите продолжить?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1154
 msgid "Merge Groups"
 msgstr "Объединить группы"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1157
 msgid "_Merge Groups"
 msgstr "_Объединить группы"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1207
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -14997,70 +15149,70 @@ msgstr ""
 "Вы удалите группу %s и всех её членов из списка собеседников. Хотите "
 "продолжить?"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1210
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1213
 msgid "_Remove Group"
 msgstr "_Удалить группу"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1246
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Вы удалите %s из списка собеседников. Хотите продолжить?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1249
 msgid "Remove Buddy"
 msgstr "Удалить собеседника"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1252
 msgid "_Remove Buddy"
 msgstr "_Удалить собеседника"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1273
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "Вы удалите чат %s из списка собеседников. Хотите продолжить?"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1276
 msgid "Remove Chat"
 msgstr "Удалить чат"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1279
 msgid "_Remove Chat"
 msgstr "_Удалить чат"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr ""
 "Щёлкните правой кнопкой мыши для чтения других непрочитанных сообщений...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Изменить статус"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "Показывать список собеседников"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "Новое сообщение..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "Отключить звуки"
 
-#: ../pidgin/gtkdocklet.c:535
+#: ../pidgin/gtkdocklet.c:728
 #, fuzzy
-msgid "Blink on new message"
+msgid "Blink on New Message"
 msgstr "Мерцать при наличии нового сообщения"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "Выйти"
 
@@ -15150,43 +15302,43 @@ msgstr "_Возобновить"
 msgid "_Resume"
 msgstr "_Возобновить"
 
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:817
 msgid "Paste as Plain _Text"
 msgstr "Вставить как простой _текст"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:834 ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "_Reset formatting"
 msgstr "_Восстановить форматирование"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1361
 msgid "Hyperlink color"
 msgstr "Цвет гиперссылки"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1362
 msgid "Color to draw hyperlinks."
 msgstr "Цвет для отображения гиперссылок."
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1365
 msgid "Hyperlink prelight color"
 msgstr "Цвет подсветки гиперссылки"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1366
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Цвет для отображения гиперссылок при наведении на них курсора мыши."
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1583
 msgid "_Copy E-Mail Address"
 msgstr "_Скопировать адрес e-mail"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1595
 msgid "_Open Link in Browser"
 msgstr "_Открыть ссылку в браузере"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1605
 msgid "_Copy Link Location"
 msgstr "_Скопировать ссылку"
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3355
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15196,7 +15348,7 @@ msgstr ""
 "\n"
 "Принимается за PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3358
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15206,7 +15358,7 @@ msgstr ""
 "\n"
 "Принимается за PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3387
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15217,7 +15369,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3390
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15228,11 +15380,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3468 ../pidgin/gtkimhtml.c:3480
 msgid "Save Image"
 msgstr "Сохранить изображение"
 
-#: ../pidgin/gtkimhtml.c:3522
+#: ../pidgin/gtkimhtml.c:3508
 #, c-format
 msgid "_Save Image..."
 msgstr "_Сохранить изображение..."
@@ -15273,7 +15425,7 @@ msgstr "Вставить ссылку"
 msgid "Insert Link"
 msgstr "Вставить ссылку"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1263
 msgid "_Insert"
 msgstr "_Вставить"
 
@@ -15293,9 +15445,9 @@ msgid "Smile!"
 #. show everything
 #: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
-msgstr "Смайл!"
+msgstr "Улыбайтесь!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1220
 msgid "_Font"
 msgstr "_Шрифт"
 
@@ -15322,7 +15474,7 @@ msgid "Strikethrough"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
-msgstr ""
+msgstr "Перечёркнутый"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Increase Font Size"
@@ -15333,24 +15485,20 @@ msgstr ""
 msgstr ""
 
 #: ../pidgin/gtkimhtmltoolbar.c:1096
-#, fuzzy
 msgid "Font Face"
-msgstr "_Облик шрифта"
+msgstr "Облик шрифта"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
 msgid "Background Color"
-msgstr "Цвет _фона"
+msgstr "Цвет фона"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
 msgid "Foreground Color"
-msgstr "Цвет _текста"
+msgstr "Цвет текста"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
 msgid "Reset Formatting"
-msgstr "_Восстановить форматирование"
+msgstr "Восстановить форматирование"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1103
 #, fuzzy
@@ -15358,70 +15506,68 @@ msgstr "Вставить изображÐ
 msgstr "Вставить изображение"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
 msgid "Insert Smiley"
-msgstr "Вставить изображение"
+msgstr "Вставить смайлик"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<b>_Bold</b>"
 msgstr "<b>_Жирный</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<i>_Italic</i>"
 msgstr "<i>_Наклонный</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<u>_Underline</u>"
 msgstr "<u>_Подчёркнутый</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr "<span size='larger'>_Больший</span>"
+msgstr "<span strikethrough='true'>Перечёркнутый</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Больший</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "_Normal"
 msgstr "_Средний"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Меньший</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Font face"
 msgstr "_Облик шрифта"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Foreground _color"
 msgstr "Цвет _текста"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Bac_kground color"
 msgstr "Цвет _фона"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Смайлик"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1271
 msgid "_Image"
 msgstr "_Изображение"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1277
 msgid "_Link"
-msgstr "_Ссылка"
+msgstr "_Ссылку"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1283
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "_Абзацную линию"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1305
+msgid "_Smile!"
+msgstr "_Улыбайтесь!"
+
 #: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
@@ -15492,17 +15638,17 @@ msgstr "Общий размер журн
 msgid "Total log size:"
 msgstr "Общий размер журналов:"
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:710
 #, c-format
 msgid "Conversations in %s"
 msgstr "Беседы в %s"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
 #, c-format
 msgid "Conversations with %s"
 msgstr "Беседы с %s"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:810
 msgid "System Log"
 msgstr "Системный журнал"
 
@@ -15524,6 +15670,7 @@ msgid ""
 "  -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"
@@ -15537,12 +15684,13 @@ msgstr ""
 "  -l, --login[=ИМЯ]   войти автоматически (необязательный аргумент ИМЯ\n"
 "                      задаёт одну или несколько учётных записей,\n"
 "                      разделённых запятыми)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       показать текущую версию и выйти\n"
 
-#: ../pidgin/gtkmain.c:512
+#: ../pidgin/gtkmain.c:516
 #, c-format
 msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15563,7 +15711,7 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -15575,7 +15723,7 @@ msgstr "<span weight=\"bold\" size=\"lar
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Вам пришла почта!</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:545
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -15583,30 +15731,30 @@ msgstr[2] "%s имеет %d новых Ñ
 msgstr[1] "%s имеет %d новых сообщения."
 msgstr[2] "%s имеет %d новых сообщений."
 
-#: ../pidgin/gtknotify.c:564
+#: ../pidgin/gtknotify.c:569
 #, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>Подробности о модуле</b>"
 msgstr[1] "<b>Подробности о модуле</b>"
 msgstr[2] "<b>Подробности о модуле</b>"
 
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:997
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Команда запуска браузера \"%s\" неверна."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:999 ../pidgin/gtknotify.c:1011
+#: ../pidgin/gtknotify.c:1024 ../pidgin/gtknotify.c:1152
 msgid "Unable to open URL"
 msgstr "Не удаётся открыть URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1009 ../pidgin/gtknotify.c:1022
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Ошибка запуска \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1145
+#: ../pidgin/gtknotify.c:1153
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Был выбран браузер \"Другой\", но команда не была задана."
@@ -15655,95 +15803,95 @@ msgstr "Выбрать файл"
 msgstr "Выбрать файл"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "За кем следить"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "_Имя собеседника:"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "_Входит"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "В_ыходит"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "Отхо_дит"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "Во_звращается"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "Начинает безде_йствовать"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "Перестаёт бездействоват_ь"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "Начинает н_абор сообщения"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Приостанавливает на_бор сообщения"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "Прекращает набо_р сообщения"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "Отправляет сооб_щение"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "Открыть ок_но мгновенных сообщений"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "Вывести уведом_ление"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Отправить _сообщение"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "Выполнить ко_манду"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Воспроизвести зв_ук"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "_Открыть..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "От_крыть..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "Т_ест"
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:805
 msgid "P_ounce only when my status is not Available"
 msgstr "Выполн_ять только при статусе, отличном от \"Доступен\""
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:810
 msgid "_Recurring"
 msgstr "_Повторение"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1253
 msgid "Pounce Target"
 msgstr "Объект слежения"
 
@@ -15758,7 +15906,7 @@ msgid "Install Theme"
 
 #: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
-msgstr ""
+msgstr "Установить тему"
 
 #: ../pidgin/gtkprefs.c:697
 msgid ""
@@ -15792,7 +15940,7 @@ msgstr "_Скрывать новые бÐ
 msgid "_Hide new IM conversations:"
 msgstr "_Скрывать новые беседы:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
 msgid "When away"
 msgstr "Во время отсутствия"
 
@@ -15845,55 +15993,59 @@ msgstr "Показывать _форма
 msgid "Show _formatting on incoming messages"
 msgstr "Показывать _форматирование во входящих сообщениях"
 
-#: ../pidgin/gtkprefs.c:998
+#: ../pidgin/gtkprefs.c:997
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Закрывать мгновенные сообщения немедленно при закрытии вкладки"
+
+#: ../pidgin/gtkprefs.c:1000
 msgid "Show _detailed information"
 msgstr "Показывать _подробную информацию"
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:1002
 msgid "Enable buddy ic_on animation"
 msgstr "Разрешить _анимацию значков собеседников"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1009
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Уведомлять собеседников, что вы набираете им сообщение"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1012
 msgid "Highlight _misspelled words"
 msgstr "Подсвечивать слова с _ошибками"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1016
 msgid "Use smooth-scrolling"
 msgstr "Использовать плавную прокрутку"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1019
 msgid "F_lash window when IMs are received"
 msgstr "_Мерцать окном при принятии мгновенных сообщений"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1021
 msgid "Minimi_ze new conversation windows"
 msgstr "_Сворачивать новые окна бесед"
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:1025
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1027
 msgid "Use document font from _theme"
 msgstr "Использовать шрифт документа из _темы"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use font from _theme"
 msgstr "Использовать шрифт из _темы"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1031
 msgid "Conversation _font:"
 msgstr "_Шрифт беседы:"
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1045
 msgid "Default Formatting"
 msgstr "Форматирование по умолчанию"
 
-#: ../pidgin/gtkprefs.c:1062
+#: ../pidgin/gtkprefs.c:1064
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -15901,119 +16053,119 @@ msgstr ""
 "Так будет выглядеть текст ваших сообщений с использованием протоколов, "
 "поддерживающих форматирование."
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1130
 msgid "ST_UN server:"
 msgstr "ST_UN-сервер:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1142
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1146
 msgid "_Autodetect IP address"
 msgstr "Определять IP-адрес _автоматически"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1155
 msgid "Public _IP:"
 msgstr "Публичный _IP:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "Ports"
 msgstr "Порты"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Manually specify range of ports to listen on"
 msgstr "Указать диапазон прослушиваемых портов _вручную"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1190
 msgid "_Start port:"
 msgstr "_Начальный порт:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1197
 msgid "_End port:"
 msgstr "_Конечный порт:"
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1205
 msgid "Proxy Server"
 msgstr "Прокси-сервер"
 
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1209
 msgid "No proxy"
 msgstr "Нет прокси"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1265
 msgid "_User:"
 msgstr "_Пользователь:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Seamonkey"
-msgstr ""
+msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "GNOME Default"
 msgstr "Браузер GNOME по умолчанию"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1337
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1338
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1348
 msgid "Manual"
 msgstr "Другой"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1401
 msgid "Browser Selection"
 msgstr "Выбор браузера"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1405
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "_Open link in:"
 msgstr "_Открывать ссылку в:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "Browser default"
 msgstr "По умолчанию"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1416
 msgid "Existing window"
 msgstr "Существующее окно"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1418
 msgid "New tab"
 msgstr "Новая вкладка"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1432
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16022,69 +16174,69 @@ msgstr ""
 "_Вручную:\n"
 "(%s для URL)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log _format:"
 msgstr "_Формат журнала:"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all _instant messages"
 msgstr "Записывать все _мгновенные сообщения"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "Записывать все _чаты"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1481
 msgid "Log all _status changes to system log"
 msgstr "Записывать все изменения _статуса в системный журнал"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1627
 msgid "Sound Selection"
 msgstr "Выбор звука"
 
-#: ../pidgin/gtkprefs.c:1635
+#: ../pidgin/gtkprefs.c:1637
 #, c-format
 msgid "Quietest"
 msgstr "Очень тихо"
 
-#: ../pidgin/gtkprefs.c:1637
+#: ../pidgin/gtkprefs.c:1639
 #, c-format
 msgid "Quieter"
 msgstr "Тихо"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1641
 #, c-format
 msgid "Quiet"
 msgstr "Ниже среднего"
 
-#: ../pidgin/gtkprefs.c:1643
+#: ../pidgin/gtkprefs.c:1645
 #, c-format
 msgid "Loud"
 msgstr "Выше среднего"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1647
 #, c-format
 msgid "Louder"
 msgstr "Громко"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1649
 #, c-format
 msgid "Loudest"
 msgstr "Очень громко"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1715
 msgid "_Method:"
 msgstr "_Метод:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1717
 msgid "Console beep"
 msgstr "Сигнал динамиком"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1724
 msgid "No sounds"
 msgstr "Нет звуков"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1732
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16093,81 +16245,81 @@ msgstr ""
 "_Команда воспроизведения звука:\n"
 "(%s для имени файла)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1759
 msgid "Sounds when conversation has _focus"
 msgstr "Звуки, когда окно беседы в _фокусе"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1761
 msgid "Enable sounds:"
 msgstr "Воспроизводить звуки:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1772
 msgid "Volume:"
 msgstr "Громкость:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1852
 msgid "Play"
 msgstr "Воспроизводить"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "_Report idle time:"
 msgstr "Сообщать _время бездействия:"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:1934
 msgid "Based on keyboard or mouse use"
 msgstr "Основываясь на использовании клавиатуры или мыши"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:1943
 msgid "_Auto-reply:"
 msgstr "_Автоматический ответ:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1947
 msgid "When both away and idle"
 msgstr "Во время отсутствия и бездействия"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:1953
 msgid "Auto-away"
 msgstr "Авто-\"Отошёл\""
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1955
 msgid "Change status when _idle"
 msgstr "Менять статус при _бездействии"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:1959
 msgid "_Minutes before becoming idle:"
 msgstr "_Минут до начала бездействия:"
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:1967
 msgid "Change _status to:"
 msgstr "Менять _статус на:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:1988
 msgid "Status at Startup"
 msgstr "Статус при запуске"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1990
 msgid "Use status from last _exit at startup"
 msgstr "Использовать при запуске статус, бывший до в_ыхода"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:1996
 msgid "Status to a_pply at startup:"
 msgstr "_Применить при запуске статус:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2034
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "Темы смайликов"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2043
 msgid "Browser"
 msgstr "Браузер"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2047
 msgid "Status / Idle"
 msgstr "Статус / Бездействие"
 
@@ -16336,67 +16488,67 @@ msgstr "Ожидание сетевогÐ
 msgid "Waiting for network connection"
 msgstr "Ожидание сетевого соединения"
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkutils.c:633
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1400 ../pidgin/gtkutils.c:1423
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Произошла следующая ошибка при загрузке %s: %s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1403 ../pidgin/gtkutils.c:1425
 msgid "Failed to load image"
 msgstr "Не удалось загрузить изображение"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Нельзя отправить папку %s."
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1534 ../pidgin/gtkutils.c:1546
+#: ../pidgin/gtkutils.c:1553
 msgid "You have dragged an image"
 msgstr "Вы перетащили изображение"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1535
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1541 ../pidgin/gtkutils.c:1561
 msgid "Set as buddy icon"
 msgstr "Установить в качестве значка собеседника"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Send image file"
 msgstr "Отправить файл изображения"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1562
 msgid "Insert in message"
 msgstr "Вставить в сообщение"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1547
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 "Хотите установить это изображение в качестве значка собеседника для этого "
 "пользователя?"
 
-#: ../pidgin/gtkutils.c:1551
+#: ../pidgin/gtkutils.c:1554
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1552
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16407,17 +16559,17 @@ msgstr ""
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1614
 msgid "Cannot send launcher"
 msgstr "Нельзя отправить ярлык"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1614
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2349
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16428,25 +16580,25 @@ msgstr ""
 "<b>Размер файла:</b> %s\n"
 "<b>Размер изображения:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2645
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2647
 msgid "Icon Error"
 msgstr "Ошибка значка"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2648
 msgid "Could not set icon"
 msgstr "Не удалось установить значок"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2748
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Не удалось открыть файл '%s': %s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2797
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -16647,7 +16799,7 @@ msgstr "Полученные сообщÐ
 msgid "Received Messages"
 msgstr "Полученные сообщения"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Выберите цвет для %s"
@@ -16922,7 +17074,7 @@ msgstr ""
 "\n"
 "<b>Заметки о собеседнике</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "История"
 
@@ -17175,45 +17327,37 @@ msgstr "Горизонтальное Ñ€Ð
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Горизонтальное разделение GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Область ввода окна беседы"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "История бесед"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Система просмотра журналов"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "Диалог запроса"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Диалог уведомления"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Выберите цвет"
 
-#: ../pidgin/plugins/pidginrc.c:300
+#: ../pidgin/plugins/pidginrc.c:294
 #, c-format
 msgid "Select Interface Font"
 msgstr "Выберите шрифт"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Выберите шрифт для %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "Шрифт интерфейса GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -17237,36 +17381,36 @@ msgstr ""
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Цвета интерфейса"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Размер виджетов"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Записать настройки в %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Повторно прочитать файлы gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:538
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Управление темой GTK+ для Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Предоставляет доступ к часто используемым настройкам gtkrc."
 
@@ -17406,7 +17550,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Лента собеседников"
 
@@ -17414,7 +17558,7 @@ msgstr "Лента собеседникÐ
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Горизонтальная прокрутка списка собеседников."
 
@@ -17665,119 +17809,3 @@ msgstr ""
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Показывать собеседников не в сети"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Порт"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "По статусу"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "По размеру журнала"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Не удаётся соединиться с сервером."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Не удаётся загрузить список собеседников"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Текущий маркер"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Модуль протокола Novell GroupWise Messenger"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Ошибка: Аутентификация завершилась неудачно"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Неизвестная ошибка"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Не удаётся соединиться с сервером."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s изменил статус с %s на %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s теперь %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s больше не %s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "Сооб_щение:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "Отправить _файл"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Добавить правило..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Не разрешено не в сети"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Не разрешено не в сети"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Добавить собеседника"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Добавить чат"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Персидский"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Учётные записи"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Учётная запись:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Адресат"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Смайл!"
-
-#~ msgid "Would like to add him?"
-#~ msgstr "Хотите добавить его?"
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/Параметры/Показывать з_начок собеседника"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/Параметры/Показывать значок собеседника"
-
-#~ msgid "Norwegian"
-#~ msgstr "Норвежский"
============================================================
--- po/sv.po	2032933ec5b139f42c68fc101f5a7372e78d0508
+++ po/sv.po	012c1fd680f46d7a25e2d8acc8df43f37d482bcc
@@ -9,18 +9,19 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-08-15 00:26+0100\n"
-"Last-Translator: Peter Hjalmarsson <xake at telia.com>\n"
+"POT-Creation-Date: 2007-10-31 21:20+0100\n"
+"PO-Revision-Date: 2007-10-31 21:23+0100\n"
+"Last-Translator: Peter Hjalmarsson <xake at rymdraket.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
+#: ../finch/finch.c:64
+#: ../finch/finch.c:301
+#: ../finch/finch.c:330
 #: ../finch/finch.c:418
-#, fuzzy
 msgid "Finch"
 msgstr "Finch"
 
@@ -50,29 +51,32 @@ msgstr ""
 "  -n, --nologin       logga inte in automatiskt\n"
 "  -v, --version       visa den nuvarande versionen och avsluta\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328
+#: ../pidgin/gtkmain.c:718
 #, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr ""
-"%s stötte på problem då dina inställningar flyttades från %s till %s. Du kan "
-"undersöka och flytta inställningarna för han och rapportera felet på sidan "
-"http://developer.pidgin.im"
+msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
+msgstr "%s stötte på problem då dina inställningar flyttades från %s till %s. Du kan undersöka och flytta inställningarna för han och rapportera felet på sidan http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/gntaccount.c:124
+#: ../finch/gntaccount.c:484
+#: ../finch/gntblist.c:300
+#: ../finch/gntblist.c:433
+#: ../finch/gntblist.c:446
+#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:235
+#: ../finch/gntstatus.c:301
+#: ../finch/gntstatus.c:310
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1515
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/qq/im.c:576
+#: ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Fel"
@@ -101,8 +105,10 @@ msgstr "(Du glömde antagligen att köra
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Du glömde antagligen att köra 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496
+#: ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:4371
 msgid "Modify Account"
 msgstr "Ändra konto"
 
@@ -110,7 +116,8 @@ msgstr "Nytt konto"
 msgid "New Account"
 msgstr "Nytt konto"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
+#: ../finch/gntaccount.c:521
+#: ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protokoll:"
 
@@ -129,35 +136,54 @@ msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../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/gntblist.c:2287
+#: ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c:472
+#: ../finch/gntpounce.c:459
+#: ../finch/gntpounce.c:667
+#: ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485
+#: ../finch/gntstatus.c:610
+#: ../libpurple/account.c:1013
+#: ../libpurple/account.c:1263
+#: ../libpurple/account.c:1298
+#: ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666
+#: ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2416
+#: ../libpurple/protocols/jabber/buddy.c:2452
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
 #: ../libpurple/protocols/jabber/jabber.c:1737
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msn/msn.c:291
+#: ../libpurple/protocols/msn/msn.c:308
+#: ../libpurple/protocols/msn/msn.c:325
+#: ../libpurple/protocols/msn/msn.c:342
+#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/oscar/oscar.c:6149
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -175,54 +201,77 @@ msgstr "Alias:"
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1194
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc/chat.c:750
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/silc.c:954
+#: ../libpurple/protocols/silc/silc.c:1162
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../pidgin/gtkaccount.c:1913
+#: ../pidgin/gtkaccount.c:2501
+#: ../pidgin/gtkblist.c:6325
+#: ../pidgin/gtkcertmgr.c:197
+#: ../pidgin/gtkdialogs.c:772
+#: ../pidgin/gtkdialogs.c:911
+#: ../pidgin/gtkdialogs.c:1003
+#: ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1069
+#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkimhtmltoolbar.c:435
+#: ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289
+#: ../pidgin/gtkpounce.c:1113
+#: ../pidgin/gtkprivacy.c:563
+#: ../pidgin/gtkprivacy.c:579
+#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:618
+#: ../pidgin/gtkrequest.c:271
+#: ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Avbryt"
 
 # src/menus.c:280
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
+#: ../finch/gntaccount.c:579
+#: ../finch/gntcertmgr.c:311
+#: ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:472
+#: ../finch/gntpounce.c:465
+#: ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1055
+#: ../finch/gntstatus.c:488
+#: ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1297
+#: ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727
+#: ../pidgin/gtkdebug.c:749
 #: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr "Spara"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632
+#: ../pidgin/gtkaccount.c:1905
+#: ../pidgin/gtksavedstatuses.c:333
+#: ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Är du säker på att du vill ta bort %s?"
@@ -232,17 +281,27 @@ msgstr "Ta bort konto"
 msgstr "Ta bort konto"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:707
+#: ../finch/gntcertmgr.c:319
+#: ../finch/gntpounce.c:666
+#: ../finch/gntpounce.c:729
+#: ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1912
+#: ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1112
+#: ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669
+#: ../finch/gntblist.c:2121
+#: ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2331
+#: ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Konton"
 
@@ -251,52 +310,72 @@ msgstr "Du kan aktivera/avaktivera konto
 msgstr "Du kan aktivera/avaktivera konton från följande lista."
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:698
+#: ../finch/gntaccount.c:888
+#: ../finch/gntblist.c:343
+#: ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456
+#: ../finch/gntblist.c:2372
+#: ../finch/gntcertmgr.c:306
+#: ../finch/gntnotify.c:385
+#: ../finch/gntpounce.c:713
+#: ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:883
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc10/chat.c:599
+#: ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:6324
+#: ../pidgin/gtkconv.c:1713
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Lägg till"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:703
+#: ../finch/gntpounce.c:721
 msgid "Modify"
 msgstr "Ändra"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811
+#: ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s har gjort %s till sin kompis%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884
+#: ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Lägg till kompisen i din lista?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944
+#: ../pidgin/gtkaccount.c:2557
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s vill lägga till %s i sin kompislista%s%s"
 
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
+#: ../finch/gntaccount.c:969
+#: ../finch/gntaccount.c:972
+#: ../finch/gntaccount.c:999
 #: ../pidgin/gtkaccount.c:2580
+#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "Auktorisera kompis?"
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:976
+#: ../finch/gntaccount.c:1003
+#: ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "Auktorisera"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:977
+#: ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "Neka"
 
@@ -320,45 +399,62 @@ msgstr "Gick inte lägga till kompis"
 msgid "Error adding buddy"
 msgstr "Gick inte lägga till kompis"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325
+#: ../libpurple/protocols/oscar/oscar.c:2903
+#: ../pidgin/gtkaccount.c:1986
+#: ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Användar-ID"
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
+#: ../finch/gntblist.c:328
+#: ../finch/gntblist.c:410
+#: ../finch/gntblist.c:1250
+#: ../libpurple/protocols/msn/msn.c:1514
+#: ../libpurple/protocols/silc/chat.c:610
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
+#: ../libpurple/protocols/zephyr/zephyr.c:1207
+#: ../pidgin/gtkdialogs.c:1022
+#: ../pidgin/gtkdialogs.c:1046
+#: ../pidgin/gtkdialogs.c:1068
 #: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:413
 msgid "Group"
 msgstr "Grupp"
 
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:335
+#: ../finch/gntblist.c:401
+#: ../finch/gntblist.c:1305
+#: ../finch/gntblist.c:2210
+#: ../finch/gntblist.c:2274
+#: ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3209
+#: ../pidgin/gtknotify.c:511
+#: ../pidgin/gtkpounce.c:1280
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+#: ../finch/gntblist.c:341
+#: ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/yahoo.c:3345
+#: ../pidgin/gtkblist.c:5830
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Lägg till kompis"
@@ -367,27 +463,35 @@ msgstr "Fel då kompisen skulle läggas 
 msgid "Please enter buddy information."
 msgstr "Fel då kompisen skulle läggas till"
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370
+#: ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Chattar"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:2205
+#: ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
+#: ../libpurple/protocols/msn/msn.c:1695
+#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msn/msn.c:1787
+#: ../libpurple/protocols/qq/buddy_info.c:44
+#: ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Namn"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:819
 msgid "Auto-join"
 msgstr "Anslut automatiskt"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419
+#: ../finch/gntblist.c:854
+#: ../pidgin/gtkblist.c:6212
 msgid "Add Chat"
 msgstr "Lägg till chatt"
 
@@ -395,7 +499,8 @@ msgstr "Du kan ändra mer information fr
 msgid "You can edit more information from the context menu later."
 msgstr "Du kan ändra mer information från omgivningsmenyn senare."
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
+#: ../finch/gntblist.c:433
+#: ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "Fel då gruppen skulle läggas till"
 
@@ -407,9 +512,11 @@ msgstr "En grupp med det namnet finns re
 msgid "A group with the name already exists."
 msgstr "En grupp med det namnet finns redan."
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
+#: ../finch/gntblist.c:454
+#: ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5484
+#: ../pidgin/gtkblist.c:6321
 msgid "Add Group"
 msgstr "Lägg till grupp"
 
@@ -425,7 +532,8 @@ msgstr "Var vänlig uppdatera de nödvä
 msgid "Please Update the necessary fields."
 msgstr "Var vänlig uppdatera de nödvändiga fälten."
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:803
+#: ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Redigera"
 
@@ -433,16 +541,19 @@ msgstr "Ändra inställningar"
 msgid "Edit Settings"
 msgstr "Ändra inställningar"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864
+#: ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Information"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:864
+#: ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Hämtar..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../finch/gntblist.c:904
+#: ../finch/gntconv.c:534
+#: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Hämta info"
@@ -452,10 +563,12 @@ msgstr "Lägg till kompisövervakning"
 msgstr "Lägg till kompisövervakning"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915
+#: ../finch/gntconv.c:546
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "Skicka fil"
 
@@ -468,7 +581,8 @@ msgstr "Ange det nya namnet för %s"
 msgid "Please enter the new name for %s"
 msgstr "Ange det nya namnet för %s"
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#: ../finch/gntblist.c:1002
+#: ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "Byt namn"
 
@@ -498,15 +612,22 @@ msgstr "Bekräfta borttagning"
 msgid "Confirm Remove"
 msgstr "Bekräfta borttagning"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../finch/gntblist.c:1100
+#: ../finch/gntblist.c:1252
+#: ../finch/gntft.c:227
+#: ../pidgin/gtkconv.c:1710
+#: ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Ta bort"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226
+#: ../finch/gntblist.c:2422
+#: ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83
+#: ../pidgin/gtkblist.c:2889
+#: ../pidgin/gtkblist.c:4614
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Kompislista"
@@ -520,44 +641,51 @@ msgstr "Välj tagg"
 msgstr "Välj tagg"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../finch/gntblist.c:1298
+#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050
+#: ../libpurple/protocols/gg/gg.c:1123
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2399
 #: ../libpurple/protocols/jabber/jabber.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1544
 #: ../libpurple/protocols/jabber/jabber.c:1567
 #: ../libpurple/protocols/jabber/jabber.c:1590
 #: ../libpurple/protocols/jabber/jabber.c:1613
 #: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1522
+#: ../libpurple/protocols/msn/msn.c:1698
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
 #: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
+#: ../pidgin/gtkblist.c:3233
 msgid "Nickname"
 msgstr "Smeknamn"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../finch/gntblist.c:1320
+#: ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:354
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2927
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
+#: ../pidgin/gtkblist.c:3261
+#: ../pidgin/gtkblist.c:3667
+#: ../pidgin/gtkprefs.c:1987
 msgid "Idle"
 msgstr "Inaktiv"
 
@@ -588,167 +716,215 @@ msgstr ""
 "\n"
 "Sågs senast: för %s sedan"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1704
+#: ../pidgin/gtkdocklet.c:582
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Nytt..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1711
+#: ../pidgin/gtkdocklet.c:583
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Sparad..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2089
+#: ../finch/gntplugin.c:343
+#: ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716
+#: ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Namn"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Konto"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2218
+#: ../pidgin/gtkdialogs.c:766
 msgid "New Instant Message"
 msgstr "Nytt snabbmeddelanden"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Ange användar-ID eller alias för den person som du vill skicka "
-"snabbmeddelande till."
+#: ../finch/gntblist.c:2220
+#: ../pidgin/gtkdialogs.c:768
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr "Ange användar-ID eller alias för den person som du vill skicka snabbmeddelande till."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
+#: ../finch/gntblist.c:2223
+#: ../finch/gntcertmgr.c:90
+#: ../finch/gntconn.c:136
+#: ../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:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324
+#: ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/oscar/oscar.c:6148
 #: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:749
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/silc.c:953
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../pidgin/gtkblist.c:4370
+#: ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:771
+#: ../pidgin/gtkdialogs.c:910
+#: ../pidgin/gtkdialogs.c:1002
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "OK"
 
+#: ../finch/gntblist.c:2270
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../finch/gntblist.c:2282
+#: ../pidgin/gtkblist.c:927
+msgid "Join a Chat"
+msgstr "Anslut till chatt"
+
+#: ../finch/gntblist.c:2284
+msgid "Please enter the name of the chat you want to join."
+msgstr "Ange namnet på chatten du vill gå med i."
+
+#: ../finch/gntblist.c:2286
+#: ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "Anslut"
+
 # src/menus.c:311
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2324
+#: ../finch/gntpounce.c:447
+#: ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Alternativ"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "Skicka IM..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "Visa tomma grupper"
+#: ../finch/gntblist.c:2334
+msgid "Join Chat..."
+msgstr "Anslut till chatt..."
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Visa frånkopplade kompisar"
+#: ../finch/gntblist.c:2338
+msgid "Show"
+msgstr "Visa"
 
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Sortera efter status"
+#: ../finch/gntblist.c:2343
+msgid "Empty groups"
+msgstr "Tomma grupper"
 
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Sortera alfabetiskt"
+#: ../finch/gntblist.c:2349
+msgid "Offline buddies"
+msgstr "Frånkopplade kompisar"
 
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Sortera efter loggstorlek"
+#: ../finch/gntblist.c:2355
+msgid "Sort"
+msgstr "Sortera"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
+#: ../finch/gntblist.c:2360
+msgid "By Status"
+msgstr "Efter status"
+
+#: ../finch/gntblist.c:2364
+#: ../pidgin/gtkblist.c:4155
+msgid "Alphabetically"
+msgstr "Alfabetiskt"
+
+#: ../finch/gntblist.c:2368
+msgid "By Log Size"
+msgstr "Efter loggstorlek"
+
+#: ../finch/gntcertmgr.c:86
+#: ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
-msgstr "Anslutningsport"
+msgstr "Certifikatsimportering"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:87
+#: ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr ""
+msgstr "Ange ett värdnamn"
 
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+#: ../finch/gntcertmgr.c:88
+#: ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "Ange värden detta certifikatet är för."
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:97
+#: ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"Filen %s kunde inte importeras.\n"
+"Försäkra dig om att filen är skrivbar och i PEM-format.\n"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:99
+#: ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "Certifikatsimporteringsfel"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:100
+#: ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "X.509-certifikatimportering misslyckades"
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-#, fuzzy
+#: ../finch/gntcertmgr.c:110
+#: ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
-msgstr "Välj en fil"
+msgstr "Välj et PEM-certifikat"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:127
+#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"Exportering till filen %s misslyckades.\n"
+"Kontrollera så du har skrivrättigheter i målkatalogen\n"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:129
+#: ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "Certifikatsexporteringsfel"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:130
+#: ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "X.509-certifikasexportering misslyckades"
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+#: ../finch/gntcertmgr.c:159
+#: ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "PEM X.509-certifikasexportering"
 
 #: ../finch/gntcertmgr.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate for %s"
-msgstr "Status för %s"
+msgstr "Certifikat för %s"
 
 #: ../finch/gntcertmgr.c:195
 #, c-format
@@ -758,70 +934,85 @@ msgstr ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"Vanligt namn: %s\n"
+"\n"
+"SHA1-fingeravtryck:\n"
+"%s"
 
 #: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "SSL Värdcertifikat"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#: ../finch/gntcertmgr.c:233
+#: ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "Säker på att ta bort certifikat för %s?"
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+#: ../finch/gntcertmgr.c:236
+#: ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "Godkänn borttagning av certifikat"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+#: ../finch/gntcertmgr.c:293
+#: ../pidgin/gtkcertmgr.c:602
 msgid "Certificate Manager"
-msgstr ""
+msgstr "Certifikatshanterare"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../finch/gntcertmgr.c:298
+#: ../libpurple/protocols/bonjour/bonjour.c:666
+#: ../libpurple/protocols/silc/silc.c:1138
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Värdnamn"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../finch/gntcertmgr.c:315
+#: ../finch/gntnotify.c:388
+#: ../pidgin/gtkconv.c:1689
 #: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Information"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../finch/gntcertmgr.c:324
+#: ../finch/gntft.c:237
+#: ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:211
+#: ../finch/gntplugin.c:403
+#: ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216
+#: ../libpurple/protocols/msn/msn.c:407
+#: ../libpurple/protocols/silc/util.c:386
+#: ../libpurple/protocols/silc10/util.c:377
+#: ../pidgin/gtkaccount.c:2474
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Stäng"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s kopplades ifrån."
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"Finch kommer inte försöka ansluta förrän du har rättat till felet och "
-"Ã¥teraktiverat kontot."
+"Finch kommer inte försöka ansluta förrän du har rättat till felet och återaktiverat kontot."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138
+#: ../pidgin/gtkblist.c:4372
 msgid "Re-enable Account"
 msgstr "Ã…teraktivera konto"
 
@@ -829,30 +1020,34 @@ msgstr "Finns inget sådant kommando."
 msgid "No such command."
 msgstr "Finns inget sådant kommando."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:143
+#: ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Syntaxfel: Du skrev fel antal argument till det kommandot."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:148
+#: ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "Ditt kommando misslyckades av okänd anledning."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:153
+#: ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "Det kommandot fungerar bara i chattar, inte i snabbmeddelanden."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:156
+#: ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "Det kommandot fungerar bara i snabbmeddelanden, inte chattar."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:160
+#: ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "Det kommandot funkar inte under detta protokoll."
 
 #: ../finch/gntconv.c:168
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "Meddelandet kunde inte skickas eftersom skickade för snabbt:"
+msgstr "Meddelandet skickades inte eftersom du inte är inloggad."
 
 #: ../finch/gntconv.c:251
 #, c-format
@@ -864,7 +1059,8 @@ msgstr "%s [%s]"
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:279
+#: ../finch/gntconv.c:801
 #, c-format
 msgid ""
 "\n"
@@ -877,67 +1073,66 @@ msgstr "Du har lämnat denna chatt."
 msgid "You have left this chat."
 msgstr "Du har lämnat denna chatt."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:414
+#: ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Loggning startades. Framtida meddelanden i denna konversation kommer att "
-"loggas."
+msgstr "Loggning startades. Framtida meddelanden i denna konversation kommer att loggas."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Loggning stoppades. Framtida meddelanden i denna konversation kommer inte "
-"att loggas."
+#: ../finch/gntconv.c:420
+#: ../pidgin/gtkconv.c:1424
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "Loggning stoppades. Framtida meddelanden i denna konversation kommer inte att loggas."
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:469
 msgid "Send To"
 msgstr "Skicka till"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:513
 msgid "Conversation"
 msgstr "Konversation"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:519
 msgid "Clear Scrollback"
 msgstr "Rensa tillbakablick"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:523
+#: ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Visa tidsstämplar"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:539
 msgid "Add Buddy Pounce..."
 msgstr "Lägg till kompisattack..."
 
-#: ../finch/gntconv.c:527
-#, fuzzy
+#: ../finch/gntconv.c:554
 msgid "Enable Logging"
-msgstr "/Alternativ/Aktivera loggning"
+msgstr "Aktivera loggning"
 
-#: ../finch/gntconv.c:533
-#, fuzzy
+#: ../finch/gntconv.c:560
 msgid "Enable Sounds"
-msgstr "Aktivera ljud:"
+msgstr "Aktivera Ljud"
 
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:766
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-SVAR>"
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:889
 msgid "List of users:\n"
 msgstr "Lista över användare:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1051
+#: ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "De felsökningsalternativ som stöds är: version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1087
+#: ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "Det finns inget sådant kommando (i denna kontext)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1090
+#: ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -945,64 +1140,70 @@ msgstr ""
 "Använde \"/help &lt;kommando&gt;\" för hjälp om ett specifikt kommando.\n"
 "Följande kommandon är tillgängliga i sammanhanget:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"say &lt;meddelande&gt;:  Skickar ett meddelande normalt som om du inte "
-"använde ett kommando."
+#: ../finch/gntconv.c:1148
+#: ../pidgin/gtkconv.c:7687
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+msgstr "say &lt;meddelande&gt;:  Skickar ett meddelande normalt som om du inte använde ett kommando."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1151
+#: ../pidgin/gtkconv.c:7690
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;åtgärd&gt;:  Skickar en åtgärd i IRC-stil till en kompis eller chatt."
+msgstr "me &lt;åtgärd&gt;:  Skickar en åtgärd i IRC-stil till en kompis eller chatt."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;alternativ&gt;:  Skickar all möjlig felsökningsinformation till "
-"den nuvarande konversationen."
+#: ../finch/gntconv.c:1154
+#: ../pidgin/gtkconv.c:7693
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr "debug &lt;alternativ&gt;:  Skickar all möjlig felsökningsinformation till den nuvarande konversationen."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1157
+#: ../pidgin/gtkconv.c:7696
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Rensar konversationens tillbakablick."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1160
+#: ../pidgin/gtkconv.c:7702
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;kommando&gt;:  Hjälp för ett specifikt kommando."
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1163
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Visa listan av användare i chatten."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1168
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Visa fönstret med insticksmoduler."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1171
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Visa kompislistan."
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1174
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Visa kontohanteraren."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1177
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Visa felsökningsfönstret."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1180
 msgid "prefs: Show the preference window."
 msgstr "prefs: Visa inställningsfönstret."
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Visar statushanteraren."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231
+#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "Kan inte öppna filen."
+
+#: ../finch/gntdebug.c:271
+#: ../finch/gntui.c:86
+#: ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
@@ -1010,38 +1211,47 @@ msgstr "Felsökningsfönster"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292
+#: ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Rensa"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
 msgstr "Filter:"
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309
+#: ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
+#: ../finch/gntft.c:118
+#: ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Filöverföringar - %d%% av %d filer"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:123
+#: ../finch/gntft.c:196
+#: ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:234
+#: ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "Filöverföringar"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:201
+#: ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Överfört"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:201
+#: ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Filnamn"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:201
+#: ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Storlek"
 
@@ -1049,31 +1259,39 @@ msgstr "Hastighet"
 msgid "Speed"
 msgstr "Hastighet"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:201
+#: ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Återstår"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../finch/gntft.c:201
+#: ../finch/gntstatus.c:547
+#: ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:358
+#: ../libpurple/protocols/gg/gg.c:1039
+#: ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
 #: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/novell/novell.c:2840
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:2715
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/yahoo/yahoo.c:3250
+#: ../pidgin/gtkblist.c:3305
+#: ../pidgin/gtkblist.c:3319
+#: ../pidgin/gtkblist.c:3321
+#: ../pidgin/gtksavedstatuses.c:999
+#: ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Status"
 
@@ -1086,23 +1304,30 @@ msgstr "Rensa bort färdiga överföring
 msgstr "Rensa bort färdiga överföringar"
 
 # Osäker
+# Denna har med överföringar att göra, så antagligen är det "stop" som i stoppa eller avbryt. Går på "Stoppa", men det är öppet för disskussion.
 #: ../finch/gntft.c:232
 msgid "Stop"
-msgstr "Stopp"
+msgstr "Stoppa"
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
+#: ../finch/gntft.c:305
+#: ../pidgin/gtkft.c:169
+#: ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "Väntar på att överföringen ska inledas"
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:372
+#: ../pidgin/gtkft.c:166
+#: ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "Avbruten"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:374
+#: ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:420
+#: ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
@@ -1110,14 +1335,17 @@ msgid "The file was saved as %s."
 #: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "Filen sparades som %s."
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
+#: ../finch/gntft.c:432
+#: ../finch/gntft.c:433
+#: ../pidgin/gtkft.c:163
 #: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "Färdig"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437
+#: ../libpurple/protocols/msn/session.c:388
 msgid "Transferring"
 msgstr "Överför"
 
@@ -1125,72 +1353,78 @@ msgstr "Epost"
 msgid "Emails"
 msgstr "Epost"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171
+#: ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Du har ett e-post!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:518
 msgid "Sender"
 msgstr "Sändare"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:525
 msgid "Subject"
 msgstr "Ämne"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) har %d nytt meddelande."
 msgstr[1] "%s (%s) har %d nya meddelanden."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226
+#: ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "Ny epost"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291
+#: ../pidgin/gtknotify.c:948
 #, c-format
 msgid "Info for %s"
 msgstr "Information om %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292
+#: ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:949
 msgid "Buddy Information"
 msgstr "Information om kompis"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Fortsätt"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391
+#: ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "Meddelande"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "Anslut"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397
+#: ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Bjud in"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(inget)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:76
+#: ../finch/gntplugin.c:85
 msgid "ERROR"
 msgstr "FEL"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:76
 msgid "loading plugin failed"
 msgstr "inläsning av modul misslyckades."
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:85
 msgid "unloading plugin failed"
 msgstr "borttagning av modul misslyckades"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:130
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1207,19 +1441,39 @@ msgstr ""
 "Hemsida: %s\n"
 "Filnamn: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:188
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Modulen behöver laddas före du kan konfigurera den."
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:236
 msgid "No configuration options for this plugin."
 msgstr "Ingen konfiguration tillgängliga för denna modul."
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:257
+msgid "Error loading plugin"
+msgstr "Fel vid inläsning av insticksmodul"
+
+#: ../finch/gntplugin.c:258
+msgid "The selected file is not a valid plugin."
+msgstr "Den valda filen är inte en giltig instickmodul."
+
+#: ../finch/gntplugin.c:259
+msgid "Please open the debug window and try again to see the exact error message."
+msgstr "Öppna felsökningsfönstret och försök igen för att få det exakta felmeddelandet."
+
+#: ../finch/gntplugin.c:322
+msgid "Select plugin to install"
+msgstr "Välj en instickmodul att installera"
+
+#: ../finch/gntplugin.c:348
 msgid "You can (un)load plugins from the following list."
 msgstr "Du kan (av)läsa moduler från följande lista."
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:399
+msgid "Install Plugin..."
+msgstr "Installera instickmodul..."
+
+#: ../finch/gntplugin.c:408
 msgid "Configure Plugin"
 msgstr "Konfigurera modul"
 
@@ -1228,20 +1482,27 @@ msgstr "Konfigurera modul"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:464
+#: ../finch/gntplugin.c:471
+#: ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90
+#: ../pidgin/gtkdocklet.c:717
+#: ../pidgin/gtkprefs.c:2130
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:183
+#: ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Ange en kompis som ska attackeras."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328
+#: ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Ny kompisattack"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:328
+#: ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Ändra kompisattack"
 
@@ -1250,7 +1511,8 @@ msgstr "Attackera vem"
 msgstr "Attackera vem"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:336
+#: ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1259,7 +1521,8 @@ msgstr "Kompisnamn:"
 msgstr "Kompisnamn:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:374
+#: ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Attackera när kompisen..."
 
@@ -1304,7 +1567,8 @@ msgstr "Skickar ett meddelande"
 msgstr "Skickar ett meddelande"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:414
+#: ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Handling"
 
@@ -1332,84 +1596,97 @@ msgstr "Attackera enbart då min status 
 msgid "Pounce only when my status is not available"
 msgstr "Attackera enbart då min status är frånvarande"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:450
+#: ../pidgin/gtkpounce.c:1293
 msgid "Recurring"
 msgstr "Ã…terkommande"
 
 #: ../finch/gntpounce.c:618
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "Kan inte ändra nick"
+msgstr "Kunde inte skapa kompisattack"
 
 #: ../finch/gntpounce.c:619
-#, fuzzy
 msgid "You do not have any accounts."
-msgstr "Du måste välja ett konto."
+msgstr "Du har inga konton."
 
 #: ../finch/gntpounce.c:620
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "Du måste skapa ett konto före du kan skapa en kompisattack."
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:662
+#: ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Är du säker på att du vill ta bort attacken för %s då %s"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:696
+#: ../finch/gntui.c:84
+#: ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Kompisattacker"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:810
+#: ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s har börjat skriva till dig (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:812
+#: ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s har pausat i meddelandet till dig (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:814
+#: ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s har loggat in (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:816
+#: ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s har blivit aktiv igen (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:818
+#: ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s har kommit tillbaka (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:820
+#: ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s har slutat skriva till dig (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:822
+#: ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s har kopplat ifrån (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824
+#: ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s har blivit inaktiv (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:826
+#: ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s har gått iväg. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:828
+#: ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s har sänt dig ett meddelande. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:829
+#: ../pidgin/gtkpounce.c:1483
 #, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Okänd atackhändelse. Var snäll och rapportera detta!"
@@ -1418,12 +1695,16 @@ msgstr "Baserat på tangetbordsanvändni
 msgid "Based on keyboard use"
 msgstr "Baserat på tangetbordsanvändning"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94
+#: ../pidgin/gtkprefs.c:1992
 msgid "From last sent message"
 msgstr "Från senast sända meddelande"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:96
+#: ../pidgin/gtkprefs.c:898
+#: ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:1991
+#: ../pidgin/gtkprefs.c:2005
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Aldrig"
@@ -1473,80 +1754,101 @@ msgstr "Ändra status till"
 msgstr "Ändra status till"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259
+#: ../pidgin/gtkprefs.c:994
+#: ../pidgin/gtkprefs.c:2096
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Konversationer"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260
+#: ../pidgin/gtkprefs.c:1524
+#: ../pidgin/gtkprefs.c:2107
 msgid "Logging"
 msgstr "Loggning"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "Funktionen är inte implementerad ännu."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../finch/gntrequest.c:661
+#: ../pidgin/gtkrequest.c:1555
 #: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Spara fil..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../finch/gntrequest.c:661
+#: ../pidgin/gtkrequest.c:1556
 #: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Öppna fil..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97
+#: ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Kompis loggar in"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98
+#: ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Kompis loggar ut"
 
 # Försöker hålla samma tempus som ovan.
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99
+#: ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Meddelande tas emot"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100
+#: ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Mottaget meddelande inleder konversation"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101
+#: ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Meddelande skickas"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102
+#: ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Person går in i chatt"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103
+#: ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Person lämnar chatt"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104
+#: ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Du pratar i chatt"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:105
+#: ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Andra pratar i chatt"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:107
+#: ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "Någon nämner ditt skärmnamn i en chatt"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361
+#: ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "GStreamer fel"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362
+#: ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer misslyckades med att initialisera."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716
+#: ../finch/gntsound.c:802
+#: ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:1737
+#: ../pidgin/gtkprefs.c:1933
 msgid "(default)"
 msgstr "(förval)"
 
@@ -1562,7 +1864,8 @@ msgstr "Profiler"
 msgid "Profiles"
 msgstr "Profiler"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954
+#: ../pidgin/gtkprefs.c:1778
 msgid "Automatic"
 msgstr "Automatiskt"
 
@@ -1570,7 +1873,8 @@ msgstr "Konsollpip"
 msgid "Console Beep"
 msgstr "Konsollpip"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958
+#: ../pidgin/gtkprefs.c:1782
 msgid "Command"
 msgstr "Kommando"
 
@@ -1578,7 +1882,8 @@ msgstr "Inga ljud"
 msgid "No Sound"
 msgstr "Inga ljud"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961
+#: ../pidgin/gtkprefs.c:1773
 msgid "Sound Method"
 msgstr "Ljudmetod"
 
@@ -1596,7 +1901,8 @@ msgstr ""
 "(%s för filnamn)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981
+#: ../pidgin/gtkprefs.c:1817
 msgid "Sound Options"
 msgstr "Ljudalternativ"
 
@@ -1604,18 +1910,23 @@ msgstr "Ljud när konversationsfönstret
 msgid "Sounds when conversation has focus"
 msgstr "Ljud när konversationsfönstret är fokuserat"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990
+#: ../pidgin/gtkprefs.c:897
+#: ../pidgin/gtkprefs.c:909
+#: ../pidgin/gtkprefs.c:1824
+#: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Alltid"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991
+#: ../pidgin/gtkprefs.c:1822
 msgid "Only when available"
 msgstr "Endast vid tillgänglig"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992
+#: ../pidgin/gtkprefs.c:1823
 msgid "Only when not available"
 msgstr "Edast vid Ej tillgänglig"
 
@@ -1624,11 +1935,13 @@ msgstr "Volym(0-100):"
 msgstr "Volym(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018
+#: ../pidgin/gtkprefs.c:1859
 msgid "Sound Events"
 msgstr "Ljudhändelser"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020
+#: ../pidgin/gtkprefs.c:1918
 msgid "Event"
 msgstr "Händelse"
 
@@ -1636,15 +1949,18 @@ msgstr "Fil"
 msgid "File"
 msgstr "Fil"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039
+#: ../pidgin/gtkprefs.c:1937
 msgid "Test"
 msgstr "Test"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042
+#: ../pidgin/gtkprefs.c:1941
 msgid "Reset"
 msgstr "Återställ"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045
+#: ../pidgin/gtkprefs.c:1945
 msgid "Choose..."
 msgstr "Välj..."
 
@@ -1657,19 +1973,22 @@ msgstr "Borttagningsstatus"
 msgid "Delete Status"
 msgstr "Borttagningsstatus"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
+#: ../finch/gntstatus.c:176
+#: ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Sparade statusar"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1486
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Titel"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
+#: ../finch/gntstatus.c:183
+#: ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Typ"
 
@@ -1682,47 +2001,61 @@ msgstr "Typ"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:564
+#: ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:270
+#: ../libpurple/protocols/bonjour/bonjour.c:277
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/gg/gg.c:1077
+#: ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597
+#: ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613
+#: ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627
+#: ../libpurple/protocols/irc/irc.c:234
 #: ../libpurple/protocols/jabber/jabber.c:1532
 #: ../libpurple/protocols/jabber/jabber.c:1555
 #: ../libpurple/protocols/jabber/jabber.c:1578
 #: ../libpurple/protocols/jabber/jabber.c:1601
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/msn/msn.c:640
+#: ../libpurple/protocols/msn/msn.c:647
+#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/msn/msn.c:673
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../libpurple/protocols/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:5609
+#: ../libpurple/protocols/oscar/oscar.c:5827
+#: ../libpurple/protocols/oscar/oscar.c:5841
+#: ../libpurple/protocols/oscar/oscar.c:5857
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:5871
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/silc/buddy.c:1554
+#: ../libpurple/protocols/silc10/buddy.c:1554
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../pidgin/gtksavedstatuses.c:526
+#: ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr "Meddelande"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
+#: ../finch/gntstatus.c:194
+#: ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Använd"
 
@@ -1746,7 +2079,8 @@ msgstr "Understatus"
 msgid "Substatus"
 msgstr "Understatus"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
+#: ../finch/gntstatus.c:464
+#: ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Status:"
 
@@ -1769,9 +2103,10 @@ msgid "Certificates"
 
 #: ../finch/gntui.c:85
 msgid "Certificates"
-msgstr ""
+msgstr "Certifikat"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89
+#: ../pidgin/gtkprefs.c:2098
 msgid "Sounds"
 msgstr "Ljud"
 
@@ -1779,25 +2114,23 @@ msgstr "Status"
 msgid "Statuses"
 msgstr "Status"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "Det blev problem då insticksmodulen avladdades."
+msgstr "Fel vid inläsning av insticksmodulen."
 
 #: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "Kan inte öppna fil"
+msgstr "Kunde inte hitta X display"
 
 #: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "Kan inte öppna fil"
+msgstr "Kunde inte hitta fönster"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "Insticksmodulen kan inte laddas eftersom den inte är byggd med stöd för X11."
 
 #: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
@@ -1808,12 +2141,8 @@ msgstr "Klippbordsmodul"
 msgstr "Klippbordsmodul"
 
 #: ../finch/plugins/gntclipboard.c:161
-msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
-msgstr ""
-"När innehållet i gnt klippboken ändras görs innehållet tillgänligt för X, "
-"när det är möjligt."
+msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
+msgstr "När innehållet i gnt klippboken ändras görs innehållet tillgänligt för X, när det är möjligt."
 
 #: ../finch/plugins/gntgf.c:231
 #, c-format
@@ -1872,30 +2201,32 @@ msgstr "GntGf"
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
+#: ../finch/plugins/gntgf.c:379
+#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Toastermodul"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116
+#: ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Konversation med %s på %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138
+#: ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Historikinstiksmodulen kräver loggning"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139
+#: ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
 "Loggning kan aktiveras från Verktyg -> Inställningar -> Loggning.\n"
 "\n"
-"Om loggning aktiveras för snabbmeddelanden och/eller chattar så aktiveras "
-"även historik för samma konversationstyper."
+"Om loggning aktiveras för snabbmeddelanden och/eller chattar så aktiveras även historik för samma konversationstyper."
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
@@ -1903,17 +2234,15 @@ msgstr "GntHistorik"
 
 # Kan tyckas vara en konstig mening, men läs nästa översättning så
 # förstår du.
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181
+#: ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Visar nyligen loggade konversationer i nya konversationsfönster."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr ""
-"När en ny konversation öppnas kommer denna insticksmodul att lägga till den "
-"föregående konversationen i den nuvarande."
+#: ../finch/plugins/gnthistory.c:182
+#: ../pidgin/plugins/history.c:198
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+msgstr "När en ny konversation öppnas kommer denna insticksmodul att lägga till den föregående konversationen i den nuvarande."
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
@@ -1928,7 +2257,8 @@ msgstr "GntLastlog"
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
+#: ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Lastlogmodul"
 
@@ -1936,7 +2266,8 @@ msgstr "konton"
 msgid "accounts"
 msgstr "konton"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:958
+#: ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "Lösenord krävs för att logga in."
 
@@ -1957,18 +2288,21 @@ msgstr "Spara lösenordet"
 msgid "Save password"
 msgstr "Spara lösenordet"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/account.c:1039
+#: ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Saknar protokollmodul för %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1041
+#: ../libpurple/connection.c:108
+#: ../pidgin/gtkblist.c:4367
 msgid "Connection Error"
 msgstr "Anslutningsfel"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/account.c:1199
+#: ../libpurple/protocols/gg/gg.c:707
 #: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "De nya lösenorden stämmer inte överens."
@@ -2003,22 +2337,28 @@ msgstr "Ändra användarinformationen fÃ
 msgid "Change user information for %s"
 msgstr "Ändra användarinformationen för %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1293
+#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Ange användarinformation"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/account.c:1764
+#: ../libpurple/protocols/gg/gg.c:1017
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/qq/qq.c:232
+#: ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521
+#: ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531
+#: ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3250
+#: ../pidgin/gtkblist.c:5720
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2028,58 +2368,61 @@ msgstr "kompislista"
 msgid "buddy list"
 msgstr "kompislista"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(MATCHAR INTE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s har uppvisat följande certifikat för engångsanvändning:"
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"Vanligt namn: %s %s\n"
+"Fingeravtryck (SHA1): %s"
 
+# Är det verkligen ett engångscertifikat som avses?
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Verifiering av engångscertifikat"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:885
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "Certifikatsutfärdare"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1053
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "SSL-motpartscache"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
+#: ../libpurple/certificate.c:1184
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "Tacka ja till chattinbjudan?"
+msgstr "Acceptera certifikat för %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1190
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "SSL Certifikatsverifikation"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
-#, fuzzy
+#: ../libpurple/certificate.c:1199
 msgid "Accept"
-msgstr "_Acceptera"
+msgstr "Acceptera"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1200
+#: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:90
@@ -2087,77 +2430,66 @@ msgstr "Avslå"
 msgid "Reject"
 msgstr "Avslå"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1201
 msgid "_View Certificate..."
-msgstr ""
+msgstr "_Visa Certifikat..."
 
 #. Prompt the user to authenticate the certificate
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1301
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
+msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
+msgstr "Certifikatet uppvisat av \"%s\" påstår sig istället vara för \"%s\". Detta kan betyda att du inte ansluter till den tjänst du tror du ansluter till."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1326
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
+msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
+msgstr "Certifikatet uppvisat av \"%s\" är självsignerat. Det kan inte kontrolleras automatiskt."
 
-#: ../libpurple/certificate.c:1331
+#: ../libpurple/certificate.c:1344
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "Certifikatskedjan uppvisad för %s är inte giltig."
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
-#, fuzzy
+#: ../libpurple/certificate.c:1352
+#: ../libpurple/certificate.c:1421
 msgid "SSL Certificate Error"
-msgstr "Skrivfel"
+msgstr "SSL Certifikatsfel"
 
-#: ../libpurple/certificate.c:1340
-#, fuzzy
+#: ../libpurple/certificate.c:1353
 msgid "Invalid certificate chain"
-msgstr "Ogiltigt titel"
+msgstr "Ogiltigt certifikatskedja"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
+#: ../libpurple/certificate.c:1373
+msgid "You have no database of root certificates, so this certificate cannot be validated."
+msgstr "Du har ingen databas över rootcertifikat, så detta certifikat kan inte bli verifierat."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
+#: ../libpurple/certificate.c:1396
+msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "Rootcertifikatet som denna påstås använda är okänd för Pidgin."
 
-#: ../libpurple/certificate.c:1408
+#: ../libpurple/certificate.c:1413
 #, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
+msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
+msgstr "Certifikatet uppvisat för %s har inte en giltig digital signatur från den certifikatsutfärdare den påstås vara signerad av."
 
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1422
 msgid "Invalid certificate authority signature"
-msgstr ""
+msgstr "Ogiltig certifigatsutfärdarsignatur"
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1886
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2167,21 +2499,25 @@ msgstr ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Vanligt namn: %s\n"
+"\n"
+"Fingeravtryck (SHA1): %s\n"
+"\n"
+"Aktiveringsdatum: %s\n"
+"Utgångsdatum: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-#, fuzzy
+#: ../libpurple/certificate.c:1895
 msgid "Certificate Information"
-msgstr "Serverinformation"
+msgstr "Certifikatsinformation"
 
 #: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Registreringsfel"
 
 #: ../libpurple/connection.c:180
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "Registreringsfel"
+msgstr "Avregistreringsfel"
 
 #: ../libpurple/connection.c:350
 #, c-format
@@ -2193,10 +2529,11 @@ msgstr "+++ %s har kopplat ifrån"
 msgid "+++ %s signed off"
 msgstr "+++ %s har kopplat ifrån"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/connection.c:497
+#: ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2340
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:363
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -2204,7 +2541,8 @@ msgstr "Kan inte skicka meddelandet: Det
 msgid "Unable to send message: The message is too large."
 msgstr "Kan inte skicka meddelandet: Det är för stort."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:173
+#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kan inte skicka meddelandet till %s."
@@ -2213,7 +2551,8 @@ msgstr "Meddelandet är för stort."
 msgid "The message is too large."
 msgstr "Meddelandet är för stort."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/conversation.c:183
+#: ../libpurple/protocols/bonjour/jabber.c:255
 #: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Kan inte skicka meddelandet."
@@ -2271,13 +2610,12 @@ msgstr "Kunde inte få serv namn: %s"
 msgid "Failed to get serv name: %s"
 msgstr "Kunde inte få serv namn: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
-"Purples D-BUS server körs inte på grund av någon av de nedan listade "
-"anledningarna"
+msgstr "Purples D-BUS server körs inte på grund av någon av de nedan listade anledningarna"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
+#: ../libpurple/desktopitem.c:287
+#: ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Inget namn"
 
@@ -2289,7 +2627,8 @@ msgstr "Kunde inte skicka förfrågan ti
 msgid "Unable to send request to resolver process\n"
 msgstr "Kunde inte skicka förfrågan till uppslagningsprocessen\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549
+#: ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2298,8 +2637,9 @@ msgstr ""
 "Fel vid uppslagning %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552
+#: ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Fel vid uppslagning %s: %d"
@@ -2318,12 +2658,12 @@ msgstr "EOF under läsning från uppslag
 msgid "EOF while reading from resolver process"
 msgstr "EOF under läsning från uppslagningsprocess"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Fel vid trådskapning: %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
@@ -2526,60 +2866,40 @@ msgstr "Hanteraren för \"ymsgr\" URLer"
 msgstr "Hanteraren för \"ymsgr\" URLer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"aim\" URLer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"gg\" URLer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"icq\" URLer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"irc\" URLer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"msnim\" URLer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"sip\" URLer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"xmpp\" URLer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"ymsgr\" URLer"
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
-msgstr ""
-"Sant om kommandot som används för att hantera denna sortens URLer ska köras "
-"i en terminal."
+msgid "True if the command used to handle this type of URL should be run in a terminal."
+msgstr "Sant om kommandot som används för att hantera denna sortens URLer ska köras i en terminal."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2639,27 +2959,21 @@ msgstr "XML"
 
 #: ../libpurple/log.c:1366
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:"
-"</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:</b></font> %s<br/>\n"
 
 #: ../libpurple/log.c:1368
 #, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:"
-"</b></font> %s<br/>\n"
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+#: ../libpurple/log.c:1426
+#: ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Kunde inte hitta loggens sökväg!</b></font>"
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
+#: ../libpurple/log.c:1438
+#: ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kunde inte läsa fil: %s</b></font>"
@@ -2695,12 +3009,8 @@ msgstr "Insticksmodulen tillhandahåller
 
 #: ../libpurple/plugin.c:547
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
-msgstr ""
-"Den efterfrågade insticksmodulen %s kunde inte hittas. Installera "
-"insticksmodulen och försök igen."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgstr "Den efterfrågade insticksmodulen %s kunde inte hittas. Installera insticksmodulen och försök igen."
 
 #: ../libpurple/plugin.c:552
 msgid "Unable to load the plugin"
@@ -2728,7 +3038,8 @@ msgstr "Autoacceptera"
 msgid "Autoaccept"
 msgstr "Autoacceptera"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25
+#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Autoacceptera filöverföringsförfrågningar från valda användare."
 
@@ -2755,16 +3066,20 @@ msgstr "_Spara"
 msgid "_Save"
 msgstr "_Spara"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/plugins/autoaccept.c:165
+#: ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204
+#: ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1456
+#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2297
 #: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6222
+#: ../libpurple/protocols/oscar/oscar.c:6292
+#: ../libpurple/request.h:1388
 #: ../libpurple/request.h:1398
+#: ../pidgin/gtkblist.c:530
 msgid "_Cancel"
 msgstr "A_vbryt"
 
@@ -2805,8 +3120,9 @@ msgstr ""
 "Rapportera med en popupp när en autoaccepterad filöverföring är avslutad\n"
 "(endast när det inte är någon konversation med sändaren)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msn/msn.c:1801
 msgid "Notes"
 msgstr "Noteringar"
 
@@ -2826,21 +3142,23 @@ msgstr "Redigera noteringar..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:90
+#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Kompiskommentar"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
+#: ../libpurple/plugins/buddynote.c:92
+#: ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Spara noteringar för vissa kompisar."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
+#: ../libpurple/plugins/buddynote.c:93
+#: ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr ""
-"Lägger till möjligheten att lagra noteringar för kompisar i din kompislista."
+msgstr "Lägger till möjligheten att lagra noteringar för kompisar i din kompislista."
 
 #. *< type
 #. *< ui_requirement
@@ -2856,7 +3174,8 @@ msgstr "Chiffertest"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267
+#: ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Testa chiffren som kommer med libpurple."
 
@@ -2893,27 +3212,33 @@ msgstr "Filkontroll"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+#: ../libpurple/plugins/filectl.c:251
+#: ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Ger möjlighet till styrning genom att ange kommandon i en fil."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158
+#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minuter"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165
+#: ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225
+#: ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Inaktivitetsskapare"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+#: ../libpurple/plugins/idle.c:166
+#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Ange kontots inaktivitetstid"
 
 # src/menus.c:280
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169
+#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "A_nge"
 
@@ -2921,7 +3246,8 @@ msgstr "Inga av dina konton är inaktiva
 msgid "None of your accounts are idle."
 msgstr "Inga av dina konton är inaktiva."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
+#: ../libpurple/plugins/idle.c:200
+#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Ta bort kontots inaktivitetstid"
 
@@ -2929,7 +3255,8 @@ msgstr "_Ta bort"
 msgid "_Unset"
 msgstr "_Ta bort"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+#: ../libpurple/plugins/idle.c:226
+#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Ange Inaktivitetstiden för alla konton"
 
@@ -2937,7 +3264,8 @@ msgstr "Tar bort inaktivitetstiden för 
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Tar bort inaktivitetstiden för alla inaktiva konton"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
+#: ../libpurple/plugins/idle.c:320
+#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "LÃ¥ter dig manuellt ange den tid som du varit inaktiv"
 
@@ -2960,12 +3288,8 @@ msgstr "Testinsticksmodul för IPC-stöd
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"Testinsticksmodul för IPC-stöd. Denna lokaliserar serverinsticksmodulen och "
-"anropar de kommandon som krävs."
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "Testinsticksmodul för IPC-stöd. Denna lokaliserar serverinsticksmodulen och anropar de kommandon som krävs."
 
 #. *< type
 #. *< ui_requirement
@@ -2987,9 +3311,7 @@ msgid "Test plugin IPC support, as a ser
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Testinsticksmodul för IPC-stöd, som en server. Denna registrerar IPC-"
-"kommandona."
+msgstr "Testinsticksmodul för IPC-stöd, som en server. Denna registrerar IPC-kommandona."
 
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
@@ -3022,90 +3344,81 @@ msgstr "Gömmer extraaktiga kommer in/lÃ
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:275
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
-msgstr ""
-"Denna modul gömmer kommer in/lämnar meddelanden i stora rum, förutom för de "
-"användare som är aktiva i konversationen."
+msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
+msgstr "Denna modul gömmer kommer in/lämnar meddelanden i stora rum, förutom för de användare som är aktiva i konversationen."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Användaren är frånkopplad."
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Auto-svar skickat:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s har kopplat ifrån."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Ett eller fler meddelande har kanske inte blivit levererad."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Du har blivit frånkopplad från servern."
 
-#: ../libpurple/plugins/log_reader.c:1628
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr ""
-"Du är just nu inte ansluten. Meddelanden kan inte tas emot om du inte är "
-"ansluten."
+#: ../libpurple/plugins/log_reader.c:1605
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgstr "Du är just nu inte ansluten. Meddelanden kan inte tas emot om du inte är ansluten."
 
-#: ../libpurple/plugins/log_reader.c:1643
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr ""
-"Meddelandet kunde inte skickas eftersom den maximala längden överträddes."
+msgstr "Meddelandet kunde inte skickas eftersom den maximala längden överträddes."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Meddelande kunde inte skickas."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr "QIP"
 
@@ -3113,34 +3426,42 @@ msgstr "QIP"
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "Allmänn konfiguration för logg-läsning"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Snabb storleksberäkning"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Använd namn heuristiskt"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Logg katalog"
 
@@ -3150,32 +3471,27 @@ msgstr "Logg katalog"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Loggvisare"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Inkludera andra IM-klienters loggfiler i loggfilsvisaren."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
 msgstr ""
-"Vid visning av loggfiler inkluderar denna modul loggar från andra IM-"
-"klienter. För närvarande inkluderar detta  Adium, MSN Messenger, och "
-"Trillian.\n"
+"Vid visning av loggfiler inkluderar denna modul loggar från andra IM-klienter. För närvarande inkluderar detta  Adium, MSN Messenger, och Trillian.\n"
 "\n"
-"VARNING: Denna modul är fortfarande alpha-kod och kan krasha ofta. Använd på "
-"egen risk!"
+"VARNING: Denna modul är fortfarande alpha-kod och kan krasha ofta. Använd på egen risk!"
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
@@ -3207,37 +3523,26 @@ msgstr "Lägger en tom rad före det vis
 
 #. *< summary
 #: ../libpurple/plugins/newline.c:71
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
-msgstr ""
-"Inleder med en tom linje i meddelandet så att resten av meddelandet "
-"uppträder nedanför skärmnamnet i konversationsfönstret."
+msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
+msgstr "Inleder med en tom linje i meddelandet så att resten av meddelandet uppträder nedanför skärmnamnet i konversationsfönstret."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Frånkopplad meddelandeemulering"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25
+#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Spara meddelandet skickat till en frånkopplad användare som en attack"
 
 #: ../libpurple/plugins/offlinemsg.c:95
-msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
-"pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"Resten av meddelanden kommer sparas som attacker. Du kan ändra/ta bort "
-"attackerna från `Kompisattacker' dialogen."
+msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgstr "Resten av meddelanden kommer sparas som attacker. Du kan ändra/ta bort attackerna från `Kompisattacker' dialogen."
 
 #: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
-msgid ""
-"\"%s\" is currently offline. Do you want to save the rest of the messages in "
-"a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
-"\"%s\" är för närvarande frånkopplad. Vill du spara resten av meddelandena "
-"som en attack och skicka dem automatiskt när \"%s\" ansluter igen?"
+msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
+msgstr "\"%s\" är för närvarande frånkopplad. Vill du spara resten av meddelandena som en attack och skicka dem automatiskt när \"%s\" ansluter igen?"
 
 #: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
@@ -3248,26 +3553,30 @@ msgstr "Du kan ändra/ta bort attackerna
 msgstr "Du kan ändra/ta bort attackerna från `Kompisattacker' dialogen"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/novell/novell.c:1919
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307
+#: ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr "Ja"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/novell/novell.c:1920
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114
+#: ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308
+#: ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "Nej"
 
@@ -3292,7 +3601,8 @@ msgstr "Inläsare för Perl-moduler"
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
+#: ../libpurple/plugins/perl/perl.c:603
+#: ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Gör det möjligt att ladda perl-insticksmoduler"
 
@@ -3305,12 +3615,8 @@ msgstr "Siande läge för inkommande kon
 msgstr "Siande läge för inkommande konversation"
 
 #: ../libpurple/plugins/psychic.c:22
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"Får konversationsfönster att dyka upp då andra användare börjar att skicka "
-"meddelande till dig. Detta fungerar för AIM, ICQ, XMPP, Sametime och Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "Får konversationsfönster att dyka upp då andra användare börjar att skicka meddelande till dig. Detta fungerar för AIM, ICQ, XMPP, Sametime och Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -3367,15 +3673,16 @@ msgstr "Enken insticksmodul"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40
+#: ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Testar för att se att det mesta fungerar."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509-certifikat"
 
 #. *< type
 #. *< ui_requirement
@@ -3383,7 +3690,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3391,8 +3698,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "Ger SSL-stöd genom GNUTLS."
 
@@ -3402,7 +3709,7 @@ msgstr "Ger SSL-stöd genom GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3410,8 +3717,8 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Ger SSL-stöd genom Mozilla NNS."
 
@@ -3429,7 +3736,8 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97
+#: ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Ger ett omslag runt SSL-stödsbibliotek"
 
@@ -3490,74 +3798,70 @@ msgstr "Rapportering av kompisstatus"
 #. *  description
 #: ../libpurple/plugins/statenotify.c:151
 #: ../libpurple/plugins/statenotify.c:154
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Rapporterar i konversationsfönstret när en kompis blir frånvarande/inaktiv "
-"eller kommer tillbaka."
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "Rapporterar i konversationsfönstret när en kompis blir frånvarande/inaktiv eller kommer tillbaka."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-insticksmodulladdare"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425
+#: ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Gör det möjligt att ladda Tcl-insticksmoduler"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"Kunde inte finna en installation av  ActiveTCL. Om du tänker använda TCL-"
-"modulen måste du installera ActiveTCL från http://www.activestate.com\n"
+#: ../libpurple/plugins/tcl/tcl.c:509
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "Kunde inte finna en installation av  ActiveTCL. Om du tänker använda TCL-modulen måste du installera ActiveTCL från http://www.activestate.com\n"
 
+#: ../libpurple/protocols/bonjour/bonjour.c:107
+msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging for more information."
+msgstr "Apples Bonjour För Windows hittades inte, läs FAQen: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging för mer information"
+
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:124
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Kan inte lyssna efter inkommande IM anslutningar\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
+#: ../libpurple/protocols/bonjour/bonjour.c:149
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Kunde inte skapa en anslutning via den lokala mDNS-servern. Körs den?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/bonjour/bonjour.c:670
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Förnamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/bonjour/bonjour.c:367
+#: ../libpurple/protocols/bonjour/bonjour.c:673
 #: ../libpurple/protocols/gg/gg.c:627
 #: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Efternamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:371
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "E-post"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:374
+#: ../libpurple/protocols/bonjour/bonjour.c:679
 msgid "AIM Account"
 msgstr "AIM-konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:377
+#: ../libpurple/protocols/bonjour/bonjour.c:682
 msgid "XMPP Account"
 msgstr "XMPP-konto"
 
@@ -3571,20 +3875,20 @@ msgstr "XMPP-konto"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:481
+#: ../libpurple/protocols/bonjour/bonjour.c:483
 msgid "Bonjour Protocol Plugin"
 msgstr "Insticksmodul för Bonjour-protokollet"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:624
 msgid "Purple Person"
 msgstr "Purple person"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/bonjour/bonjour.c:676
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc/silc.c:901
+#: ../libpurple/protocols/silc/silc.c:1142
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
@@ -3594,57 +3898,58 @@ msgstr "Bonjour"
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:381
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s har stängt konversationen."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:439
+#: ../libpurple/protocols/bonjour/jabber.c:664
+#: ../libpurple/protocols/bonjour/jabber.c:682
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kan inte skicka meddelandet, konversationen kunde inte startas."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:587
 msgid "Cannot open socket"
 msgstr "Kan inte öppna uttag"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:595
 msgid "Error setting socket options"
 msgstr "Fel vid angivning av socket-val"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:619
 msgid "Could not bind socket to port"
 msgstr "Kunde inte binda uttag till port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:627
 msgid "Could not listen on socket"
 msgstr "Kunde inte lyssna på uttag"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76
+#: ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "Felaktiga proxyinställningar"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"Antingen värdnamnet eller portnummret som är angivet för din proxytyp är "
-"ogiltigt."
+#: ../libpurple/protocols/gg/gg.c:77
+#: ../libpurple/proxy.c:1845
+msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgstr "Antingen värdnamnet eller portnummret som är angivet för din proxytyp är ogiltigt."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:115
+#: ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Markörsfel"
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:116
+#: ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Kan inte hämta markören.\n"
 
 # Eller möjligtvis i bestämd form, "kompislistan".
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269
+#: ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Spara kompislista..."
 
@@ -3652,7 +3957,8 @@ msgstr "Din kompislista är tom. Ingenti
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Din kompislista är tom. Ingenting skrevs till filen."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276
+#: ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Kan inte öppna fil"
 
@@ -3660,7 +3966,8 @@ msgstr "Kompislistan sparad utan problem
 msgid "Buddylist saved successfully!"
 msgstr "Kompislistan sparad utan problem!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307
+#: ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Kunde inte läsa in kompislista"
 
@@ -3698,26 +4005,31 @@ msgstr "Registreringen lyckades!"
 msgid "Registration completed successfully!"
 msgstr "Registreringen lyckades!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:482
+#: ../libpurple/protocols/gg/gg.c:775
 #: ../libpurple/protocols/jabber/jabber.c:913
 #: ../libpurple/protocols/jabber/jabber.c:916
 #: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:487
+#: ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Lösenord (upprepa)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:492
+#: ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Ange nuvarande markör"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Nuvarande markör"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrera nytt Gadu-Gadu-konto"
 
@@ -3725,11 +4037,12 @@ msgstr "Fyll i följande fält"
 msgid "Please, fill in the following fields"
 msgstr "Fyll i följande fält"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:1054
 #: ../libpurple/protocols/gg/gg.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Stad"
@@ -3738,12 +4051,15 @@ msgstr "Födelseår"
 msgid "Year of birth"
 msgstr "Födelseår"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:650
+#: ../libpurple/protocols/msn/msn.c:1700
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232
+#: ../libpurple/protocols/qq/qq.c:236
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Kön"
@@ -3753,14 +4069,14 @@ msgstr "Man eller kvinna"
 msgstr "Man eller kvinna"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Man"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3770,7 +4086,8 @@ msgstr "Enbart ansluten"
 msgid "Only online"
 msgstr "Enbart ansluten"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:661
+#: ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Sök efter kompisar"
 
@@ -3806,7 +4123,8 @@ msgstr "Var god ange ditt nuvarande lös
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Var god ange ditt nuvarande lösenord och nya lösenord för UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:799
+#: ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Ändra Gadu-Gadu-lösenord"
 
@@ -3815,76 +4133,93 @@ msgstr "Välj en chatt för kompisen: %s
 msgid "Select a chat for buddy: %s"
 msgstr "Välj en chatt för kompisen: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Lägg till i chatt..."
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2833
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/oscar/oscar.c:5659
+#: ../libpurple/protocols/qq/qq.c:170
+#: ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/yahoo/yahoo.c:3101
+#: ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3305
+#: ../pidgin/gtkblist.c:3643
+#: ../pidgin/gtkdocklet.c:561
+#: ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Frånkopplad"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
-#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../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/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3103
+#: ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Tillgänglig"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/gg/gg.c:1014
+#: ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2824
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/oscar/oscar.c:4562
+#: ../libpurple/protocols/oscar/oscar.c:5687
+#: ../libpurple/protocols/qq/qq.c:180
+#: ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc10/buddy.c:1479
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729
+#: ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549
+#: ../pidgin/gtkprefs.c:2001
 #: ../pidgin/gtkstatusbox.c:1058
 #, c-format
 msgid "Away"
 msgstr "Frånvarande"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1043
+#: ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2714
+#: ../libpurple/protocols/oscar/oscar.c:3714
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/gg/gg.c:1046
+#: ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Förnamn"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1059
+#: ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Födelseår"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1111
+#: ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3926
 msgid "Unable to display the search results."
 msgstr "Kan inte visa sökningsresultatet."
 
@@ -3904,7 +4239,8 @@ msgstr "Det finns inga användare som ma
 msgid "There are no users matching your search criteria."
 msgstr "Det finns inga användare som matchar dina sökkriterier."
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1310
+#: ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Kan inte läsa från uttag"
 
@@ -3924,11 +4260,13 @@ msgstr "Din kompislista blev lagrad på 
 msgid "Your buddy list was stored on the server."
 msgstr "Din kompislista blev lagrad på servern."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1509
+#: ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Anslutning misslyckad"
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1621
+#: ../libpurple/protocols/msn/msn.c:627
 msgid "Blocked"
 msgstr "Blockerad"
 
@@ -4013,7 +4351,7 @@ msgstr "Gadu-Gadu-användare"
 msgstr "Gadu-Gadu-användare"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1768
 #: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
@@ -4021,7 +4359,7 @@ msgstr "Okänt kommando: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc/silc.c:1476
 #: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
@@ -4029,7 +4367,7 @@ msgstr "det aktuella ämnet är: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc/silc.c:1480
 #: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Inget ämne är inställt"
@@ -4064,9 +4402,11 @@ msgstr "MOTD för %s"
 msgid "MOTD for %s"
 msgstr "MOTD för %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/irc/irc.c:127
+#: ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:612
+#: ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2361
 msgid "Server has disconnected"
 msgstr "Servern har kopplat ifrån"
 
@@ -4074,13 +4414,15 @@ msgstr "Visa MOTD"
 msgid "View MOTD"
 msgstr "Visa MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261
+#: ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/jabber/chat.c:59
+#: ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "_Lösenord:"
 
@@ -4092,15 +4434,16 @@ msgstr "IRC-nickar får inte innehålla 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/msn/session.c:386
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
+#: ../libpurple/protocols/simple/simple.c:1731
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:1621
+#: ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Ansluter"
 
@@ -4113,25 +4456,26 @@ msgstr "SSL-stöd ej tillgängligt"
 #. TODO: try other ports if in auto mode, then save
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/myspace/myspace.c:318
+#: ../libpurple/protocols/simple/simple.c:465
+#: ../libpurple/protocols/simple/simple.c:1646
 msgid "Couldn't create socket"
 msgstr "Kunde inte skapa socket"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/myspace/myspace.c:2474
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "Kunde inte ansluta till värden"
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/irc/irc.c:609
+#: ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "Read error"
 msgstr "Läsfel"
 
 #: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
@@ -4139,8 +4483,8 @@ msgstr "Användare"
 
 #: ../libpurple/protocols/irc/irc.c:776
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1506
@@ -4165,26 +4509,28 @@ msgstr "Insticksmodulen för IRC-protoko
 msgstr "Insticksmodulen för IRC-protokollet som inte suger lika mycket"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../libpurple/protocols/irc/irc.c:940
+#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:6726
 #: ../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/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:1918
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../libpurple/protocols/irc/irc.c:943
+#: ../libpurple/protocols/msn/msn.c:2303
+#: ../libpurple/protocols/oscar/oscar.c:6729
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:2049
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
@@ -4194,16 +4540,17 @@ msgstr "Kodning"
 msgid "Encodings"
 msgstr "Kodning"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/irc/irc.c:949
+#: ../libpurple/protocols/irc/msgs.c:316
 #: ../libpurple/protocols/jabber/jabber.c:904
 #: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/silc.c:1136
+#: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
@@ -4212,8 +4559,9 @@ msgstr "Användarnamn"
 msgid "Username"
 msgstr "Användarnamn"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/irc/irc.c:952
+#: ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1140
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Fullständigt namn"
@@ -4253,8 +4601,8 @@ msgstr " <i>(identifierad)</i>"
 msgstr " <i>(identifierad)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/oscar/oscar.c:3715
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Smeknamn"
@@ -4352,81 +4700,75 @@ msgstr "Endast inbjudna"
 msgid "Invitation only"
 msgstr "Endast inbjudna"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Du har sparkats ut av %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803
+#: ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Utsparkad av %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "läge (%s %s) av %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:911
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../libpurple/protocols/irc/msgs.c:910
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Ditt valda smeknamn vägrades av servern. Det innehåller antagligen otillåtna "
-"tecken."
+#: ../libpurple/protocols/irc/msgs.c:913
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgstr "Ditt valda smeknamn vägrades av servern. Det innehåller antagligen otillåtna tecken."
 
-#: ../libpurple/protocols/irc/msgs.c:915
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Ditt valda kontonamn vägrades av servern. Det innehåller antagligen "
-"otillåtna tecken."
+#: ../libpurple/protocols/irc/msgs.c:918
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgstr "Ditt valda kontonamn vägrades av servern. Det innehåller antagligen otillåtna tecken."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "Kan inte ändra nick"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "Kunde inte byta smeknamn"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Du har lämnat kanalen%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "Fel: Ogiltig PONG från server"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-svar -- Fördröjning: %lu sekunder"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Kan inte ansluta till %s: Registrering krävs"
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kan inte ansluta till kanalen"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nick eller kanal är temporärt otillgänglig."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "Smocka från %s"
@@ -4436,74 +4778,40 @@ msgstr "action &lt;action to perform&gt;
 msgstr "action &lt;action to perform&gt;:  Utför en åtgärd."
 
 #: ../libpurple/protocols/irc/parse.c:123
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"away [meddelande]:  Ange ett frånvaromeddelande eller ange utan meddelande "
-"för att återvända från frånvaro."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "away [meddelande]:  Ange ett frånvaromeddelande eller ange utan meddelande för att återvända från frånvaro."
 
 #: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Skicka ett kommando till chanserv"
 
 #: ../libpurple/protocols/irc/parse.c:125
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;smeknamn1&gt; [smeknamn2] ...:  Ta bort kanaloperatörsstatus från "
-"någon. Du måste vara en operatör själv för att kunna göra detta."
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;smeknamn1&gt; [smeknamn2] ...:  Ta bort kanaloperatörsstatus från någon. Du måste vara en operatör själv för att kunna göra detta."
 
 #: ../libpurple/protocols/irc/parse.c:126
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;smeknamn1&gt; [smeknamn2] ...:  Tar bort kanalröststatus från "
-"någon för att förhindra den från att tala då kanalen är modererad (+m). Du "
-"måste vara en operatör själv för att kunna göra detta."
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;smeknamn1&gt; [smeknamn2] ...:  Tar bort kanalröststatus från någon för att förhindra den från att tala då kanalen är modererad (+m). Du måste vara en operatör själv för att kunna göra detta."
 
 #: ../libpurple/protocols/irc/parse.c:127
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;smeknamn&gt; [rum]:  Bjud in någon till en specificerad kanal "
-"eller till den nuvarande."
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;smeknamn&gt; [rum]:  Bjud in någon till en specificerad kanal eller till den nuvarande."
 
 #: ../libpurple/protocols/irc/parse.c:128
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;rum1&gt;[,rum2][,...] [nyckel1[,nyckel2][,...]]:  Anslut till en eller "
-"fler kanaler, möjligen med en kanalnyckel för varje om det behövs."
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;rum1&gt;[,rum2][,...] [nyckel1[,nyckel2][,...]]:  Anslut till en eller fler kanaler, möjligen med en kanalnyckel för varje om det behövs."
 
 #: ../libpurple/protocols/irc/parse.c:129
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;rum1&gt;[,rum2][,...] [nyckel1[,nyckel2][,...]]:  Anslut till en "
-"eller fler kanaler, möjligen med en kanalnyckel för varje om det behövs."
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;rum1&gt;[,rum2][,...] [nyckel1[,nyckel2][,...]]:  Anslut till en eller fler kanaler, möjligen med en kanalnyckel för varje om det behövs."
 
 #: ../libpurple/protocols/irc/parse.c:130
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;smeknamn&gt; [meddelande]:  Tar bort någon från en kanal. Du måste "
-"vara kanaloperatör för att kunna göra detta."
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;smeknamn&gt; [meddelande]:  Tar bort någon från en kanal. Du måste vara kanaloperatör för att kunna göra detta."
 
 #: ../libpurple/protocols/irc/parse.c:131
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list:  Visar en lista över alla chattrum på ett nätverk. <i>Varning: Några "
-"servrar kan koppla ifrån dig när du gör detta.</i>"
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list:  Visar en lista över alla chattrum på ett nätverk. <i>Varning: Några servrar kan koppla ifrån dig när du gör detta.</i>"
 
 #: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -4514,27 +4822,19 @@ msgstr "memoserv: Skicka ett kommando ti
 msgstr "memoserv: Skicka ett kommando till memoserv"
 
 #: ../libpurple/protocols/irc/parse.c:134
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;smeknamn|kanal&gt;:  Sätt eller ta bort "
-"kanal- eller användarläge."
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;smeknamn|kanal&gt;:  Sätt eller ta bort kanal- eller användarläge."
 
 #: ../libpurple/protocols/irc/parse.c:135
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;smeknamn&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till "
-"en användare (i motsats till en kanal)."
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;smeknamn&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till en användare (i motsats till en kanal)."
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Lista användarna som är i kanalen just nu."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nytt smeknamn&gt;:  Ändra ditt smeknamn."
 
@@ -4543,65 +4843,40 @@ msgstr "nickserv: Skicka ett kommando ti
 msgstr "nickserv: Skicka ett kommando till nickserv"
 
 #: ../libpurple/protocols/irc/parse.c:139
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;smeknamn1&gt; [smeknamn2] ...:  Ge kanaloperatörsstatus till någon. "
-"Du måste vara kanaloperatör för att kunna göra detta."
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;smeknamn1&gt; [smeknamn2] ...:  Ge kanaloperatörsstatus till någon. Du måste vara kanaloperatör för att kunna göra detta."
 
 #: ../libpurple/protocols/irc/parse.c:140
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;meddelande&gt;:  Om du inte vet vad detta gör kan du antagligen "
-"inte göra det."
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;meddelande&gt;:  Om du inte vet vad detta gör kan du antagligen inte göra det."
 
 #: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Skicka ett kommando till operserv"
 
 #: ../libpurple/protocols/irc/parse.c:142
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [rum] [meddelande]:  Lämna det nuvarande rummet med ett möjligt "
-"meddelande."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [rum] [meddelande]:  Lämna det nuvarande rummet med ett möjligt meddelande."
 
 #: ../libpurple/protocols/irc/parse.c:143
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [smeknamn]:  Frågar hur mycket lagg en användaren (eller servern om  "
-"ingen användare är specificerad) har."
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [smeknamn]:  Frågar hur mycket lagg en användaren (eller servern om  ingen användare är specificerad) har."
 
 #: ../libpurple/protocols/irc/parse.c:144
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;smeknamn&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande "
-"till en användare."
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;smeknamn&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till en användare."
 
 #: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
-"quit [meddelande]:  Koppla ifrån servern med ett frivilligt meddelande."
+msgstr "quit [meddelande]:  Koppla ifrån servern med ett frivilligt meddelande."
 
 #: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Skicka ett rått kommando till servern."
 
 #: ../libpurple/protocols/irc/parse.c:147
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;smeknamn&gt; [meddelande]:  Ta bort någon från ett rum. Du måste "
-"vara kanaloperatör för att göra detta."
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;smeknamn&gt; [meddelande]:  Ta bort någon från ett rum. Du måste vara kanaloperatör för att göra detta."
 
 #: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
@@ -4617,52 +4892,42 @@ msgid "version [nick]: send CTCP VERSION
 
 #: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
-"version [smeknamn]: skickar en CTCP VERSION förfrågan till en användare"
+msgstr "version [smeknamn]: skickar en CTCP VERSION förfrågan till en användare"
 
 #: ../libpurple/protocols/irc/parse.c:152
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;smeknamn1&gt; [smeknamn2] ...:  Ge kanalröststatus till någon. Du "
-"måste vara kanaloperatör för att göra detta."
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;smeknamn1&gt; [smeknamn2] ...:  Ge kanalröststatus till någon. Du måste vara kanaloperatör för att göra detta."
 
 #: ../libpurple/protocols/irc/parse.c:153
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;meddelande&gt;:  Om du inte vet vad detta är kan du antagligen "
-"inte använda det."
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;meddelande&gt;:  Om du inte vet vad detta är kan du antagligen inte använda det."
 
 #: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr ""
-"whois [server] &lt;smeknamn&gt;:  Hämta informationen för en användare."
+msgstr "whois [server] &lt;smeknamn&gt;:  Hämta informationen för en användare."
 
 #: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr ""
-"whowas &lt;smeknamn&gt;: Hämta informationen för en användare som har "
-"kopplat ifrån."
+msgstr "whowas &lt;smeknamn&gt;: Hämta informationen för en användare som har kopplat ifrån."
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Svarstid från %s: %lu sekunder"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "CTCP PING-svar"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c:632
+#: ../libpurple/protocols/irc/parse.c:636
+#: ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694
+#: ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Frånkopplad."
@@ -4676,14 +4941,13 @@ msgstr "Okänt fel"
 
 #: ../libpurple/protocols/jabber/adhoccommands.c:139
 #: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "Kommandot avstängt"
+msgstr "'Ad-Hoc'-kommandot misslyckades"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
-#, fuzzy
+# Bra till vad?
+#: ../libpurple/protocols/jabber/adhoccommands.c:176
 msgid "execute"
-msgstr "Ej väntat"
+msgstr "utför"
 
 #: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
@@ -4696,12 +4960,8 @@ msgstr "Servern kräver klartextautentis
 #: ../libpurple/protocols/jabber/auth.c:319
 #: ../libpurple/protocols/jabber/auth.c:508
 #, c-format
-msgid ""
-"%s requires plaintext authentication over an unencrypted connection.  Allow "
-"this and continue authentication?"
-msgstr ""
-"%s kräver klartextautentisering över en okrypterad anslutning. Tillåt detta "
-"och fortsätt?"
+msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "%s kräver klartextautentisering över en okrypterad anslutning. Tillåt detta och fortsätt?"
 
 #: ../libpurple/protocols/jabber/auth.c:321
 #: ../libpurple/protocols/jabber/auth.c:322
@@ -4730,12 +4990,8 @@ msgstr "Ogiltigt svar från servern."
 msgstr "Ogiltigt svar från servern."
 
 #: ../libpurple/protocols/jabber/auth.c:600
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"Servern kräver klartextautentisering över en okrypterad anslutning. Tillåt "
-"detta och fortsätt?"
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "Servern kräver klartextautentisering över en okrypterad anslutning. Tillåt detta och fortsätt?"
 
 #: ../libpurple/protocols/jabber/auth.c:797
 #: ../libpurple/protocols/jabber/auth.c:820
@@ -4798,7 +5054,7 @@ msgstr "Postnummer"
 
 #: ../libpurple/protocols/jabber/buddy.c:293
 #: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc/silc.c:1146
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Land"
@@ -4826,15 +5082,16 @@ msgstr "Roll"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/oscar/oscar.c:3764
 msgid "Birthday"
 msgstr "Födelsedag"
 
 #: ../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:3116
+#: ../libpurple/protocols/jabber/usermood.c:193
+#: ../pidgin/gtkblist.c:3317
 #: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Beskrivning"
@@ -4847,12 +5104,8 @@ msgstr "Redigera XMPP vCard"
 msgstr "Redigera XMPP vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:724
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
-msgstr ""
-"Alla poster nedan är frivilliga. Ange endast den information som du vill "
-"lämna ut."
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgstr "Alla poster nedan är frivilliga. Ange endast den information som du vill lämna ut."
 
 #: ../libpurple/protocols/jabber/buddy.c:795
 #: ../libpurple/protocols/jabber/buddy.c:960
@@ -4867,48 +5120,46 @@ msgid "Last Activity"
 #: ../libpurple/protocols/jabber/buddy.c:815
 #: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
-msgstr ""
+msgstr "Senaste aktivitet"
 
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
 msgid "Service Discovery Info"
-msgstr "Ställ in kataloginformation"
+msgstr "Tjänsteupptäckningsinfo"
 
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
-msgstr ""
+msgstr "Tjänstupptäckningsföremål"
 
 #: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
 msgid "Extended Stanza Addressing"
-msgstr "Utökad adress"
+msgstr "Utökad Strofadressering"
 
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
 msgid "Multi-User Chat"
-msgstr "Chattalias"
+msgstr "Månganvändarchatt"
 
+# LÃ¥ter helt fel.
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
 #, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "Användaren har ingen kataloginformation."
+msgstr "Månganvändarchatt Utökad närvaroinformation"
 
 #: ../libpurple/protocols/jabber/buddy.c:827
 #: ../libpurple/protocols/jabber/buddy.c:987
 msgid "In-Band Bytestreams"
-msgstr ""
+msgstr "In-Band Byteströmmar"
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
 msgid "Ad-Hoc Commands"
-msgstr "Kommando"
+msgstr "'Ad-Hoc' Kommandon"
 
+# Var är denna?
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
@@ -4917,8 +5168,9 @@ msgid "SOCKS5 Bytestreams"
 #: ../libpurple/protocols/jabber/buddy.c:833
 #: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
-msgstr ""
+msgstr "SOCKS5 Byteströmmar"
 
+# Vad för?
 #: ../libpurple/protocols/jabber/buddy.c:835
 #: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Out of Band Data"
@@ -4926,45 +5178,39 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:837
 #: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
 msgid "XHTML-IM"
-msgstr "HTML"
+msgstr "XHTML-IM"
 
+# Vad menas med In-Band, när används och vad blir då lämplig översättning?
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
 msgid "In-Band Registration"
-msgstr "Registreringsfel"
+msgstr "In-Bandsregistrering"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
 msgid "User Location"
-msgstr "Plats"
+msgstr "Placering"
 
 #: ../libpurple/protocols/jabber/buddy.c:843
 #: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
 msgid "User Avatar"
-msgstr "Användarsökning"
+msgstr "Användar-avatar"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "Rapportering av kompisstatus"
+msgstr "Chatt-status notifieringar"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
 msgid "Software Version"
-msgstr "Ej stöd version"
+msgstr "Mjukvaruversion"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
 msgid "Stream Initiation"
-msgstr "Orientering"
+msgstr "Ströminitiering"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
@@ -4974,32 +5220,28 @@ msgstr "Filöverföringar"
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
 msgid "User Mood"
-msgstr "Användarlägen"
+msgstr "Användarhumör"
 
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
 msgid "User Activity"
-msgstr "Användargräns"
+msgstr "Användaraktivitet"
 
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
 msgid "Entity Capabilities"
-msgstr "Stödjer"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
-msgstr ""
+msgstr "Förhandlingar om krypterade sessioner"
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
 msgid "User Tune"
-msgstr "Användarnamn"
+msgstr "Användarlåt"
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
@@ -5007,102 +5249,96 @@ msgstr "IM med nyckelutbyte"
 msgid "Roster Item Exchange"
 msgstr "IM med nyckelutbyte"
 
+# Vet inte om detta är bästa, men...
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-#, fuzzy
 msgid "Reachability Address"
-msgstr "E-postadress"
+msgstr "NÃ¥bar adress"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
 msgid "User Profile"
-msgstr "Profil"
+msgstr "Användarprofil"
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-#, fuzzy
 msgid "Jingle"
-msgstr "Anslut"
+msgstr "Ramsa"
 
+# Vad är dessa?
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
-msgstr ""
+msgstr "SÃ¥ngsnutt"
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
 msgid "User Nickname"
-msgstr "Användarnamn"
+msgstr "Användarsmeknamn"
 
+# Vad är dessa?
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
-msgstr ""
+msgstr "Ramsa ICE UDP"
 
+# Vad är dessa?
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
-msgstr ""
+msgstr "Ramsa ICE TCP"
 
+# Vad är dessa?
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle Raw UDP"
-msgstr ""
+msgstr "Ramsa RÃ¥ UDP"
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
 msgid "Jingle Video"
-msgstr "Live-video"
+msgstr "Ramsa Video"
 
+# Vad är dessa?
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
-msgstr ""
+msgstr "Ramsa DTMF"
 
-# Försöker hålla samma tempus som ovan.
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
 msgid "Message Receipts"
-msgstr "Meddelande tas emot"
+msgstr "Meddelandekvitton"
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
-#, fuzzy
 msgid "Public Key Publishing"
-msgstr "Publik nyckelpladderavtryck"
+msgstr "Publik nyckelpublisering"
 
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
 msgid "User Chatting"
-msgstr "Användaralternativ"
+msgstr "Användarchattning"
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-#, fuzzy
 msgid "User Browsing"
-msgstr "Användarlägen"
+msgstr "Användarbläddring"
 
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-#, fuzzy
 msgid "User Gaming"
-msgstr "Användarnamn"
+msgstr "Användarspelning"
 
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-#, fuzzy
 msgid "User Viewing"
-msgstr "Användargräns"
+msgstr "Användarvisning"
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
@@ -5110,48 +5346,47 @@ msgstr "Ping"
 
 #: ../libpurple/protocols/jabber/buddy.c:899
 #: ../libpurple/protocols/jabber/buddy.c:1059
-#, fuzzy
 msgid "Stanza Encryption"
-msgstr "Trillansk kryptering"
+msgstr "Strofkryptering"
 
 #: ../libpurple/protocols/jabber/buddy.c:901
 #: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
-msgstr ""
+msgstr "Enhet Tid"
 
 #: ../libpurple/protocols/jabber/buddy.c:903
 #: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
-msgstr ""
+msgstr "Försenad försändelse"
 
 #: ../libpurple/protocols/jabber/buddy.c:905
 #: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Collaborative Data Objects"
-msgstr ""
+msgstr "Kollebrationsdata objekt"
 
 #: ../libpurple/protocols/jabber/buddy.c:907
 #: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "File Repository and Sharing"
-msgstr ""
+msgstr "Filförvaringsplats och Delning"
 
 #: ../libpurple/protocols/jabber/buddy.c:909
 #: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
-msgstr ""
+msgstr "STUN Serviceupptäckning för Ramsor"
 
 #: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgstr "Simpel crypterad session förhandling"
 
 #: ../libpurple/protocols/jabber/buddy.c:913
 #: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
-msgstr ""
+msgstr "Hoppkontroll"
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Capabilities"
 msgstr "Stödjer"
 
@@ -5183,8 +5418,8 @@ msgstr "Andranamn"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
 #: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5203,115 +5438,108 @@ msgstr "Logotyp"
 msgid "Logo"
 msgstr "Logotyp"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Göm inte \"Från\""
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Göm temporärt \"Från\""
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Avbryt närvarorapportering"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "Begär autentiserings (igen)"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "Sluta prenumerera"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
-msgstr "Ansluten"
+msgstr "Anslut"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
-msgstr "Logga alla chattar"
+msgstr "Koppla ifrån"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/buddy.c:2038
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Pratig"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Utökad frånvaro"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
+#: ../libpurple/protocols/jabber/buddy.c:2044
 #: ../libpurple/protocols/jabber/jabber.c:1622
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../libpurple/protocols/oscar/oscar.c:5863
 #: ../libpurple/protocols/sametime/sametime.c:3297
 #, c-format
 msgid "Do Not Disturb"
 msgstr "Stör inte"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/oscar/oscar.c:3726
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "Din sökning gav följande resultat"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-"Hitta en kontakt genom att ange sökkriteriet i de givna fälten. Notera: Alla "
-"fälten stödjer wild card sökningar (%)"
+#: ../libpurple/protocols/jabber/buddy.c:2322
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "Hitta en kontakt genom att ange sökkriteriet i de givna fälten. Notera: Alla fälten stödjer wild card sökningar (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2342
 msgid "Directory Query Failed"
 msgstr "Katalogförfrågning misslyckades"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2343
 msgid "Could not query the directory server."
 msgstr "Kunde inte efterfråga katalogservern."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Serverinstruktioner: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2384
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr ""
-"Fyll i ett eller flera fält för att söka efter matchande XMPPanvändare."
+msgstr "Fyll i ett eller flera fält för att söka efter matchande XMPPanvändare."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/novell/novell.c:1490
+#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "E-Mail Address"
 msgstr "E-postadress"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2414
 msgid "Search for XMPP users"
 msgstr "Sök efter XMPP användare"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2415
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5323,24 +5551,24 @@ msgstr "Sök"
 msgid "Search"
 msgstr "Sök"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2430
 msgid "Invalid Directory"
 msgstr "Ogiltigt register"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2447
 msgid "Enter a User Directory"
 msgstr "Ange ett användarregister"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Select a user directory to search"
 msgstr "Välj ett användarregister som du vill söka i"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2451
 msgid "Search Directory"
 msgstr "Sökregister"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5347
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Rum:"
@@ -5411,7 +5639,7 @@ msgstr "Att ändra smeknamn stödjs inte
 # "Rumslistan" istället?
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Fel vid hämtning av rumlistan"
@@ -5438,7 +5666,7 @@ msgid "You require encryption, but it is
 
 #: ../libpurple/protocols/jabber/jabber.c:145
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "Du kräver cryptering, men server stödjer det inte."
 
 #: ../libpurple/protocols/jabber/jabber.c:259
 #: ../libpurple/protocols/jabber/jabber.c:312
@@ -5452,9 +5680,9 @@ msgstr "Läsfel"
 msgstr "Läsfel"
 
 #: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5482,9 +5710,9 @@ msgstr "Registrering av %s@%s lyckades"
 msgstr "Registrering av %s@%s lyckades"
 
 #: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "Registrering av %s@%s lyckades"
+msgstr "Registrering till %s lyckades"
 
 #: ../libpurple/protocols/jabber/jabber.c:664
 #: ../libpurple/protocols/jabber/jabber.c:665
@@ -5497,21 +5725,19 @@ msgstr "Registreringen misslyckades"
 msgstr "Registreringen misslyckades"
 
 #: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "Registrering av %s@%s lyckades"
+msgstr "Registrering från %s togs bort"
 
 #: ../libpurple/protocols/jabber/jabber.c:694
 #: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
 msgid "Unregistration Successful"
-msgstr "Registreringen lyckades"
+msgstr "Avregistreringen lyckades"
 
 #: ../libpurple/protocols/jabber/jabber.c:703
 #: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
 msgid "Unregistration Failed"
-msgstr "Registreringen misslyckades"
+msgstr "Avregistreringen misslyckades"
 
 #: ../libpurple/protocols/jabber/jabber.c:864
 #: ../libpurple/protocols/jabber/jabber.c:865
@@ -5519,8 +5745,8 @@ msgstr "Redan registrerad"
 msgstr "Redan registrerad"
 
 #: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "State"
 msgstr "Delstat"
 
@@ -5530,8 +5756,8 @@ msgstr "Postnummer"
 
 #: ../libpurple/protocols/jabber/jabber.c:972
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:903
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:553
@@ -5543,15 +5769,12 @@ msgstr "Datum"
 msgstr "Datum"
 
 #: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
 msgid "Unregister"
-msgstr "Registrera"
+msgstr "Avregistrera"
 
 #: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
-msgid ""
-"Please fill out the information below to change your account registration."
-msgstr "Fyll i informationen nedan för att registrera ditt nya konto."
+msgid "Please fill out the information below to change your account registration."
+msgstr "Fyll i informationen nedan för att ändra din kontoregistrering."
 
 #: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
@@ -5568,43 +5791,39 @@ msgstr "Registrera"
 msgstr "Registrera"
 
 #: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "Ändra användarinformationen för %s"
+msgstr "Ändra kontoregistrering vid %s"
 
 #: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
+#, c-format
 msgid "Register New Account at %s"
-msgstr "Registrera nytt XMPP-konto"
+msgstr "Registrera nytt konto vid %s"
 
 #: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
 msgid "Change Registration"
-msgstr "Ändra status till"
+msgstr "Ändra registrering"
 
 #: ../libpurple/protocols/jabber/jabber.c:1120
 #: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
 msgid "Error unregistering account"
-msgstr "Fel vid ändring av kontoinformation"
+msgstr "Fel vid avregistrering av konto"
 
 #: ../libpurple/protocols/jabber/jabber.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:1127
-#, fuzzy
 msgid "Account successfully unregistered"
-msgstr "Du har problemfritt skapat ett Qun"
+msgstr "Kontot är problemfritt avregistrerat"
 
 #: ../libpurple/protocols/jabber/jabber.c:1284
 msgid "Initializing Stream"
 msgstr "Initierar flöde"
 
 #: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "Initierar flöde"
+msgstr "Initierar SSL/TLS"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:392
 msgid "Authenticating"
 msgstr "Autentiserar"
 
@@ -5617,7 +5836,7 @@ msgstr "Återinitierar flöde"
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5657
 msgid "Not Authorized"
 msgstr "Inte auktoriserad"
 
@@ -5658,40 +5877,37 @@ msgstr "Prenumeration"
 #: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/jabber/jabber.c:1602
 #: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
-msgstr "Stämning"
+msgstr "Humör"
 
 #: ../libpurple/protocols/jabber/jabber.c:1534
 #: ../libpurple/protocols/jabber/jabber.c:1557
 #: ../libpurple/protocols/jabber/jabber.c:1580
 #: ../libpurple/protocols/jabber/jabber.c:1603
 #: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
 msgid "Mood Text"
-msgstr "Blodgrupp"
+msgstr "Humörstext"
 
 #: ../libpurple/protocols/jabber/jabber.c:1535
 #: ../libpurple/protocols/jabber/jabber.c:1558
 #: ../libpurple/protocols/jabber/jabber.c:1581
 #: ../libpurple/protocols/jabber/jabber.c:1604
 #: ../libpurple/protocols/jabber/jabber.c:1627
-#, fuzzy
 msgid "Tune Artist"
-msgstr "Artister"
+msgstr "LÃ¥tartist"
 
 #: ../libpurple/protocols/jabber/jabber.c:1536
 #: ../libpurple/protocols/jabber/jabber.c:1559
 #: ../libpurple/protocols/jabber/jabber.c:1582
 #: ../libpurple/protocols/jabber/jabber.c:1605
 #: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
 msgid "Tune Title"
-msgstr "Titel"
+msgstr "LÃ¥ttitel"
 
 #: ../libpurple/protocols/jabber/jabber.c:1537
 #: ../libpurple/protocols/jabber/jabber.c:1560
@@ -5699,7 +5915,7 @@ msgid "Tune Album"
 #: ../libpurple/protocols/jabber/jabber.c:1606
 #: ../libpurple/protocols/jabber/jabber.c:1629
 msgid "Tune Album"
-msgstr ""
+msgstr "LÃ¥talbum"
 
 #: ../libpurple/protocols/jabber/jabber.c:1538
 #: ../libpurple/protocols/jabber/jabber.c:1561
@@ -5707,16 +5923,15 @@ msgid "Tune Genre"
 #: ../libpurple/protocols/jabber/jabber.c:1607
 #: ../libpurple/protocols/jabber/jabber.c:1630
 msgid "Tune Genre"
-msgstr ""
+msgstr "LÃ¥tgenre"
 
 #: ../libpurple/protocols/jabber/jabber.c:1539
 #: ../libpurple/protocols/jabber/jabber.c:1562
 #: ../libpurple/protocols/jabber/jabber.c:1585
 #: ../libpurple/protocols/jabber/jabber.c:1608
 #: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
 msgid "Tune Comment"
-msgstr "Kompiskommentar"
+msgstr "LÃ¥tkommentar"
 
 #: ../libpurple/protocols/jabber/jabber.c:1540
 #: ../libpurple/protocols/jabber/jabber.c:1563
@@ -5724,7 +5939,7 @@ msgid "Tune Track"
 #: ../libpurple/protocols/jabber/jabber.c:1609
 #: ../libpurple/protocols/jabber/jabber.c:1632
 msgid "Tune Track"
-msgstr ""
+msgstr "Låtspår"
 
 #: ../libpurple/protocols/jabber/jabber.c:1541
 #: ../libpurple/protocols/jabber/jabber.c:1564
@@ -5732,7 +5947,7 @@ msgid "Tune Time"
 #: ../libpurple/protocols/jabber/jabber.c:1610
 #: ../libpurple/protocols/jabber/jabber.c:1633
 msgid "Tune Time"
-msgstr ""
+msgstr "LÃ¥ttid"
 
 #: ../libpurple/protocols/jabber/jabber.c:1542
 #: ../libpurple/protocols/jabber/jabber.c:1565
@@ -5740,7 +5955,7 @@ msgid "Tune Year"
 #: ../libpurple/protocols/jabber/jabber.c:1611
 #: ../libpurple/protocols/jabber/jabber.c:1634
 msgid "Tune Year"
-msgstr ""
+msgstr "Låtår"
 
 #: ../libpurple/protocols/jabber/jabber.c:1543
 #: ../libpurple/protocols/jabber/jabber.c:1566
@@ -5748,16 +5963,15 @@ msgid "Tune URL"
 #: ../libpurple/protocols/jabber/jabber.c:1612
 #: ../libpurple/protocols/jabber/jabber.c:1635
 msgid "Tune URL"
-msgstr ""
+msgstr "LÃ¥tURL"
 
 #: ../libpurple/protocols/jabber/jabber.c:1545
 #: ../libpurple/protocols/jabber/jabber.c:1568
 #: ../libpurple/protocols/jabber/jabber.c:1591
 #: ../libpurple/protocols/jabber/jabber.c:1614
 #: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "Tillåt"
+msgstr "Tillåt Surr"
 
 #: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
@@ -5786,16 +6000,16 @@ msgstr "Ange ditt nya lösenord"
 msgstr "Ange ditt nya lösenord"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/oscar/oscar.c:6443
+#: ../libpurple/protocols/silc/silc.c:1224
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Ändra användarinfo..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/oscar/oscar.c:6454
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Byt lösenor..."
@@ -5923,7 +6137,7 @@ msgstr "Resurskonflikt"
 msgstr "Resurskonflikt"
 
 #: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc/silc.c:344
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Anslutningen överskred en tidsgräns och tappades"
@@ -6035,92 +6249,98 @@ msgstr "Kan inte sparka ut användaren %
 msgstr "Kan inte sparka ut användaren %s"
 
 #: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "Kan inte banna användaren %s"
+msgstr "Kan inte pinga användaren %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+#: ../libpurple/protocols/jabber/jabber.c:2203
+#: ../libpurple/protocols/jabber/jabber.c:2214
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2209
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2240
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Kan inte skicka fil till %s, användaren stödjer inte filöverföringar"
+msgstr "Kan inte surra, användaren %s stödjer inte det."
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:2262
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+msgid "Buzz"
+msgstr "Surr"
+
+#: ../libpurple/protocols/jabber/jabber.c:2263
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s har surrat dig!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2264
+#: ../libpurple/protocols/yahoo/yahoo.c:4123
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Surrar %s..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2296
 msgid "config:  Configure a chat room."
 msgstr "config: Konfigurera ett chattrum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "configure:  Configure a chat room."
 msgstr "configure: Konfigurera ett chattrum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "part [room]:  Leave the room."
 msgstr "part [rum]: lämna rummet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2314
 msgid "register:  Register with a chat room."
 msgstr "register: Registrera i ett chattrum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2320
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nytt ämne]:  Visa eller ändra ämne."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;användare&gt; [rum]:  Bannlys en användare från rummet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-"affiliate &lt;användare&gt; &lt;ägare|admin|medlem|utstött|ingen&gt;: Ange "
-"en användares koppling till rummet."
+#: ../libpurple/protocols/jabber/jabber.c:2332
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+msgstr "affiliate &lt;användare&gt; &lt;ägare|admin|medlem|utstött|ingen&gt;: Ange en användares koppling till rummet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-"role &lt;användare&gt; &lt;moderator|deltagare|besökare|inget&gt;: Ange en "
-"användares roll i rummet."
+#: ../libpurple/protocols/jabber/jabber.c:2338
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;användare&gt; &lt;moderator|deltagare|besökare|inget&gt;: Ange en användares roll i rummet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr ""
-"invite &lt;användare&gt; [meddelande]:  Bjud in användaren till rummet."
+msgstr "invite &lt;användare&gt; [meddelande]:  Bjud in användaren till rummet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;rum&gt; [server]:  Anslut till en chatt på denna server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2356
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;användare&gt; [rum]:  Sparka ut en användare från rummet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr ""
-"msg &lt;användare&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till "
-"en annan användare."
+#: ../libpurple/protocols/jabber/jabber.c:2361
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;användare&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till en annan användare."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\tPinga en användare/komponent/server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2372
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Stör en användare för att få dennes uppmärksamhet"
 
@@ -6140,13 +6360,14 @@ msgstr "Insticksmodul för XMPP-Protokol
 msgstr "Insticksmodul för XMPP-Protokollet"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:202
+#: ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "Domän"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:210
 msgid "Require SSL/TLS"
-msgstr ""
+msgstr "Kräver SSL/TLS"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
@@ -6157,8 +6378,8 @@ msgstr "Tillåt klartextautentisering ö
 msgstr "Tillåt klartextautentisering över okrypterad ström"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/myspace/myspace.c:3283
+#: ../libpurple/protocols/simple/simple.c:1924
 msgid "Connect port"
 msgstr "Anslutningsport"
 
@@ -6166,9 +6387,10 @@ msgstr "Anslutningsport"
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/myspace/myspace.c:3280
+#: ../libpurple/protocols/silc/silc.c:2045
+#: ../libpurple/protocols/silc10/silc.c:1857
+#: ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr "Anslutningsserver"
 
@@ -6201,12 +6423,6 @@ msgstr "XMPP meddelandefel"
 msgid "XMPP Message Error"
 msgstr "XMPP meddelandefel"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s har loggat in."
-
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6216,37 +6432,33 @@ msgstr "XML-tolkningsfel"
 msgid "XML Parse error"
 msgstr "XML-tolkningsfel"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:423
 msgid "Unknown Error in presence"
 msgstr "Okänt fel i närvaro"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:504
+#: ../libpurple/protocols/jabber/presence.c:505
 msgid "Create New Room"
 msgstr "Skapa nytt rum"
 
-#: ../libpurple/protocols/jabber/presence.c:510
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"Du skapar ett nytt rum. Vill du konfigurera det eller nöjer du dig med "
-"förvalda inställningar?"
+#: ../libpurple/protocols/jabber/presence.c:506
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "Du skapar ett nytt rum. Vill du konfigurera det eller nöjer du dig med förvalda inställningar?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:512
 msgid "_Configure Room"
 msgstr "_Konfigurera rum"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:513
 msgid "_Accept Defaults"
 msgstr "_Acceptera förval"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:555
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fel i chatt %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fel vid anslutning till chatt %s"
@@ -6275,8 +6487,7 @@ msgid "Unable to send file to %s, not su
 #: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr ""
-"Kan inte skicka filen till %s, prenumrerar inte på användartillgänglighet"
+msgstr "Kan inte skicka filen till %s, prenumrerar inte på användartillgänglighet"
 
 #: ../libpurple/protocols/jabber/si.c:857
 #, c-format
@@ -6287,81 +6498,70 @@ msgstr "Välj en tillflykt"
 msgid "Select a Resource"
 msgstr "Välj en tillflykt"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
-msgstr "Användarlägen"
+msgstr "Redigera användarhumör"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
-msgstr ""
+msgstr "Ange ditt humör från listan."
 
-# src/menus.c:280
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
 msgid "Set"
-msgstr "A_nge"
+msgstr "Ange"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
-msgstr "Skicka IM..."
+msgstr "Ange humör..."
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "Sätt användarbegränsning"
+msgstr "Sätt användarsmeknamn"
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "Ange det nya namnet för %s"
+msgstr "Ange det nya smeknamnet för dig."
 
 #: ../libpurple/protocols/jabber/usernick.c:77
-msgid ""
-"This information is visible to all contacts on your contact list, so choose "
-"something appropriate."
-msgstr ""
+msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
+msgstr "Denna information är synbar för alla på din kontaktlista, så välj något passande."
 
-#: ../libpurple/protocols/jabber/usernick.c:99
-#, fuzzy
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
-msgstr "Smeknamn"
+msgstr "Ange Smeknamn..."
 
 #: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
 msgid "Actions"
-msgstr "Handling"
+msgstr "Handlingar"
 
 #: ../libpurple/protocols/jabber/xdata.c:380
-#, fuzzy
 msgid "Select an action"
-msgstr "Välj en fil"
+msgstr "Välj en handling"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:163
+msgid "Unable to connect to contact server"
+msgstr "Kan inte ansluta till kontaktservern"
+
+#: ../libpurple/protocols/msn/contact.c:923
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Kunde inte hämta MSN-adressbok"
+
+#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problem med synkroniseringen av kompislistan i %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s på den lokala listan finns i gruppen \"%s\" men inte på serverns lista. "
-"Ska kompisen läggas till?"
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s på den lokala listan finns i gruppen \"%s\" men inte på serverns lista. Ska kompisen läggas till?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
 #, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s finns på den lokala listan men inte på serverns lista. Ska kompisen "
-"läggas till?"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "%s finns på den lokala listan men inte på serverns lista. Ska kompisen läggas till?"
 
 #: ../libpurple/protocols/msn/error.c:36
 #, c-format
@@ -6605,10 +6805,11 @@ msgstr "Servern är för upptagen"
 msgstr "Servern är för upptagen"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/oscar/oscar.c:1383
+#: ../libpurple/protocols/silc/silc.c:333
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#: ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1393
 #, c-format
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
@@ -6650,388 +6851,392 @@ msgid "Nudge"
 
 #: ../libpurple/protocols/msn/msn.c:130
 msgid "Nudge"
-msgstr ""
+msgstr "Vibba"
 
 #: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s har loggat in."
+msgstr "%s har vibbat dig!"
 
 #: ../libpurple/protocols/msn/msn.c:132
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "Vibbar %s..."
 
 #: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Ditt nya smeknamn för MSN är för långt."
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:286
 msgid "Set your friendly name."
 msgstr "Ange smeknamn."
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:287
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Detta är det namn som andra MSN-användare kommer att se."
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:305
 msgid "Set your home phone number."
 msgstr "Ange ditt hemtelefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Set your work phone number."
 msgstr "Ange ditt jobbtelefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339
 msgid "Set your mobile phone number."
 msgstr "Ange ditt mobiltelefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillåt MSN-mobilsökning?"
 
-#: ../libpurple/protocols/msn/msn.c:351
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"Vill du tillåta kompisar i din kompislista att skicka MSN-mobilsökningar "
-"till din mobiltelefon eller annan mobil enhet?"
+#: ../libpurple/protocols/msn/msn.c:355
+msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
+msgstr "Vill du tillåta kompisar i din kompislista att skicka MSN-mobilsökningar till din mobiltelefon eller annan mobil enhet?"
 
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:361
 msgid "Allow"
 msgstr "Tillåt"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362
 msgid "Disallow"
 msgstr "Tillåt ej"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378
 msgid "This Hotmail account may not be active."
 msgstr "Detta Hotmail-konto är kanske inte aktivt."
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:404
 msgid "Send a mobile message."
 msgstr "Skicka ett mobilmeddelande."
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406
 msgid "Page"
 msgstr "Sök"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Har dig"
+#: ../libpurple/protocols/msn/msn.c:611
+#: ../libpurple/protocols/msn/msn.c:641
+#: ../libpurple/protocols/msn/msn.c:648
+#: ../libpurple/protocols/msn/msn.c:655
+#: ../libpurple/protocols/msn/msn.c:662
+#: ../libpurple/protocols/msn/msn.c:668
+#: ../libpurple/protocols/msn/msn.c:674
+msgid "Current media"
+msgstr "Nuvarande media"
 
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:653
+#: ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Strax tillbaka"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2827
+#: ../libpurple/protocols/novell/novell.c:2957
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:666
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Pratar i telefon"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:672
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "PÃ¥ lunch"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:703
 msgid "Set Friendly Name..."
 msgstr "Ange smeknamn..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:708
 msgid "Set Home Phone Number..."
 msgstr "Ange hemtelefonnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:712
 msgid "Set Work Phone Number..."
 msgstr "Ange jobbtelefonnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:716
 msgid "Set Mobile Phone Number..."
 msgstr "Ange mobilnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:722
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aktivera/Avaktivera mobila enheter..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:727
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Tillåt/Hindra mobilsökningar..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:738
 msgid "Open Hotmail Inbox"
 msgstr "Öppna Hotmail Inkorg"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:762
 msgid "Send to Mobile"
 msgstr "Skicka till mobil"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:772
+#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "Starta _chatt"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:810
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr ""
-"SSL-stöd krävs för att använda MSN. Installera ett SSL-bibliotek som stöds."
+msgstr "SSL-stöd krävs för att använda MSN. Installera ett SSL-bibliotek som stöds."
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:838
 msgid "Failed to connect to server."
 msgstr "Kunde inte ansluta till servern."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1969
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Fel vid hämtninga av profil"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1692
+#: ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Allmänt"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1699
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Ã…lder"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1701
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Sysselsättning"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1702
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1480
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Plats"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1707
+#: ../libpurple/protocols/msn/msn.c:1899
+#: ../libpurple/protocols/msn/msn.c:1905
+#: ../libpurple/protocols/msn/msn.c:1912
 msgid "Hobbies and Interests"
 msgstr "Hobbies och intressen"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1839
+#: ../libpurple/protocols/msn/msn.c:1846
+#: ../libpurple/protocols/msn/msn.c:1854
+#: ../libpurple/protocols/msn/msn.c:1861
 msgid "A Little About Me"
 msgstr "Lite om mig"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1730
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1732
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Civilstånd"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1733
 msgid "Interests"
 msgstr "Intressen"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1734
 msgid "Pets"
 msgstr "Husdjur"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1735
 msgid "Hometown"
 msgstr "Hemstad"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1736
 msgid "Places Lived"
 msgstr "Tidigare boplatser"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1737
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1738
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1739
 msgid "Music"
 msgstr "Musik"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1740
+#: ../libpurple/protocols/msn/msn.c:1921
+#: ../libpurple/protocols/msn/msn.c:1927
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Favoritcitat"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1757
 msgid "Contact Info"
 msgstr "Kontaktinformation"
 
 # Osäker
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1758
 msgid "Personal"
 msgstr "Personligt"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Significant Other"
 msgstr "Make/Maka"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1762
 msgid "Home Phone"
 msgstr "Hemtelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1763
 msgid "Home Phone 2"
 msgstr "Hemtelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Home Address"
 msgstr "Hemadress"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1765
 msgid "Personal Mobile"
 msgstr "Personlig mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1766
 msgid "Home Fax"
 msgstr "Hemfax"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1767
 msgid "Personal E-Mail"
 msgstr "Personlig E-Post"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1768
 msgid "Personal IM"
 msgstr "Personlig IM"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1770
 msgid "Anniversary"
 msgstr "Högtid"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1786
 msgid "Work"
 msgstr "Arbete"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1788
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Jobbtitel"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Company"
 msgstr "Företag"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Avdelning"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work Phone"
 msgstr "Arbetselefon"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Work Phone 2"
 msgstr "Arbetselefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Address"
 msgstr "Jobbadress"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1795
 msgid "Work Mobile"
 msgstr "Arbetsmobil"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1796
 msgid "Work Pager"
 msgstr "Arbetssökare"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1797
 msgid "Work Fax"
 msgstr "Arbete Fax"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1798
 msgid "Work E-Mail"
 msgstr "Arbete E-post"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1799
 msgid "Work IM"
 msgstr "Arbete IM"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1800
 msgid "Start Date"
 msgstr "Start datum"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1870
+#: ../libpurple/protocols/msn/msn.c:1876
+#: ../libpurple/protocols/msn/msn.c:1883
+#: ../libpurple/protocols/msn/msn.c:1890
 msgid "Favorite Things"
 msgstr "Favoritsaker"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1935
 msgid "Last Updated"
 msgstr "Senast uppdaterad"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1946
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1970
 msgid "The user has not created a public profile."
 msgstr "Användaren har inte skapat en publik profil."
 
-#: ../libpurple/protocols/msn/msn.c:1860
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"MSN rapporterar att det inte kan hitta användarens profil. Detta innebär att "
-"användaren inte finns eller att användaren inte skapat en publik profil."
+#: ../libpurple/protocols/msn/msn.c:1971
+msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
+msgstr "MSN rapporterar att det inte kan hitta användarens profil. Detta innebär att användaren inte finns eller att användaren inte skapat en publik profil."
 
-#: ../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 ""
-"Kunde inte hitta någon information i användarens profil. Användaren "
-"existerar troligen inte."
+#: ../libpurple/protocols/msn/msn.c:1975
+msgid "Could not find any information in the user's profile. The user most likely does not exist."
+msgstr "Kunde inte hitta någon information i användarens profil. Användaren existerar troligen inte."
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:1983
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profil-URL"
@@ -7046,129 +7251,145 @@ msgstr "Profil-URL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "Insticksmodul för MSN-Protokollet"
+#: ../libpurple/protocols/msn/msn.c:2270
+#: ../libpurple/protocols/msn/msn.c:2272
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Windows Live Messenger Protokoll-insticksmodul"
 
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2307
 msgid "Use HTTP Method"
 msgstr "Använd HTTP-metod"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:2312
 msgid "HTTP Method Server"
-msgstr "IPC-testserver"
+msgstr "HTTP-metod server"
 
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2317
 msgid "Show custom smileys"
 msgstr "Visa egna smileys"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2325
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Knuffa till en kontakt för att få dennes uppmärksamhet"
 
-#: ../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 "Kan inte ansluta"
+#: ../libpurple/protocols/msn/nexus.c:137
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID autentisering: Kunde inte ansluta"
 
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:272
+msgid "Windows Live ID authentication Failed"
+msgstr "Windows Live ID autentisering misslyckades"
+
+#: ../libpurple/protocols/msn/notification.c:185
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s är inte en giltig grupp."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:371
 msgid "Unknown error."
 msgstr "Okänt fel."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s skickade just en vibb!"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Okänt fel (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Kan inte lägga till användaren"
+
+#: ../libpurple/protocols/msn/notification.c:897
+#, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Kan inte lägga till användare på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Kan inte blockera användaren på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Kan inte tillåta användaren på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s kunde inte läggas till eftersom din kompislista är full."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s är inte ett giltigt passport-konto."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
 msgid "Service Temporarily Unavailable."
 msgstr "Tjänst tillfälligt onåbar."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1263
 msgid "Unable to rename group"
 msgstr "Kan inte byta namn på grupp"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1318
 msgid "Unable to delete group"
 msgstr "Kan inte ta bort grupp"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1934
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"MSN-servern kommer att stängas av för underhåll om %d minut, då kommer du "
-"automatiskt att loggas ut. Passa på att avsluta dina konversationer innan "
-"tiden löper ut.\n"
+"MSN-servern kommer att stängas av för underhåll om %d minut, då kommer du automatiskt att loggas ut. Passa på att avsluta dina konversationer innan tiden löper ut.\n"
 "\n"
 "Efter underhållet är slutfört kommer du kunna ansluta till MSN som vanligt."
 msgstr[1] ""
-"MSN-servern kommer att stängas av för underhåll om %d minuter, då kommer du "
-"automatiskt att loggas ut. Passa på att avsluta dina konversationer innan "
-"tiden löper ut.\n"
+"MSN-servern kommer att stängas av för underhåll om %d minuter, då kommer du automatiskt att loggas ut. Passa på att avsluta dina konversationer innan tiden löper ut.\n"
 "\n"
 "Efter underhållet är slutfört kommer du kunna ansluta till MSN som vanligt."
 
+#: ../libpurple/protocols/msn/oim.c:142
+msgid "Unable to connect to OIM server"
+msgstr "Kan inte ansluta till OIM-servern."
+
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Kan inte ansluta"
+
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "Skrivfel"
@@ -7186,57 +7407,55 @@ msgstr ""
 "Anslutningsfel från %s servern:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:338
 msgid "Our protocol is not supported by the server."
 msgstr "Vårt protokoll stöds inte av servern."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:342
 msgid "Error parsing HTTP."
 msgstr "Fel vid avkodning av HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/msn/session.c:346
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Du har loggat in från en annan plats."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:351
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN-sernvern är temporärt otillgänglig. Var god  försök igen senare."
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:356
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-servern går ner temporärt."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:361
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kan inte autentisera: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-"Din MSN-kompislista är otillgänglig temporärt. Var god  försök igen senare."
+#: ../libpurple/protocols/msn/session.c:366
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr "Din MSN-kompislista är otillgänglig temporärt. Var god  försök igen senare."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msn/session.c:389
 msgid "Handshaking"
 msgstr "Handskakning"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:390
 msgid "Starting authentication"
 msgstr "Starta autentisering"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:391
 msgid "Getting cookie"
 msgstr "Hämtar kaka"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:393
 msgid "Sending cookie"
 msgstr "Skickar kaka"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:394
 msgid "Retrieving buddy list"
 msgstr "Tar emot kompislista"
 
@@ -7252,298 +7471,268 @@ msgstr "PÃ¥ lunch"
 msgid "Out To Lunch"
 msgstr "PÃ¥ lunch"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Meddelandet kanske inte skickades eftersom väntetiden tog slut:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:406
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Meddelandet kunde inte skickas, inte tillåtet som osynlig:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:410
 msgid "Message could not be sent because the user is offline:"
 msgstr "Meddelandet kunde inte skickas eftersom användaren är frånkopplad:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:414
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Meddelandet kunde inte skickas eftersom ett anslutningsfel uppstod:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Meddelandet kunde inte skickas eftersom skickade för snabbt:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
-"Meddelandet kunde inte skickas eftersom vi inte kunda skapa en anslutning "
-"till servern. Detta är troligen ett serverfel, försök igen om några minuter:"
+#: ../libpurple/protocols/msn/switchboard.c:422
+msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
+msgstr "Meddelandet kunde inte skickas eftersom vi inte kunda skapa en anslutning till servern. Detta är troligen ett serverfel, försök igen om några minuter:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
-msgstr ""
-"Meddelandet kunde inte skickas eftersom ett fel med växlingsbordet uppstod:"
+#: ../libpurple/protocols/msn/switchboard.c:429
+msgid "Message could not be sent because an error with the switchboard occurred:"
+msgstr "Meddelandet kunde inte skickas eftersom ett fel med växlingsbordet uppstod:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:437
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr ""
-"Meddelandet kunde kanske inte skickas på grund av att ett okänt fel uppstod:"
+msgstr "Meddelandet kunde kanske inte skickas på grund av att ett okänt fel uppstod:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s har lagt till dig till sin kompislista."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s har tagit bort dig från sin kontaktlista."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kunde inte lägga till \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "Det angivna skärmnamnet är felaktigt."
 
 #: ../libpurple/protocols/myspace/myspace.c:111
-#, fuzzy
 msgid "Missing Cipher"
-msgstr "Chiffer"
+msgstr "Chiffer Saknas"
 
 #: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "RC4-chiffret kan inte hittas"
 
 #: ../libpurple/protocols/myspace/myspace.c:113
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgstr "Uppgradera till en version av libpurble med RC4-stöd (>= 2.0.1). MySpaceIM-insticksmodulen kommer inte läsas in."
 
 #: ../libpurple/protocols/myspace/myspace.c:286
 #, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr ""
+msgid "Sorry, passwords over %d characters in length (yours is %d) are not supported by MySpace."
+msgstr "Tyvärr, lösenord som är längre än %d tecken (ditt är %d) stöds inte av MySpace."
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1810
 msgid "MySpaceIM Error"
-msgstr ""
+msgstr "MySpaceIM-fel"
 
-#: ../libpurple/protocols/myspace/myspace.c:349
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:350
 msgid "Reading challenge"
-msgstr "Läsfel"
+msgstr "Läser challenge"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:356
 msgid "Unexpected challenge length from server"
-msgstr "Ogiltigt utmaning från servern"
+msgstr "Oväntad challengelängd från server"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Logging in"
-msgstr "Loggning"
+msgstr "Loggar in"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1293
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgstr "Anslutning till servern tappad (ingen data mottagen på %d sekunder)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1335
 msgid "New mail messages"
-msgstr "Skicka ett meddelande"
+msgstr "Nya e-postmeddelanden"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1336
 msgid "New blog comments"
-msgstr ""
+msgstr "Nya bloggkommentarer"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1337
 msgid "New profile comments"
-msgstr ""
+msgstr "Nya profilkommentarer"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1338
 msgid "New friend requests!"
-msgstr ""
+msgstr "Nya vänförfrågningar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New picture comments"
-msgstr ""
+msgstr "Nya bildkommentarer"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "MySpace"
-msgstr ""
+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:1543
+#: ../libpurple/protocols/myspace/myspace.c:1550
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1561
+#: ../libpurple/protocols/myspace/myspace.c:1563
 msgid "No username set"
-msgstr "Inget namn"
+msgstr "Inget användarnamn angett"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:1562
+msgid "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."
+msgstr "Gå till http://editprofile.myspace.com/index.cfm?fuseaction=profile.username och välj ett användarnamn och försök igen."
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/myspace.c:1789
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "Processen gav felkod %d"
+msgstr "Protokollfel, gav felkod %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#, fuzzy
+# Vad säger att det är till just en chatt kompisen ska läggas till?
+#: ../libpurple/protocols/myspace/myspace.c:1981
+#: ../libpurple/protocols/myspace/myspace.c:2015
 msgid "Failed to add buddy"
-msgstr "Kunde inte ansluta kompis till chatt"
+msgstr "Kunde inte lägga till kompis"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1981
 msgid "'addbuddy' command failed."
-msgstr "Läs in kompislista från fil..."
+msgstr "'addbuddy'-kommandot misslyckades."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#, fuzzy
+# Vet inte vad den gör, mycket öppen för förslag från någon som vet MySpaceIM.
+#: ../libpurple/protocols/myspace/myspace.c:2015
+#: ../libpurple/protocols/myspace/myspace.c:2252
 msgid "persist command failed"
-msgstr "Växeln misslyckades"
+msgstr "'persist'-kommandot misslyckades"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2120
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "Ingen sådan användare: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2121
 msgid "User lookup"
-msgstr "Användarrum"
+msgstr "Användarsökning"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2233
+#: ../libpurple/protocols/myspace/myspace.c:2252
+#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "Failed to remove buddy"
-msgstr "Kunde inte ansluta kompis till chatt"
+msgstr "Kunde inte ta bort kompis från chatt"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2233
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "'delbuddy'-kommadot misslyckades"
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "blocklist command failed"
-msgstr "Växeln misslyckades"
+msgstr "'blocklist'-kommandot misslyckades"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2320
 msgid "Invalid input condition"
-msgstr "Avsluta anslutning"
+msgstr "Ogiltigt inmatningsvillkor"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2338
+#: ../libpurple/protocols/myspace/myspace.c:2369
 msgid "Read buffer full"
 msgstr "Kö full"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2407
 msgid "Unparseable message"
-msgstr "Kan inte avkoda meddelandet"
+msgstr "Otolkbart meddelande"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/myspace.c:2476
+#, c-format
 msgid "Couldn't connect to host: %s (%d)"
-msgstr "Kunde inte ansluta till värden"
+msgstr "Kunde inte ansluta till värd: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2647
 msgid "IM Friends"
-msgstr "_Snabbmeddelandefönster"
+msgstr "Snabbmeddelandevänner"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2747
 #, c-format
-msgid ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr ""
+msgid "%d buddies were added or updated from the server (including buddies already on the server-side list)"
+msgstr "%d vänner lades till eller uppdaterades av servern (inklusive vänner som redan fanns på serverns lista)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2748
 msgid "Add contacts from server"
-msgstr "Ogiltigt svar från servern."
+msgstr "Lägg till kontakter från server"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2800
+#: ../libpurple/protocols/myspace/myspace.c:2865
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "Lägg till vänner från MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2801
 msgid "Importing friends failed"
-msgstr "inläsning av modul misslyckades."
+msgstr "Importering av vänner misslyckades"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2857
 msgid "Find people..."
-msgstr "Hitta kompisar..."
+msgstr "Hitta personer..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2860
 msgid "Change IM name..."
-msgstr "Byt lösenord..."
+msgstr "Ändring visningsnamn..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3162
 msgid "myim URL handler"
-msgstr ""
+msgstr "myim URL-hanterare"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3163
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "Inget passande MySpaceIM-konto kunde hittas för att öppna denna myim-URL."
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3164
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "Aktivera det riktiga MySpaceIM-kontot och försök igen."
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3287
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Visa visningnamn i statustext"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3290
 msgid "Show headline in status text"
-msgstr ""
+msgstr "Visa rubrik i statustext"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
-#, fuzzy
+# Jag vet faktiskt inte vad dessa kallas i de officiella klienterna, kan vara en ide att kolla upp.
+#: ../libpurple/protocols/myspace/myspace.c:3295
 msgid "Send emoticons"
-msgstr "Ljudalternativ"
+msgstr "Skicka emoticons"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3300
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "Skärmupplösning (punkter per tum)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3303
 msgid "Base font size (points)"
-msgstr ""
+msgstr "Grundstorlek för tecken (punkter)"
 
 #: ../libpurple/protocols/myspace/user.c:95
 #: ../libpurple/protocols/zephyr/zephyr.c:786
@@ -7551,174 +7740,193 @@ msgstr "Användare"
 msgid "User"
 msgstr "Användare"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2979
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/myspace/user.c:124
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
-msgstr "_Alias:"
+msgstr "Rubrik"
 
-#: ../libpurple/protocols/myspace/user.c:129
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
-msgstr "Ljud"
+msgstr "SÃ¥ng"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
-msgstr ""
+msgstr "Totala vänner"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
-msgstr "Stäng konversationen"
+msgstr "Klientversion"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
-msgstr ""
+msgstr "Zappa"
 
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s har loggat in."
+msgstr "%s har zappat dig!"
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "Zappar %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, fuzzy, c-format
 msgid "%s has whacked you!"
 msgstr "Användaren har blockerat dig"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:59
 msgid "Torch"
-msgstr "Ämne"
+msgstr "Bränna"
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
 msgid "%s has torched you!"
-msgstr "Användaren har blockerat dig"
+msgstr "%s har brännt dig!"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "Bränner %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, fuzzy, c-format
 msgid "%s has smooched you!"
 msgstr "%s har loggat in."
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
-msgstr ""
+msgstr "Kram"
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s har loggat in."
+msgstr "%s har kramat dig!"
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "Kramar %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
 #, fuzzy
 msgid "Slap"
 msgstr "Sömnig"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, fuzzy, c-format
 msgid "%s has slapped you!"
 msgstr "%s har loggat in."
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
 #, fuzzy
 msgid "Goose"
 msgstr "Borta"
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
 #, fuzzy, c-format
 msgid "%s has goosed you!"
 msgstr "%s har gått iväg."
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
 #, fuzzy, c-format
 msgid "Goosing %s..."
 msgstr "Slå upp %s"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
 msgid "High-five"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, fuzzy, c-format
 msgid "%s has high-fived you!"
 msgstr "%s har loggat in."
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:81
 msgid "Punk"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, fuzzy, c-format
 msgid "%s has punk'd you!"
 msgstr "%s har loggat in."
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:90
 msgid "Raspberry"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, fuzzy, c-format
 msgid "%s has raspberried you!"
 msgstr "%s har loggat in."
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
 msgstr ""
@@ -7804,12 +8012,8 @@ msgstr "Kan inte känna igen värden fö
 msgstr "Kan inte känna igen värden för skärmnamnet du angav"
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
-msgstr ""
-"Ditt konto har blivit avstängt eftersom lösenordet var felaktigt inskrivet "
-"för många gånger"
+msgid "Your account has been disabled because too many incorrect passwords were entered"
+msgstr "Ditt konto har blivit avstängt eftersom lösenordet var felaktigt inskrivet för många gånger"
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
@@ -7836,12 +8040,8 @@ msgstr "Användaren har blockerat dig"
 msgstr "Användaren har blockerat dig"
 
 #: ../libpurple/protocols/novell/nmuser.c:1950
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
-msgstr ""
-"Denna utvärderingsversion tillåter inte mer än tio användare att vara "
-"inloggade samtidigt"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
+msgstr "Denna utvärderingsversion tillåter inte mer än tio användare att vara inloggade samtidigt"
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
@@ -7857,113 +8057,103 @@ msgstr "Inloggningen misslyckades (%s)."
 msgid "Login failed (%s)."
 msgstr "Inloggningen misslyckades (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:249
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr ""
-"Kan inte skicka meddelandet. Kunde inte hämta detaljer för användaren (%s)."
+msgstr "Kan inte skicka meddelandet. Kunde inte hämta detaljer för användaren (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:398
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Kunde inte lägga till %s till din kompislista (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Kan inte skicka meddelandet (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:495
+#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kan itne bjuda in användaren (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:534
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr ""
-"Kan inte skicka meddelandet till %s. Kunde inte skapa konferensen (%s)."
+msgstr "Kan inte skicka meddelandet till %s. Kunde inte skapa konferensen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:539
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Kan inte skicka meddelandet. Kunde inte skapa konferensen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:586
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"Kunde inte flytta användare %s till mappen %s på serverns lista. Fel uppstod "
-"vid skapandet av mapp (%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "Kunde inte flytta användare %s till mappen %s på serverns lista. Fel uppstod vid skapandet av mapp (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:634
 #, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"Kunde inte lägga till %s till din kompislista. Fel vid skapandet av mapp på "
-"serverlistan (%s)."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "Kunde inte lägga till %s till din kompislista. Fel vid skapandet av mapp på serverlistan (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:707
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Kan inte hämta detaljer om användaren %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:753
+#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Kan inte lägga till användare på avskärmningslista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Kunde inte lägga till %s till din spärrlista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Kunde inte lägga till %s till din tillåtelse-lista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Kunde inte ta bort %s från din privacy lista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:944
+#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Kunde inte ändra serverns avskärmningsinställningar (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Kunde inte skapa konferens (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1123
+#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
 msgstr "Fel vid kommunikation med servern. Stänger uppkopplingen."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Personlig titel"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Brevstopp"
 
-#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/novell/novell.c:1504
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "AnvändarID"
@@ -7974,41 +8164,41 @@ msgstr "AnvändarID"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr "Fullständigt namn"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise konferens %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
+#: ../libpurple/protocols/novell/novell.c:1670
 msgid "Unable to make SSL connection to server."
 msgstr "Kan inte skapa SSL anslutning till servern."
 
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
 msgstr "Kan inte ansluta till servern."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
 msgstr "Väntar på svar..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s har blivit inbjuden till denna konversation."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "Inbjudan till konversation"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8019,38 +8209,32 @@ msgstr ""
 "\n"
 "Skickad: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "Vill du går med i konversationen?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2017
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Du har blivit utloggad eftersom du loggat in från en annan dator."
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2074
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s verkar vara frånkopplad och fick inte meddelandet du just skickade."
 
 #. TODO: Would be nice to prompt if not set!
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-"Kunde inte ansluta till servern. Var god ange serveradressen som du vill "
-"ansluta till."
+#: ../libpurple/protocols/novell/novell.c:2172
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
+msgstr "Kunde inte ansluta till servern. Var god ange serveradressen som du vill ansluta till."
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2200
 msgid "Error. SSL support is not installed."
 msgstr "Fel. SSL-stöd är inte installerat."
 
-#: ../libpurple/protocols/novell/novell.c:2504
+#: ../libpurple/protocols/novell/novell.c:2509
 #, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Denna konferens har stängts. Inga fler meddelande kan bli skickade."
@@ -8065,33 +8249,39 @@ msgstr "Denna konferens har stängts. In
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3523
+#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protokoll-insticksmodul"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "Serveradress"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "Serverport"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
+#: ../libpurple/protocols/yahoo/ycht.c:481
+#: ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1129
+#: ../libpurple/proxy.c:1238
+#: ../libpurple/proxy.c:1338
+#: ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "Servern stängde konversationen."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632
+#: ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1141
+#: ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1350
+#: ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8100,10 +8290,12 @@ msgstr ""
 "Tappade anslutningen med servern:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/proxy.c:1158
+#: ../libpurple/proxy.c:1263
+#: ../libpurple/proxy.c:1362
+#: ../libpurple/proxy.c:1434
+#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr "Tog emot felaktig data vid anslutning till server."
 
@@ -8138,37 +8330,42 @@ msgstr "Insticksmodul för ICQ-protokoll
 msgstr "Insticksmodul för ICQ-protokoll"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kodning"
 
 # Osäker (And weeei!)
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "Användaren har stängt anslutningen."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "Användaren har nekat din förfrågan."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Tappade anslutningen till användaren: <br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Tog emot felaktig data över anslutningen till användaren."
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Kunde inte skapa en anslutning till användaren."
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Direktmeddelande har etablerats"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
+msgstr "%s försöker sända dig en %s-fil, men vi tillåter bara filer upp till %s över Diektanslutning. Försök som filöverföring istället.\n"
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -8271,29 +8468,18 @@ msgstr "Inte på AOL"
 msgstr "Inte på AOL"
 
 #: ../libpurple/protocols/oscar/oscar.c:348
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking with "
-"is probably using a different encoding than expected.  If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-"(Det uppstod ett fel vid mottagandet av detta meddelandet. Kompisen du "
-"pratar med använder antagligen en annan teckenkod än den förväntade. Om du "
-"vet vilken teckenkod han använder kan du specificera den bland de avancerade "
-"inställningarna för ditt AIM/ICQ-konto.)"
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "(Det uppstod ett fel vid mottagandet av detta meddelandet. Kompisen du pratar med använder antagligen en annan teckenkod än den förväntade. Om du vet vilken teckenkod han använder kan du specificera den bland de avancerade inställningarna för ditt AIM/ICQ-konto.)"
 
 #: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(Det uppstod ett fel vid mottagningen av detta meddelande. Antingen har du "
-"och %s olika teckenkodningar valda eller så har %s en buggig klient.)"
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+msgstr "(Det uppstod ett fel vid mottagningen av detta meddelande. Antingen har du och %s olika teckenkodningar valda eller så har %s en buggig klient.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../pidgin/gtkutils.c:2391
+#: ../pidgin/gtkutils.c:2421
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Kompisikon"
@@ -8307,15 +8493,15 @@ msgstr "AIM-direktmeddelande"
 msgstr "AIM-direktmeddelande"
 
 #: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc/silc.c:899
+#: ../libpurple/protocols/silc/util.c:557
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Chatta"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6065
 msgid "Get File"
 msgstr "Hämta fil"
 
@@ -8388,19 +8574,19 @@ msgstr "Kamera"
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:5835
 #, c-format
 msgid "Free For Chat"
 msgstr "Tillgänglig för chatt"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
+#: ../libpurple/protocols/oscar/oscar.c:5870
 #, c-format
 msgid "Not Available"
 msgstr "Ej tillgänglig"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
+#: ../libpurple/protocols/oscar/oscar.c:5856
 #, c-format
 msgid "Occupied"
 msgstr "Upptagen"
@@ -8410,10 +8596,13 @@ msgstr "Webbmedveten"
 msgid "Web Aware"
 msgstr "Webbmedveten"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/oscar/oscar.c:737
+#: ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
+#: ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557
+#: ../pidgin/gtkstatusbox.c:1060
 #, c-format
 msgid "Invisible"
 msgstr "Osynlig"
@@ -8424,13 +8613,14 @@ msgstr "Ansluten"
 msgstr "Ansluten"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
+#: ../pidgin/gtkprefs.c:1142
 msgid "IP Address"
 msgstr "IP-adress"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Warning Level"
 msgstr "Varningsnivåer"
 
@@ -8470,163 +8660,146 @@ msgstr "Avsluta anslutning"
 msgid "Finalizing connection"
 msgstr "Avsluta anslutning"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
+#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Kan inte logga in: Kunde inte ansluta som %s eftersom användarnamnet är "
-"ogiltigt.  Skärmnamnet måste vara en epostadress, eller starta med en "
-"bokstav och endast innehålla bokstäver, nummer och mellanslag, eller enbart "
-"innehålla nummer."
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Kan inte logga in: Kunde inte ansluta som %s eftersom användarnamnet är ogiltigt.  Skärmnamnet måste vara en epostadress, eller starta med en bokstav och endast innehålla bokstäver, nummer och mellanslag, eller enbart innehålla nummer."
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Ogiltigt Skärmnamn"
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1048
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Felaktigt lösenord."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid "Your account is currently suspended."
 msgstr "Ditt konto är avstängt för tillfället."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1364
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Tjänsten är tillfälligt onåbar."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och "
-"prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
+#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1380
+msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
+msgstr "Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#: ../libpurple/protocols/oscar/oscar.c:1374
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versionen av klienten du använder är för gammal. Uppgradera på %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1413
 msgid "Could Not Connect"
 msgstr "Kunde inte ansluta"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "Mottog auktorisering"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1439
 msgid "The SecurID key entered is invalid."
 msgstr "SecurID-nyckeln som är angiven är ogiltig."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Enter SecurID"
 msgstr "Ange SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1453
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Slå in de 6 siffrorna från den digitala skärmen."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:2247
+#: ../libpurple/protocols/oscar/oscar.c:2296
+#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/oscar/oscar.c:6221
+#: ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 #, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Du kanske snart blir frånkopplad, du kanske ska använda TOC tills detta är "
-"fixat. Kolla på %s efter uppdateringar."
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "Du kanske snart blir frånkopplad, du kanske ska använda TOC tills detta är fixat. Kolla på %s efter uppdateringar."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:1540
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kunde inte hämta en giltig AIM-inloggnings-hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Du kanske snart blir frånkopplad. Kolla på %s efter uppdateringar."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1628
 msgid "Unable to get a valid login hash."
 msgstr "Kunde inte hämta en giltig login-hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1658
 msgid "Password sent"
 msgstr "Lösenord skickat"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1714
 msgid "Unable to initialize connection"
 msgstr "Kan inte skapa anslutning"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2205
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Användaren vill lägga till dig i dennes kompislista."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2245
 msgid "Authorization Request Message:"
 msgstr "Meddelande om auktoriseringsbegäran:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2246
 msgid "Please authorize me!"
 msgstr "Snälla auktorisera mig!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2287
+#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:5316
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Ingen motivering angiven."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2294
 msgid "Authorization Denied Message:"
 msgstr "Meddelande om auktorisering nekad:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2422
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Användaren %u har nekat dig att lägga till honom/henne i din kompislista av "
-"följande orsak:\n"
+"Användaren %u har nekat dig att lägga till honom/henne i din kompislista av följande orsak:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2423
 msgid "ICQ authorization denied."
 msgstr "ICQ-auktorisering nekades."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2430
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr ""
-"Användaren %u har tillåtit dig att lägga till honom/henne i din kompislista."
+msgstr "Användaren %u har tillåtit dig att lägga till honom/henne i din kompislista."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2438
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8639,7 +8812,7 @@ msgstr ""
 "Från: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2446
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8652,7 +8825,7 @@ msgstr ""
 "Från: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2454
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8665,65 +8838,60 @@ msgstr ""
 "Meddelandet är:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-användaren %u har skickat dig en kompis:  %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2481
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Vill du lägga till den här kompisen till din kompislista?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2486
+#: ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2487
 msgid "_Decline"
 msgstr "_Neka"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Du har missat %hu meddelande från %s eftersom det var ogiltigt."
 msgstr[1] "Du har missat %hu meddelanden från %s eftersom de var ogiltiga."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2620
 #, 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 missade %hu meddelande från %s eftersom det var för stort."
 msgstr[1] "Du missade %hu meddelanden från %s eftersom de var för stora."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2629
 #, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] ""
-"Du missade %hu meddelande från %s eftersom frekvensgränsen har överskridits."
-msgstr[1] ""
-"Du missade %hu meddelanden från %s eftersom frekvensgränsen har överskridits."
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] "Du missade %hu meddelande från %s eftersom frekvensgränsen har överskridits."
+msgstr[1] "Du missade %hu meddelanden från %s eftersom frekvensgränsen har överskridits."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2638
 #, 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 missade %hu meddelande från %s eftersom hon/han var för onskefull."
-msgstr[1] ""
-"Du missade %hu meddelanden från %s eftersom hon/han var för onskefull."
+msgstr[0] "Du missade %hu meddelande från %s eftersom hon/han var för onskefull."
+msgstr[1] "Du missade %hu meddelanden från %s eftersom hon/han var för onskefull."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2647
 #, 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 missade %hu meddelande från %s eftersom du är för onskefull."
 msgstr[1] "Du missade %hu meddelanden från %s eftersom du är för onskefull."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2656
 #, 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."
@@ -8731,544 +8899,455 @@ msgstr[1] "Du missade %hu meddelanden fr
 msgstr[1] "Du missade %hu meddelanden från %s av okända orsaker."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2811
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan inte skicka meddelande: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2880
 msgid "Unknown reason."
 msgstr "Okänd anledning."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
+#: ../libpurple/protocols/oscar/oscar.c:2814
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kan inte skicka meddelandet till %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2880
 #, c-format
 msgid "User information not available: %s"
 msgstr "Användarinformation är inte tillgänglig: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Online Since"
 msgstr "Ansluten sedan"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2916
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Medlem sedan"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2951
 msgid "Available Message"
 msgstr "Tillgängliga meddelanden"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3059
 msgid "Your AIM connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Kan inte visa meddelande från denna användare eftersom det innehöll "
-"felaktiga tecken.]"
+#: ../libpurple/protocols/oscar/oscar.c:3247
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
+msgstr "[Kan inte visa meddelande från denna användare eftersom det innehöll felaktiga tecken.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"Det senaste meddelandet skickades inte eftersom du är över frekvensgränsen. "
-"Vänta 10 sekunder och försök igen."
+#: ../libpurple/protocols/oscar/oscar.c:3411
+msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
+msgstr "Det senaste meddelandet skickades inte eftersom du är över frekvensgränsen. Vänta 10 sekunder och försök igen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3494
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blivit frånkopplad från chattrummet %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/oscar/oscar.c:3744
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobilnummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Personal Web Page"
 msgstr "Personlig webbsida"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3798
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Extra information"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3819
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Division"
 msgstr "Avdelning"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Position"
 msgstr "Befattning"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3833
 msgid "Web Page"
 msgstr "Webbsida"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "Work Information"
 msgstr "Information om arbete"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Pop-Up Message"
 msgstr "Popup-meddelande"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3932
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Följande skärmnamn är associerat med %s"
 msgstr[1] "Följande skärmnamn är associerat med %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3937
 msgid "Screen name"
 msgstr "Skärmnamn"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3963
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Inget resultat funnet för e-postadress %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3984
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Du borde få ett e-postmeddelande som ber dig bekräfta %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3986
 msgid "Account Confirmation Requested"
 msgstr "Kontobekräftelsebegäran"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
+#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid "Error Changing Account Info"
 msgstr "Fel vid ändring av kontoinformation"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-"Fel 0x%04x: Kan inte formatera användar-ID eftersom det begärda användar-IDt "
-"skiljer sig från orginalet."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
+msgstr "Fel 0x%04x: Kan inte formatera användar-ID eftersom det begärda användar-IDt skiljer sig från orginalet."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Fel 0x%04x: Kan inte formatera skärmnamn eftersom det är ogiltigt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr ""
-"Fel 0x%04x: Kan inte formatera användar-ID eftersom det begärda användar-IDt "
-"är för långt."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
+msgstr "Fel 0x%04x: Kan inte formatera användar-ID eftersom det begärda användar-IDt är för långt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"Fel 0x%04x: Kan inte ändra e-postadressen eftersom det redan finns en "
-"begäran om ändring som väntar för detta användar-ID."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgstr "Fel 0x%04x: Kan inte ändra e-postadressen eftersom det redan finns en begäran om ändring som väntar för detta användar-ID."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"Fel 0x%04x: Kan inte ändra e-postadress eftersom den angivna adressen har "
-"för många användar-IDn associerade med sig."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgstr "Fel 0x%04x: Kan inte ändra e-postadress eftersom den angivna adressen har för många användar-IDn associerade med sig."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
-msgstr ""
-"Fel 0x%04x: Kan inte ändra e-postadress eftersom den angivna adressen inte "
-"är giltig."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgstr "Fel 0x%04x: Kan inte ändra e-postadress eftersom den angivna adressen inte är giltig."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fel 0x%04x: Okänt fel."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4048
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "E-postaderssen för %s är %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4050
 msgid "Account Info"
 msgstr "Kontoinformation"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-"Din IM-bild var inte skickad. Du måste vara direktansluten för att kunna "
-"skicka IM-bilder."
+#: ../libpurple/protocols/oscar/oscar.c:4233
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "Din IM-bild var inte skickad. Du måste vara direktansluten för att kunna skicka IM-bilder."
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4504
 msgid "Unable to set AIM profile."
 msgstr "Kan inte ändra i AIM-profil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
-msgid ""
-"You have probably requested to set your profile before the login procedure "
-"completed.  Your profile remains unset; try setting it again when you are "
-"fully connected."
-msgstr ""
-"Du har antagligen begärt att ändra i din profil innan inloggningsprocessen "
-"slutförts. Din profil är oförändrad, försök ändra den igen när du är helt "
-"ansluten."
+#: ../libpurple/protocols/oscar/oscar.c:4505
+msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
+msgstr "Du har antagligen begärt att ändra i din profil innan inloggningsprocessen slutförts. Din profil är oförändrad, försök ändra den igen när du är helt ansluten."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4519
 #, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
-msgstr[0] ""
-"Den maximala profillängden på %d byte har överskridits.  Den har blivit "
-"trunkerad åt dig."
-msgstr[1] ""
-"Den maximala profillängden på %d byte har överskridits.  Den har blivit "
-"trunkerad åt dig."
+msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
+msgstr[0] "Den maximala profillängden på %d byte har överskridits.  Den har blivit trunkerad åt dig."
+msgstr[1] "Den maximala profillängden på %d byte har överskridits.  Den har blivit trunkerad åt dig."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4524
 msgid "Profile too long."
 msgstr "Profilen är för lång."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4569
 #, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
-msgstr[0] ""
-"Den maximala längden på meddelande vid frånvaro som är %d byte har "
-"överskridits.  Den har blivit trunkerad åt dig."
-msgstr[1] ""
-"Den maximala längden på meddelande vid frånvaro som är %d byte har "
-"överskridits.  Den har blivit trunkerad åt dig."
+msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
+msgstr[0] "Den maximala längden på meddelande vid frånvaro som är %d byte har överskridits.  Den har blivit trunkerad åt dig."
+msgstr[1] "Den maximala längden på meddelande vid frånvaro som är %d byte har överskridits.  Den har blivit trunkerad åt dig."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4574
 msgid "Away message too long."
 msgstr "Frånvaromeddelandet är för långt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4647
 #, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Kunde inte lägga till kompisen %s eftersom skärmnamnet är ogiltigt. "
-"Skärmnamnet måste antingen vara en giltig epost-adress, börja med en bokstav "
-"och endast innehålla bokstäver, siffror och mellanslag eller bara innehålla "
-"siffror."
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Kunde inte lägga till kompisen %s eftersom skärmnamnet är ogiltigt. Skärmnamnet måste antingen vara en giltig epost-adress, börja med en bokstav och endast innehålla bokstäver, siffror och mellanslag eller bara innehålla siffror."
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4649
+#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:5117
 msgid "Unable To Add"
 msgstr "Kan inte lägga till"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4768
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kunde inte hämta kompislista"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
-msgid ""
-"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
-msgstr ""
-"AIM-servrarna kunde inte skicka din kompislista för tillfället. Din "
-"kompislista är inte borta och kommer antagligen vara tillgänglig om några "
-"timmar igen."
+#: ../libpurple/protocols/oscar/oscar.c:4769
+msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few minutes."
+msgstr "AIM-servrarna kunde för tillfället inte skicka din kompislista. Din kompislista är inte försvunnen utan kommer antagligen vara tillgänglig om några timmar igen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4952
+#: ../libpurple/protocols/oscar/oscar.c:4954
+#: ../libpurple/protocols/oscar/oscar.c:5182
+#: ../libpurple/protocols/oscar/oscar.c:5183
+#: ../libpurple/protocols/oscar/oscar.c:5188
 msgid "Orphans"
 msgstr "Föräldralösa"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5100
 #, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"Kunde inte lägga till kompisen %s eftersom du har för många kompisar i din "
-"kompislista. Ta bort en och försök igen."
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "Kunde inte lägga till kompisen %s eftersom du har för många kompisar i din kompislista. Ta bort en och försök igen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5100
+#: ../libpurple/protocols/oscar/oscar.c:5115
 msgid "(no name)"
 msgstr "(inget namn)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5114
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Kunde inte lägga till kompisen %s av okänd anledning."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5231
 #, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr ""
-"Användaren %s har givit dig tillåtelse att lägga till den till din "
-"kompislista, vill du göra det?"
+msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
+msgstr "Användaren %s har givit dig tillåtelse att lägga till den till din kompislista, vill du göra det?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Given"
 msgstr "Auktorisering given"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5312
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr ""
-"Användaren %s har tillåtit dig att lägga till henne/honom till din "
-"kompislista."
+msgstr "Användaren %s har tillåtit dig att lägga till henne/honom till din kompislista."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5313
 msgid "Authorization Granted"
 msgstr "Auktorisering beviljades"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5316
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Användaren %s tillåter inte att du lägga till henne/honom till din "
-"kompislista av följande orsak:\n"
+"Användaren %s tillåter inte att du lägga till henne/honom till din kompislista av följande orsak:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5317
 msgid "Authorization Denied"
 msgstr "Auktorisering nekades"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5353
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Utbyte:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Invalid chat name specified."
 msgstr "Ogiltigt chattnamn angivet."
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5462
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"Din IM-bild skickades inte. Du kan inte skicka IM-bilder via AIM-chattar."
+msgstr "Din IM-bild skickades inte. Du kan inte skicka IM-bilder via AIM-chattar."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5624
+#: ../libpurple/protocols/oscar/oscar.c:5629
 msgid "Away Message"
 msgstr "Frånvaromeddelande"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5629
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(mottar)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5829
 msgid "iTunes Music Store Link"
 msgstr "Länk till iTunes Musikaffär"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5937
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kompiskommentar för %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5938
 msgid "Buddy Comment:"
 msgstr "Kompiskommentar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5985
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr ""
-"Du har valt att öppna en direktanslutning för snabbmeddelanden till %s."
+msgstr "Du har valt att öppna en direktanslutning för snabbmeddelanden till %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Eftersom detta avslöjar din IP-adress kan det ses som en säkerhetsrisk. Vill "
-"du fortsätta?"
+#: ../libpurple/protocols/oscar/oscar.c:5989
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "Eftersom detta avslöjar din IP-adress kan det ses som en säkerhetsrisk. Vill du fortsätta?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "_Anslut"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6030
 msgid "Get AIM Info"
 msgstr "Hämta AIM-info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "Edit Buddy Comment"
 msgstr "Ändra kompiskommentar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6044
 msgid "Get Status Msg"
 msgstr "Hämta statusmeddelande"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6057
 msgid "Direct IM"
 msgstr "Direktmeddelande"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6079
 msgid "Re-request Authorization"
 msgstr "Begär autentiserings igen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6138
 msgid "Require authorization"
 msgstr "Kräver auktorisering"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Webbnärvaro (aktivera detta innebär att du kommer få SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "ICQ Privacy Options"
 msgstr "ICQ sekretessinställningar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "The new formatting is invalid."
 msgstr "Den nya formateringen är ogiltig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6166
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-"Användar-ID formatering kan endast förändra stora-/småbokstäver och "
-"mellanslag."
+msgstr "Användar-ID formatering kan endast förändra stora-/småbokstäver och mellanslag."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6219
 msgid "Change Address To:"
 msgstr "Ändra adress till:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6265
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du väntar inte på auktorisering</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6268
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Du väntar på auktorisering från följande kompisar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"Du kan begära auktorisering igen från dessa kompisar genom att högerkilcka "
-"på dem och välja \"Begär auktorisering igen.\""
+#: ../libpurple/protocols/oscar/oscar.c:6269
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "Du kan begära auktorisering igen från dessa kompisar genom att högerkilcka på dem och välja \"Begär auktorisering igen.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "Find Buddy by E-Mail"
 msgstr "Hitta kompis på e-postadress"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6287
 msgid "Search for a buddy by e-mail address"
 msgstr "Sök efter en kompis på dess e-postadress"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6288
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Skriv in e-postadressen för den kompis du söker efter."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6291
 msgid "_Search"
 msgstr "_Sök"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6449
 msgid "Set User Info (URL)..."
 msgstr "Ändra användarinformation (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6460
 msgid "Change Password (URL)"
 msgstr "Byt lösenord (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6464
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfigurera vidarebefordring av snabbmeddelanden (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6474
 msgid "Set Privacy Options..."
 msgstr "Ange sekretessinställningar..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6481
 msgid "Confirm Account"
 msgstr "Bekräfta konto"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6485
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Visa för tillfället registrerad epost-adress"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6489
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ändra för tillfället registrerad epost-adress..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6496
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Visa kompisar som väntar på auktorisering"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Sök efter kompis på e-postadress..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Search for Buddy by Information"
 msgstr "Sök efter kompis via information"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6575
 msgid "Use recent buddies group"
 msgstr "Använd senaste kompisgruppen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6578
 msgid "Show how long you have been idle"
 msgstr "Visar hur länge du varit inaktiv"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6733
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9276,35 +9355,29 @@ msgstr ""
 "Använda alltid ICQ proxy server för filöverföringar\n"
 "(långsammare men avslöjar inte ditt IP-nummer)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Ber %s att ansluta till oss på %s:%hu för Direct IM."
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Försöker ansluta till %s: %hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
+#: ../libpurple/protocols/oscar/peer.c:858
 #, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Försöker ansluta via en proxy-server."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s har just frågat om att koppla sig direkt till %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"Detta kräver en direkt koppling mellan de två datorerna och behövs för att "
-"IM-bilder ska fungera. Eftersom din IP-adress kommer att avslöjas kan detta "
-"betraktas som en säkerhetsrisk."
+#: ../libpurple/protocols/oscar/peer.c:1039
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "Detta kräver en direkt koppling mellan de två datorerna och behövs för att IM-bilder ska fungera. Eftersom din IP-adress kommer att avslöjas kan detta betraktas som en säkerhetsrisk."
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
@@ -9458,29 +9531,26 @@ msgstr "Annan"
 msgid "Other"
 msgstr "Annan"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Ändra min information"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Uppdatera min information"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Din infromation har blivit uppdaterad"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
-msgid ""
-"Setting custom faces is not currently supported. Please choose an image from "
-"%s."
-msgstr ""
-"Att ange ett valfritt ansikte för tillfället. Var god välj en bild från %s."
+msgid "Setting custom faces is not currently supported. Please choose an image from %s."
+msgstr "Att ange ett valfritt ansikte för tillfället. Var god välj en bild från %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Ogiltigt QQ-ansikte"
 
@@ -9753,12 +9823,13 @@ msgstr "Problem att efterfråga inloggni
 msgid "Error requesting login token"
 msgstr "Problem att efterfråga inloggningsmarkör"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:488
 msgid "Unable to login, check debug log"
 msgstr "Kan inte logga in, kolla felsökningsloggen"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:139
+#: ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -9834,7 +9905,8 @@ msgstr "Ange min information"
 msgid "Set My Information"
 msgstr "Ange min information"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536
+#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Byt lösenord"
 
@@ -9860,7 +9932,8 @@ msgstr "Blockera denna kompis"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ protokoll\tmodul"
 
@@ -10011,10 +10084,8 @@ msgstr "Startar tjänster"
 
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
-"En Sametimeadministratör har placerat följande meddelande på servern %s"
+msgid "A Sametime administrator has issued the following announcement on server %s"
+msgstr "En Sametimeadministratör har placerat följande meddelande på servern %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
@@ -10080,12 +10151,8 @@ msgstr "Skapa konferens med användare"
 
 #: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
-msgstr ""
-"Var god ange ett nytt ämne för den nya konferensen, och en inbjudan att "
-"skicka till %s"
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgstr "Var god ange ett nytt ämne för den nya konferensen, och en inbjudan att skicka till %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
@@ -10109,14 +10176,8 @@ msgstr "Bjud in användaren till en konf
 
 #: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr ""
-"Välj en konferens från listan här under för att skicka en inbjudan till "
-"användaren %s. Välj \"Skapa ny konferens\" om du vill skapa en ny konferens "
-"att bjuda in användaren till."
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "Välj en konferens från listan här under för att skicka en inbjudan till användaren %s. Välj \"Skapa ny konferens\" om du vill skapa en ny konferens att bjuda in användaren till."
 
 #: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
@@ -10130,7 +10191,8 @@ msgstr "Skicka TEST-annonsering"
 msgid "Send TEST Announcement"
 msgstr "Skicka TEST-annonsering"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3586
+#: ../pidgin/gtkconv.c:4434
 msgid "Topic:"
 msgstr "Ämne:"
 
@@ -10140,12 +10202,8 @@ msgstr "Ingen Sametime communityserver s
 
 #: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr ""
-"Ingen värd eller IP har konfigurerats för ditt Meanwhile-konto %s. Var god "
-"ange en nedan för att fortsätta inloggningen."
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "Ingen värd eller IP har konfigurerats för ditt Meanwhile-konto %s. Var god ange en nedan för att fortsätta inloggningen."
 
 #: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
@@ -10155,7 +10213,8 @@ msgstr "Ingen Sametime communityserver s
 msgid "No Sametime Community Server Specified"
 msgstr "Ingen Sametime communityserver specificerad"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:4372
 msgid "Connect"
 msgstr "Anslut"
 
@@ -10184,12 +10243,8 @@ msgstr "Ett svårförståligt användari
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"Identifieraren '%s' kan referera till följande användare. Var god välj rätt "
-"användare för att lägga till dem på din kompislista."
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "Identifieraren '%s' kan referera till följande användare. Var god välj rätt användare för att lägga till dem på din kompislista."
 
 #: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
@@ -10201,17 +10256,9 @@ msgstr "Kan inte lägga till användaren
 
 #: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
-msgstr ""
-"Identifieraren '%s' matchar inte någon i din Sametime community. DDDDenna "
-"post har blivit borttagen från din kompislista."
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "Identifieraren '%s' matchar inte någon i din Sametime community. DDDDenna post har blivit borttagen från din kompislista."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Kan inte lägga till användaren"
-
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -10279,14 +10326,8 @@ msgstr "Notes adressboksgruppresultat"
 
 #: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr ""
-"Identifieraren '%s' kan möjligen referera till någon av följande Notes "
-"adressböcksgrupper. Var god välj den korrekta gruppen från listan här nedan "
-"för att lägga till den till din kompislista."
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "Identifieraren '%s' kan möjligen referera till någon av följande Notes adressböcksgrupper. Var god välj den korrekta gruppen från listan här nedan för att lägga till den till din kompislista."
 
 #: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
@@ -10298,24 +10339,16 @@ msgstr "Kunde inte lägga till grupp: gr
 
 #: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
-msgstr ""
-"Identidieraren '%s' matchade inte någon Notes adressböcksgrupper i din "
-"Sametime-community."
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgstr "Identidieraren '%s' matchade inte någon Notes adressböcksgrupper i din Sametime-community."
 
 #: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes adressboksgrupp"
 
 #: ../libpurple/protocols/sametime/sametime.c:5481
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr ""
-"Ange namnet på en Notes adressboksgrupp i fältet nedan för att lägga till "
-"gruppen och dess medlemmar till din kompislista."
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgstr "Ange namnet på en Notes adressboksgrupp i fältet nedan för att lägga till gruppen och dess medlemmar till din kompislista."
 
 #: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
@@ -10324,16 +10357,11 @@ msgstr "Sökresultat för '%s'"
 
 #: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-"Identifieraren '%s' kan referera till följande användare. Du kan lägga till "
-"dessa användare till din kompislista eller skicka meddelande till dem med "
-"hjälp av knapparna här nedanför."
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "Identifieraren '%s' kan referera till följande användare. Du kan lägga till dessa användare till din kompislista eller skicka meddelande till dem med hjälp av knapparna här nedanför."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5538
+#: ../pidgin/gtknotify.c:762
 msgid "Search Results"
 msgstr "Sökresultat"
 
@@ -10355,12 +10383,8 @@ msgstr "Sök efter en användare"
 msgstr "Sök efter en användare"
 
 #: ../libpurple/protocols/sametime/sametime.c:5606
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr ""
-"Ange ett namn eller del av ID i fältet nedan för att söka efter matchande "
-"användare i sin Sametime-community."
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "Ange ett namn eller del av ID i fältet nedan för att söka efter matchande användare i sin Sametime-community."
 
 #: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
@@ -10472,12 +10496,8 @@ msgstr "Fjärranvändaren är inte tillg
 #: ../libpurple/protocols/silc/buddy.c:298
 #: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-msgstr ""
-"Nyckelöverenskommelse mottagen från %s. Vill du utföra en "
-"nyckelöverenskommelse?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgstr "Nyckelöverenskommelse mottagen från %s. Vill du utföra en nyckelöverenskommelse?"
 
 #: ../libpurple/protocols/silc/buddy.c:302
 #: ../libpurple/protocols/silc10/buddy.c:299
@@ -10518,8 +10538,8 @@ msgstr "Sätt IM-lösenord"
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10528,8 +10548,8 @@ msgstr "Hämta publik nyckel"
 msgstr "Hämta publik nyckel"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10537,17 +10557,17 @@ msgstr "Kan inte hämta den publika nyck
 msgstr "Kan inte hämta den publika nyckeln"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Visa publik nyckel"
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Kunde inte ladda publik nyckel"
@@ -10555,9 +10575,9 @@ msgstr "Kunde inte ladda publik nyckel"
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10569,7 +10589,7 @@ msgstr "Användarinformation"
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10584,265 +10604,248 @@ msgstr "Kompisen %s är inte tillitsfull
 
 #: ../libpurple/protocols/silc/buddy.c:726
 #: ../libpurple/protocols/silc10/buddy.c:738
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"Du kan inte ta emot kompisnotifiering förrän du har importerat dennes "
-"publika nyckel. Du kan använda \"Hämta publik nyckel\"-kommandot för att få "
-"den."
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "Du kan inte ta emot kompisnotifiering förrän du har importerat dennes publika nyckel. Du kan använda \"Hämta publik nyckel\"-kommandot för att få den."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Öppna..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "%s kompisenär inte tillgänglig på nätverket"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"För att lägga till kompisen måste du importera dennes publika nyckel. Tryck "
-"på \"importera\" för att importera publik nyckel."
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "För att lägga till kompisen måste du importera dennes publika nyckel. Tryck på \"importera\" för att importera publik nyckel."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importera..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Välj rätt användare"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"Mer än en användare hittades med samma publika nyckel. Välj rätt användare "
-"från listan för att lägga till denne till kompislistan."
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "Mer än en användare hittades med samma publika nyckel. Välj rätt användare från listan för att lägga till denne till kompislistan."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"Mer än en användare hittades med samma namn. Välj rätt användare från listan "
-"för att lägga till denne till kompislistan."
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "Mer än en användare hittades med samma namn. Välj rätt användare från listan för att lägga till denne till kompislistan."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Frånskild"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Otillgänglig"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Väck mig"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyperaktiv"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:874
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:654
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Glad"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:656
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Ledsen"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:878
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Arg"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:880
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Avundsjuk"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:882
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Skäms"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Osårbar"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Kär"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Sömnig"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Uttråkad"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Upphetsad"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Orolig"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Användarlägen"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Föredragen kontakt"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Föredraget språk"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Enhet"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:722
 #: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geografisk plats"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Nollställ IM-nyckel"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "IM med nyckelutbyte"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "IM med lösenord"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Hämta publik nyckel..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Döda användare"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Rita på whiteboard"
@@ -10859,7 +10862,7 @@ msgstr "Kanalen %s existerar inte pÃ¥ nÃ
 msgstr "Kanalen %s existerar inte på nätverket"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -10913,60 +10916,50 @@ msgstr "<br><b>Kanallägen:</b> "
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanallägen:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Skaparnyckelns fingeravtryck:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Skaparnyckelns pladderavtryck:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Lägg till kanalpublik nyckel"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Öppna publik nyckel..."
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanalens lösenord"
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Kanalpublik nyckellista"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
 #, c-format
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"Kanal autentisering används för att säkra kanalen från obehörigt tillträde. "
-"Autentiseringen kan vara baserad på ett lösenord eller en digital signatur. "
-"Om ett lösenord är valt, då är det nödvändigt för att kunna ansluta. Om "
-"kanalpublika nycklar är valt kan enbart användare vars publika nycklar är "
-"listade ansluta."
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "Kanal autentisering används för att säkra kanalen från obehörigt tillträde. Autentiseringen kan vara baserad på ett lösenord eller en digital signatur. Om ett lösenord är valt, då är det nödvändigt för att kunna ansluta. Om kanalpublika nycklar är valt kan enbart användare vars publika nycklar är listade ansluta."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -10975,156 +10968,159 @@ msgstr "Kanalautentisering"
 msgid "Channel Authentication"
 msgstr "Kanalautentisering"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Lägg till/Ta bort"
 
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1151
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1901
 #: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Lösenord"
 
-#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Ange kanalen %s privata gruppnamn och lösenord."
 
-#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Lägg till kanal-privat grupp"
 
-#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Användargräns"
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr ""
-"Antalet användare begränsat på kanal. Sätt till noll för att nollställa "
-"användargräns."
+msgstr "Antalet användare begränsat på kanal. Sätt till noll för att nollställa användargräns."
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Gästlista"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Spärrlista"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Lägg till privat grupp"
 
-#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Nollställ Permanent"
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Sätt permanent"
 
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Sätt användarbegränsning"
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Nollställ ämnesrestriktioner"
 
-#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Sätt Ämnesestriktioner"
 
-#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Nollställ Privat Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Sätt Privat Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Nollställ Hemlig Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Sätt Hemlig Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
-msgstr ""
-"Du måste ansluta till kanalen %s före du kan ansluta till den privata gruppen"
+msgid "You have to join the %s channel before you are able to join the private group"
+msgstr "Du måste ansluta till kanalen %s före du kan ansluta till den privata gruppen"
 
-#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Anslut till privat grupp"
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Kunde inte ansluta till privat grupp"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1348
 #: ../libpurple/protocols/silc10/chat.c:1299
 #: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Uppringningskommando"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1349
 #: ../libpurple/protocols/silc10/chat.c:1299
 #: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Kan inte utföra kommando"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1350
 #: ../libpurple/protocols/silc10/chat.c:1300
 #: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:85
+#: ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104
+#: ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112
+#: ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120
+#: ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277
+#: ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288
+#: ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89
+#: ../libpurple/protocols/silc10/ft.c:92
 #: ../libpurple/protocols/silc10/ft.c:96
 #: ../libpurple/protocols/silc10/ft.c:100
 #: ../libpurple/protocols/silc10/ft.c:104
@@ -11136,11 +11132,16 @@ msgstr "Säker filöverföringar"
 msgid "Secure File Transfer"
 msgstr "Säker filöverföringar"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc/ft.c:86
+#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113
+#: ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121
+#: ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93
+#: ../libpurple/protocols/silc10/ft.c:97
 #: ../libpurple/protocols/silc10/ft.c:101
 #: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
@@ -11150,11 +11151,13 @@ msgstr "Fjärrdatorn kopplade ifrån"
 msgid "Remote disconnected"
 msgstr "Fjärrdatorn kopplade ifrån"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:106
+#: ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Tillstånd nekat"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110
+#: ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Nyckelöverenskommelse misslyckades"
 
@@ -11166,27 +11169,33 @@ msgstr "Skapandet av anslutning misslyck
 msgid "Creating connection failed"
 msgstr "Skapandet av anslutning misslyckad"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:122
+#: ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Filöverföringssession finns inte"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273
+#: ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Ingen aktiv filöverföring"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278
+#: ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Filöverföringen är redan påbörjad"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283
+#: ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Kunde inte utföra nyckelöverenskommelse för filöverföring"
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289
+#: ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Kunde inte starta filöverföring"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426
+#: ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Kan inte skicka fil"
 
@@ -11194,7 +11203,8 @@ msgstr "Ett fel uppstod"
 msgid "Error occurred"
 msgstr "Ett fel uppstod"
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:533
+#: ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
@@ -11233,7 +11243,8 @@ msgstr "Du har sparkats ut ur <I>%s</I> 
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Du har sparkats ut ur <I>%s</I> av <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:718
+#: ../libpurple/protocols/silc/ops.c:723
 #: ../libpurple/protocols/silc/ops.c:728
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
@@ -11242,7 +11253,8 @@ msgstr "Du har dödats av %s (%s)"
 msgid "You have been killed by %s (%s)"
 msgstr "Du har dödats av %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:749
+#: ../libpurple/protocols/silc/ops.c:754
 #: ../libpurple/protocols/silc/ops.c:759
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
@@ -11272,7 +11284,7 @@ msgstr "Jobbroll"
 msgstr "Jobbroll"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1144
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
@@ -11306,7 +11318,7 @@ msgstr "Kanalskaparen för <I>%s</I> är
 msgstr "Kanalskaparen för <I>%s</I> är <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
@@ -11318,90 +11330,90 @@ msgstr "Statustext"
 msgid "Status Text"
 msgstr "Statustext"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Publik nyckelfingeravtryck"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Publik nyckelpladderavtryck"
 
-#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mer..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1208
 #: ../libpurple/protocols/silc10/ops.c:1371
 #: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Frånskilj från server"
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Kan inte skilja"
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Kan inte ange kanalämne"
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Kunde inte byta nick"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Rumlista"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Kan inte hämta rumlista"
 
-#: ../libpurple/protocols/silc/ops.c:1468
+#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "Nätverket är tomt"
 
-#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Ingen publik nyckel var mottagen"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Serverinformation"
 
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Kan inte hämta serverinformation"
 
-#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Serverstatestik"
 
-#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Kan inte hämta serverstatestik"
 
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11437,73 +11449,72 @@ msgstr ""
 "Totala serveroperatörer: %d\n"
 "Totala routeroperatörer: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Nätverksstatestik"
 
-#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping misslyckades"
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Svar på Ping mottagen från server"
 
-#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Kunde inte döda användare"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr "TITTA"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr "Kan inte följa användaren"
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:377
 #: ../libpurple/protocols/silc10/ops.c:1811
 #: ../libpurple/protocols/silc10/ops.c:1858
 #: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Ã…terupptar session"
 
-#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc/ops.c:1730
 #: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Autentiserar uppkoppling"
 
-#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc/ops.c:1781
 #: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Verifierar publik servernyckel"
 
-#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc/ops.c:1818
 #: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Lösenord krävs"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98
+#: ../libpurple/protocols/silc10/pk.c:104
 #, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-"Mottog %ss publika nyckel. Din lokala kopia stämmer inte överens med denna. "
-"Vill du fortfarande acceptera denna publika nyckel?"
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
+msgstr "Mottog %ss publika nyckel. Din lokala kopia stämmer inte överens med denna. Vill du fortfarande acceptera denna publika nyckel?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Mottog %ss publika nyckel. Vill du acceptera denna publika nyckel?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107
+#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11516,101 +11527,102 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc/pk.c:110
+#: ../libpurple/protocols/silc/pk.c:139
 #: ../libpurple/protocols/silc10/pk.c:116
 #: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verifiera publik nyckel"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115
+#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Visa..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Ej stödd  publik nyckeltyp"
 
-#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc/silc.c:317
 #: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Frånkopplad av server"
 
-#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc/silc.c:324
 #: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Fel vid anslutning till SILC-server"
 
-#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc/silc.c:329
 #: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Nyckelutbytet misslyckades"
 
-#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1714
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Misslyckades med att återuppta frånskild session. Tryck \"Återanslut\" för "
-"at skapa en ny uppkoppling."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "Misslyckades med att återuppta frånskild session. Tryck \"Återanslut\" för at skapa en ny uppkoppling."
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc/silc.c:365
+#: ../libpurple/protocols/silc/silc.c:411
 #: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Anslutning misslyckad"
 
-#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc/silc.c:380
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Utför nyckelutbyte"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc/silc.c:435
 #: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "Ansluter till SILC-server"
 
-#: ../libpurple/protocols/silc/silc.c:352
+#: ../libpurple/protocols/silc/silc.c:444
 #, c-format
 msgid "Could not load SILC key pair"
 msgstr "Kunde inte ladda SILC nyckelpar"
 
-#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc/silc.c:458
 #: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "Kan inte skapa anslutning"
 
-#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc/silc.c:487
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc/silc.c:538
 #: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Kan inte inleda SILC-klientanslutning"
 
-#: ../libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc/silc.c:547
 msgid "Error loading SILC key pair"
 msgstr "Fel vid inläsning av SILC-nyckelpar"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:870
 #: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Ditt nuvarande humör"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
+#: ../libpurple/protocols/silc/silc.c:872
+#: ../libpurple/protocols/silc10/silc.c:652
+#: ../pidgin/gtkprefs.c:1702
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc/silc.c:886
 #: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Kär"
 
-#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc/silc.c:897
 #: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
@@ -11619,97 +11631,91 @@ msgstr ""
 "\n"
 "Dina föredragna kontakmetoder"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:905
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/silc.c:907
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc/silc.c:909
 #: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videokonferens"
 
-#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc/silc.c:914
 #: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Din nuvarande status"
 
-#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc/silc.c:921
 #: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Anslutningstjänster"
 
-#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc/silc.c:924
 #: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Låt andra se vilka tjänster du använder"
 
-#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc/silc.c:930
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Låt andra se vilken dator du använder"
 
-#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc/silc.c:937
 #: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Din VCard-fil"
 
-#: ../libpurple/protocols/silc/silc.c:812
+#: ../libpurple/protocols/silc/silc.c:943
 msgid "Timezone (UTC)"
 msgstr "Tidszon (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 #: ../libpurple/protocols/silc10/silc.c:729
 #: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Användarens anslutningsstatusattribut"
 
-#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc/silc.c:949
 #: ../libpurple/protocols/silc10/silc.c:731
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"Du kan låta andra användare se din anslutningsstatusinformation och din "
-"personliga information. Var god fyll i informationen du vill att andra ska "
-"kunna se om dig."
+msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
+msgstr "Du kan låta andra användare se din anslutningsstatusinformation och din personliga information. Var god fyll i informationen du vill att andra ska kunna se om dig."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc/silc.c:990
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1617
 #: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
 #: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Meddelande för dagen"
 
-#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:990
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Inget dagligt meddelande tillgänglig"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc/silc.c:991
+#: ../libpurple/protocols/silc/silc.c:1612
 #: ../libpurple/protocols/silc10/silc.c:773
 #: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Det finns inget dagligt meddelande associerat med denna anslutning"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc/silc.c:1042
+#: ../libpurple/protocols/silc/silc.c:1088
+#: ../libpurple/protocols/silc/silc.c:1159
+#: ../libpurple/protocols/silc/silc.c:1160
 #: ../libpurple/protocols/silc10/silc.c:824
 #: ../libpurple/protocols/silc10/silc.c:868
 #: ../libpurple/protocols/silc10/silc.c:939
@@ -11717,265 +11723,242 @@ msgstr "Skapa nytt SILC-nyckelpar"
 msgid "Create New SILC Key Pair"
 msgstr "Skapa nytt SILC-nyckelpar"
 
-#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1042
 #: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1088
 #: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Genrerering av nyckelpar misslyckades"
 
-#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1127
 #: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Nyckellängd"
 
-#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:1129
 #: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Publik nyckelfil"
 
-#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc/silc.c:1131
 #: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Privat nyckelfil"
 
-#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Lösenord (upprepa)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc/silc.c:1161
 #: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Generera nyckelpar"
 
-#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc/silc.c:1204
 #: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Anslutningsstatus"
 
-#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc/silc.c:1212
 #: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Visa Meddelande för dagen"
 
-#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc/silc.c:1216
 #: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Skapa SILC-nyckelpar..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc/silc.c:1308
 #: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Användaren <I>%s</> är inte tillgänglig på nätverket"
 
-#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc/silc.c:1488
 #: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Ämnet är för långt"
 
-#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc/silc.c:1569
 #: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Du måste ange ett alias"
 
-#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc/silc.c:1671
 #: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "kanal %s kunde inte hittas"
 
-#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc/silc.c:1676
 #: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanallägen för %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc/silc.c:1678
 #: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "inga kanallägen är angivna för %s"
 
-#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc/silc.c:1691
 #: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Misslyckades med att ange cmodes för %s"
 
-#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1721
 #: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Okänt kommando: %s, (kan vara ett fel i klienten)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc/silc.c:1784
 #: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]: Lämna chatten"
 
-#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1788
 #: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]: Lämna chatten"
 
-#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc/silc.c:1792
 #: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nytt ämne&gt;]:  Visa eller ändra ämnet"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1797
 #: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-"join &lt;kanal&gt; [&lt;lösenord&gt;]:  Anslut till enn chatt på detta "
-"nätverk"
+msgstr "join &lt;kanal&gt; [&lt;lösenord&gt;]:  Anslut till enn chatt på detta nätverk"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1801
 #: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list: Listar  kanalerna på detta nätverk"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1805
 #: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  Visar information för nick"
 
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1809
 #: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr ""
-"msg &lt;nick&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till en "
-"användare"
+msgstr "msg &lt;nick&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till en användare"
 
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1813
 #: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr ""
-"query &lt;nick&gt; [&lt;meddelande&gt;]:  Skicka ett privat meddelande till "
-"en användare"
+msgstr "query &lt;nick&gt; [&lt;meddelande&gt;]:  Skicka ett privat meddelande till en användare"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1817
 #: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Visar serverns Dagliga meddelande (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1821
 #: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Frånskilj denna session"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1825
 #: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [meddelande]: koppla från servern med ett tilläggsmeddelande"
 
-#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc/silc.c:1829
 #: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;kommando&gt;:  Utför ett SILC-kommando"
 
-#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc/silc.c:1835
 #: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Döda nick"
 
-#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc/silc.c:1839
 #: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nyttalias&gt;:  Ändrar ditt alias"
 
-#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc/silc.c:1843
 #: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  Visa information om nick"
 
-#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc/silc.c:1847
 #: ../libpurple/protocols/silc10/silc.c:1645
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;kanal&gt; [+|-&lt;lägen&gt;] [argument]:  Ändra eller visa "
-"kanallägen"
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;kanal&gt; [+|-&lt;lägen&gt;] [argument]:  Ändra eller visa kanallägen"
 
-#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc/silc.c:1851
 #: ../libpurple/protocols/silc10/silc.c:1649
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;kanal&gt; +|-&lt;lägen&gt; &lt;nick&gt;:  Ändra lägen för nick på "
-"kanal"
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;kanal&gt; +|-&lt;lägen&gt; &lt;nick&gt;:  Ändra lägen för nick på kanal"
 
-#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc/silc.c:1855
 #: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;användarlägen&gt;:  Anger dina lägen på nätverket"
 
-#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc/silc.c:1859
 #: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Hämta serveroperatörprivilegier"
 
-#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc/silc.c:1863
 #: ../libpurple/protocols/silc10/silc.c:1661
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;kanal&gt; [-|+]&lt;nick&gt;:  bjud in nick eller lägg till/ta "
-"bort från kanalens inbjudningslista"
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;kanal&gt; [-|+]&lt;nick&gt;:  bjud in nick eller lägg till/ta bort från kanalens inbjudningslista"
 
-#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc/silc.c:1867
 #: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;kanal&gt; &lt;nick&gt; [kommentar]:  Sparka klient från kanal"
 
-#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc/silc.c:1871
 #: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  Visa administrativa detaljer för server"
 
-#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc/silc.c:1875
 #: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;nick&gt;]:  Banna klient från kanal"
 
-#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc/silc.c:1879
 #: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
-"getkey &lt;nick|server&gt;:  Hämta serverns eller klientens publika nyckel"
+msgstr "getkey &lt;nick|server&gt;:  Hämta serverns eller klientens publika nyckel"
 
-#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc/silc.c:1883
 #: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Visa server och nätverksstatestik"
 
-#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc/silc.c:1887
 #: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: skicka PING till den anslutna servern"
 
-#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc/silc.c:1892
 #: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Lista användare i kanal"
 
-#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc/silc.c:1896
 #: ../libpurple/protocols/silc10/silc.c:1694
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(er)&gt;:  Lista "
-"specifika användare i kanal(er)"
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(er)&gt;:  Lista specifika användare i kanal(er)"
 
 #. *< type
 #. *< ui_requirement
@@ -11986,67 +11969,68 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc/silc.c:2007
 #: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Insticksmodul för SILC-protokoll"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc/silc.c:2009
 #: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protokoll"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc/silc.c:2041
+#: ../libpurple/protocols/silc10/silc.c:1853
+#: ../pidgin/gtkprefs.c:2099
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:2052
 #: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Publik nyckelfil"
 
-#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc/silc.c:2056
 #: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Privat nyckelfil"
 
-#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc/silc.c:2066
 #: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Chiffer"
 
-#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc/silc.c:2076
 #: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
+#: ../libpurple/protocols/silc/silc.c:2079
 msgid "Use Perfect Forward Secrecy"
 msgstr "Använd Perfekt Vidarebefodrandesekretess"
 
-#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc/silc.c:2083
 #: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Publik nyckelautentisering"
 
-#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc/silc.c:2086
 #: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Blockera snabbmeddelanden utan nyckelutbyte"
 
-#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc/silc.c:2089
 #: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Blockera meddelande till whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc/silc.c:2092
 #: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Öppna automatiskt whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc/silc.c:2095
 #: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Signera och verifiera alla meddelanden digitalt"
@@ -12066,60 +12050,60 @@ msgstr "Kunde inte skapa SILC-nyckelpar\
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc/util.c:362
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "För- och efternamn: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Användarnamn: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-Post: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Värdnamn: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Land: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:373
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritm: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Nyckellängd: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:376
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Version: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:378
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12131,7 +12115,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12141,53 +12125,52 @@ msgstr ""
 "Publik nyckelpladderavtryck:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:383
+#: ../libpurple/protocols/silc/util.c:384
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Publik nyckelinformation"
 
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Sökare"
 
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferens"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Dator"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s sände meddelanden till whiteboard. Vill du öppna whiteboarden?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:292
+#: ../libpurple/protocols/silc10/wb.c:291
 #, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
-msgstr ""
-"%s sände ett meddelande till vita tavlan i kanal %s. Will du öppna den vita "
-"tavlan?"
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgstr "%s sände ett meddelande till vita tavlan i kanal %s. Will du öppna den vita tavlan?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:306
+#: ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Whiteboard"
 
@@ -12203,8 +12186,7 @@ msgid "Failure: Remote does not trust/su
 #: ../libpurple/protocols/silc10/ops.c:1934
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-"Misslyckande: Fjärrdatorn litar inte på/stödjer inte din publika nyckel"
+msgstr "Misslyckande: Fjärrdatorn litar inte på/stödjer inte din publika nyckel"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
 #, c-format
@@ -12264,36 +12246,35 @@ msgstr "Kunde inte ladda SILC nyckelpar:
 msgstr "Kunde inte ladda SILC nyckelpar: %s"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:417
 msgid "Could not write"
 msgstr "Kunde inte skriva"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:439
+#: ../libpurple/protocols/simple/simple.c:1544
 msgid "Could not connect"
 msgstr "Kunde inte ansluta"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1062
 msgid "Unknown server response."
-msgstr "Okänd anledning."
+msgstr "Okänt serversvar."
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1578
+#: ../libpurple/protocols/simple/simple.c:1620
+#: ../libpurple/protocols/simple/simple.c:1633
+#: ../libpurple/protocols/simple/simple.c:1684
 msgid "Could not create listen socket"
 msgstr "Kunde inte skapa lyssnarsocket"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1601
 msgid "Couldn't resolve host"
 msgstr "Kunde ej slå upp värden"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1692
 msgid "Could not resolve hostname"
 msgstr "Kunde ej slå upp värden"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1709
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-skärmnamn får inte innehålla mellanslag eller symbolen @"
 
@@ -12305,36 +12286,36 @@ msgstr "SIP-skärmnamn får inte innehå
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1892
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Insticksmodul för SIP/SIMPLE-protokollet"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Insticksmodulen för SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:1921
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publicera statusen (notering: alla kan se dig)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:1927
 msgid "Use UDP"
 msgstr "Använda UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1929
 msgid "Use proxy"
 msgstr "Använd proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1931
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:1933
 msgid "Auth User"
 msgstr "Autentisera användare"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1935
 msgid "Auth Domain"
 msgstr "Autentiserad domän"
 
@@ -12401,8 +12382,7 @@ msgid "You missed an IM from %s because 
 #: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Du missade ett snabbmeddelande från %s eftersom det skickades för snabbt."
+msgstr "Du missade ett snabbmeddelande från %s eftersom det skickades för snabbt."
 
 #: ../libpurple/protocols/toc/toc.c:518
 #, c-format
@@ -12471,12 +12451,8 @@ msgstr "Din varningsnivå är för tillf
 
 #: ../libpurple/protocols/toc/toc.c:558
 #, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och "
-"prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
+msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
+msgstr "Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -12502,15 +12478,15 @@ msgid "TOC has come back from its pause.
 
 #: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"TOC har kommit tillbaka från dess paus. Du kan nu skicka meddelanden igen."
+msgstr "TOC har kommit tillbaka från dess paus. Du kan nu skicka meddelanden igen."
 
 #: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Lösenordsändring lyckades"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366
+#: ../pidgin/gtkblist.c:5929
+#: ../pidgin/gtkblist.c:6285
 msgid "_Group:"
 msgstr "_Grupp:"
 
@@ -12531,8 +12507,10 @@ msgstr "Filöverföringen misslyckades, 
 msgid "File transfer failed; other side probably canceled."
 msgstr "Filöverföringen misslyckades, antagligen eftersom andra sidan avbröt."
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878
+#: ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042
+#: ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Kunde inte ansluta för överföring."
 
@@ -12566,114 +12544,99 @@ msgstr "%s ber att du ska skicka denne e
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306
+#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Insticksmodul för TOC-protokoll"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgstr "%s har skickat dig en webbkamerainbjudan, vilket ännu inte stöds."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ditt Yahoo!-meddelande skickades inte."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-systemmeddelande till %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Auktoriserings nekelsemeddelande:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s har (retroaktivt) nekat din förfrågan att lägga till henne/honom till din "
-"kontaktlista med följande motivering: %s."
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "%s har (retroaktivt) nekat din förfrågan att lägga till henne/honom till din kontaktlista med följande motivering: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s har (retroaktivt) nekat din att lägga till henne/honom till din "
-"kontaktlista."
+msgstr "%s har (retroaktivt) nekat din att lägga till henne/honom till din kontaktlista."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Lägg till kompisavvisning"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-msgstr ""
-"Yahoo-servern har begärt att en okänd autentisering ska användas. Du kommer "
-"antagligen inte lyckas med att ansluta till Yahoo. Kontrollera om det finns "
-"uppdateringar på %s."
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "Yahoo-servern har begärt att en okänd autentisering ska användas. Du kommer antagligen inte lyckas med att ansluta till Yahoo. Kontrollera om det finns uppdateringar på %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Misslyckad Yahoo!-autentisering"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"Du har försökt ignorera %s men hon/han finns i din kompislista. Genom att "
-"klicka \"Ja\" tar du bort och blockerar kompisen."
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "Du har försökt ignorera %s men hon/han finns i din kompislista. Genom att klicka \"Ja\" tar du bort och blockerar kompisen."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Ignorera kompis?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Ditt konto är låst, var vänlig och logga in på Yahoo!s webbplats."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Okänt felnummer %d. Logga in på Yahoo!s hemsida kan fixa detta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Kan inte lägga till kompis %s i grupp %s på serverlistan för konto %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "Kunde inte lägga till kompis i listan på servern"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hörbar %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "Mottog oväntat HTTP-svar från servern."
 
-#: ../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/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problem med anslutning"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12682,7 +12645,7 @@ msgstr ""
 "Tappade anslutningen med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12691,112 +12654,103 @@ msgstr ""
 "Kunde inte skapa en anslutning med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Inte hemma"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Inte vid skrivbordet"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Inte på kontoret"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "PÃ¥ semester"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "GÃ¥tt ut"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Finns inte i listan på servern"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "Verka vara ansluten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr "Verka vara permanent frånkopplad"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "Närvaro"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "Verka vara frånkopplad"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr "Verka inte vara permanent frånkopplad"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Anslut till chatt"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Starta konferens"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "Närvaroinställningar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr "Starta kladda"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "Vilket ID ska aktiveras?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Join whom in chat?"
 msgstr "Anslut vem till chatten?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Aktivera ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Gå med användare i chatt..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr "Öppna Inkorg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;rum&gt;:  Anslut till ett chatt-rum på Yahoo-nätverket"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4143
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listar rummen på Yahoo's nätverk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4151
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Fråga användaren angående att starta en kladd-session"
 
@@ -12810,56 +12764,56 @@ msgstr "doodle: Fråga användaren angå
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
 #: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4362
 msgid "Yahoo Protocol Plugin"
 msgstr "Insticksmodul för Yahoo-protokoll"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Pager server"
 msgstr "Sökarserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Japan Pager server"
 msgstr "Japan Sökarsörver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Pager port"
 msgstr "Sökareport"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "File transfer server"
 msgstr "Filöverföringsserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan file transfer server"
 msgstr "Japan filöverföringsserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "File transfer port"
 msgstr "Port för filöverföring"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Chat room locale"
 msgstr "Chatrummets språk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorera inbjudningar till konferenser och chatrum"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Chat room list URL"
 msgstr "URL för chattrumlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat server"
 msgstr "Yahoo Chat-server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "Yahoo Chat port"
 msgstr "Yahoo Chatt port"
 
@@ -12877,7 +12831,7 @@ msgstr "Kan inte inte etablera filbeskri
 msgstr "Kan inte inte etablera filbeskrivning."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:306
 msgid "Write Error"
 msgstr "Skrivfel"
 
@@ -12890,15 +12844,11 @@ msgstr "Yahoo! Profil"
 msgstr "Yahoo! Profil"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "Profiler märkta att innehålla vuxeninnehåll stöds ännu inte."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
 msgstr "Om du vill se denna profil måste du besöka länken i din webbläsare"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
@@ -12942,28 +12892,16 @@ msgstr "Användarinformation om %s är i
 msgstr "Användarinformation om %s är inte tillgänglig"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
 msgstr "Denna profil verkar vara i ett språk eller format som ännu inte stöds."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"Kan inte hämta användarens profil. Detta är antagligen ett temporärt fel på "
-"servern. var god försök igen senare."
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "Kan inte hämta användarens profil. Detta är antagligen ett temporärt fel på servern. var god försök igen senare."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"Kunde inte hämta användarens profil. Detta beror antagligen på att "
-"användaren inte finns, men ibland hittar inte Yahoo! en användares profil. "
-"Om du vet att användaren finns: försök igen senare."
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "Kunde inte hämta användarens profil. Detta beror antagligen på att användaren inte finns, men ibland hittar inte Yahoo! en användares profil. Om du vet att användaren finns: försök igen senare."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
@@ -12998,12 +12936,8 @@ msgstr "Ej tillgänglig"
 msgstr "Ej tillgänglig"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:451
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Okänt fel. Du kanske behöver koppla från och vänta fem minuter före du kan "
-"ansluta till chatrummet igen"
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "Okänt fel. Du kanske behöver koppla från och vänta fem minuter före du kan ansluta till chatrummet igen"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
@@ -13054,12 +12988,8 @@ msgstr ""
 "%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:354
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr ""
-"(Det blev ett fel vid konverteringen av detta meddelande.\t Kontrollera "
-"Kodningsinställningen för kontot.)"
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgstr "(Det blev ett fel vid konverteringen av detta meddelande.\t Kontrollera Kodningsinställningen för kontot.)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
@@ -13109,8 +13039,7 @@ msgid "instance &lt;instance&gt;: Set th
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"instance &lt;instance&gt;: Ange instanserna att användas med denna klass"
+msgstr "instance &lt;instance&gt;: Ange instanserna att användas med denna klass"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
@@ -13122,44 +13051,27 @@ msgid "sub &lt;class&gt; &lt;instance&gt
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
-"sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Anslut till en ny chatt"
+msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Anslut till en ny chatt"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;instance&gt;: Skicka ett meddelande till &lt;message,<i>instance</i>,"
-"*&gt;"
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;instance&gt;: Skicka ett meddelande till &lt;message,<i>instance</i>,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2727
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;class&gt; &lt;instance&gt;: Skicka ett meddelande till &lt;<i>class</"
-"i>,<i>instance</i>,*&gt;"
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;class&gt; &lt;instance&gt;: Skicka ett meddelande till &lt;<i>class</i>,<i>instance</i>,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2733
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Skicka ett meddelande "
-"till &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Skicka ett meddelande till &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2739
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Skicka ett meddelande till &lt;"
-"MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;instance&gt; &lt;recipient&gt;: Skicka ett meddelande till &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
-"zc &lt;class&gt;: Skicka ett meddelande till &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;class&gt;: Skicka ett meddelande till &lt;<i>class</i>,PERSONAL,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
@@ -13216,8 +13128,10 @@ msgstr "Exponering"
 msgid "Exposure"
 msgstr "Exponering"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461
+#: ../libpurple/proxy.c:902
+#: ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13226,28 +13140,30 @@ msgstr ""
 "Kan inte skapa uttag:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Kan inte tolka svaret från HTTP-proxyn: %s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:702
+#: ../libpurple/proxy.c:750
+#: ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxyanslutningsfel %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Åtkomst nekad: HTTP-proxyservern tillåter inte tunnel på port %d."
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fel vid uppslagning av %s"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "Kunde inte slå upp värdnamnet"
 
@@ -13288,14 +13204,14 @@ msgid "Requesting %s's attention..."
 #: ../libpurple/server.c:302
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "Efterfrågar %s's uppmärksamhet..."
 
 #: ../libpurple/server.c:347
 #, c-format
 msgid "%s has requested your attention!"
-msgstr ""
+msgstr "%s har efterfrågat din uppmärksamhet!"
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13304,38 +13220,38 @@ msgstr ""
 "%s har bjudit in %s till chattrum %s\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s bjuder in %s till chattrum %s\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Tacka ja till chattinbjudan?"
 
 #: ../libpurple/sslconn.c:164
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "Anslutning misslyckad"
+msgstr "SSL-anslutning misslyckades"
 
 #: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
-msgstr "SSL-handskakning misslyckades"
+msgstr "SSL_handskakning misslyckades"
 
 #: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
-msgstr ""
+msgstr "SSL-motparten uppvisade ett ogiltig certifikat"
 
 #: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "Okänt fel"
+msgstr "Okänt SSL-fel"
 
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Osatt"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Stör inte"
 
@@ -13352,135 +13268,143 @@ msgstr "%s har bytt status från %s till
 msgid "%s changed status from %s to %s"
 msgstr "%s har bytt status från %s till %s"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:612
 #, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) har bytt status från %s till %s"
+
+#: ../libpurple/status.c:623
+#, c-format
 msgid "%s is now %s"
 msgstr "%s är nu %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:625
 #, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) är nu %s"
+
+#: ../libpurple/status.c:631
+#, c-format
 msgid "%s is no longer %s"
 msgstr "%s är inte längre %s"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:633
 #, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) är inte längre %s"
+
+#: ../libpurple/status.c:1244
+#, c-format
 msgid "%s became idle"
 msgstr "%s har blivit inaktiv"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1261
 #, c-format
 msgid "%s became unidle"
 msgstr "%s har blivit aktiv"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1324
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s har blivit inaktiv"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1326
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s har blivit aktiv"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:701
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2706
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fel vid läsning av %s"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2707
 #, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Ett fel upptäcktes vid inläsandet av din %s. De har inte laddats och den "
-"gamla har blivit flyttad till %s~."
+msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
+msgstr "Ett fel upptäcktes vid inläsandet av din %s. De har inte laddats och den gamla har blivit flyttad till %s~."
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3204
 msgid "Calculating..."
 msgstr "Beräknar..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3207
 msgid "Unknown."
 msgstr "Okänd."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3233
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3245
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagar"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3253
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d timme"
 msgstr[1] "%s, %d timmar"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3259
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3267
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minut"
 msgstr[1] "%s, %d minuter"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3273
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3533
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Kunde inte öppna %s: Omdirigerad för många gånger"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3570
+#: ../libpurple/util.c:3866
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kan inte ansluta till %s"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3693
 #, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-"Kunde inte allokera tillräckligt mycket minne för att hålla innehållet från %"
-"s. Webb-servern försöker kanske med något konstigt."
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "Kunde inte allokera tillräckligt mycket minne för att hålla innehållet från %s. Webb-servern försöker kanske med något konstigt."
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3728
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Fel vid läsning av från %s: %s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3759
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Fel vid skrivning av %s: %s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3784
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Kan inte ansluta till %s: %s"
@@ -13497,81 +13421,82 @@ msgstr "Sänder snabbmeddelanden över m
 msgid "Send instant messages over multiple protocols"
 msgstr "Sänder snabbmeddelanden över multipla protokoll"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Orientering"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Uppsamlarens orientering."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "Inloggningsalternativ"
 
-#: ../pidgin/gtkaccount.c:428
+#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
 msgstr "Pro_tokoll:"
 
-#: ../pidgin/gtkaccount.c:439
+#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
 msgstr "Skärm_namn:"
 
-#: ../pidgin/gtkaccount.c:529
+#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
 msgstr "_Lokalt alias:"
 
-#: ../pidgin/gtkaccount.c:533
+#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
 msgstr "_Kom ihåg lösenordet"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "Användaralternativ"
 
-#: ../pidgin/gtkaccount.c:604
+#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
 msgstr "Rapportera ny e-_post"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
+#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
 msgstr "Använd denna kompis_ikon för detta konto:"
 
 # src/menus.c:311
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
 msgstr "%s-alternativ"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr "Använd GNOME proxyinställningar"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "Använd globala proxyinställningar"
 
-#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "Ingen proxy"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:970
+#: ../pidgin/gtkprefs.c:1253
 msgid "Use Environmental Settings"
 msgstr "Använd miljöinställningar"
 
@@ -13580,341 +13505,368 @@ msgstr "Använd miljöinställningar"
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1009
 msgid "If you look real closely"
 msgstr "Om du tittar riktigt nära"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:1012
 msgid "you can see the butterflies mating"
 msgstr "kan du se fjärilarna para sig"
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr "Proxyalternativ"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1047
+#: ../pidgin/gtkprefs.c:1247
 msgid "Proxy _type:"
 msgstr "Proxy_typ:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1056
+#: ../pidgin/gtkprefs.c:1268
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1060
+#: ../pidgin/gtkprefs.c:1286
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1068
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1075
+#: ../pidgin/gtkprefs.c:1323
 msgid "Pa_ssword:"
 msgstr "_Lösenord:"
 
-#: ../pidgin/gtkaccount.c:1195
-#, fuzzy
+#: ../pidgin/gtkaccount.c:1199
 msgid "Unable to save new account"
-msgstr "Kan inte skapa anslutning"
+msgstr "Kan inte spara nytt konto"
 
-#: ../pidgin/gtkaccount.c:1196
+#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "Ett konto finns redan med de angivna uppgifterna."
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "Lägg till konto"
 
 # src/menus.c:327
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "_Basic"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1504
 msgid "Create this new account on the server"
-msgstr ""
+msgstr "Skapa detta nya kontot på servern"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "_Avancerat"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1978
+#: ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2207
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add</b> button below and configure your first account. If you want %s to "
-"connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
+"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Välkommen till %s!</span>\n"
 "\n"
-"Du har inga IM-konton konfigurerade. För att påbörja en anslutning med %s så "
-"trycker du på knappen <b>Lägg till</b> nedanför och konfigurerar ditt första "
-"konto. Om du vill att %s ska ansluta till fler konton trycker du på <b>Lägg "
-"till</b> igen för att konfigurera dem en och en.\n"
+"Du har inga IM-konton konfigurerade. För att påbörja en anslutning med %s så trycker du på knappen <b>Lägg till</b> nedanför och konfigurerar ditt första konto. Om du vill att %s ska ansluta till fler konton trycker du på <b>Lägg till</b> igen för att konfigurera dem en och en.\n"
 "\n"
-"Du kan komma tillbaka till detta fönster för att lägga till, ändra eller ta "
-"bort konton från <b>Konton->Lägg till/Ändra</b> i kompislistans fönster"
+"Du kan komma tillbaka till detta fönster för att lägga till, ändra eller ta bort konton från <b>Konton->Lägg till/Ändra</b> i kompislistans fönster"
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "Anslut till chatt"
+#: ../pidgin/gtkblist.c:527
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "Du har för tillfället %d kontakt vid namn %s. Vill du slå ihop dem?"
+msgstr[1] "Du har för tillfället %d kontakter vid namn %s. Vill du slå ihop dem?"
 
-#: ../pidgin/gtkblist.c:788
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
+#: ../pidgin/gtkblist.c:528
+msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
+msgstr "Slår du ihop dessa kontakter innebär det att de kommer dela på en post på din kompislista och använda ett konversationsfönster. Du kan separera dem igen genom att välja 'Expandera' från kontaktens omgivningsmeny"
+
+# src/sidebar.c:103
+#: ../pidgin/gtkblist.c:530
+msgid "_Merge"
+msgstr "_Slå ihop"
+
+#: ../pidgin/gtkblist.c:948
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "Var god ange information om chatten du vill ansluta till.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkblist.c:959
+#: ../pidgin/gtkblist.c:6246
+#: ../pidgin/gtkpounce.c:546
 #: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Blockera"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1248
 msgid "Un_block"
 msgstr "Ta bort _blockering"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1291
+msgid "Move to"
+msgstr "Flytta till"
+
+#: ../pidgin/gtkblist.c:1331
 msgid "Get _Info"
 msgstr "Hämta _info"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Meddelande"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Skicka fil"
+#: ../pidgin/gtkblist.c:1340
+msgid "_Send File..."
+msgstr "_Skicka fil..."
 
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "Lägg till kom_pisattack"
+#: ../pidgin/gtkblist.c:1347
+msgid "Add Buddy _Pounce..."
+msgstr "Lägg till kom_pisattack..."
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1352
+#: ../pidgin/gtkblist.c:1356
+#: ../pidgin/gtkblist.c:1471
+#: ../pidgin/gtkblist.c:1494
 msgid "View _Log"
 msgstr "Visa _logg"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1362
+msgid "Hide when offline"
+msgstr "Dölj om frånkopplade"
+
+#: ../pidgin/gtkblist.c:1362
+msgid "Show when offline"
+msgstr "Visa om frånkopplade"
+
+#: ../pidgin/gtkblist.c:1376
+#: ../pidgin/gtkblist.c:1385
+#: ../pidgin/gtkblist.c:1479
+#: ../pidgin/gtkblist.c:1500
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1379
+#: ../pidgin/gtkblist.c:1387
+#: ../pidgin/gtkblist.c:1481
+#: ../pidgin/gtkblist.c:1502
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "_Lägg till kompis"
+#: ../pidgin/gtkblist.c:1437
+msgid "Add _Buddy..."
+msgstr "_Lägg till kompis..."
 
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "Lägg till c_hatt"
+#: ../pidgin/gtkblist.c:1440
+msgid "Add C_hat..."
+msgstr "Lägg till c_hatt..."
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1443
 msgid "_Delete Group"
 msgstr "_Ta bort grupp"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1445
 msgid "_Rename"
 msgstr "Byt _namn"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1465
+#: ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkroomlist.c:460
+#: ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Anslut"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1467
 msgid "Auto-Join"
 msgstr "Anslut automatiskt"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1469
+msgid "Persistent"
+msgstr "Ihållande"
+
+#: ../pidgin/gtkblist.c:1507
+#: ../pidgin/gtkblist.c:1530
 msgid "_Collapse"
 msgstr "_Fäll ihop"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1535
 msgid "_Expand"
 msgstr "_Expandera"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1786
+#: ../pidgin/gtkblist.c:1798
+#: ../pidgin/gtkblist.c:4933
+#: ../pidgin/gtkblist.c:4946
 msgid "/Tools/Mute Sounds"
 msgstr "/Verktyg/Stäng av ljud"
 
-#: ../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 är för tillfället inte inloggad med något konto som kan lägga till den "
-"kompisen."
+#: ../pidgin/gtkblist.c:2258
+#: ../pidgin/gtkconv.c:4919
+#: ../pidgin/gtkpounce.c:437
+msgid "You are not currently signed on with an account that can add that buddy."
+msgstr "Du är för tillfället inte inloggad med något konto som kan lägga till den kompisen."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3070
 msgid "/_Buddies"
 msgstr "/_Kompisar"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kompisar/Nytt _snabbmeddelande..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3072
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kompisar/Anslut till _chatt..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3073
 msgid "/Buddies/Get User _Info..."
 msgstr "/Kompisar/Hämta användar_info..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3074
 msgid "/Buddies/View User _Log..."
 msgstr "/Kompisar/Visa användar_logg..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/_Kompisar"
+#: ../pidgin/gtkblist.c:3076
+msgid "/Buddies/Sh_ow"
+msgstr "/Kompisar/_Visa"
 
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
+#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Kompisar/Visa _frånkopplade kompisar"
+msgstr "/Kompisar/Visa/_Frånkopplade kompisar"
 
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
+#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Kompisar/Visa _tomma grupper"
+msgstr "/Kompisar/Visa/_Tomma grupper"
 
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Kompisar/Visa _kompisdetaljer"
+msgstr "/Kompisar/Visa/_Kompisdetaljer"
 
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
+#: ../pidgin/gtkblist.c:3080
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Kompisar/Visa frånvaro_tid"
+msgstr "/Kompisar/Visa/Frånvaro_tid"
 
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
+#: ../pidgin/gtkblist.c:3081
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Kompisar/Visa _tomma grupper"
+msgstr "/Kompisar/Visa/_Protokollikoner"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Kompisar/_Sortera kompisar"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3084
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Kompisar/Lägg till _kompis..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kompisar/Lägg till c_hatt..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3086
 msgid "/Buddies/Add _Group..."
 msgstr "/Kompisar/Lägg till _grupp..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3088
 msgid "/Buddies/_Quit"
 msgstr "/Kompisar/_Avsluta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3091
 msgid "/_Accounts"
 msgstr "/_Konton"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Verktyg/Lägg till\\/Redigera"
+#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:6948
+msgid "/Accounts/Manage"
+msgstr "/Konton/Hantera"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3095
 msgid "/_Tools"
 msgstr "/_Verktyg"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3096
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Verktyg/Kom_pisattack"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
+#: ../pidgin/gtkblist.c:3097
 msgid "/Tools/_Certificates"
-msgstr "/Verktyg/_Inställningar"
+msgstr "/Verktyg/_Certifikat"
 
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3098
 msgid "/Tools/Plu_gins"
 msgstr "/Verktyg/Insticksmodu_ler"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3099
 msgid "/Tools/Pr_eferences"
 msgstr "/Verktyg/_Inställningar"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3100
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktyg/_Spärrlista"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3102
 msgid "/Tools/_File Transfers"
 msgstr "/Verktyg/_Filöverföringar"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/R_oom List"
 msgstr "/Verktyg/R_umslista"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3104
 msgid "/Tools/System _Log"
 msgstr "/Verktyg/Visa _systemlogg"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3106
 msgid "/Tools/Mute _Sounds"
 msgstr "/Verktyg/Stäng av _ljud"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3108
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3109
 msgid "/Help/Online _Help"
 msgstr "/Hjälp/Online_hjälp"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3110
 msgid "/Help/_Debug Window"
 msgstr "/Hjälp/_Felsökningsfönster"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3112
+#: ../pidgin/gtkblist.c:3114
 msgid "/Help/_About"
 msgstr "/Hjälp/_Om"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3143
 #, c-format
 msgid ""
 "\n"
@@ -13923,481 +13875,465 @@ msgstr ""
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3221
 msgid "Buddy Alias"
 msgstr "Kompisalias"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3250
 msgid "Logged In"
 msgstr "Ansluten"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3296
 msgid "Last Seen"
 msgstr "Senast sedd"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3317
 msgid "Spooky"
 msgstr "Skrämmande"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3319
 msgid "Awesome"
 msgstr "Fantastisk"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3321
 msgid "Rockin'"
 msgstr "Rockar"
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3660
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inaktiv %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3662
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inaktiv %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3664
 #, c-format
 msgid "Idle %dm"
 msgstr "Inaktiv %dm"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3818
 msgid "/Buddies/New Instant Message..."
 msgstr "/Kompisar/Nytt snabbmeddelande..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3819
+#: ../pidgin/gtkblist.c:3852
 msgid "/Buddies/Join a Chat..."
 msgstr "/Kompisar/Anslut till _chatt..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3820
 msgid "/Buddies/Get User Info..."
 msgstr "/Kompisar/Hämta användarinfo..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3821
 msgid "/Buddies/Add Buddy..."
 msgstr "/Kompisar/Lägg till kompis..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:3855
 msgid "/Buddies/Add Chat..."
 msgstr "/Kompisar/Lägg till chatt..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3823
 msgid "/Buddies/Add Group..."
 msgstr "/Kompisar/Lägg till grupp..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3858
 msgid "/Tools/Privacy"
 msgstr "/Verktyg/_Spärrlista"
 
 # Säger man inte "rumslista"?
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3861
 msgid "/Tools/Room List"
 msgstr "/Verktyg/Rumlista"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3993
+#: ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d oläst meddelande från %s\n"
 msgstr[1] "%d olästa meddelande från %s\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4153
 msgid "Manually"
 msgstr "Manuellt"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Alfabetiskt"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4156
 msgid "By status"
 msgstr "Efter status"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4157
 msgid "By log size"
 msgstr "Efter loggstorlek"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4362
+#: ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "%s kopplades ifrån."
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4397
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s frånkopplad: %s</span>"
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4549
 msgid "<b>Username:</b>"
 msgstr "<b>Användarnamn:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4556
 msgid "<b>Password:</b>"
 msgstr "<b>Lösenord:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4567
 msgid "_Login"
 msgstr "_Login"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4650
 msgid "/Accounts"
 msgstr "/Konton"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4664
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Välkommen till %s!</span>\n"
 "\n"
-"Du har inga konton aktiverade. Aktivera dina IM-konton från fönstret "
-"<b>Konton</b> vid <b>Konton->Lägg till/Ändra</b>. Så snart dy har aktiverat "
-"dina konton kommer du kunna välja en status och prata med dina vänner."
+"Du har inga konton aktiverade. Aktivera dina IM-konton från fönstret <b>Konton</b> vid <b>Konton->Hantera</b>. Så snart du har aktiverat dina konton kommer du kunna välja en status och prata med dina vänner."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
+#: ../pidgin/gtkblist.c:4927
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Kompisar/Visa frånkopplade kompisar"
+msgstr "/Kompisar/Visa/Frånkopplade kompisar"
 
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
+#: ../pidgin/gtkblist.c:4930
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Kompisar/Visa tomma grupper"
+msgstr "/Kompisar/Visa/Tomma grupper"
 
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
+#: ../pidgin/gtkblist.c:4936
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Kompisar/Visa kompisdetaljer"
+msgstr "/Kompisar/Visa/Kompisdetaljer"
 
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
+#: ../pidgin/gtkblist.c:4939
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Kompisar/Visa frånvarotid"
+msgstr "/Kompisar/Visa/Frånvarotid"
 
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
+#: ../pidgin/gtkblist.c:4942
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Kompisar/Visa tomma grupper"
+msgstr "/Kompisar/Visa/Protokollikoner"
 
-#: ../pidgin/gtkblist.c:5507
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Ange användar-ID för den kompis du vill lägga till i din kompislista. Du kan "
-"också ange ett alias eller ett smeknamn på kompisen. Detta alias kommer att "
-"visas i stället för användar-ID när det är möjligt.\n"
+#: ../pidgin/gtkblist.c:5854
+msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr "Ange användar-ID för den kompis du vill lägga till i din kompislista. Du kan också ange ett alias eller ett smeknamn på kompisen. Detta alias kommer att visas i stället för användar-ID när det är möjligt.\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:5877
+msgid "A_ccount:"
+msgstr "_Konto:"
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:5889
 msgid "_Screen name:"
 msgstr "_Skärmnamn:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:5911
+#: ../pidgin/gtkblist.c:6267
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6179
 msgid "This protocol does not support chat rooms."
 msgstr "Protokollet stödjer inte chattrum."
 
-#: ../pidgin/gtkblist.c:5842
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"Du är för tillfället inte inloggad med något protokoll som erbjuder chatt."
+#: ../pidgin/gtkblist.c:6195
+msgid "You are not currently signed on with any protocols that have the ability to chat."
+msgstr "Du är för tillfället inte inloggad med något protokoll som erbjuder chatt."
 
-#: ../pidgin/gtkblist.c:5883
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Ange information och alias för den chatt som du vill lägga till i din "
-"kompislista.\n"
+#: ../pidgin/gtkblist.c:6236
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "Ange information och alias för den chatt som du vill lägga till i din kompislista.\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6295
+msgid "Autojoin when account becomes online."
+msgstr "Gå med automatiskt då kontot är anslutet."
+
+#: ../pidgin/gtkblist.c:6296
+msgid "Hide chat when the window is closed."
+msgstr "Göm chatt när fönstret är stängt."
+
+#: ../pidgin/gtkblist.c:6322
 msgid "Please enter the name of the group to be added."
 msgstr "Ange namnet på den grupp som du vill lägga till."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6968
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Konton/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:6992
 msgid "_Edit Account"
 msgstr "_Ändra konto"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7005
+#: ../pidgin/gtkconv.c:3143
 msgid "No actions available"
 msgstr "Inga åtgärder tillgängliga"
 
 # Möjligen passar "Aktivt" bättre här.
 # Är inte så säker på det, tror det är mer en fråga om smak då det är viss skillnad mellan något som är aktivt och något som är aktiverat. Tyvärr kan jag inte bygga det från CVS just nu (eller rättare sagt: jag kan bygga det, men jag får det inte att starta på denna datorn) så därför kan jag inte kolla upp riktigt i vilken kontext det är.
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7013
 msgid "_Disable"
 msgstr "A_vaktivera"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7025
 msgid "Enable Account"
 msgstr "Aktivera konto"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7031
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Konton/Aktivera Konto"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7080
 msgid "/Tools"
 msgstr "/Verktyg"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7150
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kompisar/Sortera kompisar"
 
 #. Widget creation function
 #: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
 msgid "SSL Servers"
-msgstr "Server"
+msgstr "SSL-Server"
 
-#: ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkconn.c:181
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
+"%s will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"%s kommer inte försöka ansluta förrän du har rättat till felet och "
-"Ã¥teraktiverat kontot."
+"%s kommer inte försöka ansluta förrän du har rättat till felet och återaktiverat kontot."
 
-#: ../pidgin/gtkconv.c:482
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "Okänt kommando."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:796
+#: ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Den kompisen använder inte samma protokoll som denna chatt."
 
-#: ../pidgin/gtkconv.c:774
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Du är för tillfället inte inloggad med något konto som kan bjuda in den "
-"kompisen."
+#: ../pidgin/gtkconv.c:816
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr "Du är för tillfället inte inloggad med något konto som kan bjuda in den kompisen."
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "Bjud in kompis till chattrum"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Ange namnet på den användare du vill bjuda in, samt ett "
-"inbjudningsmeddelande om du vill"
+#: ../pidgin/gtkconv.c:899
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgstr "Ange namnet på den användare du vill bjuda in, samt ett inbjudningsmeddelande om du vill"
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "_Kompis:"
 
 # src/sidebar.c:103
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:931
+#: ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtksavedstatuses.c:1529
 msgid "_Message:"
 msgstr "_Meddelande:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Kan inte öppna filen."
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Konversation med %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "Spara konversationen"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179
+#: ../pidgin/gtkdebug.c:167
+#: ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Sök"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205
+#: ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Sök efter:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "Avignorera"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1679
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "Hämta frånvaromeddelande"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "Senast sagt"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "Kan inte spara ikonfil på disken."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "Spara ikon"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "Animera"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "Dölj ikon"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "Spara ikon som..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "Välj egen ikon..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "Ta bort egen ikon"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
-msgstr ""
+msgstr "Visa Alla"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/_Konversation"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Konversation/Nytt snabb_meddelande..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/Konversation/_Sök..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/Konversation/Visa _Logg"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/Konversation/_Spara som..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Konversation/_Rensa tillbakablick"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konversation/S_kicka fil..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konversation/Lägg till Kom_pisattack..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/Konversation/_Hämta information"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/Konversation/_Bjud in..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/Konversation/_Mer"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/Konversation/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/Konversation/_Blockera"
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/Konversation/_Avblockera..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/Konversation/_Lägg till..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/Konversation/_Ta bort..."
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Konversation/Infoga län_k..."
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Konversation/Infoga _bild..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/Konversation/_Stäng"
 
 # src/menus.c:311
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "_Alternativ"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/Alternativ/Aktivera _loggning"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/Alternativ/_Aktivera ljud"
 
 # Lite konstigt med plural på verktygsrader, men det står
 # ju faktiskt så:-)
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Alternativ/Visa forma_teringsverktygsrader"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Alternativ/Visa tidsstä_mplar"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/More"
 msgstr "/Konversation/Mer"
 
 # src/menus.c:311
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3187
 msgid "/Options"
 msgstr "/Alternativ"
 
@@ -14406,172 +14342,179 @@ msgstr "/Alternativ"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3254
 msgid "/Conversation"
 msgstr "/Konversation"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/View Log"
 msgstr "/Konversation/Visa logg"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3268
 msgid "/Conversation/Send File..."
 msgstr "/Konversation/Skicka fil..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konversation/Lägg till kompisattack..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3278
 msgid "/Conversation/Get Info"
 msgstr "/Konversation/Hämta information"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Invite..."
 msgstr "/Konversation/Bjud in..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3288
 msgid "/Conversation/Alias..."
 msgstr "/Konversation/Alias..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3292
 msgid "/Conversation/Block..."
 msgstr "/Konversation/Blockera..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3296
 msgid "/Conversation/Unblock..."
 msgstr "/Konversation/Avblockera..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3300
 msgid "/Conversation/Add..."
 msgstr "/Konversation/Lägg till..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Remove..."
 msgstr "/Konversation/Ta bort..."
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3310
 msgid "/Conversation/Insert Link..."
 msgstr "/Konversation/Infoga länk..."
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3314
 msgid "/Conversation/Insert Image..."
 msgstr "/Konversation/Infoga bild..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3320
 msgid "/Options/Enable Logging"
 msgstr "/Alternativ/Aktivera loggning"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Sounds"
 msgstr "/Alternativ/Aktivera ljud"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3336
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Alternativ/Visa formateringsverktyg"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Timestamps"
 msgstr "/Alternativ/Visa tidsstämplar"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3416
+#: ../pidgin/gtkconv.c:3458
 msgid "User is typing..."
 msgstr "Användaren skriver..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3461
 msgid "User has typed something and stopped"
 msgstr "Användaren har skrivit något och sedan slutat"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
+#: ../pidgin/gtkconv.c:3645
+#: ../pidgin/gtkconv.c:8180
+msgid "S_end To"
 msgstr "_Skicka till"
 
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4357
 msgid "_Send"
 msgstr "_Skicka"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4470
 msgid "0 people in room"
 msgstr "0 personer i rummet"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5843
+#: ../pidgin/gtkconv.c:5964
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person är i rummet"
 msgstr[1] "%d personer är i rummet"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6571
+#: ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Skriver"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6575
 msgid "Stopped Typing"
 msgstr "Slutade skriva"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6578
 msgid "Nick Said"
 msgstr "Smeknamn nämnt"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6581
+#: ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Olästa meddeladen"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6587
 msgid "New Event"
 msgstr "Ny händelse"
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7699
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Rensar alla konversationers tillbakablickar."
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7862
 msgid "Confirm close"
 msgstr "Bekräfta stängning"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7894
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Du har olästa meddelanden. Är du säker på att du vill stänga fönstret?"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8513
 msgid "Close other tabs"
 msgstr "Stäng andra flikar"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8519
 msgid "Close all tabs"
 msgstr "Stäng alla flikar"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8527
 msgid "Detach this tab"
 msgstr "Lossa denna flik"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8533
 msgid "Close this tab"
 msgstr "Stäng denna flik"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9038
 msgid "Close conversation"
 msgstr "Stäng konversationen"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9640
 msgid "Last created window"
 msgstr "Senast skapade fönster"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9642
 msgid "Separate IM and Chat windows"
 msgstr "Separera IM- och chattfönster"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9644
+#: ../pidgin/gtkprefs.c:1471
 msgid "New window"
 msgstr "Nytt fönster"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9646
 msgid "By group"
 msgstr "Efter grupp"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9648
 msgid "By account"
 msgstr "Efter konto"
 
@@ -14611,7 +14554,8 @@ msgstr "Nivå"
 msgid "Level "
 msgstr "Nivå"
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:825
+#: ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr "Välj debugfiltrets nivå."
 
@@ -14635,18 +14579,27 @@ msgstr "Allvarligt fel"
 msgid "Fatal Error"
 msgstr "Allvarligt fel"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:72
+#: ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "utvecklingsledare"
 
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:91
 #: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr "utvecklare"
@@ -14659,13 +14612,14 @@ msgstr "support/QA"
 msgid "support/QA"
 msgstr "support/QA"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "utvecklare & webbansvarig"
 
 #: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "Senior Contributor/Kvalitetsgranskning"
 
 #: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
@@ -14673,7 +14627,8 @@ msgstr "win32-portering"
 
 # Vi borde försöka hitta en bra översättning för detta ord.
 # Kanske "underhållsansvarig"?
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "maintainer"
 
@@ -14698,21 +14653,25 @@ msgstr "Afrikaans"
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
 msgstr "Arabiska"
 
 #: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "Vitryska Latin"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:137
 #: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "Bulgariska"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "Bengali"
 
@@ -14720,34 +14679,41 @@ msgstr "Bostniska"
 msgid "Bosnian"
 msgstr "Bostniska"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:228
 #: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "Katalanska"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "Valencianska"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "Tjeckiska"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "Danska"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150
 #: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "Tyska"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:152
 #: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "Grekiska"
 
@@ -14767,43 +14733,51 @@ msgstr "Esperanto"
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 #: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "Spanska"
 
 #: ../pidgin/gtkdialogs.c:161
-#, fuzzy
 msgid "Estonian"
-msgstr "Bostniska"
+msgstr "Estniska"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr "Baskiska"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:165
 #: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "Persiska"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:236
 #: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "Finska"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:240
 #: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "Franska"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:170
 #: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr "Galiciska"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "Gujarati"
 
@@ -14811,7 +14785,8 @@ msgstr "Gujarati Språkteam"
 msgid "Gujarati Language Team"
 msgstr "Gujarati Språkteam"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "Hebreiska"
 
@@ -14819,7 +14794,8 @@ msgstr "Hindi"
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "Ungerska"
 
@@ -14827,16 +14803,20 @@ msgstr "Indonesiska"
 msgid "Indonesian"
 msgstr "Indonesiska"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "Italienska"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "Japanska"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "Georgiska"
 
@@ -14852,32 +14832,37 @@ msgstr "Kannada översättningsteam"
 msgid "Kannada Translation team"
 msgstr "Kannada översättningsteam"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:250
 #: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "Koreanska"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183
 #: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "Kurdiska"
 
 #: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "Lejon"
+msgstr "Lao"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:252
 #: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "Lettländska"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "Makedonska"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:255
 #: ../pidgin/gtkdialogs.c:256
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norska"
@@ -14894,8 +14879,10 @@ msgstr "Norska Nynorsk"
 msgid "Norwegian Nynorsk"
 msgstr "Norska Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:257
 msgid "Polish"
 msgstr "Polska"
 
@@ -14915,18 +14902,22 @@ msgstr "Rumänska"
 msgid "Romanian"
 msgstr "Rumänska"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:258
 #: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "Ryska"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:261
 #: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "Slovakiska"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "Slovenska"
 
@@ -14934,12 +14925,15 @@ msgstr "Albanska"
 msgid "Albanian"
 msgstr "Albanska"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "Serbiska"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:266
 #: ../pidgin/gtkdialogs.c:267
 msgid "Swedish"
 msgstr "Svenska"
@@ -14956,7 +14950,8 @@ msgstr "Thailändska"
 msgid "Thai"
 msgstr "Thailändska"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "Turkiska"
 
@@ -14968,16 +14963,19 @@ msgstr "T.M.Thanh och Gnome-Vi Teamet"
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh och Gnome-Vi Teamet"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "Förenklad kinesiska"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:216
 #: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Kinesiska"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 #: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "Traditionell kinesiska"
@@ -14992,26 +14990,9 @@ msgstr "Om %s"
 msgstr "Om %s"
 
 #: ../pidgin/gtkdialogs.c:400
-#, fuzzy, c-format
-msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr ""
-"%s är en grafisk modulär meddelandeklient baserad på libpurple som är "
-"kapabel att använda AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu och QQ "
-"samtidigt.  Det är skrivet med GTK+.<BR><BR>Du kan ändra och distribuera "
-"programmet enligt GPL (version 2 eller senare).  En kopia av GPL finns i "
-"filen 'COPYING' som kommer med %s.  %s är kopieringsskyddad av dess "
-"bidragsgivare.  Se filen 'COPYRIGHT' för en komplett lista av "
-"bidragsgivare.  Vi ger inga garantier för detta program.<BR><BR>"
+#, c-format
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "%s är en grafisk modulär meddelandeklient baserad på libpurple som kan ansluta till AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu och QQ samtidigt.  Det är skrivet för GTK+.<BR><BR>Du kan ändra och distribuera programmet enligt GPL (version 2 eller senare).  En kopia av GPL finns i filen 'COPYING' som kommer med %s.  %s är kopieringsskyddad av dess bidragsgivare.  Se filen 'COPYRIGHT' för en komplett lista av bidragsgivare.  Vi ger inga garantier för detta program.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:418
 #, c-format
@@ -15050,164 +15031,151 @@ msgstr "Felsökningsinformation"
 msgid "Debugging Information"
 msgstr "Felsökningsinformation"
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:753
+#: ../pidgin/gtkdialogs.c:892
+#: ../pidgin/gtkdialogs.c:973
+msgid "_Name"
+msgstr "_Namn"
+
+#: ../pidgin/gtkdialogs.c:758
+#: ../pidgin/gtkdialogs.c:897
+#: ../pidgin/gtkdialogs.c:978
+msgid "_Account"
+msgstr "_Konto"
+
+#: ../pidgin/gtkdialogs.c:905
 msgid "Get User Info"
 msgstr "Hämta användarinformation"
 
-#: ../pidgin/gtkdialogs.c:908
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Ange användar-ID eller alias för den person vars information du vill visa."
+#: ../pidgin/gtkdialogs.c:907
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
+msgstr "Ange användar-ID eller alias för den person vars information du vill visa."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:997
 msgid "View User Log"
 msgstr "Visa användarlogg"
 
-#: ../pidgin/gtkdialogs.c:1000
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
+#: ../pidgin/gtkdialogs.c:999
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "Ange användar-ID eller alias för den person vars logg du vill visa."
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this contact."
 msgstr "Ange ett alias för denna kontakt."
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1042
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Ange ett alias för %s."
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1044
 msgid "Alias Buddy"
 msgstr "Kompisalias"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Alias Chat"
 msgstr "Chattalias"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1066
 msgid "Enter an alias for this chat."
 msgstr "Ange ett alias för denna chatt."
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1105
 #, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"Du håller på att ta bort kontakten som innehåller %s och %d annan kompis "
-"från din kompislista. Vill du fortsätta?"
-msgstr[1] ""
-"Du håller på att ta bort kontakten som innehåller %s och %d andra kompisar "
-"från din kompislista. Vill du fortsätta?"
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr[0] "Du håller på att ta bort kontakten som innehåller %s och %d annan kompis från din kompislista. Vill du fortsätta?"
+msgstr[1] "Du håller på att ta bort kontakten som innehåller %s och %d andra kompisar från din kompislista. Vill du fortsätta?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1113
 msgid "Remove Contact"
 msgstr "Ta bort kontakt"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1116
 msgid "_Remove Contact"
 msgstr "Ta bo_rt kontakt"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1147
 #, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"Du håller på att slå ihop gruppen %s med gruppen %s. Vill du fortsätta?"
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+msgstr "Du håller på att slå ihop gruppen %s med gruppen %s. Vill du fortsätta?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1154
 msgid "Merge Groups"
 msgstr "Slå ihop grupper"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1157
 msgid "_Merge Groups"
 msgstr "_Slå ihop grupper"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1207
 #, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"Du håller på att ta bort gruppen %s och alla dess medlemmar från din "
-"kompislista. Vill du fortsätta?"
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "Du håller på att ta bort gruppen %s och alla dess medlemmar från din kompislista. Vill du fortsätta?"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1210
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1213
 msgid "_Remove Group"
 msgstr "Ta bo_rt grupp"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1246
 #, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Du håller på att ta bort %s från din kompislista. Vill du fortsätta?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1249
 msgid "Remove Buddy"
 msgstr "Ta bort kompis"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1252
 msgid "_Remove Buddy"
 msgstr "Ta bo_rt kompis"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1273
 #, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr ""
-"Du håller på att ta bort chatten %s från din kompislista. Vill du fortsätta?"
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+msgstr "Du håller på att ta bort chatten %s från din kompislista. Vill du fortsätta?"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1276
 msgid "Remove Chat"
 msgstr "Ta bort chatt"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1279
 msgid "_Remove Chat"
 msgstr "Ta bo_rt chatt"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Högerklicka för fler olästa meddelanden...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Ändra status"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "Visa kompislistan"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "Nytt meddelande..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "Stäng av ljud"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
 msgstr "Blinka vid nya meddelande"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -15233,8 +15201,7 @@ msgid "There is no application configure
 
 #: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
-msgstr ""
-"Det finns ingen applikation konfigurarad att öppna den här typen av fil."
+msgstr "Det finns ingen applikation konfigurarad att öppna den här typen av fil."
 
 #: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
@@ -15289,7 +15256,8 @@ msgstr "_Detaljerad filöverföringsinfo
 msgstr "_Detaljerad filöverföringsinformation"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:833
+#: ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pausa"
 
@@ -15298,44 +15266,45 @@ msgstr "_Ã…teruppta"
 msgid "_Resume"
 msgstr "_Ã…teruppta"
 
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:817
 msgid "Paste as Plain _Text"
 msgstr "Klistra in som ren _text"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:834
+#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "_Reset formatting"
 msgstr "_Rensa formatering"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1361
 msgid "Hyperlink color"
 msgstr "Färg på länkar"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1362
 msgid "Color to draw hyperlinks."
 msgstr "Färg som länkar ska ha."
 
 # "utpekade" var det bästa ord jag kunde komma på.
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1365
 msgid "Hyperlink prelight color"
 msgstr "Färg på utpekade länkar"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1366
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Färg som länkar ska ha när musmarkören är ovanför dem."
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1583
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiera e-postadress"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1595
 msgid "_Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1605
 msgid "_Copy Link Location"
 msgstr "_Kopiera länk"
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3355
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15345,7 +15314,7 @@ msgstr ""
 "\n"
 "Tillbakafaller till PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3358
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15355,7 +15324,7 @@ msgstr ""
 "\n"
 "Tillbakafaller till PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3387
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15366,7 +15335,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3390
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15377,11 +15346,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3468
+#: ../pidgin/gtkimhtml.c:3480
 msgid "Save Image"
 msgstr "Spara bild"
 
-#: ../pidgin/gtkimhtml.c:3522
+#: ../pidgin/gtkimhtml.c:3508
 #, c-format
 msgid "_Save Image..."
 msgstr "_Spara bild..."
@@ -15407,22 +15377,20 @@ msgstr "_Beskrivning"
 msgstr "_Beskrivning"
 
 #: ../pidgin/gtkimhtmltoolbar.c:421
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Ange URL och beskrivning av länken du vill infoga. Beskrivningen är inte "
-"obligatorisk."
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+msgstr "Ange URL och beskrivning av länken du vill infoga. Beskrivningen är inte obligatorisk."
 
 #: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Ange URL för länken du vill infoga."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:430
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "Infoga länk"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:434
+#: ../pidgin/gtkimhtmltoolbar.c:1263
 msgid "_Insert"
 msgstr "_Infoga"
 
@@ -15431,7 +15399,8 @@ msgstr "Kunde inte spara bilden: %s\n"
 msgid "Failed to store image: %s\n"
 msgstr "Kunde inte spara bilden: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:540
+#: ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "Infoga bild"
 
@@ -15444,159 +15413,144 @@ msgstr "Smile!"
 msgid "Smile!"
 msgstr "Smile!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:846
+#: ../pidgin/gtkimhtmltoolbar.c:1220
 msgid "_Font"
 msgstr "_Typsnitt"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
 msgid "Group Items"
-msgstr "Grupp ID"
+msgstr "Gruppera föremål"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
-msgstr ""
+msgstr "Avgruppera föremål"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1088
+#: ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Fet"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+#: ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+#: ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Understruken"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
-msgstr ""
+msgstr "Genomstruket"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Increase Font Size"
-msgstr ""
+msgstr "Öka Typsnittsstorlek"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "Minska Typsnittsstorlek"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1096
-#, fuzzy
 msgid "Font Face"
-msgstr "_Typsnittsansikte"
+msgstr "Typsnitt"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
 msgid "Background Color"
-msgstr "_Bakgrundsfärg"
+msgstr "Bakgrundsfärg"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
 msgid "Foreground Color"
-msgstr "_Förgrundsfärg"
+msgstr "Förgrundsfärg"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
 msgid "Reset Formatting"
-msgstr "_Rensa formatering"
+msgstr "Återställ formatering"
 
+# Jag har inte kommit på något bra att ersätta "IM" med då det står för sig själv. Finns det några bra förslag?
 #: ../pidgin/gtkimhtmltoolbar.c:1103
-#, fuzzy
 msgid "Insert IM Image"
-msgstr "Infoga bild"
+msgstr "Infoga IM bild"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
 msgid "Insert Smiley"
-msgstr "Infoga bild"
+msgstr "Infoga Smiley"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<b>_Bold</b>"
 msgstr "<b>_Fet</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursiv</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<u>_Underline</u>"
 msgstr "<u>_Understruken</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr "<span size='larger'>S_törre</span>"
+msgstr "<span strikethrough='true'>Genomstruket</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>S_törre</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Mindre</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Font face"
 msgstr "_Typsnittsansikte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Foreground _color"
 msgstr "_Förgrundsfärg"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Bac_kground color"
 msgstr "_Bakgrundsfärg"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Smiley"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1271
 msgid "_Image"
 msgstr "B_ild"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1277
 msgid "_Link"
 msgstr "_Länk"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1283
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "_Horisontell linje"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1305
+msgid "_Smile!"
+msgstr "_Smile!"
+
 #: ../pidgin/gtklog.c:293
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
-msgstr ""
-"Är du säker på att du vill permanent ta bort historiken över "
-"konversationerna med %s som påbörjades vid %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
+msgstr "Är du säker på att du vill permanent ta bort historiken över konversationerna med %s som påbörjades vid %s?"
 
 #: ../pidgin/gtklog.c:304
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr ""
-"Är du säker på att du vill permanent ta bort historiken över konversationer "
-"i %s som påbörjades vid %s"
+msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
+msgstr "Är du säker på att du vill permanent ta bort historiken över konversationer i %s som påbörjades vid %s"
 
 #: ../pidgin/gtklog.c:309
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr ""
-"Är du säker på att du vill permanent ta bort systemloggen vilken startades "
-"vid %s?"
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
+msgstr "Är du säker på att du vill permanent ta bort systemloggen vilken startades vid %s?"
 
 #: ../pidgin/gtklog.c:453
 #, c-format
@@ -15613,27 +15567,16 @@ msgstr "%B %Y"
 msgstr "%B %Y"
 
 #: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"Systemhändelser kommer endast att loggas om alternativet \"Logga alla "
-"statusförändringar till systemloggen\" är aktiverat i inställningarna."
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "Systemhändelser kommer endast att loggas om alternativet \"Logga alla statusförändringar till systemloggen\" är aktiverat i inställningarna."
 
 #: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Snabbmeddelanden kommer endast att loggas om alternativet \"Logga alla "
-"snabbmeddelanden\" är aktiverat i inställningarna."
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "Snabbmeddelanden kommer endast att loggas om alternativet \"Logga alla snabbmeddelanden\" är aktiverat i inställningarna."
 
 #: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"Chattar kommer endast att loggas om alternativet \"Logga alla chattar\" är "
-"aktiverat i inställningarna."
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "Chattar kommer endast att loggas om alternativet \"Logga alla chattar\" är aktiverat i inställningarna."
 
 #: ../pidgin/gtklog.c:561
 msgid "No logs were found"
@@ -15648,17 +15591,18 @@ msgstr "Total loggstorlek"
 msgid "Total log size:"
 msgstr "Total loggstorlek"
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:710
 #, c-format
 msgid "Conversations in %s"
 msgstr "Konversationer i %s"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:718
+#: ../pidgin/gtklog.c:785
 #, c-format
 msgid "Conversations with %s"
 msgstr "Konversationer med %s"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:810
 msgid "System Log"
 msgstr "Systemlogg"
 
@@ -15667,9 +15611,8 @@ msgstr "%s %s. Försök med '%s -h' för
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Försök med '%s -h' för mer information.\n"
 
-# FIXME: Ska "FLAGGA" användas istället för "ALTERNATIV" här?
 #: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15681,6 +15624,7 @@ msgid ""
 "  -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"
@@ -15694,12 +15638,13 @@ msgstr ""
 "  -l, --login[=NAMN]  logga in automatiskt (frivilliga argumentet NAMN\n"
 "                      anger kontot/kontona som ska användas, separerade\n"
 "                      med kommatecken)\n"
+"  --display=DISPLAY   X display att använda\n"
 "  -v, --version       visa den nuvarande versionen och avsluta\n"
 
-#: ../pidgin/gtkmain.c:512
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:516
+#, c-format
 msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15717,8 +15662,7 @@ msgstr ""
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"%s har råkat ut för ett segmenteringsfel och försökte att dumpa kärnan till "
-"fil.\n"
+"%s %s har råkat ut för ett segmenteringsfel och försökte att dumpa kärnan till fil.\n"
 "Detta är ett fel i mjukvaran och beror inte på något fel du gjort.\n"
 "\n"
 "Om du kan återskapa krashen, var vänlig att meddela utvecklarna\n"
@@ -15726,20 +15670,18 @@ msgstr ""
 "%ssimpleticket\n"
 "\n"
 "Var god och meddela vad du gjorde vid tillfället\n"
-"och posta backtraceen från kärn-filen. Om du inte vet hur du skapar en "
-"backtrace,\n"
+"och posta en backtrace från kärn-filen. Om du inte vet hur du skapar en backtrace,\n"
 "var god läs instruktionerna på\n"
 "%swiki/GetABacktrace\n"
 "\n"
-"Om du behöver ytterligare hjälp så kan du skicka ett meddelande till "
-"antingen\n"
-"SeanEgn eller LSchiere (via AIM). Hur du får tag på Sean och Luke finner du "
-"på\n"
+"Om du behöver ytterligare hjälp så kan du skicka ett meddelande till antingen\n"
+"SeanEgn eller LSchiere (via AIM). Hur du får tag på Sean och Luke finner du på\n"
 "%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:706
+#: ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -15751,38 +15693,40 @@ msgstr "<span weight=\"bold\" size=\"lar
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-post!!</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:545
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s har %d nytt meddelande."
 msgstr[1] "%s har %d nya meddelanden."
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b> Du har %d nytt epost.</b>"
-msgstr[1] "<b> Du har %d nya epost.</b>"
+#: ../pidgin/gtknotify.c:569
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>Du har %d nytt epost.</b>"
+msgstr[1] "<b>Du har %d nya epost.</b>"
 
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:997
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Kommandot för webbläsaren \"%s\" är ogiltigt."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:999
+#: ../pidgin/gtknotify.c:1011
+#: ../pidgin/gtknotify.c:1024
+#: ../pidgin/gtknotify.c:1152
 msgid "Unable to open URL"
 msgstr "Kan inte öppna URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1009
+#: ../pidgin/gtknotify.c:1022
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Fel vid körning av \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1145
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+#: ../pidgin/gtknotify.c:1153
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Manuellt webbläsarkommando har valts, men inget kommando angivits."
 
 #: ../pidgin/gtkplugin.c:265
@@ -15832,95 +15776,95 @@ msgstr "Välj en fil"
 msgstr "Välj en fil"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "Attackera vem"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "K_ompisnamn:"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "_Ansluter"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "_Kopplar ifrån"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "Blir _frånvarande"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "_Återvänder från frånvaro"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "Blir _inaktiv"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "_Är inte längre inaktiv"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "Börjar _skriva"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Pa_usar under skrivning"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "Slutar s_kriva"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "Skickar ett _meddelande"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "_Öppna ett snabbmeddelandefönster"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "Visa en _rapport"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Skicka ett _meddelande"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "_Kör ett kommando"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Spela upp ett _ljud"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "_Bläddra..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "B_läddra..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "_Förhandsgranska"
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "A_ttackera enbart då min status är frånvarande"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "Ã…te_rkommande"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1258
 msgid "Pounce Target"
 msgstr "Attackera mål"
 
@@ -15938,12 +15882,8 @@ msgstr "Installera tema"
 msgstr "Installera tema"
 
 #: ../pidgin/gtkprefs.c:697
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Välj det tema för grafiska smileys som du vill använda från listan nedanför. "
-"Nya teman kan installeras genom att dra och släppa dem på temalistan."
+msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
+msgstr "Välj det tema för grafiska smileys som du vill använda från listan nedanför. Nya teman kan installeras genom att dra och släppa dem på temalistan."
 
 #: ../pidgin/gtkprefs.c:732
 msgid "Icon"
@@ -15969,7 +15909,8 @@ msgstr "_Dölj nya IM konversationer:"
 msgid "_Hide new IM conversations:"
 msgstr "_Dölj nya IM konversationer:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:2006
 msgid "When away"
 msgstr "Vid frånvaro"
 
@@ -16018,179 +15959,199 @@ msgstr "_Nya konversationer:"
 msgid "N_ew conversations:"
 msgstr "_Nya konversationer:"
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:996
 msgid "Show _formatting on incoming messages"
 msgstr "Visa _formaterade inkommande meddelanden"
 
 #: ../pidgin/gtkprefs.c:998
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Stäng snabbmeddelanden direkt då fliken stängs"
+
+#: ../pidgin/gtkprefs.c:1001
 msgid "Show _detailed information"
 msgstr "Visa _detaljerad information"
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:1003
 msgid "Enable buddy ic_on animation"
 msgstr "Aktivera _animering av kompisikoner"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1010
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Meddela kompisar att du skriver till dem"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1013
 msgid "Highlight _misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1017
 msgid "Use smooth-scrolling"
 msgstr "Använd mjuk rullning"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1020
 msgid "F_lash window when IMs are received"
 msgstr "B_linka med fönstret när meddelanden tagits emot"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1022
 msgid "Minimi_ze new conversation windows"
 msgstr "_Minimera nya konversationsfönstret"
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:1026
 msgid "Font"
 msgstr "Typsnitt"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1028
 msgid "Use document font from _theme"
 msgstr "Använde dokumenttypsnitt från _tema"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1030
 msgid "Use font from _theme"
 msgstr "Använde typsnitt från _tema"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1032
 msgid "Conversation _font:"
 msgstr "Konversations_typsnitt:"
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1046
 msgid "Default Formatting"
 msgstr "Förvald Formatering"
 
-#: ../pidgin/gtkprefs.c:1062
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-msgstr ""
-"Så här kommer texten i ditt utgående meddelande att se ut när du använder "
-"ett protokoll som stödjer formatering."
+#: ../pidgin/gtkprefs.c:1065
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
+msgstr "Så här kommer texten i ditt utgående meddelande att se ut när du använder ett protokoll som stödjer formatering."
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1125
+msgid "Cannot start proxy configuration program."
+msgstr "Kan inte starta konfigurationsprogrammet för proxy."
+
+#: ../pidgin/gtkprefs.c:1144
 msgid "ST_UN server:"
 msgstr "ST_UN-server:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1156
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exempel: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1160
 msgid "_Autodetect IP address"
 msgstr "Känn av IP-adress _automatiskt"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1169
 msgid "Public _IP:"
 msgstr "Publik _IP-adress:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1200
 msgid "Ports"
 msgstr "Portar"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1203
 msgid "_Manually specify range of ports to listen on"
 msgstr "Ange _manuellt vilken portserie som ska användas"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1206
 msgid "_Start port:"
 msgstr "_Startport:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1213
 msgid "_End port:"
 msgstr "_Slutport:"
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1220
 msgid "Proxy Server"
 msgstr "Proxyserver"
 
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1229
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Konfigurationsprogrammet för proxy hittades inte.</b>"
+
+#: ../pidgin/gtkprefs.c:1234
+msgid ""
+"Proxy preferences are configured in\n"
+"GNOME Control Center: Desktop Preferences"
+msgstr ""
+"Proxy-inställningarna konfigureras i\n"
+"GNOMEs kontrollpanel: Skrivbordsinställningar"
+
+#: ../pidgin/gtkprefs.c:1241
+msgid "Configure _Proxy"
+msgstr "Konfigurera _Proxy"
+
+#: ../pidgin/gtkprefs.c:1249
 msgid "No proxy"
 msgstr "Ingen proxy"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1305
 msgid "_User:"
 msgstr "_Användare:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1384
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1385
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1386
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1387
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1388
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1389
 msgid "GNOME Default"
 msgstr "GNOMEs standardval"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1390
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1391
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1392
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1393
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1402
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1455
 msgid "Browser Selection"
 msgstr "Val av webbläsare"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1459
 msgid "_Browser:"
 msgstr "Webb_läsare:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1467
 msgid "_Open link in:"
 msgstr "_Öppna länk i:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1469
 msgid "Browser default"
 msgstr "Förvald webbläsare"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1470
 msgid "Existing window"
 msgstr "Befintligt fönster"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1472
 msgid "New tab"
 msgstr "Ny flik"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1486
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16199,69 +16160,69 @@ msgstr ""
 "_Manuell:\n"
 "(%s för URL)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1527
 msgid "Log _format:"
 msgstr "Logg _format:"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1532
 msgid "Log all _instant messages"
 msgstr "_Logga alla snabbmeddelanden"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1534
 msgid "Log all c_hats"
 msgstr "Logga alla _chattar"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1536
 msgid "Log all _status changes to system log"
 msgstr "Logga alla _statusförändringar till systemloggen"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1686
 msgid "Sound Selection"
 msgstr "Ljudval"
 
-#: ../pidgin/gtkprefs.c:1635
+#: ../pidgin/gtkprefs.c:1696
 #, c-format
 msgid "Quietest"
 msgstr "Tystast"
 
-#: ../pidgin/gtkprefs.c:1637
+#: ../pidgin/gtkprefs.c:1698
 #, c-format
 msgid "Quieter"
 msgstr "Tystare"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1700
 #, c-format
 msgid "Quiet"
 msgstr "Tyst"
 
-#: ../pidgin/gtkprefs.c:1643
+#: ../pidgin/gtkprefs.c:1704
 #, c-format
 msgid "Loud"
 msgstr "Högt"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1706
 #, c-format
 msgid "Louder"
 msgstr "Högre"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1708
 #, c-format
 msgid "Loudest"
 msgstr "Högst"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1774
 msgid "_Method:"
 msgstr "_Metod:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1776
 msgid "Console beep"
 msgstr "Konsolpip"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1783
 msgid "No sounds"
 msgstr "Inga ljud"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1791
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16270,81 +16231,81 @@ msgstr ""
 "Ljud_kommando:\n"
 "(%s för filnamn)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1818
 msgid "Sounds when conversation has _focus"
 msgstr "Ljud när konversationsfönstret har _fokus"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1820
 msgid "Enable sounds:"
 msgstr "Aktivera ljud:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1831
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1911
 msgid "Play"
 msgstr "Spela upp"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1989
 msgid "_Report idle time:"
 msgstr "_Rapportera inaktivitetstid:"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:1994
 msgid "Based on keyboard or mouse use"
 msgstr "Baserat på tangetbord eller musanvändning"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:2003
 msgid "_Auto-reply:"
 msgstr "_Automatiskt svar:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:2007
 msgid "When both away and idle"
 msgstr "Vid både frånvaro och inaktivitet"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:2013
 msgid "Auto-away"
 msgstr "Automatisk frånvaro"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:2015
 msgid "Change status when _idle"
 msgstr "Ändra status vid _inaktivitet"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2019
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuter innan du räknas som inaktiv:"
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:2027
 msgid "Change _status to:"
 msgstr "Ändra _status till:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:2048
 msgid "Status at Startup"
 msgstr "Status vid uppstart"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:2050
 msgid "Use status from last _exit at startup"
 msgstr "A_nvänd samma status som vid senaste avslutet"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:2056
 msgid "Status to a_pply at startup:"
 msgstr "Status att använda vid u_ppstart:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2095
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2097
 msgid "Smiley Themes"
 msgstr "Smileyteman"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2104
 msgid "Browser"
 msgstr "Webbläsare"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2108
 msgid "Status / Idle"
 msgstr "Status / Inaktiv"
 
@@ -16381,7 +16342,8 @@ msgstr "Ställ in spärrlista för:"
 msgid "Set privacy for:"
 msgstr "Ställ in spärrlista för:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:557
+#: ../pidgin/gtkprivacy.c:574
 msgid "Permit User"
 msgstr "Tillåt användare"
 
@@ -16393,7 +16355,8 @@ msgstr "Ange namnet på den användare d
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Ange namnet på den användare du vill ska kunna kontakta dig."
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Tillåt"
 
@@ -16407,7 +16370,8 @@ msgstr "Är du säker på att du vill ti
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Är du säker på att du vill tillåta %s att kontakta dig?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:599
+#: ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr "Blockera användare"
 
@@ -16449,7 +16413,8 @@ msgstr "Välj nytt namn"
 msgid "Choose New Name"
 msgstr "Välj nytt namn"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1650
+#: ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Välj katalog..."
 
@@ -16471,11 +16436,11 @@ msgid "Are you sure you want to delete t
 
 #: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr ""
-"Är du säker på att du vill ta bort den valda sparade statusinställningen?"
+msgstr "Är du säker på att du vill ta bort den valda sparade statusinställningen?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:620
+#: ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr "_Använd"
 
@@ -16491,7 +16456,8 @@ msgstr "_Titel"
 msgid "_Title:"
 msgstr "_Titel"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1178
+#: ../pidgin/gtksavedstatuses.c:1498
 msgid "_Status:"
 msgstr "_Status:"
 
@@ -16505,7 +16471,7 @@ msgstr "Spara & An_vänd"
 msgid "Sa_ve & Use"
 msgstr "Spara & An_vänd"
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1481
 #, c-format
 msgid "Status for %s"
 msgstr "Status för %s"
@@ -16514,95 +16480,82 @@ msgstr "Väntar på nätverksanslutning.
 msgid "Waiting for network connection"
 msgstr "Väntar på nätverksanslutning."
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkutils.c:633
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1400
+#: ../pidgin/gtkutils.c:1423
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Följande fel skedde vis inläsning av %s: %s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1403
+#: ../pidgin/gtkutils.c:1425
 msgid "Failed to load image"
 msgstr "Kunde inte läsa in bilden"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kan inte skicka mappen %s."
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1500
 #, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
-msgstr ""
-"%s kan inte överföra en mapp. Du måste skicka filerna inuti den en och en"
+msgid "%s cannot transfer a folder. You will need to send the files within individually."
+msgstr "%s kan inte överföra en mapp. Du måste skicka filerna inuti den en och en"
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1534
+#: ../pidgin/gtkutils.c:1546
+#: ../pidgin/gtkutils.c:1553
 msgid "You have dragged an image"
 msgstr "Du har dragit och släppt en bild"
 
-#: ../pidgin/gtkutils.c:1532
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Du kan skicka bilden via filöverföring, infoga den i detta meddelande, eller "
-"använda den som kompisikon för denna användare."
+#: ../pidgin/gtkutils.c:1535
+msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
+msgstr "Du kan skicka bilden via filöverföring, infoga den i detta meddelande, eller använda den som kompisikon för denna användare."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1561
 msgid "Set as buddy icon"
 msgstr "Använd som kompisikon"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1562
 msgid "Send image file"
 msgstr "Skicka bildfil"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1562
 msgid "Insert in message"
 msgstr "Infoga i meddelandet"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1547
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Vill du använda den som kompisikon för denna användare?"
 
-#: ../pidgin/gtkutils.c:1551
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
-msgstr ""
-"Du kan skicka bilden via filöverföring eller använda den som kompisikon för "
-"denna användare."
+#: ../pidgin/gtkutils.c:1554
+msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
+msgstr "Du kan skicka bilden via filöverföring eller använda den som kompisikon för denna användare."
 
-#: ../pidgin/gtkutils.c:1552
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"Du kan infoga bilden i detta meddelande eller använda den som kompisikon för "
-"denna användare"
+#: ../pidgin/gtkutils.c:1555
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "Du kan infoga bilden i detta meddelande eller använda den som kompisikon för denna användare"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1614
 msgid "Cannot send launcher"
 msgstr "Kan inte skicka startare"
 
-#: ../pidgin/gtkutils.c:1610
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"Du drog en skrivbordsstartare. Antagligen ville du skicka vad som startaren "
-"pekar på istället för startaren själv."
+#: ../pidgin/gtkutils.c:1614
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr "Du drog en skrivbordsstartare. Antagligen ville du skicka vad som startaren pekar på istället för startaren själv."
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2349
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16613,32 +16566,31 @@ msgstr ""
 "<b>Filstorlek:</b> %s\n"
 "<b>Bildstorlek:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2645
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Filen '%s' är för stor för %s. Försök med en mindre bild.\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2647
 msgid "Icon Error"
 msgstr "Ikonfel"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2648
 msgid "Could not set icon"
 msgstr "Kunde inte ange ikon"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2748
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Kunde inte öppna filen '%s': %s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2797
 #, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Kunde inte öppna bilden '%s' av okänd anledning. Troligtvis är filen trasig."
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "Kunde inte öppna bilden '%s' av okänd anledning. Troligtvis är filen trasig."
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
+#: ../pidgin/gtkwhiteboard.c:754
+#: ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Spara fil"
 
@@ -16690,7 +16642,8 @@ msgstr "Visa statestik"
 msgid "Display Statistics"
 msgstr "Visa statestik"
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:462
+#: ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Trolighet för svar:"
 
@@ -16703,8 +16656,10 @@ msgstr "Maximal svarsväntetid:"
 msgid "Maximum response timeout:"
 msgstr "Maximal svarsväntetid:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817
+#: ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831
+#: ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minuter"
 
@@ -16736,12 +16691,8 @@ msgstr "Modul för förutspå kontaktens
 
 #. *  summary
 #: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"Modulen för förutspå kontaktens tillgänglighet används för att visa "
-"statistisk information för en kompis i användarens kontaktlistan."
+msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
+msgstr "Modulen för förutspå kontaktens tillgänglighet används för att visa statistisk information för en kompis i användarens kontaktlistan."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -16769,12 +16720,8 @@ msgstr "Poängvärden att använda när.
 msgstr "Poängvärden att använda när..."
 
 #: ../pidgin/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-"Kompisen med den <i>största poängen</i> är den kompisen som kommer ha "
-"prioritet i kontakten.\n"
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgstr "Kompisen med den <i>största poängen</i> är den kompisen som kommer ha prioritet i kontakten.\n"
 
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -16790,33 +16737,28 @@ msgstr "Poängvärden att använda för 
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Kontaktprioritet"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Ger möjlighet att kontrollera värdena associerade med olika kompisstatusar."
+#: ../pidgin/plugins/contact_priority.c:191
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "Ger möjlighet att kontrollera värdena associerade med olika kompisstatusar."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Ger möjlighet att ändra poängvärdena på inaktiv/frånvarande/utloggad-status "
-"för kompisar som konkurerar om kontaktprioritet."
+#: ../pidgin/plugins/contact_priority.c:193
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "Ger möjlighet att ändra poängvärdena på inaktiv/frånvarande/utloggad-status för kompisar som konkurerar om kontaktprioritet."
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Konversationsfärger"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+#: ../pidgin/plugins/convcolors.c:25
+#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Ändra färgerna konversationsfönstret"
 
@@ -16840,7 +16782,8 @@ msgstr "Mottagna meddelande"
 msgid "Received Messages"
 msgstr "Mottagna meddelande"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210
+#: ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Välj färg för %s"
@@ -16867,12 +16810,8 @@ msgstr "Konversationsplacering"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 #: ../pidgin/plugins/extplacement.c:105
-msgid ""
-"Note: The preference for \"New conversations\" must be set to \"By "
-"conversation count\"."
-msgstr ""
-"Observera: Inställningen för \"Nya konversationer\" måste vara \"Efter "
-"konversationsantal\"."
+msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgstr "Observera: Inställningen för \"Nya konversationer\" måste vara \"Efter konversationsantal\"."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -16901,12 +16840,8 @@ msgstr "Extra konversationsplaceringsmö
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Begränsa antalet konversationer per fönster med möjlighet att separera "
-"snabbmeddelanden och chattar"
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgstr "Begränsa antalet konversationer per fönster med möjlighet att separera snabbmeddelanden och chattar"
 
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
@@ -16988,12 +16923,8 @@ msgstr "Välj kompis"
 
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Välj en person ur adressboken som du vill lägga till denna kompis till eller "
-"skapa en ny person."
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "Välj en person ur adressboken som du vill lägga till denna kompis till eller skapa en ny person."
 
 #. Add the expander
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:431
@@ -17112,7 +17043,7 @@ msgstr ""
 "\n"
 "<b>Kompiskommentar</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Historik"
 
@@ -17130,11 +17061,10 @@ msgstr "Ikonifiera vid frånvarande"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85
+#: ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
-"Gör din kompislista och dina konversationer till en ikon när du är "
-"frånvarande."
+msgstr "Gör din kompislista och dina konversationer till en ikon när du är frånvarande."
 
 #: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
@@ -17146,14 +17076,14 @@ msgid "Adds a small box to the buddy lis
 
 #: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Lägger till en liten ruta till kompislistan som visar om du fått ny e-post."
+msgstr "Lägger till en liten ruta till kompislistan som visar om du fått ny e-post."
 
 #: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Markeringslinje"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+#: ../pidgin/plugins/markerline.c:25
+#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Rita en linje för att indikera nya meddelanden i en konversation."
 
@@ -17161,21 +17091,19 @@ msgstr "Rita markeringlinje i "
 msgid "Draw Markerline in "
 msgstr "Rita markeringlinje i "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
+#: ../pidgin/plugins/markerline.c:250
+#: ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_Snabbmeddelandefönster"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
+#: ../pidgin/plugins/markerline.c:254
+#: ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_Chattfönster"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"En music messaging session har efterfrågats. Var god tryck på MM-ikonen för "
-"att acceptera."
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr "En music messaging session har efterfrågats. Var god tryck på MM-ikonen för att acceptera."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
@@ -17224,12 +17152,8 @@ msgstr "Music Messaging-modul för gemen
 
 #. *  summary
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"Music Messaging-modulen tillåter ett antal användare att samtidigt arbeta på "
-"ett stycke musik genom att editera ett gemensamt notblad i realtid."
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr "Music Messaging-modulen tillåter ett antal användare att samtidigt arbeta på ett stycke musik genom att editera ett gemensamt notblad i realtid."
 
 #. ---------- "Notify For" ----------
 #: ../pidgin/plugins/notify.c:678
@@ -17318,7 +17242,8 @@ msgstr "Meddelanderapportering"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
+#: ../pidgin/plugins/notify.c:910
+#: ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Erbjuder ett antal olika sätt att få rapporter om olästa meddelanden."
 
@@ -17350,8 +17275,7 @@ msgstr ""
 "Det här är en riktigt häftig insticksmodul som gör en massa saker:\n"
 "- Den visar vem som skrivit programmet när du loggar in\n"
 "- Den vänder på all text som kommer in\n"
-"- Den sänder ett meddelande till personerna på din kompislista direkt när du "
-"loggar in"
+"- Den sänder ett meddelande till personerna på din kompislista direkt när du loggar in"
 
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
@@ -17369,45 +17293,37 @@ msgstr "GtkTreeView horisontal separatio
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horisontal separation"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Konversationsinlägg"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Konversationshistorik"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Loggvisare"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "Förfrågningsdialog"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Rapporteringsdialog"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Välj färg"
 
-#: ../pidgin/plugins/pidginrc.c:300
+#: ../pidgin/plugins/pidginrc.c:294
 #, c-format
 msgid "Select Interface Font"
 msgstr "Välj typsnitt för gränssnittet"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Välj typsnitt för %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "GTK+ Gränssnittstypsnitt"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Textgenvägstema"
 
@@ -17431,37 +17347,38 @@ msgstr "GTK+ Textgenvägstema"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Gränssnittsfärger"
 
 # Osäker: Finns smidigare lösning?
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Storlek på grafiska element"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc filverktyg"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Skriv inställningar till %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Läs om gtkrc-filer"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ temakontroll"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:545
+#: ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Ger tillgång till ofta använda gtkrc-inställningar."
 
@@ -17474,29 +17391,21 @@ msgstr "Låter dig skicka rå indata til
 msgstr "Låter dig skicka rå indata till textbaserade protokoll."
 
 #: ../pidgin/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Låter dig skicka rå indata till textbaserade protokoll (XMPP, MSN, IRC, "
-"TOC). Tryck 'Enter' i inmatningsrutan för att skicka. Titta i "
-"felsökningsfönstret."
+msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "Låter dig skicka rå indata till textbaserade protokoll (XMPP, MSN, IRC, TOC). Tryck 'Enter' i inmatningsrutan för att skicka. Titta i felsökningsfönstret."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
-msgstr ""
-"Du använder version %s av %s. Den aktuella versionen är %s. Du kan hämta den "
-"från <a href=\"%s\">%s</a><hr>"
+msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
+msgstr "Du använder version %s av %s. Den aktuella versionen är %s. Du kan hämta den från <a href=\"%s\">%s</a><hr>"
 
 #: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Förändringslogg:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
+#: ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Ny version tillgänglig"
 
@@ -17519,12 +17428,8 @@ msgstr "Kontrollerar periodiskt om ny ve
 
 #. *  description
 #: ../pidgin/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Kontrollerar periodiskt om ny version har släppts och rapporterar "
-"förändringsloggen till användaren."
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "Kontrollerar periodiskt om ny version har släppts och rapporterar förändringsloggen till användaren."
 
 #: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
@@ -17569,8 +17474,7 @@ msgid "_Exact case match (uncheck for au
 #. Created here so it can be passed to whole_words_button_toggled.
 #: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-"_Exakt skriftlägeskäbslighet (avmarkera för automatisk skriftlägesavkänning)"
+msgstr "_Exakt skriftlägeskäbslighet (avmarkera för automatisk skriftlägesavkänning)"
 
 #: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
@@ -17584,11 +17488,12 @@ msgstr "Tillåt ersättning av det sista
 msgid "Enable replacement of last word on send"
 msgstr "Tillåt ersättning av det sista ordet vid sändning."
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "Textersättning"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2374
+#: ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Ersätter text i utgående meddelanden enligt dina egna regler."
 
@@ -17598,7 +17503,8 @@ msgstr "Ersätter text i utgående medde
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74
+#: ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Kompistickare"
 
@@ -17606,7 +17512,8 @@ msgstr "Kompistickare"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "En horisontellt rullande version av kompislistan."
 
@@ -17686,12 +17593,8 @@ msgstr "Personifiera tidsformatsstämpel
 
 #. *  description
 #: ../pidgin/plugins/timestamp_format.c:156
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Denna modul tillåter användaren att personifiera konversationernas och "
-"loggarnas tidsstämpelformat."
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "Denna modul tillåter användaren att personifiera konversationernas och loggarnas tidsstämpelformat."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
@@ -17754,13 +17657,11 @@ msgid ""
 #. *  description
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Denna insticksmodul gör det möjligt att använda alfagenomskinlighet på "
-"konversationsfönster och kompislistan.\n"
+"Denna insticksmodul gör det möjligt att använda alfagenomskinlighet på konversationsfönster och kompislistan.\n"
 "\n"
 "* Observera: Denna insticksmodul kräver Win2000 eller senare."
 
@@ -17805,13 +17706,10 @@ msgstr "Inställningar specifika för Pi
 msgstr "Inställningar specifika för Pidgin i Windows."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-"Tillhandahåller insällningar specifika för Pidgion i Windows såsom dockning "
-"av kompislistan."
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr "Tillhandahåller insällningar specifika för Pidgion i Windows såsom dockning av kompislistan."
 
-#: ../pidgin/plugins/xmppconsole.c:667
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Loggade ut.</font>"
 
@@ -17821,174 +17719,84 @@ msgstr "<font color='#777777'>Loggade ut
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749
+#: ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "XMPP Konsoll"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Konto: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Inte ansluten till XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Infoga en <iq/> strof."
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Infoga en <presence/> strof."
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Infoga en <message/> strof."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Skicka och ta emot råa XMPP strofer."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Denna modul 'r användbar vid felsökning av XMPP serverar och klienter."
+msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter."
 
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Visa frånkopplade kompisar"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Port"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Efter status"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Efter loggstorlek"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Kan inte ansluta till servern."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Välj Notes adressbok"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Nuvarande markör"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger Protokoll-insticksmodul"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Misslyckande: Autentisering misslyckades"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s skickade just en vibb!"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Okänt fel"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Kan inte ansluta till servern."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s har bytt status från %s till %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s är nu %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s är inte längre %s"
-
-# src/sidebar.c:103
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Meddelande:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Skicka fil"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Lägg till kompisattack..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Inte tillåtet vid ej ansluten"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Inte tillåtet vid ej ansluten"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Lägg till kompis"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Lägg till chatt"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persiska"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Konton"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Konto:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Skicka till"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Smile!"
-
+#~ msgid "Sort by status"
+#~ msgstr "Sortera efter status"
+#~ msgid "Sort alphabetically"
+#~ msgstr "Sortera alfabetiskt"
+#~ msgid "Sort by log size"
+#~ msgstr "Sortera efter loggstorlek"
+#~ msgid "Has you"
+#~ msgstr "Har dig"
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "Insticksmodul för MSN-Protokollet"
+#~ msgid "Add Buddy _Pounce"
+#~ msgstr "Lägg till kom_pisattack"
+#~ msgid "Add a _Buddy"
+#~ msgstr "_Lägg till kompis"
+#~ msgid "Add a C_hat"
+#~ msgstr "Lägg till c_hatt"
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "/Verktyg/Lägg till\\/Redigera"
+#~ msgid "_Send To"
+#~ msgstr "_Skicka till"
+#~ msgid "_Smiley"
+#~ msgstr "_Smiley"
+#~ msgid "nudged"
+#~ msgstr "vibbad"
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Du har just sänt en vibb!"
-
-#~ msgid "Would like to add him?"
-#~ msgstr "Vill du lägga till honom?"
-
 #~ msgid "%s just sent you a Buzz!"
 #~ msgstr "%s skickade just en vibb!"
-
 #~ msgid "You have just sent a Buzz!"
 #~ msgstr "Du har just sänt en vibb!"
+#~ msgid "buzzed"
+#~ msgstr "surrad"
+#~ msgid "Attention! %s %s."
+#~ msgstr "Lystring! %s %s."
+#~ msgid "Attention!"
+#~ msgstr "Lystring!"
+#~ msgid "Attention! You have been %s."
+#~ msgstr "Lystring! Du har blivit %s."
+#~ msgid "Conversation History"
+#~ msgstr "Konversationshistorik"
+#~ msgid "Log Viewer"
+#~ msgstr "Loggvisare"
 
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/Alternativ/Visa kompis_ikoner"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/Alternativ/Visa kompisikoner"
-
-#~ msgid "Norwegian"
-#~ msgstr "Norska"
-
-#~ msgid "_Bold"
-#~ msgstr "_Fet"
-
-#~ msgid "_Larger"
-#~ msgstr "_Större"


More information about the Commits mailing list