diff po/eu.po @ 20263:15ad77c653ad

I ran stats.pl to get updated po files. This was necessary to pull some old strings back into use, now that we've gone back in time.
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 18:19:24 +0000
parents 60485bc8ff7f
children e4719768af06
line wrap: on
line diff
--- a/po/eu.po	Fri Sep 28 17:11:39 2007 +0000
+++ b/po/eu.po	Fri Sep 28 18:19:24 2007 +0000
@@ -250,7 +250,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-25 01:15-0700\n"
+"POT-Creation-Date: 2007-09-28 13:16-0500\n"
 "PO-Revision-Date: 2006-05-25 23:48+0200\n"
 "Last-Translator: tamax\n"
 "Language-Team:  <en@li.org>\n"
@@ -296,7 +296,7 @@
 "                      kontua(k) erabiltzeko, koma batez bereiztu)\n"
 "  -v, --version       Erakutsi egungo bertsioa eta irten\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -309,7 +309,7 @@
 #: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2032
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1515
@@ -345,8 +345,8 @@
 msgid "(You probably forgot to '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 "Aldatu kontua"
 
@@ -377,7 +377,7 @@
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntcertmgr.c:91
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
 #: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
 #: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
 #: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
@@ -387,8 +387,8 @@
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2416
-#: ../libpurple/protocols/jabber/buddy.c:2452
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2449
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:1008
 #: ../libpurple/protocols/jabber/jabber.c:1017
@@ -397,10 +397,10 @@
 #: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/msn/msn.c:362
-#: ../libpurple/protocols/oscar/oscar.c:6092
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6094
 #: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -435,16 +435,16 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:767
-#: ../pidgin/gtkdialogs.c:906 ../pidgin/gtkdialogs.c:998
-#: ../pidgin/gtkdialogs.c:1018 ../pidgin/gtkdialogs.c:1042
-#: ../pidgin/gtkdialogs.c:1064 ../pidgin/gtkdialogs.c:1112
-#: ../pidgin/gtkdialogs.c:1153 ../pidgin/gtkdialogs.c:1209
-#: ../pidgin/gtkdialogs.c:1248 ../pidgin/gtkdialogs.c:1275
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:769
+#: ../pidgin/gtkdialogs.c:908 ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1044
+#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1155 ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1250 ../pidgin/gtkdialogs.c:1277
 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
 #: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
@@ -486,7 +486,7 @@
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
 #: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Kontuak"
@@ -498,16 +498,15 @@
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2305
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:383 ../finch/gntpounce.c:713
-#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
-#: ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
+#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:6266 ../pidgin/gtkconv.c:1712
+#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
 #: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Gehitu"
@@ -571,19 +570,19 @@
 msgid "Error adding buddy"
 msgstr "Errorea %s irakurtzean"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2884
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
 #: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Pantaila-izena"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1507
+#: ../libpurple/protocols/msn/msn.c:1395
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1017
-#: ../pidgin/gtkdialogs.c:1041 ../pidgin/gtkdialogs.c:1063
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1043 ../pidgin/gtkdialogs.c:1065
 #: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Ezizena"
@@ -596,7 +595,7 @@
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
 #: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3206 ../pidgin/gtknotify.c:503
+#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
 #: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Kontua"
@@ -610,7 +609,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3342 ../pidgin/gtkblist.c:5772
+#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Gehitu laguna"
@@ -620,15 +619,15 @@
 msgid "Please enter buddy information."
 msgstr "Adierazi lagun bat alerta emateko."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
 msgid "Chats"
 msgstr "Berriketak"
 
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
 #: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1694 ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
 #: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -641,7 +640,7 @@
 msgid "Auto-join"
 msgstr "_Automatikoki sartu"
 
-#: ../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 "Gehitu berriketa"
 
@@ -666,7 +665,7 @@
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6263
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
 msgid "Add Group"
 msgstr "Gehitu taldea"
 
@@ -703,7 +702,7 @@
 msgid "Retrieving..."
 msgstr "Erabiltzailea idazten ari da..."
 
-#: ../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"
@@ -715,10 +714,10 @@
 msgstr "Gehitu lagun-_alerta"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1607
 msgid "Send File"
 msgstr "Bidali fitxategia"
 
@@ -766,14 +765,14 @@
 msgstr "Isteko konfirmazioa"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1709 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Kendu"
 
 #. 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 "Lagunen zerrenda"
@@ -793,15 +792,15 @@
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/jabber/buddy.c:2214
+#: ../libpurple/protocols/jabber/buddy.c:2396
 #: ../libpurple/protocols/jabber/jabber.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1544
 #: ../libpurple/protocols/jabber/jabber.c:1567
 #: ../libpurple/protocols/jabber/jabber.c:1590
 #: ../libpurple/protocols/jabber/jabber.c:1613
 #: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1515 ../libpurple/protocols/msn/msn.c:1697
+#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -811,7 +810,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3230
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
 msgid "Nickname"
 msgstr "Goitizena"
 
@@ -820,12 +819,12 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2830
-#: ../libpurple/protocols/oscar/oscar.c:2908
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
-#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
+#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
 msgid "Idle"
 msgstr "Ez-aktibo"
 
@@ -855,36 +854,36 @@
 "\n"
 "<b>Azken aldiz ikusia:</b> duela %s"
 
-#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Berria..."
 
-#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Gordeta..."
 
-#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Plugin-ak"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:748
-#: ../pidgin/gtkdialogs.c:887 ../pidgin/gtkdialogs.c:968
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:750
+#: ../pidgin/gtkdialogs.c:889 ../pidgin/gtkdialogs.c:970
 msgid "_Name"
 msgstr "_Izena"
 
-#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:753
-#: ../pidgin/gtkdialogs.c:892 ../pidgin/gtkdialogs.c:973
+#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:755
+#: ../pidgin/gtkdialogs.c:894 ../pidgin/gtkdialogs.c:975
 msgid "_Account"
 msgstr "K_ontua"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:761
+#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:763
 msgid "New Instant Message"
 msgstr "Berehalako mezu berria"
 
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:763
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:765
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Idatzi BM bidali nahi diozun pertsonaren pantaila-izena edo ezizena."
@@ -892,15 +891,15 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
 #: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
 #: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
 #: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
 #: ../libpurple/protocols/jabber/jabber.c:1736
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:289 ../libpurple/protocols/msn/msn.c:306
-#: ../libpurple/protocols/msn/msn.c:323 ../libpurple/protocols/msn/msn.c:340
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6093
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -917,56 +916,48 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
-#: ../libpurple/protocols/yahoo/yahoo.c:3507 ../pidgin/gtkblist.c:4321
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:766
-#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:768
+#: ../pidgin/gtkdialogs.c:907 ../pidgin/gtkdialogs.c:999
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "Ados"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2261 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr "Aukerak"
 
-#: ../finch/gntblist.c:2267
+#: ../finch/gntblist.c:2247
 #, fuzzy
 msgid "Send IM..."
 msgstr "Gordeta..."
 
-#: ../finch/gntblist.c:2271
-msgid "Show"
-msgstr ""
-
-#: ../finch/gntblist.c:2276
-#, fuzzy
-msgid "Empty groups"
+#: ../finch/gntblist.c:2251
+#, fuzzy
+msgid "Show empty groups"
 msgstr "Taldearen arabera"
 
-#: ../finch/gntblist.c:2282
-#, fuzzy
-msgid "Offline buddies"
-msgstr "Bilatu lagunak"
-
-#: ../finch/gntblist.c:2288
-#, fuzzy
-msgid "Sort"
-msgstr "Ataka"
-
-#: ../finch/gntblist.c:2293
-#, fuzzy
-msgid "By Status"
-msgstr "Egoeraren arabera"
-
-#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106
-msgid "Alphabetically"
+#: ../finch/gntblist.c:2257
+#, fuzzy
+msgid "Show offline buddies"
+msgstr "/Lagunak/Erakutsi Lineaz kanpoko lagunak"
+
+#: ../finch/gntblist.c:2263
+#, fuzzy
+msgid "Sort by status"
+msgstr "Egoera"
+
+#: ../finch/gntblist.c:2267
+#, fuzzy
+msgid "Sort alphabetically"
 msgstr "Alfabetikoki "
 
-#: ../finch/gntblist.c:2301
-#, fuzzy
-msgid "By Log Size"
+#: ../finch/gntblist.c:2271
+#, fuzzy
+msgid "Sort by log size"
 msgstr "Egunkari-tamainaren arabera"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
@@ -1059,7 +1050,7 @@
 msgid "Hostname"
 msgstr "Ostalari-Izena"
 
-#: ../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 "Informazioa"
@@ -1067,24 +1058,24 @@
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
 #: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:406
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
 #: ../libpurple/protocols/silc/util.c:382
 #: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Itxi"
 
-#: ../finch/gntconn.c:125
+#: ../finch/gntconn.c:124
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s: %s (%s)"
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:127
 #, fuzzy, c-format
 msgid "%s disconnected."
 msgstr "%s Deskonektatuta."
 
-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:128
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -1096,7 +1087,7 @@
 " Gaim ez da saiatuko kontua berriz konektatzen errorea konpondu  eta kontua "
 "ahalbidetu arte."
 
-#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323
+#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
 msgid "Re-enable Account"
 msgstr "Ber ahalbidetu kontua"
 
@@ -1104,24 +1095,24 @@
 msgid "No such command."
 msgstr "Komando hori ez dago."
 
-#: ../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 ""
 "Sintaxi errorea: argumentu kopuru okerra idatzi duzu komando horrentzako."
 
-#: ../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 "Komandoak huts egin du arrazoi ezezagunen batengatik."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:543
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
 msgid "That command only works in chats, not IMs."
 msgstr "Komando horrek Berriketan bakarrik funtzionatzen du, ez IMen "
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:546
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
 msgid "That command only works in IMs, not chats."
 msgstr "Komando horrek IMen bakarrik funtzionatzen du, ez Berriketan "
 
-#: ../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 "Komando horrek ez du protokolo honekin lanik egiten"
 
@@ -1140,7 +1131,7 @@
 msgid "%s [%s]"
 msgstr ""
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1152,73 +1143,73 @@
 msgid "You have left this chat."
 msgstr "Berriketan ari zara"
 
-#: ../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 ""
 "Egunkaria martxan jarri da. Solasaldi honetako etorkizuneko mezuak egunkaria "
 "gordeko dira."
 
-#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423
+#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Egunkaria gelditua. Solasaldi honetako mezuak etorkizunean ez dira "
 "egunkarian gordeko."
 
-#: ../finch/gntconv.c:469
+#: ../finch/gntconv.c:442
 #, fuzzy
 msgid "Send To"
 msgstr "_Bidali honi:"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:486
 #, fuzzy
 msgid "Conversation"
 msgstr "Solasaldiak"
 
-#: ../finch/gntconv.c:519
+#: ../finch/gntconv.c:492
 #, fuzzy
 msgid "Clear Scrollback"
 msgstr "/Solasaldia/Garb_itu Scrollback"
 
-#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
 #, fuzzy
 msgid "Show Timestamps"
 msgstr "Ordu-zigiluak"
 
-#: ../finch/gntconv.c:539
+#: ../finch/gntconv.c:512
 #, fuzzy
 msgid "Add Buddy Pounce..."
 msgstr "Gehitu lagun-_alerta"
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:527
 #, fuzzy
 msgid "Enable Logging"
 msgstr "/Aukerak/Gaitu egunkaria"
 
-#: ../finch/gntconv.c:560
+#: ../finch/gntconv.c:533
 #, fuzzy
 msgid "Enable Sounds"
 msgstr "/Aukerak/Gaitu soinuak"
 
-#: ../finch/gntconv.c:766
+#: ../finch/gntconv.c:739
 #, fuzzy
 msgid "<AUTO-REPLY> "
 msgstr "(%s) %s <ERANTZUN AUTOMATIKOA>: %s\n"
 
 #. 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 "Onartutako arazketa aukerak: bertsioa"
 
-#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422
+#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr "Komando hori ez dago (testuinguru honetan)"
 
-#: ../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"
@@ -1226,7 +1217,7 @@
 "Erabili \"/help &lt;komandoa&gt;\" komando zehatz baten laguntza ikusteko.\n"
 "Testuinguru honetan honako komandoak daude eskuragarri:\n"
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7642
+#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1234,51 +1225,51 @@
 "say &lt;mezua&gt;:  bidali mezua modu normalean, komandorik erabiliko ez "
 "bazenu bezala."
 
-#: ../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;ekintza&gt;:  bidali IRC estiloko ekintza lagun bati edo berriketara."
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7648
+#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;aukera&gt;: bidali hainbat arazketako informazio uneko solasaldira."
 
-#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651
+#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 msgid "clear: Clears the conversation scrollback."
 msgstr "garbitu: Garbitu sosaldiaren scrollback"
 
-#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komandoa&gt;: komando zehatz bati dagokion laguntza."
 
-#: ../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 ""
 
@@ -1344,17 +1335,17 @@
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
 #: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:596 ../libpurple/protocols/msn/msn.c:603
-#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/msn/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2696
-#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:2700
+#: ../libpurple/protocols/oscar/oscar.c:3780
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3247 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
+#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
 #: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Egoera"
@@ -1401,7 +1392,7 @@
 msgid "Finished"
 msgstr "Amaituta"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transferitzen"
 
@@ -1414,12 +1405,12 @@
 msgid "You have mail!"
 msgstr ""
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:510
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
 #, fuzzy
 msgid "Sender"
 msgstr "Sexua"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:517
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
 msgid "Subject"
 msgstr "Gaia"
 
@@ -1444,25 +1435,25 @@
 msgid "Buddy Information"
 msgstr "Lagunaren datuak"
 
-#: ../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 "Konektatu"
 
-#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649
+#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
 msgstr "BM"
 
-#: ../finch/gntnotify.c:392
+#: ../finch/gntnotify.c:389
 #, fuzzy
 msgid "Join"
 msgstr "_Sartu"
 
-#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Gonbidatu"
 
-#: ../finch/gntnotify.c:398
+#: ../finch/gntnotify.c:395
 #, fuzzy
 msgid "(none)"
 msgstr "(ez dago izenik)"
@@ -1515,7 +1506,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2069
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
 msgid "Preferences"
 msgstr "Hobespenak"
 
@@ -1718,6 +1709,7 @@
 msgstr "%s bidali mezu bat bidali dizu  (%s)"
 
 #: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Alerta emateko gertaera ezezaguna. Eman honen berri!"
 
@@ -1726,12 +1718,12 @@
 msgid "Based on keyboard use"
 msgstr "Teklatu edo saguaren erabilpenean oinarrituta"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
 msgid "From last sent message"
 msgstr "Bidalitako azkeneko mezutik"
 
 #: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Inoiz ez"
@@ -1791,12 +1783,12 @@
 msgstr "_Egoera  aldatu hona:"
 
 #. 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 "Solasaldiak"
 
-#: ../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 "Egunkaria"
 
@@ -1865,8 +1857,8 @@
 msgid "GStreamer failed to initialize."
 msgstr "desenpetatzerakoan huts egin du."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
-#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
+#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
 msgid "(default)"
 msgstr ""
 
@@ -1885,7 +1877,7 @@
 msgid "Profiles"
 msgstr "MSN profila"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
 msgid "Automatic"
 msgstr "Automatikoa"
 
@@ -1894,7 +1886,7 @@
 msgid "Console Beep"
 msgstr "Kontsolaren soinu-seinalea"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
 msgid "Command"
 msgstr "Komandoa"
 
@@ -1903,7 +1895,7 @@
 msgid "No Sound"
 msgstr "Soinurik ez"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
 msgid "Sound Method"
 msgstr "Soinu-metodoa"
 
@@ -1922,7 +1914,7 @@
 "(%s fitxategi-izena)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
 msgid "Sound Options"
 msgstr "Soinu-aukerak"
 
@@ -1932,18 +1924,18 @@
 msgstr "_Solasaldiak fokua duenean"
 
 #: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Beti"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 #, fuzzy
 msgid "Only when available"
 msgstr "Ez erabilgarri"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
 #, fuzzy
 msgid "Only when not available"
 msgstr "Ez dago erabilgarri"
@@ -1954,11 +1946,11 @@
 msgstr "Bolumena:"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
 msgid "Sound Events"
 msgstr "Soinu-gertaerak"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
 msgid "Event"
 msgstr "Gertaera"
 
@@ -1967,15 +1959,15 @@
 msgid "File"
 msgstr "Iragazgailua"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
 msgid "Test"
 msgstr "Probatu"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
 msgid "Reset"
 msgstr "Berrezarri"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
 msgid "Choose..."
 msgstr "Aukeratu..."
 
@@ -1996,7 +1988,7 @@
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Lanpostua"
@@ -2027,20 +2019,17 @@
 #: ../libpurple/protocols/jabber/jabber.c:1601
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/msn/msn.c:634 ../libpurple/protocols/msn/msn.c:641
-#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/msn.c:655
-#: ../libpurple/protocols/msn/msn.c:661 ../libpurple/protocols/msn/msn.c:667
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/novell/novell.c:2946
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/oscar/oscar.c:5552
-#: ../libpurple/protocols/oscar/oscar.c:5770
-#: ../libpurple/protocols/oscar/oscar.c:5784
-#: ../libpurple/protocols/oscar/oscar.c:5800
-#: ../libpurple/protocols/oscar/oscar.c:5807
-#: ../libpurple/protocols/oscar/oscar.c:5814
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5554
+#: ../libpurple/protocols/oscar/oscar.c:5772
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5802
+#: ../libpurple/protocols/oscar/oscar.c:5809
+#: ../libpurple/protocols/oscar/oscar.c:5816
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -2048,8 +2037,8 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3750
-#: ../libpurple/protocols/yahoo/yahoo.c:3756
+#: ../libpurple/protocols/yahoo/yahoo.c:3751
+#: ../libpurple/protocols/yahoo/yahoo.c:3757
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
@@ -2114,7 +2103,7 @@
 msgid "Certificates"
 msgstr ""
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
 msgid "Sounds"
 msgstr "Soinuak"
 
@@ -2222,16 +2211,16 @@
 msgid "Toaster plugin"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:123
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Solasaldia honekin  %s  hemen %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:150
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Historia Plugin-a logeatzea eskatzen du"
 
-#: ../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"
@@ -2248,11 +2237,11 @@
 msgid "GntHistory"
 msgstr "Historia"
 
-#: ../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 "Azkenaldiko solasaldiak erakusten ditu solasaldi berrietan."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:195
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -2264,15 +2253,16 @@
 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 ""
 
@@ -2304,7 +2294,7 @@
 msgstr "%s - protokoloaren plugin-a falta da"
 
 #: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4318
+#: ../pidgin/gtkblist.c:4036
 msgid "Connection Error"
 msgstr "Konexio-errorea"
 
@@ -2349,16 +2339,16 @@
 
 #: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2030
-#: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/jabber/buddy.c:2027
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../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"
@@ -2498,7 +2488,7 @@
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1882
+#: ../libpurple/certificate.c:1881
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2510,7 +2500,7 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1891
+#: ../libpurple/certificate.c:1890
 #, fuzzy
 msgid "Certificate Information"
 msgstr "Zerbitzariaren informazioa"
@@ -2535,9 +2525,9 @@
 msgstr "+++%s irten egin da"
 
 #: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2337
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:361
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
@@ -2657,6 +2647,7 @@
 msgstr "Errorea socket-etik irakurtzean:%s."
 
 #: ../libpurple/dnsquery.c:578
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr ""
 
@@ -2766,6 +2757,7 @@
 msgstr "%s fitxategiaren transferentzia osatu da"
 
 #: ../libpurple/ft.c:685
+#, c-format
 msgid "File transfer complete"
 msgstr "Fitxategi-transferentzien osatuta"
 
@@ -2775,6 +2767,7 @@
 msgstr "%s(r)en transferentzia bertan behera utzi duzu"
 
 #: ../libpurple/ft.c:1108
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Fitxategi-transferentzia bertan behera utzi da"
 
@@ -3015,6 +3008,7 @@
 msgstr ""
 
 #: ../libpurple/plugin.c:380
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -3102,13 +3096,13 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2229
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5884
-#: ../libpurple/protocols/oscar/oscar.c:5939
-#: ../libpurple/protocols/oscar/oscar.c:6165
-#: ../libpurple/protocols/oscar/oscar.c:6235 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
+#: ../libpurple/protocols/oscar/oscar.c:2233
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:5941
+#: ../libpurple/protocols/oscar/oscar.c:6167
+#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398
 msgid "_Cancel"
 msgstr "_Utzi"
 
@@ -3149,8 +3143,8 @@
 "(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
 msgid "Notes"
 msgstr "Oharra "
 
@@ -3593,9 +3587,9 @@
 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/silc10/buddy.c:314
@@ -3605,9 +3599,9 @@
 msgstr "Bai"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:622
-#: ../libpurple/protocols/novell/novell.c:1920
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
@@ -3718,7 +3712,7 @@
 msgstr "Gauza gehienak ondo dabiltzan begiratzen du."
 
 #. 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 ""
@@ -3729,7 +3723,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3737,8 +3731,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
 msgid "Provides SSL support through GNUTLS."
 msgstr "SSL euskarria ematen du GNUTLSekin."
 
@@ -3843,15 +3837,15 @@
 "Lagunak alde egin duen edo itzuli den, edo inaktibo edo aktibo dagoen "
 "jakinarazten du solasaldi-leihoan."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl plugin-aren kargatzailea"
 
-#: ../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 "Tcl plugin-ak kargatzeko aukera ematen du"
 
-#: ../libpurple/plugins/tcl/tcl.c:509
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3888,7 +3882,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/jabber/buddy.c:2216
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -4079,8 +4073,8 @@
 #: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
 #: ../libpurple/protocols/gg/gg.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3785
-#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3802
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Herria"
@@ -4089,9 +4083,9 @@
 msgid "Year of birth"
 msgstr "Jaiotze urtea"
 
-#: ../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
@@ -4104,14 +4098,14 @@
 msgstr "Gizonezko edo Emakumezkoa"
 
 #: ../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 "Gizonezkoa"
 
 #: ../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"
@@ -4172,25 +4166,25 @@
 msgstr "Gehitu berriketara ..."
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/jabber/buddy.c:2031
+#: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5604
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Lineaz kanpo"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/jabber/buddy.c:2033
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2821
+#: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3100 ../libpurple/status.c:155
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
 #: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Erabilgarri"
@@ -4200,31 +4194,32 @@
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2824
+#: ../libpurple/protocols/jabber/buddy.c:2037
+#: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4543
-#: ../libpurple/protocols/oscar/oscar.c:5630
+#: ../libpurple/protocols/oscar/oscar.c:4547
+#: ../libpurple/protocols/oscar/oscar.c:5632
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3652
-#: ../libpurple/protocols/yahoo/yahoo.c:3726 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1941
+#: ../libpurple/protocols/yahoo/yahoo.c:3653
+#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
 #: ../pidgin/gtkstatusbox.c:1058
+#, c-format
 msgid "Away"
 msgstr "Kanpoan"
 
 #: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2695
-#: ../libpurple/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/oscar/oscar.c:2699
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "UIN"
 msgstr "UINa"
 
 #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2389
-#: ../libpurple/protocols/oscar/oscar.c:3706
+#: ../libpurple/protocols/jabber/buddy.c:2210
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -4235,7 +4230,7 @@
 msgstr "Jaiotza-urtea"
 
 #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3907
+#: ../libpurple/protocols/oscar/oscar.c:3911
 msgid "Unable to display the search results."
 msgstr "Ezin izan da aurkitutakoaren emaitza azaldu."
 
@@ -4280,7 +4275,7 @@
 msgid "Connection failed."
 msgstr "Konexioak huts egin du "
 
-#: ../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 "Blokeatuta"
 
@@ -4419,7 +4414,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2354
+#: ../libpurple/protocols/myspace/myspace.c:2356
 msgid "Server has disconnected"
 msgstr "Zerbitzaria deskonektatu da"
 
@@ -4445,14 +4440,14 @@
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:384
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
+#: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1287
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1718
-#: ../libpurple/protocols/yahoo/yahoo.c:2938
+#: ../libpurple/protocols/simple/simple.c:1716
+#: ../libpurple/protocols/yahoo/yahoo.c:2939
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Konektatzen"
@@ -4466,20 +4461,20 @@
 #. TODO: try other ports if in auto mode, then save
 #. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:318
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1633
+#: ../libpurple/protocols/simple/simple.c:1631
 msgid "Couldn't create socket"
 msgstr "Ezin izan da socket-a sortu"
 
 #: ../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 "Ezin izan da ostalariarekin konektatu"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2350
+#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr "Irakurketa-errorea"
 
@@ -4519,22 +4514,22 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:6669
+#: ../libpurple/protocols/msn/msn.c:2185
+#: ../libpurple/protocols/oscar/oscar.c:6671
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1898
+#: ../libpurple/protocols/simple/simple.c:1896
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Zerbitzaria"
 
 #. 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
@@ -4606,7 +4601,7 @@
 msgstr " <i>(identifikatuta)</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"
@@ -4890,7 +4885,7 @@
 msgstr "names [kanala]:  zerrendatu kanalean dauden uneko erabiltzaileak."
 
 #: ../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;goitizen berria&gt;:  aldatu zure goitizena"
 
@@ -5034,7 +5029,7 @@
 msgid "Ad-Hoc Command Failed"
 msgstr "Komandoa desgaitu da"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:176
+#: ../libpurple/protocols/jabber/adhoccommands.c:173
 #, fuzzy
 msgid "execute"
 msgstr "Ez zen espero"
@@ -5183,15 +5178,15 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1768
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/oscar/oscar.c:3749
 msgid "Birthday"
 msgstr "Urtebetetzea"
 
 #: ../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 "Azalpena"
@@ -5507,7 +5502,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2902
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Capabilities"
 msgstr "Gaitasunak"
 
@@ -5534,8 +5529,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
 #: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3784
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/oscar/oscar.c:3801
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5554,117 +5549,118 @@
 msgid "Logo"
 msgstr "Logotipoa"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr "Desezkutatu honengandik"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr "Ezkutatu aldi baterako honengandik"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr "Ezeztatu presentzia-jakinarazpena"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr "Eskatu baimena (berriro)"
 
 #. 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 "Harpidetza kendu"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
+#: ../libpurple/protocols/jabber/buddy.c:1985
 #, fuzzy
 msgid "Log In"
 msgstr "Egunkaria"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:1989
 #, fuzzy
 msgid "Log Out"
 msgstr "Saioa hasteko aukerak"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/buddy.c:2035
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Berritsu"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr "Kanpoan luzarorako"
 
-#: ../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 "Ez molestatu"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/protocols/jabber/buddy.c:2208
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2394
-#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/jabber/buddy.c:2212
+#: ../libpurple/protocols/jabber/buddy.c:2391
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "Last Name"
 msgstr "Deitura"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr "Zure bilaketaren ondoriozko emaitzak hauek dira"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2322
+#: ../libpurple/protocols/jabber/buddy.c:2319
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2342
+#: ../libpurple/protocols/jabber/buddy.c:2339
 #, fuzzy
 msgid "Directory Query Failed"
 msgstr "Zuzeneko konexioak huts egin du"
 
-#: ../libpurple/protocols/jabber/buddy.c:2343
+#: ../libpurple/protocols/jabber/buddy.c:2340
 #, fuzzy
 msgid "Could not query the directory server."
 msgstr "Ezin izan da fitxategi-transferentzia hasi"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2377
+#: ../libpurple/protocols/jabber/buddy.c:2374
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Zerbitzariaren aginduak:%s"
 
-#: ../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 ""
 "Bete ezazu bat edo eremu gehiago edozein Jabber erabiltzaileren "
 "topaketarako. "
 
-#: ../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 "Helbide elektronikoa"
 
-#: ../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 "Erabiltzailea bilatu"
 
 #. "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
@@ -5676,24 +5672,24 @@
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2427
 msgid "Invalid Directory"
 msgstr "Direktorio baliogabea"
 
-#: ../libpurple/protocols/jabber/buddy.c:2447
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Enter a User Directory"
 msgstr "Sartu erabiltzailearen direktorioa"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Select a user directory to search"
 msgstr "Aukeratu erabiltzaile direktorioa bilaketarako"
 
-#: ../libpurple/protocols/jabber/buddy.c:2451
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Search Directory"
 msgstr "Bilatu direktorioa"
 
 #: ../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 "_Gela:"
@@ -5804,9 +5800,9 @@
 msgstr "Irakurketa-errorea"
 
 #: ../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
 #, fuzzy, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5872,8 +5868,8 @@
 msgstr "Erregistratuta dago"
 
 #: ../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 "Herrialdea"
 
@@ -5957,7 +5953,7 @@
 msgstr "Korrontea hasieratzen"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:390
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autentifikatzen"
 
@@ -5970,7 +5966,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5600
+#: ../libpurple/protocols/oscar/oscar.c:5602
 msgid "Not Authorized"
 msgstr "Baimenik ez"
 
@@ -6139,7 +6135,7 @@
 msgstr "Idatzi pasahitz berria"
 
 #: ../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..."
@@ -6147,7 +6143,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/oscar/oscar.c:6399
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -6409,50 +6405,31 @@
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Ezin da soinua jo, aukeratutako fitxategia (%s) ez dagoelako."
 
-#: ../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 "%s konektatu da bertan."
-
-#: ../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 "konfig.: konfiguratu berriketa-gela bat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2257
 msgid "configure:  Configure a chat room."
 msgstr "konfiguratu: konfiguratu berriketa-gela bat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2304
+#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
 msgstr "part [gela]:  irten gelatik."
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr "register:  harpidetu berriketa-gela batean."
 
-#: ../libpurple/protocols/jabber/jabber.c:2315
+#: ../libpurple/protocols/jabber/jabber.c:2277
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [gai berria]:  ikusi edo aldatu gaia"
 
-#: ../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;erabiltzailea&gt; [gela]:  bota erabiltzailea gela batetik."
 
-#: ../libpurple/protocols/jabber/jabber.c:2327
+#: ../libpurple/protocols/jabber/jabber.c:2289
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6460,7 +6437,7 @@
 "Afiliatu &It; erabiltzaile&gt;&It;jabea| administratzailea|kidea| paria | "
 "ezer ez&gt;: Erabiltzailearen afiliazioa ezarri gelarekiko."
 
-#: ../libpurple/protocols/jabber/jabber.c:2333
+#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6468,33 +6445,33 @@
 "Zeregin &It;erabiltzaile;&It;moderatzailea| partehartzailea | bisitari | "
 "ezer ez&gt;: Ezarri erabiltzailearen zeregina gelarekiko."
 
-#: ../libpurple/protocols/jabber/jabber.c:2339
+#: ../libpurple/protocols/jabber/jabber.c:2301
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "gonbidatu &lt;erabiltzailea&gt; [mezua]:  gonbidatu erabiltzailea gelara."
 
-#: ../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 ""
 "Lotu: &lt;gela&gt; [zerbitzaria]:  Lotu zerbitzari hontako berriketara."
 
-#: ../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 "Jaurti &lt;erabiltzailea&gt; [gela]: Jaurti erabiltzailea gelatik."
 
-#: ../libpurple/protocols/jabber/jabber.c:2356
+#: ../libpurple/protocols/jabber/jabber.c:2318
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;erabiltzailea&gt; &lt;mezua&gt;:  bidali mezu pribatua "
 "erabiltzaileari."
 
-#: ../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: eman abisu kontaktu bati bere harreta lortzeko"
@@ -6535,8 +6512,8 @@
 msgstr "Onartu testu arruntaren autentifikazioa enkriptatu gabeko korronteetan"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3275
-#: ../libpurple/protocols/simple/simple.c:1904
+#: ../libpurple/protocols/myspace/myspace.c:3277
+#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Connect port"
 msgstr "Konektatzeko atak"
 
@@ -6544,7 +6521,7 @@
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3272
+#: ../libpurple/protocols/myspace/myspace.c:3274
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -6580,6 +6557,12 @@
 msgid "XMPP Message Error"
 msgstr "Jabber mezuaren errorea"
 
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s konektatu da bertan."
+
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6589,16 +6572,16 @@
 msgid "XML Parse error"
 msgstr "XML analisi-errorea"
 
-#: ../libpurple/protocols/jabber/presence.c:422
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Presentzia-errore ezezaguna"
 
-#: ../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 "Sortu gela berria"
 
-#: ../libpurple/protocols/jabber/presence.c:505
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6606,20 +6589,20 @@
 "Gela berri bat sortzera zoaz. Konfiguratu egin nahi duzu, ala ezarpen "
 "lehenetsiak onartu nahi dituzu?"
 
-#: ../libpurple/protocols/jabber/presence.c:511
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "Gela _Konfiguratu"
 
-#: ../libpurple/protocols/jabber/presence.c:512
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "Lehenetsiak _onartu"
 
-#: ../libpurple/protocols/jabber/presence.c:554
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "Errorea %s berriketan"
 
-#: ../libpurple/protocols/jabber/presence.c:558
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Errorea %s berriketan sartzean"
@@ -6702,7 +6685,7 @@
 "something appropriate."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:100
+#: ../libpurple/protocols/jabber/usernick.c:99
 #, fuzzy
 msgid "Set Nickname..."
 msgstr "Goitizena"
@@ -6717,22 +6700,12 @@
 msgid "Select an action"
 msgstr "Hautatu fitxategia"
 
-#: ../libpurple/protocols/msn/contact.c:207
-#, fuzzy
-msgid "Unable to connect to contact server"
-msgstr "Ezin da zerbitzariarekin konektatu."
-
-#: ../libpurple/protocols/msn/contact.c:954
-#, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "Gehitu helbide-liburuan oharretan"
-
-#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Arazoa lagunen zerrenda %s(e)n (%s) sinkronizatzean"
 
-#: ../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. "
@@ -6741,7 +6714,7 @@
 "%s lokaleko zerrendan (\"%s\" taldean) dago, baina ez zerbitzariaren "
 "zerrendan. Lagun hau gehitzea nahi duzu?"
 
-#: ../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 "
@@ -6751,203 +6724,241 @@
 "gehitzea nahi duzu?"
 
 #: ../libpurple/protocols/msn/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "Ezin da mezua analizatu"
 
 #: ../libpurple/protocols/msn/error.c:41
-#, fuzzy
+#, fuzzy, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Sintaxi-errorea (beharbada Gaim errorea dago)"
 
 #: ../libpurple/protocols/msn/error.c:46
+#, c-format
 msgid "Invalid e-mail address"
 msgstr "Helbide elektronikoa ez da zuzena"
 
 #: ../libpurple/protocols/msn/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "Erabiltzailea ez dago"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, fuzzy
+#, fuzzy, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Domeinu-izen osoa falta da"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, fuzzy
+#, fuzzy, c-format
 msgid "Already logged in"
 msgstr "Konektatuta dago lehendik"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, fuzzy
+#, fuzzy, c-format
 msgid "Invalid screen name"
 msgstr "Erabiltzaile-izena ez da baliozkoa"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, fuzzy
+#, fuzzy, c-format
 msgid "Invalid friendly name"
 msgstr "Lagunarteko izena ez da baliozkoa"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, fuzzy
+#, fuzzy, c-format
 msgid "List full"
 msgstr "Zerrenda beteta dago"
 
 #: ../libpurple/protocols/msn/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Hor dago lehendik"
 
 #: ../libpurple/protocols/msn/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "Ez dago zerrendan"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "Erabiltzailea lineaz kanpo dago"
 
 #: ../libpurple/protocols/msn/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Lehendik dago modu honetan"
 
 #: ../libpurple/protocols/msn/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Lehendik dago aurkako zerrendan"
 
 #: ../libpurple/protocols/msn/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Talde gehiegi daude"
 
 #: ../libpurple/protocols/msn/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Taldea ez da baliozkoa"
 
 #: ../libpurple/protocols/msn/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "Erabiltzailea ez dago taldean"
 
 #: ../libpurple/protocols/msn/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Talde-izena luzeegia da"
 
 #: ../libpurple/protocols/msn/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Ezin da zero taldea kendu"
 
 #: ../libpurple/protocols/msn/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Existitzen ez den talde batera erabiltzailea atxikitzen"
 
 #: ../libpurple/protocols/msn/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard hutsegitea"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, fuzzy
+#, fuzzy, c-format
 msgid "Notify transfer failed"
 msgstr "Jakinarazpen-transferentziak huts egin du"
 
 #: ../libpurple/protocols/msn/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Behar diren eremu batzuk falta dira"
 
 #: ../libpurple/protocols/msn/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Emaitza gehiegi FND baterako"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
+#, c-format
 msgid "Not logged in"
 msgstr "Ez dago konektatuta"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, fuzzy
+#, fuzzy, c-format
 msgid "Service temporarily unavailable"
 msgstr "Zerbitzua ez dago erabilgarri une honetan"
 
 #: ../libpurple/protocols/msn/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Datu-basearen zerbitzariaren errorea"
 
 #: ../libpurple/protocols/msn/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Komandoa desgaitu da"
 
 #: ../libpurple/protocols/msn/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Errorea fitxategi-eragiketan"
 
 #: ../libpurple/protocols/msn/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Memoria-esleipeneko errorea"
 
 #: ../libpurple/protocols/msn/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Okerreko CHL balioa bidali da zerbitzarira"
 
 #: ../libpurple/protocols/msn/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Zerbitzaria okupatuta dago"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Zerbitzaria ez dago erabilgarri"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, fuzzy
+#, fuzzy, c-format
 msgid "Peer notification server down"
 msgstr "Parekoaren jakinarazpen-zerbitzaria itxita"
 
 #: ../libpurple/protocols/msn/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Errorea datu-basearekin konektatzean"
 
 #: ../libpurple/protocols/msn/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Zerbitzaria ixtera doa (ospa itsasontzitik)"
 
 #: ../libpurple/protocols/msn/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Errorea konexioa sortzean"
 
 #: ../libpurple/protocols/msn/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametroak ezezagunak dira edo ez dira onartzen"
 
 #: ../libpurple/protocols/msn/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Ezin da idatzi"
 
 #: ../libpurple/protocols/msn/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Saioak karga handiegia du"
 
 #: ../libpurple/protocols/msn/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "Erabiltzailea aktiboegia da"
 
 #: ../libpurple/protocols/msn/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Saio gehiegi daude"
 
 #: ../libpurple/protocols/msn/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Pasaportea ez da egiaztatu"
 
 #: ../libpurple/protocols/msn/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Okerreko lagun-fitxategia"
 
 #: ../libpurple/protocols/msn/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Ez zen espero"
 
 #: ../libpurple/protocols/msn/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Lagunarteko izena bizkorregi aldatu da"
 
 #: ../libpurple/protocols/msn/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Zerbitzaria okupatuegi dago"
 
@@ -6956,26 +6967,32 @@
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#, c-format
 msgid "Authentication failed"
 msgstr "Huts egin du autentifikatzean."
 
 #: ../libpurple/protocols/msn/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Ez da onartzen lineaz kanpo"
 
 #: ../libpurple/protocols/msn/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Ez da erabiltzaile berririk onartzen"
 
 #: ../libpurple/protocols/msn/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Ume-pasaportea gurasoen baimenik gabe"
 
 #: ../libpurple/protocols/msn/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Pasaporte-kontua ez da egiaztatu oraindik"
 
 #: ../libpurple/protocols/msn/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Okerreko tiketa"
 
@@ -7007,31 +7024,31 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "MSN lagunarteko izen berria luzeegia da."
 
-#: ../libpurple/protocols/msn/msn.c:285
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Ezarri lagunarteko izena."
 
-#: ../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 "Beste MSN lagunek izen horrekin ikusiko zaituzte."
 
-#: ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Idatzi zure etxeko telefonoa."
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Idatzi zure laneko telefonoa."
 
-#: ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Idatzi zure telefono mugikorra."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN Mobile-ren orriak onartu nahi dituzu?"
 
-#: ../libpurple/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -7039,334 +7056,329 @@
 "Onartu nahi duzu zure lagunen zerrendakoek zuri MSN Mobile-ren orriak "
 "bidaltzea, telefono mugikorrera edo beste gailu mugikorren batera?"
 
-#: ../libpurple/protocols/msn/msn.c:360
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Onartu"
 
-#: ../libpurple/protocols/msn/msn.c:361
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Ez onartu"
 
-#: ../libpurple/protocols/msn/msn.c:377
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Hotmail kontu hau behar bada ez dago aktibatua."
 
-#: ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Bidali mezu bat mugikor batera."
 
-#: ../libpurple/protocols/msn/msn.c:405
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Orria"
 
-# , fuzzy
-#: ../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 "Momentuko lekukoa"
-
-#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3076
-#: ../libpurple/protocols/yahoo/yahoo.c:3760
+#: ../libpurple/protocols/msn/msn.c:549
+msgid "Has you"
+msgstr "Atzeman zaitu"
+
+#: ../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 "Oraintxe nator"
 
-#: ../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 "Lanpetuta"
 
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/yahoo/yahoo.c:3086
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On the Phone"
 msgstr "Telefonoan "
 
-#: ../libpurple/protocols/msn/msn.c:666
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Out to Lunch"
 msgstr "Bazkaltzera joan naiz "
 
-#: ../libpurple/protocols/msn/msn.c:697
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Ezarri lagunarteko izena..."
 
-#: ../libpurple/protocols/msn/msn.c:702
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Ezarri etxeko telefonoa..."
 
-#: ../libpurple/protocols/msn/msn.c:706
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Ezarri laneko telefonoa..."
 
-#: ../libpurple/protocols/msn/msn.c:710
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Ezarri telefono mugikorra..."
 
-#: ../libpurple/protocols/msn/msn.c:716
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Gaitu/ez-gaitu gailu mugikorrak..."
 
-#: ../libpurple/protocols/msn/msn.c:721
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Baimendu/Ukatu mugikorraren orriak..."
 
-#: ../libpurple/protocols/msn/msn.c:732
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Ireki Hotmail posta"
 
-#: ../libpurple/protocols/msn/msn.c:756
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Bidali mugikorrera"
 
-#: ../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 "Hasi _berriketa"
 
-#: ../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 euskarria behar da MSNrako. Instalatu SSL liburutegi onartu bat. "
 "Informazio gehiago: http://gaim.sf.net/faq-ssl.php."
 
-#: ../libpurple/protocols/msn/msn.c:832
+#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr "Huts egin du zerbitzariarekin konektatzean."
 
-#: ../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 "Errorea profila eskuratzean"
 
-#: ../libpurple/protocols/msn/msn.c:1691 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
+#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Orokorra"
 
-#: ../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 "Adina"
 
-#: ../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 "Funtzioa"
 
-#: ../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 "Kokalekua"
 
-#: ../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 "Zaletasunak eta interesak"
 
-#: ../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 "Zertxobait niri buruz"
 
-#: ../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 "Egoera zibila"
 
-#: ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Interests"
 msgstr "Intereresak"
 
-#: ../libpurple/protocols/msn/msn.c:1733
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Pets"
 msgstr "Azienda"
 
-#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Hometown"
 msgstr "Jaiotze hiria"
 
-#: ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
 msgstr "Bizilekua"
 
 # , fuzzy
-#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
 msgstr "Fashion"
 
-#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
 msgstr "humorea"
 
-#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
 msgstr "Musika"
 
-#: ../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 "Aipamen gogokoena"
 
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1646
 #, fuzzy
 msgid "Contact Info"
 msgstr "Kontuari buruzko informazioa"
 
-#: ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1647
 #, fuzzy
 msgid "Personal"
 msgstr "IM pertsonala"
 
-#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Significant Other"
 msgstr "Beste zentzu"
 
-#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Home Phone"
 msgstr "Etxeko telefonoa"
 
-#: ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Phone 2"
 msgstr "Etxeko telefonoa 2"
 
-#: ../libpurple/protocols/msn/msn.c:1763
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Home Address"
 msgstr "Etxeko helbidea"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal Mobile"
 msgstr "Zagapoto pertsonala"
 
-#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Home Fax"
 msgstr "Etxeko Fax-a"
 
-#: ../libpurple/protocols/msn/msn.c:1766
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Personal E-Mail"
 msgstr "Norberaren posta elektronikoa"
 
-#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Personal IM"
 msgstr "IM pertsonala"
 
-#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr "Urteurren"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1675
 #, fuzzy
 msgid "Work"
 msgstr "Laneko IM"
 
-#: ../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 "Lanpostua"
 
-#: ../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 "Enpresa"
 
-#: ../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 "Departamentua"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1680
 msgid "Profession"
 msgstr "Ofizio"
 
-#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Phone"
 msgstr "Laneko Telefonoa"
 
-#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Phone 2"
 msgstr "Laneko telefonoa 2"
 
-#: ../libpurple/protocols/msn/msn.c:1793
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Work Address"
 msgstr "Laneko helbidea"
 
-#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work Mobile"
 msgstr "Laneko segapotoa"
 
 # , fuzzy
-#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work Pager"
 msgstr "Lan orrigilea"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
 msgstr "Laneko Fax-a"
 
-#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work E-Mail"
 msgstr "Laneko helbide elektronikoa"
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
 msgstr "Laneko IM"
 
-#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msn/msn.c:1689
 msgid "Start Date"
 msgstr "Hasteko data "
 
-#: ../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 "Gogoko gauzak"
 
-#: ../libpurple/protocols/msn/msn.c:1934
+#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr "Azken eguneratzea"
 
-#: ../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 "Etxeko orria"
 
-#: ../libpurple/protocols/msn/msn.c:1969
+#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr "Erabiltzaileak ez du profila publikorik sortu."
 
-#: ../libpurple/protocols/msn/msn.c:1970
+#: ../libpurple/protocols/msn/msn.c:1860
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7376,7 +7388,7 @@
 "erabiltzailea ez da existitzen, edo exisititzen bada ez duela profila "
 "publikorik sortu."
 
-#: ../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 "
@@ -7385,7 +7397,7 @@
 "Gaim-ek ezin izan du erabiltzailearen profilean informaziorik aurkitu. "
 "Erabiltzailea ez dela existitzen dirudi."
 
-#: ../libpurple/protocols/msn/msn.c:1982
+#: ../libpurple/protocols/msn/msn.c:1872
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profilaren URLa"
@@ -7400,106 +7412,102 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271
-#, fuzzy
-msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Novell GroupWise mezulariaren protokoloaren plugin-a"
-
-#: ../libpurple/protocols/msn/msn.c:2306
+#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
+#, fuzzy
+msgid "MSN Protocol Plugin"
+msgstr "AIM/ICQ protokoloaren plugin-a"
+
+#: ../libpurple/protocols/msn/msn.c:2194
 msgid "Use HTTP Method"
 msgstr "Erabili HTTP metodoa"
 
-#: ../libpurple/protocols/msn/msn.c:2311
+#: ../libpurple/protocols/msn/msn.c:2199
 #, fuzzy
 msgid "HTTP Method Server"
 msgstr "Zerbitzariaren IPC proba"
 
-#: ../libpurple/protocols/msn/msn.c:2316
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "Show custom smileys"
 msgstr "Erakutsi _aurpegiera grafikoak "
 
-#: ../libpurple/protocols/msn/msn.c:2324
+#: ../libpurple/protocols/msn/msn.c:2212
 msgid "nudge: nudge a user to get their attention"
 msgstr "Harreta ematen: harreta eman kontaktu bati atentzioa lortzeko"
 
-#: ../libpurple/protocols/msn/nexus.c:137
-msgid "Windows Live ID authentication:Unable to connect"
-msgstr ""
-
-#: ../libpurple/protocols/msn/nexus.c:275
-#, fuzzy
-msgid "Windows Live ID authentication Failed"
-msgstr "Huts egin du era normalean autentifikatzean."
-
-#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Ezin da konektatu"
+
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ez da baliozko taldea."
 
-#: ../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 "Errore ezezaguna."
 
-#: ../libpurple/protocols/msn/notification.c:200
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s: %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:518
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s berriki harreta eskaera bidali dizute !"
-
-#: ../libpurple/protocols/msn/notification.c:843
-#, fuzzy, c-format
-msgid "Unknown error (%d)"
-msgstr "Errore ezezaguna"
-
-#: ../libpurple/protocols/msn/notification.c:844
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Ezin da erabiltzailea gehitu"
-
-#: ../libpurple/protocols/msn/notification.c:904
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Ezin da erabiltzailea gehitu: %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 "Ezin da erabiltzailea blokeatu: %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 "Ezin da erabiltzailea baimendu: %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 ezin da gehitu lagunen zerrenda beteta daukazulako."
 
-#: ../libpurple/protocols/msn/notification.c:929
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ez da baliozko pasaporte-kontua."
 
-#: ../libpurple/protocols/msn/notification.c:934
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Zerbitzua ez dago erabilgarri une honetan "
 
-#: ../libpurple/protocols/msn/notification.c:1272
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Ezin da taldea izenez aldatu"
 
-#: ../libpurple/protocols/msn/notification.c:1327
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Ezin da taldea ezabatu"
 
-#: ../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 "
@@ -7526,30 +7534,6 @@
 "\n"
 "Mantentze-lanak egindakoan, berriz ere sartu ahal izango zara."
 
-#: ../libpurple/protocols/msn/oim.c:141
-#, fuzzy
-msgid "Unable to connect to OIM server"
-msgstr "Ezin da zerbitzariarekin konektatu."
-
-#: ../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 "Ezin da konektatu"
-
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "Idazketa-errorea"
@@ -7567,60 +7551,60 @@
 "Konexio-errorea %s zerbitzarian :\n"
 "%s "
 
-#: ../libpurple/protocols/msn/session.c:336
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Zerbitzariak ez du protokoloa hau onartzen"
 
-#: ../libpurple/protocols/msn/session.c:340
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Errorea HTTP analizatzean"
 
-#: ../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 "Beste kokaleku batetik hasi duzu saioa."
 
-#: ../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 zerbitzariak ez daude eskuragarri une honetan. Itxaron, eta saiatu "
 "berriro."
 
-#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN zerbitzariak ixtera doaz aldi baterako."
 
-#: ../libpurple/protocols/msn/session.c:359
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ezin da autentifikatu: %s"
 
-#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN lagunen zerrenda ez dago erabilgarri une honetan. Itxaron, eta saiatu "
 "berriro."
 
-#: ../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 "Negoziaketa"
 
-#: ../libpurple/protocols/msn/session.c:388
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Autentifikazioa haiseratzen"
 
-#: ../libpurple/protocols/msn/session.c:389
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Cookie eskuratzen"
 
-#: ../libpurple/protocols/msn/session.c:391
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Cookie bidaltzen"
 
-#: ../libpurple/protocols/msn/session.c:392
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Lagunen zerrenda eskuratzen"
 
@@ -7675,25 +7659,22 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Mezua ezin izan da bidali errore ezezaguna gertatu delako:"
 
-#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s gehitu zaitut bere lagunen-zerrendara."
 
-#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s ezabatu zaitu bere lagunen-zerrendatik."
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Ezin da gehitu \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "Zehastu duzun Pantaila-izena ez baliogarria."
 
@@ -7721,7 +7702,7 @@
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1798
+#: ../libpurple/protocols/myspace/myspace.c:1801
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -7740,195 +7721,195 @@
 msgid "Logging in"
 msgstr "Egunkaria"
 
-#: ../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 "Bidali _mezua"
 
-#: ../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 ""
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1538
+#: ../libpurple/protocols/myspace/myspace.c:1543
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Konektatua"
 
-#: ../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 "Ez dago izenik"
 
-#: ../libpurple/protocols/myspace/myspace.c:1550
+#: ../libpurple/protocols/myspace/myspace.c:1555
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1777
+#: ../libpurple/protocols/myspace/myspace.c:1782
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Prozesua errorea kodea itzuli du %d"
 
-#: ../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 "Huts egin du berriketako lagunarekin elkartzean"
 
-#: ../libpurple/protocols/myspace/myspace.c:1970
+#: ../libpurple/protocols/myspace/myspace.c:1972
 #, fuzzy
 msgid "'addbuddy' command failed."
 msgstr "Kargatu lagunen-zerrenda fitxategi batetik..."
 
-#: ../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 "Switchboard hutsegitea"
 
-#: ../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 "Erabiltzaile-gelak"
 
-#: ../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 "Huts egin du berriketako lagunarekin elkartzean"
 
-#: ../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 "Switchboard hutsegitea"
 
-#: ../libpurple/protocols/myspace/myspace.c:2313
+#: ../libpurple/protocols/myspace/myspace.c:2315
 #, fuzzy
 msgid "Invalid input condition"
 msgstr "Konexioa amaitzen"
 
 #. 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 "Ilara beteta dago"
 
-#: ../libpurple/protocols/myspace/myspace.c:2400
+#: ../libpurple/protocols/myspace/myspace.c:2402
 #, fuzzy
 msgid "Unparseable message"
 msgstr "Ezin da mezua analizatu"
 
-#: ../libpurple/protocols/myspace/myspace.c:2469
+#: ../libpurple/protocols/myspace/myspace.c:2471
 #, fuzzy, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Ezin izan da ostalariarekin konektatu"
 
-#: ../libpurple/protocols/myspace/myspace.c:2640
+#: ../libpurple/protocols/myspace/myspace.c:2642
 #, fuzzy
 msgid "IM Friends"
 msgstr "_BM leihoak"
 
-#: ../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)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2740
+#: ../libpurple/protocols/myspace/myspace.c:2742
 #, fuzzy
 msgid "Add contacts from server"
 msgstr "Erantzun baliogabea zerbitzaritik."
 
-#: ../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 ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2793
+#: ../libpurple/protocols/myspace/myspace.c:2795
 #, fuzzy
 msgid "Importing friends failed"
 msgstr "Okerreko lagun-fitxategia"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2849
+#: ../libpurple/protocols/myspace/myspace.c:2851
 #, fuzzy
 msgid "Find people..."
 msgstr "Lagunak bilatu..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2852
+#: ../libpurple/protocols/myspace/myspace.c:2854
 #, fuzzy
 msgid "Change IM name..."
 msgstr "Pasahitza aldatu..."
 
-#: ../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
 msgid "Show headline in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3287
+#: ../libpurple/protocols/myspace/myspace.c:3289
 #, fuzzy
 msgid "Send emoticons"
 msgstr "Soinu-aukerak"
 
-#: ../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 "Letra-tipo handiagoa"
@@ -7942,7 +7923,7 @@
 
 #. TODO: link to username, if available
 #: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2960
+#: ../libpurple/protocols/oscar/oscar.c:2964
 #, fuzzy
 msgid "Profile"
 msgstr "MSN profila"
@@ -8250,42 +8231,42 @@
 msgid "Login failed (%s)."
 msgstr "Huts egin du saioa hastean (%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 ""
 "Ezin da mezua bidali. Ezin izan dira erabiltzailearen xehetasunak lortu (%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 "Ezin da %s gehitu zure lagunen zerrendan (%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 "Ezin da mezua bidali (%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 "Ezin da erabiltzaiea gonbidatu (%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 ""
 "Ezin zaio mezua bidali %s erabiltzaileari. Ezin izan da konferentzia sortu (%"
 "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 "Ezin da mezua bidali. Ezin izan da konferentzia sortu (%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 "
@@ -8294,7 +8275,7 @@
 "Ezin izan da %s erabiltzailea eraman zerbitzariaren aldeko zerrendako %s "
 "karpetara. Errorea karpeta sortzean (%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 "
@@ -8303,61 +8284,61 @@
 "Ezin da %s gehitu zure lagunen zerrendan. Errorea zerbitzariaren aldeko "
 "zerrendan karpeta sortzean (%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 "Ezin izan dira %s erabiltzailearen xehetasunak lortu (%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 "Ezin da erabiltzailea gehitu zure pribatuen zerrendan (%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 "Ezin da %s gehitu zure ukatuen zerrendan (%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 "Ezin da %s gehitu zure baimenduen zerrendan (%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 "Ezin da %s kendu zure pribatuen zerrendan (%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 "Ezin da zerbitzariaren aldeko pribatutasunaren ezarpenak aldatu (%s)"
 
-#: ../libpurple/protocols/novell/novell.c:1014
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ezin da konferentzia sortu (%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 "Errorea zerbitzariarekin komunikatzean. Konexioa ixten."
 
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telefono zenbakia"
 
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Titulu pertsonala"
 
-#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Postontzia"
 
-#: ../libpurple/protocols/novell/novell.c:1504
+#: ../libpurple/protocols/novell/novell.c:1502
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Erabiltzailearen IDa"
@@ -8368,41 +8349,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1517
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Izen-deiturak"
 
-#: ../libpurple/protocols/novell/novell.c:1639
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise konferentzia %d"
 
-#: ../libpurple/protocols/novell/novell.c:1670
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "Ezin da zerbitzariarekiko SSL konexiorik ezarri."
 
-#: ../libpurple/protocols/novell/novell.c:1722
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Autentifikatzen..."
 
-#: ../libpurple/protocols/novell/novell.c:1734
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "Ezin da zerbitzariarekin konektatu."
 
-#: ../libpurple/protocols/novell/novell.c:1737
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "Erantzunaren zain..."
 
-#: ../libpurple/protocols/novell/novell.c:1872
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s erabiltzailea solasaldira gonbidatua izan da."
 
-#: ../libpurple/protocols/novell/novell.c:1900
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Solasaldirako gonbita"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8413,16 +8394,17 @@
 "\n"
 "Bidalita: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1903
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Solasaldian sartu nahi duzu?"
 
-#: ../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 ""
 "Deskonektatu egin zaituzte, beste lanpostu batetik hasi duzulako saioa."
 
-#: ../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."
@@ -8434,7 +8416,7 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2172
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8442,11 +8424,12 @@
 "Ezin da zerbitzariarekin konektatu. Sartu konektatu beharreko zerbitzariaren "
 "helbidea."
 
-#: ../libpurple/protocols/novell/novell.c:2200
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Errorea. SSL euskarria ez dago instalatuta."
 
-#: ../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 "Konferentzia hau itxi egin da, eta ezin da mezu gehiago bidali."
 
@@ -8460,22 +8443,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3523
-#: ../libpurple/protocols/novell/novell.c:3525
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise mezulariaren protokoloaren plugin-a"
 
-#: ../libpurple/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Zerbitzariaren helbidea"
 
-#: ../libpurple/protocols/novell/novell.c:3554
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Zerbitzariaren ataka"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
-#: ../libpurple/protocols/yahoo/yahoo.c:2635
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2469
+#: ../libpurple/protocols/yahoo/yahoo.c:2636
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
 #: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
 #: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
@@ -8483,9 +8466,9 @@
 msgid "Server closed the connection."
 msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2462
-#: ../libpurple/protocols/yahoo/yahoo.c:2629 ../libpurple/proxy.c:593
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2463
+#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
 #: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, fuzzy, c-format
@@ -8494,7 +8477,7 @@
 "%s"
 msgstr "Zerbitzaritik deskonektatuta zaude."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
 #: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
 #: ../libpurple/proxy.c:1478
@@ -8535,7 +8518,7 @@
 msgstr "IRC protokoloaren plugin-a"
 
 #: ../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 "Kodeketa"
@@ -8713,7 +8696,7 @@
 msgstr "Berriketa"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6008
+#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr "Hartu fitxategia"
 
@@ -8786,43 +8769,49 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5778
+#: ../libpurple/protocols/oscar/oscar.c:5780
+#, c-format
 msgid "Free For Chat"
 msgstr "Berriketarako libre"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5813
+#: ../libpurple/protocols/oscar/oscar.c:5815
+#, c-format
 msgid "Not Available"
 msgstr "Ez erabilgarri"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5799
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#, c-format
 msgid "Occupied"
 msgstr "Okupatuta"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
+#, c-format
 msgid "Web Aware"
 msgstr "Web-ean"
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3094 ../libpurple/status.c:157
+#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr "Ikusezin"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
+#, c-format
 msgid "Online"
 msgstr "Linean"
 
 #: ../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 helbidea"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Warning Level"
 msgstr "Abisu-maila"
 
@@ -8870,15 +8859,15 @@
 "behar dituzte."
 
 #: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2104
+#: ../libpurple/protocols/yahoo/yahoo.c:2105
 #, fuzzy
 msgid "Invalid screen name."
 msgstr "Erabiltzaile-izena ez da baliozkoa."
 
 #: ../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 "Okerreko pasahitza."
 
@@ -8930,10 +8919,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2228
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5883
-#: ../libpurple/protocols/oscar/oscar.c:6164 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2281
+#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
 #, fuzzy
 msgid "_OK"
 msgstr "Ados"
@@ -8975,31 +8964,31 @@
 msgid "Unable to initialize connection"
 msgstr "Ezin da konexio sortu."
 
-#: ../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 "Emango didazu baimena nire lagunen zerrendan gehi zaitzadan?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr "Baimena eskatzeko mezua:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2227
+#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr "Emadazu baimena!"
 
-#: ../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 "Ez da arrazoirik eman."
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2279
 msgid "Authorization Denied Message:"
 msgstr "Baimena ezesteko mezua:"
 
-#: ../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 "
@@ -9010,18 +8999,18 @@
 "baimena. Arrazoia:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2408
 msgid "ICQ authorization denied."
 msgstr "ICQ baimena ukatu da."
 
 #. 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 ""
 "%u erabiltzaileak baimena eman dizu bera zure lagunen zerrendan gehitzeko."
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9034,7 +9023,7 @@
 "Bidaltzailea: %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"
@@ -9048,7 +9037,7 @@
 "%s"
 
 # c-format
-#: ../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"
@@ -9061,24 +9050,24 @@
 "Mezua:\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 "%u erabiltzaileak lagun bat bidali dizu: %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 "Lagun hori zure lagunen zerrendan gehitu nahi duzu?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Gehitu"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2472
 msgid "_Decline"
 msgstr "_Ukatu"
 
-#: ../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."
@@ -9086,7 +9075,7 @@
 msgstr[1] ""
 "%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, baliogabeak direlako."
 
-#: ../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."
@@ -9094,7 +9083,7 @@
 msgstr[1] ""
 "%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, handiegiak direlako."
 
-#: ../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."
@@ -9107,7 +9096,7 @@
 "%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, abiadura-muga gainditu "
 "delako."
 
-#: ../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."
@@ -9118,7 +9107,7 @@
 "%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, bidaltzailea gaiztoegia "
 "delako."
 
-#: ../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."
@@ -9127,7 +9116,7 @@
 msgstr[1] ""
 "%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, gaiztoegia zarelako."
 
-#: ../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."
@@ -9137,47 +9126,47 @@
 "%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu. Arrazoia ez da ezaguna."
 
 #. 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 "Ezin da mezua bidali: %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 "Arrazoi ezezaguna."
 
-#: ../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 "Ezin zaio mezua bidali %s(r)i:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "User information not available: %s"
 msgstr "Erabiltzailearen datuak ez daude erabilgarri: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2892
+#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Online Since"
 msgstr "Noiztik linean"
 
-#: ../libpurple/protocols/oscar/oscar.c:2897
+#: ../libpurple/protocols/oscar/oscar.c:2901
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Noiztik kidea"
 
-#: ../libpurple/protocols/oscar/oscar.c:2932
+#: ../libpurple/protocols/oscar/oscar.c:2936
 msgid "Available Message"
 msgstr "Mezua eskuragarri:"
 
-#: ../libpurple/protocols/oscar/oscar.c:3040
+#: ../libpurple/protocols/oscar/oscar.c:3044
 msgid "Your AIM connection may be lost."
 msgstr "Beharbada AIM konexioa galdu egingo zen."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3228
+#: ../libpurple/protocols/oscar/oscar.c:3232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9185,7 +9174,7 @@
 "[Ezin da erabiltzaile honen mezu bat erakutsi, karaktere baliogabeak "
 "dituelako.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3392
+#: ../libpurple/protocols/oscar/oscar.c:3396
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9193,83 +9182,84 @@
 "Egiten saiatu zaren azken ekintza ezin izan da egin abiadura-muga gainditu "
 "duzulako. Itxaron 10 segundo, eta saiatu berriro."
 
-#: ../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 "%s berriketa-gelatik deskonektatu egin zaituzte."
 
-#: ../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 "Telefono mugikorra"
 
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Personal Web Page"
 msgstr "Web orri pertsonala"
 
-#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3783
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informazio osagarria"
 
-#: ../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 "Posta-kodea"
 
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/oscar/oscar.c:3815
 msgid "Division"
 msgstr "Saila"
 
-#: ../libpurple/protocols/oscar/oscar.c:3812
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Position"
 msgstr "Kargua"
 
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Web Page"
 msgstr "Web orria"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Information"
 msgstr "Laneko datuak"
 
-#: ../libpurple/protocols/oscar/oscar.c:3873
+#: ../libpurple/protocols/oscar/oscar.c:3877
 msgid "Pop-Up Message"
 msgstr "Pop-up mezua"
 
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/oscar/oscar.c:3917
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Ondoko pantaila-izenak %s erabiltzailearekin erlazionatuak daude"
 msgstr[1] "Ondoko pantaila-izenak %s erabiltzailearekin erlazionatuak daude"
 
-#: ../libpurple/protocols/oscar/oscar.c:3918
+#: ../libpurple/protocols/oscar/oscar.c:3922
 #, fuzzy
 msgid "Screen name"
 msgstr "Pantaila-izena:"
 
-#: ../libpurple/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Emaitzarik ez %s helbide elektronikoarentzat "
 
-#: ../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 "%s berrestea eskatzeko posta-mezu bat jaso beharko zenuke. "
 
-#: ../libpurple/protocols/oscar/oscar.c:3967
+#: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
 msgstr "Kontuaren berrespena eskatu da"
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4002
+#, c-format
 msgid "Error Changing Account Info"
 msgstr "Errorea kontuaren datuak aldatzean"
 
-#: ../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 "
@@ -9278,14 +9268,14 @@
 "0x%04x errorea: ezin da formateatu pantaila-izena, eskatutako pantaila-izena "
 "eta jatorrizkoa bat ez datozelako."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "0x%04x errorea: ezin da formateatu pantaila-izena, eskatutako pantaila-izena "
 "Balio okerra du."
 
-#: ../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 "
@@ -9294,7 +9284,7 @@
 "0x%04x errorea: ezin da formateatu pantaila-izena, eskatutako pantaila-izena "
 "luzeegia delako."
 
-#: ../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 "
@@ -9303,7 +9293,7 @@
 "0x%04x errorea: ezin da helbide elektronikoa aldatu,  lehendik "
 "badagoelakeskaera bat zain pantaila-izen honekin."
 
-#: ../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 "
@@ -9312,7 +9302,7 @@
 "0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbideak "
 "pantaila-izen gehiegi dituelako erlazionatuak."
 
-#: ../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 "
@@ -9321,32 +9311,32 @@
 "0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbidea ez "
 "delako baliozkoa. "
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "0x%04x errorea: errore ezezaguna."
 
-#: ../libpurple/protocols/oscar/oscar.c:4029
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s erabiltzailearen helbide elektronikoa %s da "
 
-#: ../libpurple/protocols/oscar/oscar.c:4031
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr "Kontuari buruzko informazioa"
 
-#: ../libpurple/protocols/oscar/oscar.c:4214
+#: ../libpurple/protocols/oscar/oscar.c:4218
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Zure BM irudia ez da bidali. 'Zuzeneko Konexioa'  behar duzu BM irudiak "
 "bidaltzeko."
 
-#: ../libpurple/protocols/oscar/oscar.c:4485
+#: ../libpurple/protocols/oscar/oscar.c:4489
 msgid "Unable to set AIM profile."
 msgstr "Ezin da AIM profila ezarri."
 
-#: ../libpurple/protocols/oscar/oscar.c:4486
+#: ../libpurple/protocols/oscar/oscar.c:4490
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -9356,7 +9346,7 @@
 "Profilak ezarri gabe jarraitzen du. Saiatu berriro, ondo konektatuta "
 "zaudenean."
 
-#: ../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 "
@@ -9369,11 +9359,11 @@
 msgstr[1] ""
 "Profilaren gehienezko luzera (%d byte) gainditu da. Gaim-ek trunkatu egin du."
 
-#: ../libpurple/protocols/oscar/oscar.c:4505
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Profile too long."
 msgstr "Profila luzeegia da."
 
-#: ../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 "
@@ -9388,11 +9378,11 @@
 "Kanpoan zaudeneko mezuaren gehienezko luzera (%d byte) gainditu da. Gaim-ek "
 "trunkatu egin du."
 
-#: ../libpurple/protocols/oscar/oscar.c:4555
+#: ../libpurple/protocols/oscar/oscar.c:4559
 msgid "Away message too long."
 msgstr "Kanpoan zaudeneko mezua luzeegia da."
 
-#: ../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 "
@@ -9403,17 +9393,17 @@
 "izenek letra batekin hasi behar dute, eta letrak, zenbakiak eta zuriuneak "
 "bakarrik eduki, edo bestela zenbakiak bakarrik."
 
-#: ../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 "Ezin da gehitu"
 
-#: ../libpurple/protocols/oscar/oscar.c:4735
+#: ../libpurple/protocols/oscar/oscar.c:4739
 msgid "Unable To Retrieve Buddy List"
 msgstr "Ezin da eskuratu lagunen zerrenda"
 
-#: ../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 "
@@ -9423,15 +9413,15 @@
 "Zure lagunen zerrenda ez da galdu, eta ordu batzuk barru erabilgarri egongo "
 "da seguru asko."
 
-#: ../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 "Umezurtzak"
 
-#: ../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 "
@@ -9440,17 +9430,17 @@
 "Ezin izan da %s laguna gehitu, lagun gehiegi daudelako zure lagunen "
 "zerrendan. Kendu baten bat, eta saiatu berriro."
 
-#: ../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 "(ez dago izenik)"
 
-#: ../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 "Komandoak huts egin du arrazoi ezezagunen batengatik."
 
-#: ../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 "
@@ -9459,23 +9449,23 @@
 "%s erabiltzaileak baimena eman dizu zure burua bere lagun-zerrendan "
 "gehitzeko. Zuk bera gehitu nahi duzu?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5182
+#: ../libpurple/protocols/oscar/oscar.c:5186
 msgid "Authorization Given"
 msgstr "Baimena eman da"
 
 #. 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 ""
 "%s erabiltzaileak baimena eman dizu bera zure lagun-zerrendan gehitzeko."
 
-#: ../libpurple/protocols/oscar/oscar.c:5256
+#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Granted"
 msgstr "Baimena eman da"
 
 #. 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 "
@@ -9486,54 +9476,54 @@
 "Arrazoia:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5264
 msgid "Authorization Denied"
 msgstr "Baimena ukatu da"
 
-#: ../libpurple/protocols/oscar/oscar.c:5296
+#: ../libpurple/protocols/oscar/oscar.c:5300
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Trukea:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5336
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Invalid chat name specified."
 msgstr "Zehaztutako berriketa-izena ez da baliozkoa."
 
-#: ../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 ""
 "Zure IM irudia ez da bidali. Ezin duzu IM irudirik bidali AIM berriketetan."
 
-#: ../libpurple/protocols/oscar/oscar.c:5567
-#: ../libpurple/protocols/oscar/oscar.c:5572
+#: ../libpurple/protocols/oscar/oscar.c:5569
+#: ../libpurple/protocols/oscar/oscar.c:5574
 #, fuzzy
 msgid "Away Message"
 msgstr "Kanpoan nagoeneko mezua "
 
-#: ../libpurple/protocols/oscar/oscar.c:5572
+#: ../libpurple/protocols/oscar/oscar.c:5574
 #, fuzzy
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(identifikatuta)</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 "Lagunaren iruzkinak %s(r)entzako"
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr "Lagunaren iruzkina:"
 
-#: ../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 "%s(r)ekiko zuzeneko BMko konexio bat irekitzea hautatu duzu."
 
-#: ../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.  "
@@ -9542,69 +9532,69 @@
 "Zure IP helbidea ikusiko denez, arriskutsua izan daiteke pribatutasunaren "
 "aldetik. Jarraitu nahi duzu?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5940
 #: ../libpurple/protocols/oscar/peer.c:1045
 #, fuzzy
 msgid "C_onnect"
 msgstr "Konektatu"
 
-#: ../libpurple/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:5975
 #, fuzzy
 msgid "Get AIM Info"
 msgstr "Hartu informazioa"
 
-#: ../libpurple/protocols/oscar/oscar.c:5979
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
 msgstr "Editatu lagunaren iruzkina"
 
-#: ../libpurple/protocols/oscar/oscar.c:5987
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr "Hartu egoera-mezua"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
 msgstr "Zuzeneko BM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6022
+#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr "Eskatu baimena berriro"
 
-#: ../libpurple/protocols/oscar/oscar.c:6081
+#: ../libpurple/protocols/oscar/oscar.c:6083
 msgid "Require authorization"
 msgstr "Baimena beharrezkoa"
 
-#: ../libpurple/protocols/oscar/oscar.c:6084
+#: ../libpurple/protocols/oscar/oscar.c:6086
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 "Web kontuan izan ( hau ahalbidetzen baduzu Zaborra jasotzea gerta daiteke) "
 
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6091
 msgid "ICQ Privacy Options"
 msgstr "ICQ pribatisasun ezarpenak"
 
-#: ../libpurple/protocols/oscar/oscar.c:6108
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
 msgstr "Formatu berria ez da baliozkoa."
 
-#: ../libpurple/protocols/oscar/oscar.c:6109
+#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Pantaila-izenen formatuan maiuskulak eta minuskulak eta zuriuneak bakarrik "
 "alda daitezke."
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "Change Address To:"
 msgstr "Aldatu helbidea eta jarri hau:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6208
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ez zaude baimenaren zain</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Lagun hauen baimenaren zain zaude"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9612,79 +9602,79 @@
 "Lagun hauei baimena berriro eskatzeko, egin klik eskuin-botoiarekin lagunen "
 "gainean, eta hautatu \"Eskatu baimena berriro.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6229
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by E-Mail"
 msgstr "Bilatu laguna helbide elektronikoaren arabera "
 
-#: ../libpurple/protocols/oscar/oscar.c:6230
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by e-mail address"
 msgstr "Bilatu laguna helbide elektronikoaren arabera"
 
-#: ../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 "Idatzi aurkitu nahi duzun lagunaren helbide elektronikoa."
 
-#: ../libpurple/protocols/oscar/oscar.c:6234
+#: ../libpurple/protocols/oscar/oscar.c:6236
 #, fuzzy
 msgid "_Search"
 msgstr "Bilatu"
 
-#: ../libpurple/protocols/oscar/oscar.c:6392
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Set User Info (URL)..."
 msgstr "Ezarri erabiltzailearen datuak (URLa)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Change Password (URL)"
 msgstr "Aldatu pasahitza (URLa)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6407
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfiguratu BMen birbidalketa (URLa)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6417
+#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "Set Privacy Options..."
 msgstr "Ezarri pribatitasun aukerak:"
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6424
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr "Berretsi kontua"
 
-#: ../libpurple/protocols/oscar/oscar.c:6428
+#: ../libpurple/protocols/oscar/oscar.c:6430
 #, fuzzy
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Bistaratu une honetan erregistratuta dagoen helbidea"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6434
 #, fuzzy
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Aldatu une honetan erregistratuta dagoen helbidea..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6439
+#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Bistaratu baimenaren zain dauden lagunak"
 
-#: ../libpurple/protocols/oscar/oscar.c:6445
+#: ../libpurple/protocols/oscar/oscar.c:6447
 #, fuzzy
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Bilatu laguna helbide elektronikoaren arabera... "
 
-#: ../libpurple/protocols/oscar/oscar.c:6450
+#: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
 msgstr "Bilatu laguna informazioaren arabera..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6518
+#: ../libpurple/protocols/oscar/oscar.c:6520
 #, fuzzy
 msgid "Use recent buddies group"
 msgstr "Erabiltzailea ez dago taldean"
 
-#: ../libpurple/protocols/oscar/oscar.c:6521
+#: ../libpurple/protocols/oscar/oscar.c:6523
 #, fuzzy
 msgid "Show how long you have been idle"
 msgstr "Ez-aktibo-denbora kopurua eskuz konfiguratzeko aukera ematen du"
 
-#: ../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)"
@@ -9701,7 +9691,7 @@
 msgstr "%s(e)ra (%s) konektatzen saiatzen: %hu BM Zuzenerako."
 
 #: ../libpurple/protocols/oscar/peer.c:856
-#, fuzzy
+#, fuzzy, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Konexioa berbideratzen zailatzen..."
 
@@ -10216,7 +10206,7 @@
 msgid "Error requesting login token"
 msgstr "Errorea konexioa sortzean"
 
-#: ../libpurple/protocols/qq/login_logout.c:488
+#: ../libpurple/protocols/qq/login_logout.c:486
 #, fuzzy
 msgid "Unable to login, check debug log"
 msgstr "Ezin da AIMen sartu"
@@ -10619,7 +10609,7 @@
 msgid "Send TEST Announcement"
 msgstr "Bidali FROGA oharra"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr "Gaia:"
 
@@ -10644,7 +10634,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Ez dago Sametime komunitatearen espezifikaziorik zerbitzarian "
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
 msgid "Connect"
 msgstr "Konektatu"
 
@@ -10699,6 +10689,10 @@
 "%s identifikatzailea ez dator bat Sametime-ko komunitateko inongo "
 "erabiltzailearekin. Sarrea hau zure lagunen-zerrendatik ezabatua izan da."
 
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Ezin da erabiltzailea gehitu"
+
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -10822,7 +10816,7 @@
 "erreferentzia egiten ari da. Erabiltzaileek zure lagunen-zerrendara gehitu "
 "ditzazkezu edo mezu bat bidali beheko ekintza botoiekin."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:755
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
 msgid "Search Results"
 msgstr "Bilaketaren emaitza"
 
@@ -11400,6 +11394,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanalaren moduak:</b> "
 
@@ -11438,6 +11433,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -12065,7 +12061,7 @@
 msgstr "SILC zerbitzariarekin konektatzen"
 
 #: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy
+#, fuzzy, c-format
 msgid "Could not load SILC key pair"
 msgstr "Ezin da SILC gako-parea : %s kargatu."
 
@@ -12095,7 +12091,8 @@
 msgstr "Uneko umorea"
 
 #: ../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 "Normala"
 
@@ -12498,7 +12495,7 @@
 msgstr "Interneteko Zuzeneko Konferentzia Segurua (SILC) protokoloa"
 
 #: ../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 "Sarea"
 
@@ -12700,42 +12697,52 @@
 msgstr "Ez dago zerbitzariaren estatistika eskuragarri"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Hutsegitea: bertsioa falta da. Eguneratu bezeroa"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Hutsegitea: urrunekoak ez du zure gako publikoan fidatzen/onartzen"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Hutsegitea: urrunekoak ez du eskainitako KE taldea onartzen"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "hutsegitea: urrunekoak ez du eskainitako zifratua "
 
 #: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Hutsegitea: urrunekoak ez du eskainitako PKCS onartzen"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Hutsegitea: urrunekoak ez du eskainitako hash funtzioa onartzen"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Hutsegitea: urrunekoak ez du eskainitako HMAC onartzen"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Hutsegitea: sinadura okerra"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Hutsegitea: cookie baliogabea"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Hutsegitea: huts egin du autentifikatzean."
 
@@ -12763,34 +12770,34 @@
 msgstr "Ezin izan da idatzi"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1531
+#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr "Ezin izan da konektatu"
 
-#: ../libpurple/protocols/simple/simple.c:1061
+#: ../libpurple/protocols/simple/simple.c:1059
 #, fuzzy
 msgid "Unknown server response."
 msgstr "Zerbitzari errore ezezaguna."
 
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1607
-#: ../libpurple/protocols/simple/simple.c:1620
-#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/simple/simple.c:1563
+#: ../libpurple/protocols/simple/simple.c:1605
+#: ../libpurple/protocols/simple/simple.c:1618
+#: ../libpurple/protocols/simple/simple.c:1669
 msgid "Could not create listen socket"
 msgstr "Ezin izan da entzuteko socket-a sortu"
 
 # ,fuzzy
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't resolve host"
 msgstr "Ezin izan da ostalaria"
 
 # ,fuzzy
-#: ../libpurple/protocols/simple/simple.c:1679
+#: ../libpurple/protocols/simple/simple.c:1677
 #, fuzzy
 msgid "Could not resolve hostname"
 msgstr "Ezin izan da ostalaria"
 
-#: ../libpurple/protocols/simple/simple.c:1696
+#: ../libpurple/protocols/simple/simple.c:1694
 #, fuzzy
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP goitizenek ezin dute zurigunerik izan edo @ ikurra"
@@ -12803,37 +12810,37 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokoloaren plugin-a"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1873
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokoloaren plugin-a"
 
-#: ../libpurple/protocols/simple/simple.c:1901
+#: ../libpurple/protocols/simple/simple.c:1899
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Egoera argitaratu (oharra:Jende guztiak ikusi zaitzake)"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1905
 msgid "Use UDP"
 msgstr "Erabilli UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:1907
 msgid "Use proxy"
 msgstr "Erabili proxy-a"
 
+#: ../libpurple/protocols/simple/simple.c:1909
+msgid "Proxy"
+msgstr "Proxy-a"
+
 #: ../libpurple/protocols/simple/simple.c:1911
-msgid "Proxy"
-msgstr "Proxy-a"
-
-#: ../libpurple/protocols/simple/simple.c:1913
 #, fuzzy
 msgid "Auth User"
 msgstr "AP erabiltzailea"
 
-#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/simple/simple.c:1913
 #, fuzzy
 msgid "Auth Domain"
 msgstr "Automatikoa"
@@ -12879,6 +12886,7 @@
 msgstr "%s erabiltzailearen abisua ez da onartzen."
 
 #: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Mezu bat jaregin da, zerbitzariaren abiadura-muga gainditu duzu."
 
@@ -12903,38 +12911,47 @@
 msgstr "%s erabiltzailearen BM bat ez zaizu heldu, bizkorregi bidali delako."
 
 #: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Huts egin du."
 
 #: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Emaitza gehiegi."
 
 #: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Identifikatzaile gehiago behar dira."
 
 #: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Dir zerbitzua ez dago erabilgarri une honetan."
 
 #: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "E-mail lookup restricted."
 msgstr "Helbide elektronikoaren bilaketa murriztu da. "
 
 #: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Gako-hitza ez ikusi egin da."
 
 #: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "Gako-hitzik ez."
 
 #: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "Erabiltzaileak ez du direktorio-informaziorik."
 
 #: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "Estatua ez da onartzen."
 
@@ -12944,19 +12961,22 @@
 msgstr "Hutsegite ezezaguna: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, fuzzy
+#, fuzzy, c-format
 msgid "Incorrect screen name or password."
 msgstr "Goitizen edo pasahitz okerra."
 
 #: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Zerbitzua ez dago erabilgarri une honetan."
 
 #: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Zure abisu-maila altuegia da konektatu ahal izateko."
 
 #: ../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."
@@ -12995,8 +13015,8 @@
 msgid "Password Change Successful"
 msgstr "Pasahitza ondo aldatu da"
 
-#: ../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 "_Taldea:"
 
@@ -13064,26 +13084,26 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokoloaren plugin-a"
 
-#: ../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 "Yahoo! mezua ez da bidali."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:959
+#: ../libpurple/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! sistema-mezua - %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 #, fuzzy
 msgid "Authorization denied message:"
 msgstr "Baimena ezesteko mezua:"
 
-#: ../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 "
@@ -13092,18 +13112,18 @@
 "%s erabiltzaileak bera zure zerrendan gehitzeko eskaera ukatu du "
 "(atzeraeraginez). Arrazoia: %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 erabiltzaileak bera zure zerrendan gehitzeko eskaera ukatu du "
 "(atzeraeraginez)."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr "Laguna gehitzea ezetsita"
 
-#: ../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 "
@@ -13114,11 +13134,11 @@
 "du. Gaim-en bertsio hau ez da gai izango Yahoo-n ondo sartzeko. Eguneratzeak "
 "lortzeko, begiratu %s gunean."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr "Huts egin du Yahoo! autentifikazioak"
 
-#: ../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 "
@@ -13127,168 +13147,178 @@
 "%s erabiltzaileari ez ikusi egiten saiatu zara, baina zure lagunen zerrendan "
 "dago. \"Bai\" hautatuz gero, laguna kendu eta ez ikusi egingo zaio."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
 msgstr "Lagunari ez ikusi egin nahi diozu?"
 
-#: ../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 "Kontua blokeatuta dago, konektatu yahoo-ren web gunean."
 
-#: ../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 ""
 "%d errore-zenbaki ezezaguna. Yahoo-ren web gunean konektatzeak arazoa konpon "
 "dezake."
 
-#: ../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 ""
 "Ezin izan da %s laguna %s taldean gehitu, %s kontuko zerbitzari-zerrendan."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2188
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr "Ezin izan da laguna zerbitzari-zerrendan gehitu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
+#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Entzungai %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2650
+#: ../libpurple/protocols/yahoo/yahoo.c:2651
 #, fuzzy
 msgid "Received unexpected HTTP response from server."
 msgstr "Erantzun baliogabea zerbitzaritik."
 
-#: ../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 "Konexio-arazoa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2700
+#: ../libpurple/protocols/yahoo/yahoo.c:2701
 #, fuzzy, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr "Solasaldiak %s(r)ekin"
 
-#: ../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
 msgid "Not at Home"
 msgstr "Ez dago etxean "
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3082
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not at Desk"
 msgstr "Ez dago bere mahaian "
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3084
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "Not in Office"
 msgstr "Ez dago bulegoan "
 
-#: ../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 "Oporretan"
 
-#: ../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 "Irten egin da"
 
-#: ../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 "Ez dago zerbitzarien zerrendan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
-#: ../libpurple/protocols/yahoo/yahoo.c:3290
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Appear Online"
 msgstr "Agertu Linean"
 
-#: ../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 "Agertu Lineaz kanpo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
+#: ../libpurple/protocols/yahoo/yahoo.c:3254
 #, fuzzy
 msgid "Presence"
 msgstr "Hobespenak"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3296
+#: ../libpurple/protocols/yahoo/yahoo.c:3297
 msgid "Appear Offline"
 msgstr "Agertu Lineaz kanpo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3305
+#: ../libpurple/protocols/yahoo/yahoo.c:3306
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Agertu Lineaz kanpo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3353
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr "Sartu berriketan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3359
+#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr "Hasi konferentzia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3387
+#: ../libpurple/protocols/yahoo/yahoo.c:3388
 #, fuzzy
 msgid "Presence Settings"
 msgstr "Erabili ingurune-ezarpenak"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3393
+#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
 msgstr "Hasi \"Doodling\" "
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 #, fuzzy
 msgid "Activate which ID?"
 msgstr "Zein ID aktibatu?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Join whom in chat?"
 msgstr "Norekin elkartu nahi duzu berriketan?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3517
+#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr "Aktibatu IDa..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3521
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "Join User in Chat..."
 msgstr "Join User in Chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3526
+#: ../libpurple/protocols/yahoo/yahoo.c:3527
 #, fuzzy
 msgid "Open Inbox"
 msgstr "Ireki Hotmail posta"
 
-#: ../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
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;gela&gt;:  konektatu Yahoo sareko berriketa-gelara"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4140
+#: ../libpurple/protocols/yahoo/yahoo.c:4141
 msgid "list: List rooms on the Yahoo network"
 msgstr "zerrendatu: ZerrendatuYahoo sareko kanalak"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4148
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Request user to start a Doodle session"
 
@@ -13302,60 +13332,60 @@
 #. *< 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 protokoloaren plugin-a"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4382
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Yahoo Japan"
 msgstr "Japoniako yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4385
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 #, fuzzy
 msgid "Pager server"
 msgstr "Proxy zerbitzaria"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4388
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 #, fuzzy
 msgid "Japan Pager server"
 msgstr "Japoniako bilagailuaren ostalaria"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4391
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr "Bilagailuaren ataka"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 #, fuzzy
 msgid "File transfer server"
 msgstr "Fitxategi-transferentzien ostalaria"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 #, fuzzy
 msgid "Japan file transfer server"
 msgstr "Japoniako fitxategi-transferentzien ostalaria "
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr "Fitxategi-transferentzien ataka"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Chat room locale"
 msgstr "Berriketarako gela gunea"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
 msgstr "Entzungor egin konferentzia eta berriketa-gela gonbidapenei"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4414
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room list URL"
 msgstr "Berriketa-gelen zerrendaren URLa "
 
-#: ../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 "Japoniako yahoo"
@@ -13800,7 +13830,7 @@
 msgid "%s has requested your attention!"
 msgstr "%s(e)k zuri buruzko informazioa eskatu du"
 
-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:796
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13809,12 +13839,12 @@
 "'%s' erabiltzaileak %s gonbidatu du %s:\n"
 "%s berriketa-gelara"
 
-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:801
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "'%s' erabiltzaileak %s gonbidatu du %s berriketa-gelara\n"
 
-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
 msgstr "Berriketarako gonbita onartu nahi duzu?"
 
@@ -13860,62 +13890,47 @@
 msgid "%s changed status from %s to %s"
 msgstr "%s(e)k egoera aldatu du: %s -> %s"
 
-#: ../libpurple/status.c:612
-#, fuzzy, c-format
-msgid "%s (%s) changed status from %s to %s"
-msgstr "%s(e)k egoera aldatu du: %s -> %s"
-
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:619
 #, c-format
 msgid "%s is now %s"
 msgstr "%s orain %s da"
 
-#: ../libpurple/status.c:625
-#, fuzzy, c-format
-msgid "%s (%s) is now %s"
-msgstr "%s orain %s da"
-
-#: ../libpurple/status.c:631
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ez dago luzaroago %s"
 
-#: ../libpurple/status.c:633
-#, fuzzy, c-format
-msgid "%s (%s) is no longer %s"
-msgstr "%s ez dago luzaroago %s"
-
-#: ../libpurple/status.c:1244
+#: ../libpurple/status.c:1234
 #, c-format
 msgid "%s became idle"
 msgstr "%s inaktibo geratu da"
 
-#: ../libpurple/status.c:1261
+#: ../libpurple/status.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s aktibo dago berriro"
 
-#: ../libpurple/status.c:1324
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s inaktibo geratu da"
 
-#: ../libpurple/status.c:1326
+#: ../libpurple/status.c:1316
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s aktibo dago berriro"
 
-#: ../libpurple/util.c:701
+#: ../libpurple/util.c:718
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2705
+#: ../libpurple/util.c:2722
 #, c-format
 msgid "Error Reading %s"
 msgstr "Errorea %s irakurtzean"
 
-#: ../libpurple/util.c:2706
+#: ../libpurple/util.c:2723
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13924,86 +13939,86 @@
 "Errore bat aurkitu da %s zerrenda analizatzean, eta ez da kargatu.Fitxategi "
 "zaharra %s~ izenarekin gorde da."
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3223
 msgid "Calculating..."
 msgstr "Kalkulatzen..."
 
-#: ../libpurple/util.c:3209
+#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr "Ezezaguna."
 
-#: ../libpurple/util.c:3235
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "segundo %d"
 msgstr[1] "%d segundo"
 
-#: ../libpurple/util.c:3247
+#: ../libpurple/util.c:3264
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "egun %d"
 msgstr[1] "%d egun"
 
-#: ../libpurple/util.c:3255
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, ordu %d"
 msgstr[1] "%s, %d ordu"
 
-#: ../libpurple/util.c:3261
+#: ../libpurple/util.c:3278
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "ordu %d"
 msgstr[1] "%d ordu"
 
-#: ../libpurple/util.c:3269
+#: ../libpurple/util.c:3286
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, minutu %d"
 msgstr[1] "%s, %d minutu"
 
-#: ../libpurple/util.c:3275
+#: ../libpurple/util.c:3292
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "minutu %d"
 msgstr[1] "%d minutu"
 
-#: ../libpurple/util.c:3535
+#: ../libpurple/util.c:3552
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3572 ../libpurple/util.c:3868
+#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
 #, fuzzy, c-format
 msgid "Unable to connect to %s"
 msgstr "Ezin da ostalariarekin konektatu"
 
-#: ../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."
 msgstr ""
 
-#: ../libpurple/util.c:3730
+#: ../libpurple/util.c:3747
 #, fuzzy, c-format
 msgid "Error reading from %s: %s"
 msgstr "Errorea socket-etik irakurtzean:%s."
 
-#: ../libpurple/util.c:3761
+#: ../libpurple/util.c:3778
 #, fuzzy, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 "Errorea %s idaztean: \n"
 "%s\n"
 
-#: ../libpurple/util.c:3786
+#: ../libpurple/util.c:3803
 #, fuzzy, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Ezin da ostalariarekin konektatu"
@@ -14100,7 +14115,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
 msgid "Use Environmental Settings"
 msgstr "Erabili ingurune-ezarpenak"
 
@@ -14122,15 +14137,15 @@
 msgid "Proxy Options"
 msgstr "Proxy aukerak"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
 msgstr "_Proxy-mota:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
 msgstr "_Ostalaria:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr "_Ataka:"
 
@@ -14138,7 +14153,7 @@
 msgid "_Username:"
 msgstr "_Erabiltzaile-izena:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
 msgstr "_Pasahitza:"
 
@@ -14189,292 +14204,252 @@
 "<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 "_Mezua:"
-
-#: ../pidgin/gtkblist.c:924
+#: ../pidgin/gtkblist.c:767
 msgid "Join a Chat"
 msgstr "Sartu berriketa batean"
 
-#: ../pidgin/gtkblist.c:945
+#: ../pidgin/gtkblist.c:788
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Eman sartu nahi duzun berriketari buruzko informazioa.\n"
 
-#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6188
-#: ../pidgin/gtkpounce.c:539 ../pidgin/gtkroomlist.c:396
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
+#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "K_ontua:"
 
-#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "Blokeatu "
 
-#: ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1088
 #, fuzzy
 msgid "Un_block"
 msgstr "Blokeoa kendu"
 
-#: ../pidgin/gtkblist.c:1288
-msgid "Move to"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:1328
+#: ../pidgin/gtkblist.c:1139
 msgid "Get _Info"
 msgstr "_Inf."
 
-#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_BM"
 
-#: ../pidgin/gtkblist.c:1337
-#, fuzzy
-msgid "_Send File..."
-msgstr "_Bidali fitxategia"
-
-#: ../pidgin/gtkblist.c:1344
-#, fuzzy
-msgid "Add Buddy _Pounce..."
+#: ../pidgin/gtkblist.c:1148
+#, fuzzy
+msgid "_Send File"
+msgstr "Bidali fitxategia"
+
+#: ../pidgin/gtkblist.c:1155
+#, fuzzy
+msgid "Add Buddy _Pounce"
 msgstr "Gehitu lagun-_alerta"
 
-#: ../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 "Ikusi _egunkaria"
 
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Hide when offline"
-msgstr "Ez da onartzen lineaz kanpo"
-
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Show when offline"
-msgstr "Ez da onartzen lineaz kanpo"
-
-#: ../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 "_Ezizena..."
 
-#: ../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 "_Kendu"
 
-#: ../pidgin/gtkblist.c:1434
-#, fuzzy
-msgid "Add _Buddy..."
-msgstr "Gehitu laguna"
-
-#: ../pidgin/gtkblist.c:1437
-#, fuzzy
-msgid "Add C_hat..."
-msgstr "Gehitu berriketa"
-
-#: ../pidgin/gtkblist.c:1440
+#: ../pidgin/gtkblist.c:1238
+msgid "Add a _Buddy"
+msgstr "_Gehitu laguna"
+
+#: ../pidgin/gtkblist.c:1241
+msgid "Add a C_hat"
+msgstr "G_ehitu berriketa"
+
+#: ../pidgin/gtkblist.c:1244
 msgid "_Delete Group"
 msgstr "E_zabatu taldea"
 
-#: ../pidgin/gtkblist.c:1442
+#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr "_Izena aldatu"
 
 #. join button
-#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
 #: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Sartu"
 
-#: ../pidgin/gtkblist.c:1464
+#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
 msgstr "_Automatikoki sartu"
 
-#: ../pidgin/gtkblist.c:1466
-#, fuzzy
-msgid "Persistent"
-msgstr "pertsiera"
-
-#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
+#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
 msgid "_Collapse"
 msgstr "_Tolestu"
 
-#: ../pidgin/gtkblist.c:1532
+#: ../pidgin/gtkblist.c:1334
 msgid "_Expand"
 msgstr "_Zabaldu"
 
-#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
-#: ../pidgin/gtkblist.c:4885 ../pidgin/gtkblist.c:4898
+#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
+#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
 msgid "/Tools/Mute Sounds"
 msgstr "/Erabilpenak/Mutututako soinuak"
 
-#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903
+#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
 #: ../pidgin/gtkpounce.c:430
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "Kontu honetan ezin da lagun hori gehitu."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3067
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr "/_Lagunak"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Lagunak/_Berehalako mezu berria..."
 
-#: ../pidgin/gtkblist.c:3069
+#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Lagunak/_Sartu berriketa batean..."
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:2872
 msgid "/Buddies/Get User _Info..."
 msgstr "/Lagunak/_Hartu erabiltzailearen datuak..."
 
-#: ../pidgin/gtkblist.c:3071
+#: ../pidgin/gtkblist.c:2873
 msgid "/Buddies/View User _Log..."
 msgstr "/Lagunak/Ikusi erabiltzailearen _egunkaria..."
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:2875
 #, fuzzy
 msgid "/Buddies/Show"
 msgstr "/_Lagunak"
 
-#: ../pidgin/gtkblist.c:3074
+#: ../pidgin/gtkblist.c:2876
 #, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Lagunak/Erakutsi _Lineaz kanpoko lagunak"
 
-#: ../pidgin/gtkblist.c:3075
+#: ../pidgin/gtkblist.c:2877
 #, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Lagunak/Erakutsi _talde hutsak"
 
-#: ../pidgin/gtkblist.c:3076
+#: ../pidgin/gtkblist.c:2878
 #, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Lagunak/Erakutsi Lineaz  lagunen _ezaugarriak"
 
-#: ../pidgin/gtkblist.c:3077
+#: ../pidgin/gtkblist.c:2879
 #, fuzzy
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Lagunak/Erakutsi ez-aktibo _Denborak"
 
-#: ../pidgin/gtkblist.c:3078
+#: ../pidgin/gtkblist.c:2880
 #, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Lagunak/Erakutsi _talde hutsak"
 
-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Lagunak/Lagun_motak"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Lagunak/_Gehitu laguna..."
 
-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr "/Lagunak/Gehitu _berriketa..."
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr "/Lagunak/Gehitu _taldea..."
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr "/Lagunak/_Irten"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:2890
 msgid "/_Accounts"
 msgstr "/K_ontua"
 
-#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889
-#, fuzzy
-msgid "/Accounts/Manage"
-msgstr "/Kontuak"
+#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Kontuak/Gehitu\\/Editatu"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr "/_Tresnak"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:2895
 #, fuzzy
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Tresnak/Gehitu lagun-_alerta"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:2896
 #, fuzzy
 msgid "/Tools/_Certificates"
 msgstr "/Tresnak/_Hobespenak"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:2897
 msgid "/Tools/Plu_gins"
 msgstr "/Tresnak/Plu_gin-ak"
 
-#: ../pidgin/gtkblist.c:3096
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr "/Tresnak/_Hobespenak"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tresnak/P_ribatutasuna"
 
-#: ../pidgin/gtkblist.c:3099
+#: ../pidgin/gtkblist.c:2901
 msgid "/Tools/_File Transfers"
 msgstr "/Tresnak/_Fitxategi-transferentziak"
 
-#: ../pidgin/gtkblist.c:3100
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/R_oom List"
 msgstr "/Tresnak/_Gelen zerrenda"
 
-#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:2903
 msgid "/Tools/System _Log"
 msgstr "/Tresnak/_Ikusi sistemaren egunkaria "
 
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:2905
 msgid "/Tools/Mute _Sounds"
 msgstr "/Tresnak/Mututu _soinuak"
 
 #. Help
-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:2907
 msgid "/_Help"
 msgstr "/Lagu_ntza"
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:2908
 msgid "/Help/Online _Help"
 msgstr "/Laguntza/_Lineako laguntza..."
 
-#: ../pidgin/gtkblist.c:3107
+#: ../pidgin/gtkblist.c:2909
 msgid "/Help/_Debug Window"
 msgstr "/Laguntza/_Arazketa-leihoa"
 
-#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
+#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
 msgid "/Help/_About"
 msgstr "/Laguntza/H_oni buruz"
 
-#: ../pidgin/gtkblist.c:3140
+#: ../pidgin/gtkblist.c:2942
 #, c-format
 msgid ""
 "\n"
@@ -14483,168 +14458,172 @@
 "\n"
 "<b>Kontua:</b> %s"
 
-#: ../pidgin/gtkblist.c:3218
+#: ../pidgin/gtkblist.c:3020
 #, fuzzy
 msgid "Buddy Alias"
 msgstr "Lagunen zerrenda"
 
-#: ../pidgin/gtkblist.c:3247
+#: ../pidgin/gtkblist.c:3049
 #, fuzzy
 msgid "Logged In"
 msgstr "Konektatuta dago lehendik"
 
-#: ../pidgin/gtkblist.c:3293
+#: ../pidgin/gtkblist.c:3095
 #, fuzzy
 msgid "Last Seen"
 msgstr "Deitura"
 
-#: ../pidgin/gtkblist.c:3314
+#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3316
+#: ../pidgin/gtkblist.c:3118
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3120
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3657
+#: ../pidgin/gtkblist.c:3453
 #, fuzzy, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Ez-aktibo %dh%02dm "
 
-#: ../pidgin/gtkblist.c:3659
+#: ../pidgin/gtkblist.c:3455
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Ez-aktibo %dh%02dm "
 
-#: ../pidgin/gtkblist.c:3661
+#: ../pidgin/gtkblist.c:3457
 #, c-format
 msgid "Idle %dm"
 msgstr "Ez-aktibo %dm "
 
-#: ../pidgin/gtkblist.c:3806
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/New Instant Message..."
 msgstr "/Lagunak/Berehalako mezu berria..."
 
-#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Join a Chat..."
 msgstr "/Lagunak/Sartu berriketa batean..."
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Get User Info..."
 msgstr "/Lagunak/Lortu erabiltzailearen datuak..."
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3605
 msgid "/Buddies/Add Buddy..."
 msgstr "/Lagunak/Gehitu laguna..."
 
-#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843
+#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
 msgid "/Buddies/Add Chat..."
 msgstr "/Lagunak/Gehitu berriketa..."
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3607
 msgid "/Buddies/Add Group..."
 msgstr "/Lagunak/Gehitu taldea..."
 
-#: ../pidgin/gtkblist.c:3846
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Privacy"
 msgstr "/Tresnak/Pribatutasuna"
 
-#: ../pidgin/gtkblist.c:3849
+#: ../pidgin/gtkblist.c:3645
 msgid "/Tools/Room List"
 msgstr "/Tresnak/Gelen zerrenda"
 
-#: ../pidgin/gtkblist.c:3944 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d irakurri gabeko mezua  %s bidalia \n"
 msgstr[1] "%d irakurri gabeko mezuak  %s bidalia \n"
 
-#: ../pidgin/gtkblist.c:4104
+#: ../pidgin/gtkblist.c:3822
 msgid "Manually"
 msgstr "Eskuz "
 
-#: ../pidgin/gtkblist.c:4107
+#: ../pidgin/gtkblist.c:3824
+msgid "Alphabetically"
+msgstr "Alfabetikoki "
+
+#: ../pidgin/gtkblist.c:3825
 msgid "By status"
 msgstr "Egoeraren arabera"
 
-#: ../pidgin/gtkblist.c:4108
+#: ../pidgin/gtkblist.c:3826
 msgid "By log size"
 msgstr "Egunkari-tamainaren arabera"
 
-#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
 #, c-format
 msgid "%s disconnected"
 msgstr "%s Deskonektatuta."
 
-#: ../pidgin/gtkblist.c:4349
+#: ../pidgin/gtkblist.c:4067
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s deskonektatua%s</span>"
 
-#: ../pidgin/gtkblist.c:4501
+#: ../pidgin/gtkblist.c:4219
 #, fuzzy
 msgid "<b>Username:</b>"
 msgstr "_Erabiltzaile-izena:"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4226
 #, fuzzy
 msgid "<b>Password:</b>"
 msgstr "Pasahitza:"
 
-#: ../pidgin/gtkblist.c:4519
+#: ../pidgin/gtkblist.c:4237
 #, fuzzy
 msgid "_Login"
 msgstr "Egunkaria"
 
-#: ../pidgin/gtkblist.c:4602
+#: ../pidgin/gtkblist.c:4320
 msgid "/Accounts"
 msgstr "/Kontuak"
 
 #. 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 "
+"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 "/Lagunak/Erakutsi Lineaz kanpoko lagunak"
 
-#: ../pidgin/gtkblist.c:4882
+#: ../pidgin/gtkblist.c:4600
 #, fuzzy
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Lagunak/Erakutsi talde hutsak"
 
-#: ../pidgin/gtkblist.c:4888
+#: ../pidgin/gtkblist.c:4606
 #, fuzzy
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Lagunak/Erakutsi lagunaren ezaugarriak"
 
-#: ../pidgin/gtkblist.c:4891
+#: ../pidgin/gtkblist.c:4609
 #, fuzzy
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Lagunak/Erakutsi ez-aktibo Denbora"
 
-#: ../pidgin/gtkblist.c:4894
+#: ../pidgin/gtkblist.c:4612
 #, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Lagunak/Erakutsi talde hutsak"
 
-#: ../pidgin/gtkblist.c:5796
+#: ../pidgin/gtkblist.c:5507
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -14654,34 +14633,28 @@
 "izanez gero, alias edo goitizen bat ezar diezaiokezu. Aliasa pantaila-"
 "izenaren ordez azalduko da, ahal denean.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:5819
-#, fuzzy
-msgid "A_ccount:"
-msgstr "Kontua:"
-
 #. End of account box
-#: ../pidgin/gtkblist.c:5831
+#: ../pidgin/gtkblist.c:5542
 #, fuzzy
 msgid "_Screen name:"
 msgstr "Pantaila-izena:"
 
-#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209
+#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
 #, fuzzy
 msgid "A_lias:"
 msgstr "Aliasa:"
 
-#: ../pidgin/gtkblist.c:6121
+#: ../pidgin/gtkblist.c:5826
 msgid "This protocol does not support chat rooms."
 msgstr "Protokolo honek ez ditu berriketa-gelak onartzen"
 
-#: ../pidgin/gtkblist.c:6137
+#: ../pidgin/gtkblist.c:5842
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Une honetan ez daukazu berriketarako gaitasuna duen protokolorik."
 
-#: ../pidgin/gtkblist.c:6178
+#: ../pidgin/gtkblist.c:5883
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14689,47 +14662,39 @@
 "Sartu aliasa, eta lagunen zerrendan gehitu nahi duzun berriketari buruzko "
 "informazio guztia.\n"
 
-#: ../pidgin/gtkblist.c:6237
-msgid "Autojoin when account becomes online."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6238
-msgid "Hide chat when the window is closed."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6264
+#: ../pidgin/gtkblist.c:5964
 msgid "Please enter the name of the group to be added."
 msgstr "Idatzi gehitu nahi duzun taldearen izena."
 
-#: ../pidgin/gtkblist.c:6909
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6933
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "Kontua _Editatu"
 
-#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
 msgid "No actions available"
 msgstr "Ekintza erabilgarririk ez"
 
-#: ../pidgin/gtkblist.c:6954
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Ez-gaitu"
 
-#: ../pidgin/gtkblist.c:6966
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Ahalbidetu Kontua"
 
-#: ../pidgin/gtkblist.c:6972
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7021
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Tresnak"
 
-#: ../pidgin/gtkblist.c:7091
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Lagunak/Lagun Motak"
 
@@ -14739,7 +14704,7 @@
 msgid "SSL Servers"
 msgstr "Zerbitzaria"
 
-#: ../pidgin/gtkconn.c:181
+#: ../pidgin/gtkconn.c:180
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -14751,26 +14716,26 @@
 " Gaim ez da saiatuko kontua berriz konektatzen errorea konpondu  eta kontua "
 "ahalbidetu arte."
 
-#: ../pidgin/gtkconv.c:523
+#: ../pidgin/gtkconv.c:482
 #, fuzzy
 msgid "Unknown command."
 msgstr "Komando ezezaguna"
 
-#: ../pidgin/gtkconv.c:795 ../pidgin/gtkconv.c:821
+#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Lagun hori ez dago berriketa honek darabilen protokoloarekin."
 
-#: ../pidgin/gtkconv.c:815
+#: ../pidgin/gtkconv.c:774
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Ez duzu sinatu kontu batekin lagun hori gonbidatzeko."
 
-#: ../pidgin/gtkconv.c:868
+#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
 msgstr "Gonbidatu laguna berriketa-gelara"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:898
+#: ../pidgin/gtkconv.c:857
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14778,193 +14743,193 @@
 "Idatzi gonbidatu nahi duzun erabiltzailearen izena, gonbit-mezu batekin nahi "
 "baduzu."
 
-#: ../pidgin/gtkconv.c:919
+#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
 msgstr "_Laguna:"
 
-#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Mezua:"
 
-#: ../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 "Ezin da fitxategia ireki."
 
-#: ../pidgin/gtkconv.c:994
+#: ../pidgin/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Solasaldia: %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1032
+#: ../pidgin/gtkconv.c:991
 msgid "Save Conversation"
 msgstr "Gorde solasaldia"
 
-#: ../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 "Bilatu"
 
-#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "Bila_tu:"
 
-#: ../pidgin/gtkconv.c:1675
+#: ../pidgin/gtkconv.c:1622
 msgid "Un-Ignore"
 msgstr "Desegin ez ikustea"
 
-#: ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr "Ez ikusi egin"
 
-#: ../pidgin/gtkconv.c:1698
+#: ../pidgin/gtkconv.c:1645
 msgid "Get Away Message"
 msgstr "Kanpoan nagoeneko mezua "
 
-#: ../pidgin/gtkconv.c:1721
+#: ../pidgin/gtkconv.c:1668
 msgid "Last said"
 msgstr "Esandako azkena"
 
-#: ../pidgin/gtkconv.c:2665
+#: ../pidgin/gtkconv.c:2606
 msgid "Unable to save icon file to disk."
 msgstr "Ezin da gorde ikono-fitxategia diskoan."
 
-#: ../pidgin/gtkconv.c:2716
+#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr "Gorde ikonoa"
 
-#: ../pidgin/gtkconv.c:2768
+#: ../pidgin/gtkconv.c:2709
 msgid "Animate"
 msgstr "Animatu"
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2714
 msgid "Hide Icon"
 msgstr "Ezkutatu ikonoa"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2717
 msgid "Save Icon As..."
 msgstr "Gorde ikonoa honela..."
 
-#: ../pidgin/gtkconv.c:2780
+#: ../pidgin/gtkconv.c:2721
 #, fuzzy
 msgid "Set Custom Icon..."
 msgstr "Ezarri erabiltzailearen datuak..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2734
 #, fuzzy
 msgid "Remove Custom Icon"
 msgstr "Kendu kontaktua"
 
-#: ../pidgin/gtkconv.c:2924
+#: ../pidgin/gtkconv.c:2861
 msgid "Show All"
 msgstr ""
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2943
+#: ../pidgin/gtkconv.c:2880
 msgid "/_Conversation"
 msgstr "/_Solasaldia"
 
-#: ../pidgin/gtkconv.c:2945
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Solasaldia/_Berehalako mezu berria..."
 
-#: ../pidgin/gtkconv.c:2950
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Find..."
 msgstr "/Solasaldia/B_ilatu..."
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/View _Log"
 msgstr "/Solasaldia/Ikusi _egunkaria"
 
-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr "/Solasaldia/_Gorde honela..."
 
-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Solasaldia/Garb_itu Scrollback"
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/Se_nd File..."
 msgstr "/Solasaldia/B_idali fitxategia..."
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Solasaldia/Gehitu lagun-_alerta..."
 
-#: ../pidgin/gtkconv.c:2962
+#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr "/Solasaldia/_Hartu informazioa"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/Solasaldia/G_onbidatu..."
 
-#: ../pidgin/gtkconv.c:2966
+#: ../pidgin/gtkconv.c:2903
 #, fuzzy
 msgid "/Conversation/M_ore"
 msgstr "/Solasaldia/It_xi"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2907
 msgid "/Conversation/Al_ias..."
 msgstr "/Solasaldia/Ezize_na..."
 
-#: ../pidgin/gtkconv.c:2972
+#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/Solasaldia/Blo_keatu..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2911
 #, fuzzy
 msgid "/Conversation/_Unblock..."
 msgstr "/Solasaldia/Blo_keatu..."
 
-#: ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Add..."
 msgstr "/Solasaldia/Gehi_tu..."
 
-#: ../pidgin/gtkconv.c:2978
+#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Remove..."
 msgstr "/Solasaldia/Ke_ndu..."
 
-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Solasaldia/Txertat_u esteka..."
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Solasaldia/Txe_rtatu irudia..."
 
-#: ../pidgin/gtkconv.c:2991
+#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/_Close"
 msgstr "/Solasaldia/It_xi"
 
 #. Options
-#: ../pidgin/gtkconv.c:2995
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Options"
 msgstr "/_Aukerak"
 
-#: ../pidgin/gtkconv.c:2996
+#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr "/Aukerak/Gaitu _egunkaria"
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr "/Aukerak/Gaitu _soinuak"
 
-#: ../pidgin/gtkconv.c:2999
+#: ../pidgin/gtkconv.c:2936
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Aukerak/Erakutsi  tresna-barrarren  _formatua"
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:2937
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Aukerak/Erakutsi ord_u-zigiluak"
 
-#: ../pidgin/gtkconv.c:3124
+#: ../pidgin/gtkconv.c:3061
 #, fuzzy
 msgid "/Conversation/More"
 msgstr "/Solasaldia/It_xi"
 
-#: ../pidgin/gtkconv.c:3180
+#: ../pidgin/gtkconv.c:3117
 #, fuzzy
 msgid "/Options"
 msgstr "/_Aukerak"
@@ -14974,177 +14939,177 @@
 #. 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 "/_Solasaldia"
 
-#: ../pidgin/gtkconv.c:3255
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/View Log"
 msgstr "/Solasaldia/Ikusi egunkaria"
 
-#: ../pidgin/gtkconv.c:3261
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Send File..."
 msgstr "/Solasaldia/Bidali fitxategia..."
 
-#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Solasaldia/Gehitu lagun-alerta..."
 
-#: ../pidgin/gtkconv.c:3271
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Get Info"
 msgstr "/Solasaldia/Hartu informazioa"
 
-#: ../pidgin/gtkconv.c:3275
+#: ../pidgin/gtkconv.c:3212
 msgid "/Conversation/Invite..."
 msgstr "/Solasaldia/Gonbidatu..."
 
-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Alias..."
 msgstr "/Solasaldia/Aliasa..."
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr "/Solasaldia/Blokeatu..."
 
-#: ../pidgin/gtkconv.c:3289
+#: ../pidgin/gtkconv.c:3226
 #, fuzzy
 msgid "/Conversation/Unblock..."
 msgstr "/Solasaldia/Blokeatu..."
 
-#: ../pidgin/gtkconv.c:3293
+#: ../pidgin/gtkconv.c:3230
 msgid "/Conversation/Add..."
 msgstr "/Solasaldia/Gehitu..."
 
-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Remove..."
 msgstr "/Solasaldia/Kendu..."
 
-#: ../pidgin/gtkconv.c:3303
+#: ../pidgin/gtkconv.c:3240
 msgid "/Conversation/Insert Link..."
 msgstr "/Solasaldia/Txertatu esteka..."
 
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Insert Image..."
 msgstr "/Solasaldia/Txertatu irudia..."
 
-#: ../pidgin/gtkconv.c:3313
+#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr "/Aukerak/Gaitu egunkaria"
 
-#: ../pidgin/gtkconv.c:3316
+#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr "/Aukerak/Gaitu soinuak"
 
-#: ../pidgin/gtkconv.c:3329
+#: ../pidgin/gtkconv.c:3266
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Aukerak/Erakutsi  tresna-barrarren formatua"
 
-#: ../pidgin/gtkconv.c:3332
+#: ../pidgin/gtkconv.c:3269
 msgid "/Options/Show Timestamps"
 msgstr "/Aukerak/Erakutsi ordu-zigiluak"
 
-#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451
+#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
 msgstr "Erabiltzailea idazten ari da..."
 
-#: ../pidgin/gtkconv.c:3454
+#: ../pidgin/gtkconv.c:3391
 msgid "User has typed something and stopped"
 msgstr "Erabiltzaileak zerbait idatzi du eta gelditu egin da "
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3637 ../pidgin/gtkconv.c:8103
-#, fuzzy
-msgid "S_end To"
+#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
+#, fuzzy
+msgid "_Send To"
 msgstr "_Bidali honi:"
 
-#: ../pidgin/gtkconv.c:4349
+#: ../pidgin/gtkconv.c:4286
 msgid "_Send"
 msgstr "_Bidali"
 
 #. 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 pertsona gelan"
 
-#: ../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] "pertsona %d gelan"
 msgstr[1] "%d pertsona gelan"
 
-#: ../pidgin/gtkconv.c:6550 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Idazten"
 
-#: ../pidgin/gtkconv.c:6554
+#: ../pidgin/gtkconv.c:6490
 msgid "Stopped Typing"
 msgstr "Gelditu idazteari"
 
-#: ../pidgin/gtkconv.c:6557
+#: ../pidgin/gtkconv.c:6493
 msgid "Nick Said"
 msgstr "Goitizenak dio"
 
-#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Irakurri gabeko mezuak"
 
-#: ../pidgin/gtkconv.c:6563
+#: ../pidgin/gtkconv.c:6499
 msgid "New Event"
 msgstr "Gertaera berria "
 
-#: ../pidgin/gtkconv.c:7654
+#: ../pidgin/gtkconv.c:7572
 #, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "garbitu: Garbitu sosaldiaren scrollback"
 
-#: ../pidgin/gtkconv.c:7817
+#: ../pidgin/gtkconv.c:7736
 msgid "Confirm close"
 msgstr "Isteko konfirmazioa"
 
-#: ../pidgin/gtkconv.c:7849
+#: ../pidgin/gtkconv.c:7768
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Irakurri gabeko mezuak dituzu. Zihur al zaude lehioa itxi nahi duzula ?"
 
-#: ../pidgin/gtkconv.c:8436
+#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
 msgstr "Itxi beste tapakia"
 
-#: ../pidgin/gtkconv.c:8442
+#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
 msgstr "Tapaki guztiak itxi"
 
-#: ../pidgin/gtkconv.c:8450
+#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
 msgstr "Banatu betilea"
 
-#: ../pidgin/gtkconv.c:8456
+#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
 msgstr "Tapaki hau itxi"
 
-#: ../pidgin/gtkconv.c:8951
+#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr "Itxi solasaldia"
 
-#: ../pidgin/gtkconv.c:9553
+#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
 msgstr "Sortutako azken leihoa"
 
-#: ../pidgin/gtkconv.c:9555
+#: ../pidgin/gtkconv.c:9479
 msgid "Separate IM and Chat windows"
 msgstr "Bereiztu IM eta berriketa leihoak"
 
-#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417
+#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr "Leiho berria"
 
-#: ../pidgin/gtkconv.c:9559
+#: ../pidgin/gtkconv.c:9483
 msgid "By group"
 msgstr "Taldearen arabera"
 
-#: ../pidgin/gtkconv.c:9561
+#: ../pidgin/gtkconv.c:9485
 msgid "By account"
 msgstr "Kontuaren arabera"
 
@@ -15518,11 +15483,12 @@
 msgstr "Errumaniera"
 
 #: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
 msgid "Serbian"
 msgstr "Serbiera"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:260
-#: ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:263
 msgid "Swedish"
 msgstr "Suediera"
 
@@ -15539,7 +15505,7 @@
 msgid "Thai"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:264
 msgid "Turkish"
 msgstr "Turkiera"
 
@@ -15551,7 +15517,7 @@
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh eta Gnome-Vi taldea"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:265
 msgid "Simplified Chinese"
 msgstr "Txinera soildua"
 
@@ -15561,7 +15527,7 @@
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:217
-#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:266
 msgid "Traditional Chinese"
 msgstr "Txinera tradizionala"
 
@@ -15569,12 +15535,12 @@
 msgid "Amharic"
 msgstr "Amharic"
 
-#: ../pidgin/gtkdialogs.c:351
+#: ../pidgin/gtkdialogs.c:353
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "Gaim-i buruz"
 
-#: ../pidgin/gtkdialogs.c:394
+#: ../pidgin/gtkdialogs.c:396
 #, fuzzy, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15596,92 +15562,92 @@
 "laguntzaileen eskutik. Ikusi ezazy COPYRIGHT fitxategia laguntzaileen "
 "zerrenda osoa ikusteko. Ez dugu programa honen bermea zihurtatzen.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:412
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:414
+#, fuzzy, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim irc.freenode.net-en<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:417
+#: ../pidgin/gtkdialogs.c:419
 msgid "Current Developers"
 msgstr "Egungo garatzailea"
 
-#: ../pidgin/gtkdialogs.c:432
+#: ../pidgin/gtkdialogs.c:434
 msgid "Crazy Patch Writers"
 msgstr "Adabaki-idazle zoroak"
 
-#: ../pidgin/gtkdialogs.c:447
+#: ../pidgin/gtkdialogs.c:449
 msgid "Retired Developers"
 msgstr "Garatzaile erretiratuak"
 
-#: ../pidgin/gtkdialogs.c:462
+#: ../pidgin/gtkdialogs.c:464
 #, fuzzy
 msgid "Retired Crazy Patch Writers"
 msgstr "Adabaki-idazle zoroak"
 
-#: ../pidgin/gtkdialogs.c:477
+#: ../pidgin/gtkdialogs.c:479
 msgid "Artists"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:494
 msgid "Current Translators"
 msgstr "Itzultzaileak"
 
-#: ../pidgin/gtkdialogs.c:512
+#: ../pidgin/gtkdialogs.c:514
 msgid "Past Translators"
 msgstr "Lehengo itzultzaileak"
 
-#: ../pidgin/gtkdialogs.c:530
+#: ../pidgin/gtkdialogs.c:532
 msgid "Debugging Information"
 msgstr "Arakatze informazioa"
 
-#: ../pidgin/gtkdialogs.c:900
+#: ../pidgin/gtkdialogs.c:902
 msgid "Get User Info"
 msgstr "Hartu erabiltzailearen datuak"
 
-#: ../pidgin/gtkdialogs.c:902
+#: ../pidgin/gtkdialogs.c:904
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Idatzi informazioa ikusi nahi duzun pertsonaren pantaila-izena edo ezizena."
 
-#: ../pidgin/gtkdialogs.c:992
+#: ../pidgin/gtkdialogs.c:994
 msgid "View User Log"
 msgstr "Ikusi erabiltzailearen egunkaria"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:996
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "Idatzi egunkaria ikusi nahi duzun pertsonaren pantaila-izena edo ezizena."
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1016
 msgid "Alias Contact"
 msgstr "Ezizena kontaktuarentzat"
 
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Enter an alias for this contact."
 msgstr "Idatzi ezizen bat kontaktu honentzat."
 
-#: ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1039
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Idatzi ezizena bat %s(r)entzat."
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1041
 msgid "Alias Buddy"
 msgstr "Ezizena lagunarentzat"
 
-#: ../pidgin/gtkdialogs.c:1060
+#: ../pidgin/gtkdialogs.c:1062
 msgid "Alias Chat"
 msgstr "Ezizena berriketarako"
 
-#: ../pidgin/gtkdialogs.c:1061
+#: ../pidgin/gtkdialogs.c:1063
 msgid "Enter an alias for this chat."
 msgstr "Idatzi ezizen bat berriketa honetarako."
 
-#: ../pidgin/gtkdialogs.c:1100
+#: ../pidgin/gtkdialogs.c:1102
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15696,15 +15662,15 @@
 "%s eta beste %d lagun dituen kontaktua lagunen zerrendatik kentzera zoaz. "
 "Jarraitu nahi duzu?"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1110
 msgid "Remove Contact"
 msgstr "Kendu kontaktua"
 
-#: ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1113
 msgid "_Remove Contact"
 msgstr "_Kontaktua kendu"
 
-#: ../pidgin/gtkdialogs.c:1142
+#: ../pidgin/gtkdialogs.c:1144
 #, fuzzy, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15713,17 +15679,17 @@
 "%s taldea eta taldeko kide guztiak lagunen zerrendatik kentzera zoaz. "
 "Jarraitu nahi duzu?"
 
-#: ../pidgin/gtkdialogs.c:1149
+#: ../pidgin/gtkdialogs.c:1151
 #, fuzzy
 msgid "Merge Groups"
 msgstr "Kendu taldea"
 
-#: ../pidgin/gtkdialogs.c:1152
+#: ../pidgin/gtkdialogs.c:1154
 #, fuzzy
 msgid "_Merge Groups"
 msgstr "E_zabatu taldea"
 
-#: ../pidgin/gtkdialogs.c:1202
+#: ../pidgin/gtkdialogs.c:1204
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15732,40 +15698,40 @@
 "%s taldea eta taldeko kide guztiak lagunen zerrendatik kentzera zoaz. "
 "Jarraitu nahi duzu?"
 
-#: ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1207
 msgid "Remove Group"
 msgstr "Kendu taldea"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1210
 msgid "_Remove Group"
 msgstr "_Kendu taldea"
 
-#: ../pidgin/gtkdialogs.c:1241
+#: ../pidgin/gtkdialogs.c:1243
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "%s lagunen zerrendatik kentzera zoaz. Jarraitu nahi duzu?"
 
-#: ../pidgin/gtkdialogs.c:1244
+#: ../pidgin/gtkdialogs.c:1246
 msgid "Remove Buddy"
 msgstr "Kendu laguna"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1249
 msgid "_Remove Buddy"
 msgstr "_Kendu laguna"
 
-#: ../pidgin/gtkdialogs.c:1268
+#: ../pidgin/gtkdialogs.c:1270
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "%s berriketa lagunen zerrendatik kentzera zoaz. Jarraitu nahi duzu?"
 
-#: ../pidgin/gtkdialogs.c:1271
+#: ../pidgin/gtkdialogs.c:1273
 msgid "Remove Chat"
 msgstr "Kendu berriketa"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1276
 msgid "_Remove Chat"
 msgstr "_Kendu berriketa"
 
@@ -15791,7 +15757,7 @@
 
 #: ../pidgin/gtkdocklet.c:535
 #, fuzzy
-msgid "Blink on New Message"
+msgid "Blink on new message"
 msgstr "Mezu berria..."
 
 #: ../pidgin/gtkdocklet.c:542
@@ -15889,7 +15855,7 @@
 msgid "Paste as Plain _Text"
 msgstr "Itsatsi _testu gisa"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Reset formatting"
 msgstr "_Garbitu estiloa "
 
@@ -15969,6 +15935,7 @@
 msgstr "Gorde irudia"
 
 #: ../pidgin/gtkimhtml.c:3522
+#, c-format
 msgid "_Save Image..."
 msgstr "_Gorde irudia..."
 
@@ -16004,11 +15971,11 @@
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Sartu txertatu nahi duzun estekaren URL helbidea."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1099
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "Txertatu esteka"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1260
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr "_Txertatu"
 
@@ -16030,93 +15997,93 @@
 msgid "Smile!"
 msgstr "Irri egin!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:843 ../pidgin/gtkimhtmltoolbar.c:1217
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
 #, fuzzy
 msgid "_Font"
 msgstr "Letra-tipoak"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1051
+#: ../pidgin/gtkimhtmltoolbar.c:1054
 #, fuzzy
 msgid "Group Items"
 msgstr "Taldearen izena"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1051
+#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Lodia"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Etzana"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1087 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Azpimarratua"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088
+#: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090
-msgid "Increase Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1091
-msgid "Decrease Font Size"
-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 "Letra-tipoa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/gtkimhtmltoolbar.c:1097
 #, fuzzy
 msgid "Background Color"
 msgstr "Atzeko planoko kolorea"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 #, fuzzy
 msgid "Foreground Color"
 msgstr "Aurreko planoko letraren kolorea"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 #, fuzzy
 msgid "Reset Formatting"
 msgstr "Formateoa beregin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1103
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "Txertatu irudia"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 #, fuzzy
 msgid "Insert Smiley"
 msgstr "Txertatu aurpegiera"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1177
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 #, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>%s:</b> "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1178
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 #, fuzzy
 msgid "<i>_Italic</i>"
 msgstr " <i>(identifikatuta)</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 #, fuzzy
 msgid "<u>_Underline</u>"
 msgstr "Azpimarratua"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 #, fuzzy
 msgid "<span size='larger'>_Larger</span>"
 msgstr ""
@@ -16124,52 +16091,52 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 #, fuzzy
 msgid "_Normal"
 msgstr "Normala"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span size='smaller'>_Smaller</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:1189
+#: ../pidgin/gtkimhtmltoolbar.c:1191
 #, fuzzy
 msgid "_Font face"
 msgstr "Letra-tipoa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1190
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 #, fuzzy
 msgid "Foreground _color"
 msgstr "Aurreko planoko letraren kolorea"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "Atzeko planoko kolorea"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1268
+#: ../pidgin/gtkimhtmltoolbar.c:1270
+#, fuzzy
+msgid "_Smiley"
+msgstr "Irri egin!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1276
 #, fuzzy
 msgid "_Image"
 msgstr "Gorde irudia"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1274
+#: ../pidgin/gtkimhtmltoolbar.c:1282
 #, fuzzy
 msgid "_Link"
 msgstr "_Sartu"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1280
+#: ../pidgin/gtkimhtmltoolbar.c:1288
 msgid "_Horizontal rule"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1302
-#, fuzzy
-msgid "_Smile!"
-msgstr "Irri egin!"
-
 # , fuzzy
 #: ../pidgin/gtklog.c:293
 #, fuzzy, c-format
@@ -16277,7 +16244,6 @@
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
-"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "Gaim %s\n"
@@ -16292,10 +16258,10 @@
 "                      kontua(k) erabiltzeko, koma batez bereiztu)\n"
 "  -v, --version       Erakutsi egungo bertsioa eta irten\n"
 
-#: ../pidgin/gtkmain.c:516
-#, c-format
-msgid ""
-"%s %s has segfaulted and attempted to dump a core file.\n"
+#: ../pidgin/gtkmain.c:512
+#, c-format
+msgid ""
+"%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"
@@ -16316,7 +16282,7 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
 #, fuzzy
 msgid "Pidgin"
 msgstr "Markatzea"
@@ -16329,17 +16295,17 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Posta-mezua daukazu!</span>"
 
-#: ../pidgin/gtknotify.c:537
+#: ../pidgin/gtknotify.c:540
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s erabiltzaileak mezu berri %d du."
 msgstr[1] "%s erabiltzaileak %d mezu berri ditu."
 
-#: ../pidgin/gtknotify.c:562
-#, fuzzy, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+#: ../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>Plugin ezaugarriak</b>"
 msgstr[1] "<b>Plugin ezaugarriak</b>"
 
@@ -16558,7 +16524,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Eskutatu BM solasaldi berria"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 msgid "When away"
 msgstr "Kanpora joatean"
 
@@ -16611,65 +16577,61 @@
 msgid "Show _formatting on incoming messages"
 msgstr "Erakutsi  datozen mezuen _formatua "
 
-#: ../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 "Ezin da kanalaren informazioa eskuratu"
 
-#: ../pidgin/gtkprefs.c:1002
+#: ../pidgin/gtkprefs.c:1000
 msgid "Enable buddy ic_on animation"
 msgstr "_Gaitu lagunen ikonen animazioa"
 
-#: ../pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1007
 msgid "_Notify buddies that you are typing to them"
 msgstr "Jakinarazi _lagunei idazten ari zatzaizkienean"
 
-#: ../pidgin/gtkprefs.c:1012
+#: ../pidgin/gtkprefs.c:1010
 msgid "Highlight _misspelled words"
 msgstr "_Nabarmendu gaizki idatzitako hitzak "
 
-#: ../pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
 msgstr "Erabili mugimendu leuna norantza bertikalean"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1017
 #, fuzzy
 msgid "F_lash window when IMs are received"
 msgstr "_Erakutsi leihoa keinuka mezuak jasotzean"
 
-#: ../pidgin/gtkprefs.c:1021
+#: ../pidgin/gtkprefs.c:1019
 #, fuzzy
 msgid "Minimi_ze new conversation windows"
 msgstr "BMko solasaldi-leihoak"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1023
 #, fuzzy
 msgid "Font"
 msgstr "Letra-tipoak"
 
+#: ../pidgin/gtkprefs.c:1025
+msgid "Use document font from _theme"
+msgstr ""
+
 #: ../pidgin/gtkprefs.c:1027
-msgid "Use document font from _theme"
+msgid "Use font from _theme"
 msgstr ""
 
 #: ../pidgin/gtkprefs.c:1029
-msgid "Use font from _theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1031
 #, fuzzy
 msgid "Conversation _font:"
 msgstr "Solasaldiako Sarrerak"
 
-#: ../pidgin/gtkprefs.c:1045
+#: ../pidgin/gtkprefs.c:1043
 #, fuzzy
 msgid "Default Formatting"
 msgstr "Formateoa beregin"
 
-#: ../pidgin/gtkprefs.c:1064
+#: ../pidgin/gtkprefs.c:1062
 #, fuzzy
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
@@ -16678,119 +16640,119 @@
 "Irteerako testudun mezuek edukiko duten itxura estiloa onartzen duten "
 "protokoloak erabiltzean. :)"
 
-#: ../pidgin/gtkprefs.c:1130
+#: ../pidgin/gtkprefs.c:1128
 msgid "ST_UN server:"
 msgstr "ST_UN Zerbitzaria:"
 
-#: ../pidgin/gtkprefs.c:1142
+#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1146
+#: ../pidgin/gtkprefs.c:1144
 msgid "_Autodetect IP address"
 msgstr "_Automatikoki detektatu IP helbidea "
 
-#: ../pidgin/gtkprefs.c:1155
+#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
 msgstr "_IP publikoa:"
 
-#: ../pidgin/gtkprefs.c:1184
+#: ../pidgin/gtkprefs.c:1182
 msgid "Ports"
 msgstr "Atakak"
 
-#: ../pidgin/gtkprefs.c:1187
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Zehaztu eskuz entzuteko ataken barrutia"
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1188
 msgid "_Start port:"
 msgstr "_Hasierako ataka: "
 
-#: ../pidgin/gtkprefs.c:1197
+#: ../pidgin/gtkprefs.c:1195
 msgid "_End port:"
 msgstr "_Amaierako ataka: "
 
-#: ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkprefs.c:1203
 msgid "Proxy Server"
 msgstr "Proxy zerbitzaria"
 
-#: ../pidgin/gtkprefs.c:1209
+#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr "Proxy-rik ez"
 
-#: ../pidgin/gtkprefs.c:1265
+#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr "_Erabiltzailea:"
 
+#: ../pidgin/gtkprefs.c:1328
+msgid "Seamonkey"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1329
+msgid "Opera"
+msgstr "Opera"
+
 #: ../pidgin/gtkprefs.c:1330
-msgid "Seamonkey"
-msgstr ""
+msgid "Netscape"
+msgstr "Netscape"
 
 #: ../pidgin/gtkprefs.c:1331
-msgid "Opera"
-msgstr "Opera"
+msgid "Mozilla"
+msgstr "Mozilla"
 
 #: ../pidgin/gtkprefs.c:1332
-msgid "Netscape"
-msgstr "Netscape"
+msgid "Konqueror"
+msgstr "Konqueror"
 
 #: ../pidgin/gtkprefs.c:1333
-msgid "Mozilla"
-msgstr "Mozilla"
+msgid "GNOME Default"
+msgstr "Gnome-ren lehenetsia "
 
 #: ../pidgin/gtkprefs.c:1334
-msgid "Konqueror"
-msgstr "Konqueror"
+msgid "Galeon"
+msgstr "Galeon"
 
 #: ../pidgin/gtkprefs.c:1335
-msgid "GNOME Default"
-msgstr "Gnome-ren lehenetsia "
+msgid "Firefox"
+msgstr "Firefox"
 
 #: ../pidgin/gtkprefs.c:1336
-msgid "Galeon"
-msgstr "Galeon"
+msgid "Firebird"
+msgstr "Firebird"
 
 #: ../pidgin/gtkprefs.c:1337
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../pidgin/gtkprefs.c:1338
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1348
+#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr "Eskuz"
 
-#: ../pidgin/gtkprefs.c:1401
+#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr "Arakatzailea hautatzea"
 
-#: ../pidgin/gtkprefs.c:1405
+#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr "_Arakatzailea:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1411
 msgid "_Open link in:"
 msgstr "_Ireki esteka:"
 
-#: ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkprefs.c:1413
 msgid "Browser default"
 msgstr "Arakatzaile lehenetsian"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1414
 msgid "Existing window"
 msgstr "Lehendik dagoen leihoan"
 
-#: ../pidgin/gtkprefs.c:1418
+#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr "Fitxa berrian"
 
-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16799,67 +16761,69 @@
 "_Eskuz:\n"
 "(%s - URL)"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log _format:"
 msgstr "_Egunkari-formatua: "
 
+#: ../pidgin/gtkprefs.c:1475
+msgid "Log all _instant messages"
+msgstr "Erregistratu _egunkarian berehalako mezu guztiak "
+
 #: ../pidgin/gtkprefs.c:1477
-msgid "Log all _instant messages"
-msgstr "Erregistratu _egunkarian berehalako mezu guztiak "
-
-#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "Erreg_istratu egunkarian berriketa guztiak"
 
-#: ../pidgin/gtkprefs.c:1481
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
 msgstr "Egunkarian gorde _egoera aldaketa guztiak egunkari sistema bidez"
 
-#: ../pidgin/gtkprefs.c:1627
+#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr "Soinua hautatzea"
 
-#: ../pidgin/gtkprefs.c:1637
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1635
+#, fuzzy, c-format
 msgid "Quietest"
 msgstr "Erreserbatua"
 
-#: ../pidgin/gtkprefs.c:1639
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1637
+#, fuzzy, c-format
 msgid "Quieter"
 msgstr "Irten"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1639
+#, c-format
 msgid "Quiet"
 msgstr "Irten "
 
+#: ../pidgin/gtkprefs.c:1643
+#, c-format
+msgid "Loud"
+msgstr "Altu esan "
+
 #: ../pidgin/gtkprefs.c:1645
-msgid "Loud"
-msgstr "Altu esan "
-
-#: ../pidgin/gtkprefs.c:1647
-#, fuzzy
+#, fuzzy, c-format
 msgid "Louder"
 msgstr "ordu"
 
-#: ../pidgin/gtkprefs.c:1649
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1647
+#, fuzzy, c-format
 msgid "Loudest"
 msgstr "Soinuak"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr "_Metodoa:"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
 msgstr "Kontsolaren soinu-seinalea"
 
-#: ../pidgin/gtkprefs.c:1724
+#: ../pidgin/gtkprefs.c:1722
 msgid "No sounds"
 msgstr "Soinurik ez"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16868,85 +16832,85 @@
 "Soinuaren k_omandoa:\n"
 "(%s fitxategi-izena)"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1757
 msgid "Sounds when conversation has _focus"
 msgstr "_Solasaldiak fokua duenean"
 
-#: ../pidgin/gtkprefs.c:1761
+#: ../pidgin/gtkprefs.c:1759
 #, fuzzy
 msgid "Enable sounds:"
 msgstr "Ahalbidetu Kontua"
 
-#: ../pidgin/gtkprefs.c:1772
+#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
 msgstr "Bolumena:"
 
-#: ../pidgin/gtkprefs.c:1852
+#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr "Erreproduzitu"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1927
 msgid "_Report idle time:"
 msgstr "Ezagutarazi _inaktibotasun-denborak"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr "Teklatu edo saguaren erabilpenean oinarrituta"
 
-#: ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1941
 msgid "_Auto-reply:"
 msgstr "_Erantzun _automatikoki"
 
-#: ../pidgin/gtkprefs.c:1947
+#: ../pidgin/gtkprefs.c:1945
 msgid "When both away and idle"
 msgstr "Bai Kanpoan eta inaktibo dagoenean"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
 msgstr "Kanpoan automatikoki ezartzea"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:1953
 msgid "Change status when _idle"
 msgstr "Egoera aldatu _ez-aktibo dagoenean"
 
-#: ../pidgin/gtkprefs.c:1959
+#: ../pidgin/gtkprefs.c:1957
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Egoera aldatu aurreko minutuak:"
 
-#: ../pidgin/gtkprefs.c:1967
+#: ../pidgin/gtkprefs.c:1965
 msgid "Change _status to:"
 msgstr "_Egoera  aldatu hona:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1986
 #, fuzzy
 msgid "Status at Startup"
 msgstr "Hasierako egoera"
 
-#: ../pidgin/gtkprefs.c:1990
+#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
 msgstr "Erabili azkeneko irteteerako egoera hasieratzeko"
 
-#: ../pidgin/gtkprefs.c:1996
+#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
 msgstr "Haserako egoera ezartzeko:"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2032
 #, fuzzy
 msgid "Interface"
 msgstr "Koloreen Interfaze"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2034
 msgid "Smiley Themes"
 msgstr "Aurpegiera-gaiak"
 
-#: ../pidgin/gtkprefs.c:2043
+#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr "Arakatzailea"
 
-#: ../pidgin/gtkprefs.c:2047
+#: ../pidgin/gtkprefs.c:2045
 #, fuzzy
 msgid "Status / Idle"
 msgstr "Kanpoan / Inaktibo"
@@ -17457,7 +17421,7 @@
 msgid "Received Messages"
 msgstr "Irakurri gabeko mezuak"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Hautatu testu-kolorea honentzako  %s"
@@ -17727,7 +17691,7 @@
 "\n"
 "<b>Lagun ezizena:</b> %s"
 
-#: ../pidgin/plugins/history.c:192
+#: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Historia"
 
@@ -17989,36 +17953,46 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView banatzaile horizontala"
 
-#: ../pidgin/plugins/pidginrc.c:69
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Solasaldiako Sarrerak"
 
-#: ../pidgin/plugins/pidginrc.c:70
+#: ../pidgin/plugins/pidginrc.c:74
+msgid "Conversation History"
+msgstr "Solasaldiak Historia"
+
+#: ../pidgin/plugins/pidginrc.c:75
+#, fuzzy
+msgid "Log Viewer"
+msgstr "Log ikuskatzailea"
+
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Eskaera Elkarrizketa"
 
-#: ../pidgin/plugins/pidginrc.c:71
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Jakinarazpenak elkarrizketa"
 
-#: ../pidgin/plugins/pidginrc.c:247
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Hautatu kolorea"
 
-#: ../pidgin/plugins/pidginrc.c:294
+#: ../pidgin/plugins/pidginrc.c:300
+#, c-format
 msgid "Select Interface Font"
 msgstr "Hautatu letra-tipoa "
 
-#: ../pidgin/plugins/pidginrc.c:297
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Hautatu letra-tipoa honentzako %s"
 
-#: ../pidgin/plugins/pidginrc.c:365
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+ Interfazearen letra-tipoa"
 
-#: ../pidgin/plugins/pidginrc.c:385
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Testu ? gaia"
 
@@ -18042,38 +18016,38 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Koloreen Interfaze"
 
-#: ../pidgin/plugins/pidginrc.c:446
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Widget neurriak"
 
-#: ../pidgin/plugins/pidginrc.c:467
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Letra-tipoak"
 
-#: ../pidgin/plugins/pidginrc.c:491
+#: ../pidgin/plugins/pidginrc.c:497
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Gaim fitxategien kontrola"
 
-#: ../pidgin/plugins/pidginrc.c:496
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Ezapernak idatzi honentzako %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:505
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Berirakurri  gtkrc files"
 
-#: ../pidgin/plugins/pidginrc.c:538
+#: ../pidgin/plugins/pidginrc.c:544
 #, fuzzy
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Gaim GTK+ Gaien kontrola"
 
-#: ../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 "gtkrc -ren ohizko ezarpenetara akzesua ahalbidetzen du."
 
@@ -18261,7 +18235,7 @@
 msgstr "Timestamp-en formatu ezarpenak"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, fuzzy
+#, fuzzy, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Behartu (Ohizko Gaim) 24 orduko denbora formatua"
 
@@ -18484,6 +18458,110 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Offline buddies"
+#~ msgstr "Bilatu lagunak"
+
+#, fuzzy
+#~ msgid "Sort"
+#~ msgstr "Ataka"
+
+#, fuzzy
+#~ msgid "By Status"
+#~ msgstr "Egoeraren arabera"
+
+#, fuzzy
+#~ msgid "By Log Size"
+#~ msgstr "Egunkari-tamainaren arabera"
+
+#, fuzzy
+#~ msgid "Unable to connect to contact server"
+#~ msgstr "Ezin da zerbitzariarekin konektatu."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Gehitu helbide-liburuan oharretan"
+
+# , fuzzy
+#, fuzzy
+#~ msgid "Current media"
+#~ msgstr "Momentuko lekukoa"
+
+#, fuzzy
+#~ msgid "Windows Live Messenger Protocol Plugin"
+#~ msgstr "Novell GroupWise mezulariaren protokoloaren plugin-a"
+
+#, fuzzy
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Huts egin du era normalean autentifikatzean."
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s berriki harreta eskaera bidali dizute !"
+
+#, fuzzy
+#~ msgid "Unknown error (%d)"
+#~ msgstr "Errore ezezaguna"
+
+#, fuzzy
+#~ msgid "Unable to connect to OIM server"
+#~ msgstr "Ezin da zerbitzariarekin konektatu."
+
+#, fuzzy
+#~ msgid "%s (%s) changed status from %s to %s"
+#~ msgstr "%s(e)k egoera aldatu du: %s -> %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is now %s"
+#~ msgstr "%s orain %s da"
+
+#, fuzzy
+#~ msgid "%s (%s) is no longer %s"
+#~ msgstr "%s ez dago luzaroago %s"
+
+#, fuzzy
+#~ msgid "_Merge"
+#~ msgstr "_Mezua:"
+
+#, fuzzy
+#~ msgid "_Send File..."
+#~ msgstr "_Bidali fitxategia"
+
+#, fuzzy
+#~ msgid "Add Buddy _Pounce..."
+#~ msgstr "Gehitu lagun-_alerta"
+
+#, fuzzy
+#~ msgid "Hide when offline"
+#~ msgstr "Ez da onartzen lineaz kanpo"
+
+#, fuzzy
+#~ msgid "Show when offline"
+#~ msgstr "Ez da onartzen lineaz kanpo"
+
+#, fuzzy
+#~ msgid "Add _Buddy..."
+#~ msgstr "Gehitu laguna"
+
+#, fuzzy
+#~ msgid "Add C_hat..."
+#~ msgstr "Gehitu berriketa"
+
+#, fuzzy
+#~ msgid "Persistent"
+#~ msgstr "pertsiera"
+
+#, fuzzy
+#~ msgid "/Accounts/Manage"
+#~ msgstr "/Kontuak"
+
+#, fuzzy
+#~ msgid "A_ccount:"
+#~ msgstr "Kontua:"
+
+#, fuzzy
+#~ msgid "S_end To"
+#~ msgstr "_Bidali honi:"
+
 #~ msgid "Gaim Internet Messenger"
 #~ msgstr "Gaim interneteko mezularitza "
 
@@ -18520,9 +18598,6 @@
 #~ msgid "GtkTreeView Expander Size"
 #~ msgstr "GtkTreeView Zabaltzailearen tamaina"
 
-#~ msgid "Conversation History"
-#~ msgstr "Solasaldiak Historia"
-
 # , fuzzy
 #~ msgid "GtkTreeView Indent Expanders"
 #~ msgstr "GtkTreeView zabaltzailea"
@@ -18570,15 +18645,6 @@
 #~ msgid "Alias..."
 #~ msgstr "_Ezizena..."
 
-#~ msgid "Add a _Buddy"
-#~ msgstr "_Gehitu laguna"
-
-#~ msgid "Add a C_hat"
-#~ msgstr "G_ehitu berriketa"
-
-#~ msgid "/Accounts/Add\\/Edit"
-#~ msgstr "/Kontuak/Gehitu\\/Editatu"
-
 #~ msgid ""
 #~ "\n"
 #~ "<b>Nickname:</b> %s"
@@ -18783,9 +18849,6 @@
 #~ "\n"
 #~ "<b>%s:</b> %s"
 
-#~ msgid "Has you"
-#~ msgstr "Atzeman zaitu"
-
 #~ msgid "%s<b>General</b><br>%s"
 #~ msgstr "%s<b>Orokorral</b><br>%s"