diff po/ar.po @ 20269:e4719768af06

Re-run stats.pl to update the po files again.
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 19:44:38 +0000
parents a14208697dcd
children 1f27c4471ccf d35d761ded1a
line wrap: on
line diff
--- a/po/ar.po	Fri Sep 28 19:39:01 2007 +0000
+++ b/po/ar.po	Fri Sep 28 19:44:38 2007 +0000
@@ -6,13 +6,12 @@
 # Afief Halumi <Afief.h@gmail.com>, 2007.
 # AbdulAziz AlSharif <a.a-a.s@hotmail.com>, 2007.
 # Khaled Hosny <khaledhosny@eglug.org>, 2007.
-
 #: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: 6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 03:21-0400\n"
+"POT-Creation-Date: 2007-09-28 14:39-0500\n"
 "PO-Revision-Date: 2007-09-28 17:30+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -22,7 +21,8 @@
 "X-Poedit-Language: Arabic\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
 #: ../finch/finch.c:418
@@ -55,7 +55,7 @@
 "  -n, --nologin       لا تلج آليا\n"
 "  -v, --version       يظهر النسخة الحالية ويختفي\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 "
@@ -70,7 +70,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
@@ -105,8 +105,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(ربم نسيت أن تقوم بـ 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4322
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
 msgid "Modify Account"
 msgstr "عدّل الحساب"
 
@@ -136,7 +136,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
@@ -146,8 +146,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
@@ -156,10 +156,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:6096
+#: ../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
@@ -194,16 +194,16 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1034
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
-#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:6267
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:769
-#: ../pidgin/gtkdialogs.c:908 ../pidgin/gtkdialogs.c:1000
-#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1044
-#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1114
-#: ../pidgin/gtkdialogs.c:1155 ../pidgin/gtkdialogs.c:1211
-#: ../pidgin/gtkdialogs.c:1250 ../pidgin/gtkdialogs.c:1277
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
+#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
+#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
+#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
 #: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
 #: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
 #: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
@@ -215,7 +215,7 @@
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
 #: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
 #: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
 #: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
@@ -244,7 +244,7 @@
 msgid "Delete"
 msgstr "احذف"
 
-#: ../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 "الحسابات"
@@ -255,16 +255,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 "أضف"
@@ -330,13 +329,13 @@
 msgstr "اسم الشاشة"
 
 #: ../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:1019
-#: ../pidgin/gtkdialogs.c:1043 ../pidgin/gtkdialogs.c:1065
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
 #: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "الكنية"
@@ -348,7 +347,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:506
+#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
 #: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "الحساب"
@@ -362,7 +361,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5772
+#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "أضف صديق"
@@ -371,15 +370,15 @@
 msgid "Please enter buddy information."
 msgstr "من فضلك أدخل معلومات الصديق."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
 msgid "Chats"
 msgstr "دردشات"
 
 #. 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
@@ -391,7 +390,7 @@
 msgid "Auto-join"
 msgstr "انضمام تلقائي"
 
-#: ../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 "أضف دردشة"
 
@@ -413,7 +412,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 "أضف مجموعة"
 
@@ -445,7 +444,7 @@
 msgid "Retrieving..."
 msgstr "ينزّل..."
 
-#: ../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"
@@ -457,10 +456,10 @@
 msgstr "أضف إشعار صديق"
 
 #. 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 "أرسل ملفا"
 
@@ -504,14 +503,14 @@
 msgstr "أكِّد الإزالة"
 
 #: ../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 "أزِل"
 
 #. 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 "قائمة الأصدقاء"
@@ -530,15 +529,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
@@ -548,7 +547,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 "الاسم المستعار"
 
@@ -557,12 +556,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/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:3099
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
-#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
+#: ../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 "خامل"
 
@@ -593,51 +592,52 @@
 "\n"
 "شوهد قبل %s"
 
-#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "جديد..."
 
-#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "حُفِظ..."
 
-#: ../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 "ملحقات"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:750
-#: ../pidgin/gtkdialogs.c:889 ../pidgin/gtkdialogs.c:970
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
+#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
 msgid "_Name"
 msgstr "الا_سم"
 
-#: ../finch/gntblist.c:2210 ../pidgin/gtkdialogs.c:755
-#: ../pidgin/gtkdialogs.c:894 ../pidgin/gtkdialogs.c:975
+#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
+#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
 msgid "_Account"
 msgstr "ال_حساب"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:763
+#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
 msgid "New Instant Message"
 msgstr "رسالة فورية جديدة..."
 
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:765
-msgid "Please enter the screen name or alias of the person you would like to IM."
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
 msgstr "من فضلك أدخل اسم الشاشة أو كنية الشخص الذي تود محادثته."
 
 #. 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:6095
+#: ../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
@@ -654,50 +654,47 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1033
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
-#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4321
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:768
-#: ../pidgin/gtkdialogs.c:907 ../pidgin/gtkdialogs.c:999
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
+#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
 #: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "موافق"
 
 #. 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 "خيارات"
 
-#: ../finch/gntblist.c:2267
+#: ../finch/gntblist.c:2247
 msgid "Send IM..."
 msgstr "ابعث رسالة فورية..."
 
+#: ../finch/gntblist.c:2251
+#, fuzzy
+msgid "Show empty groups"
+msgstr "المجموعات الخالية"
+
+#: ../finch/gntblist.c:2257
+#, fuzzy
+msgid "Show offline buddies"
+msgstr "اعرض الأصدقاء غير المتَّصلين"
+
+#: ../finch/gntblist.c:2263
+#, fuzzy
+msgid "Sort by status"
+msgstr "حالة فرعية"
+
+#: ../finch/gntblist.c:2267
+#, fuzzy
+msgid "Sort alphabetically"
+msgstr "أبجديًّا"
+
 #: ../finch/gntblist.c:2271
-msgid "Show"
-msgstr "اعرض"
-
-#: ../finch/gntblist.c:2276
-msgid "Empty groups"
-msgstr "المجموعات الخالية"
-
-#: ../finch/gntblist.c:2282
-msgid "Offline buddies"
-msgstr "الأصدقاء غير المتَّصلين"
-
-#: ../finch/gntblist.c:2288
-msgid "Sort"
-msgstr "رتِّب"
-
-#: ../finch/gntblist.c:2293
-msgid "By Status"
-msgstr "حسب الحالة"
-
-#: ../finch/gntblist.c:2297 ../pidgin/gtkblist.c:4106
-msgid "Alphabetically"
-msgstr "أبجديًّا"
-
-#: ../finch/gntblist.c:2301
-msgid "By Log Size"
+#, fuzzy
+msgid "Sort by log size"
 msgstr "حسب حجم السجل"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
@@ -796,7 +793,7 @@
 msgid "Hostname"
 msgstr "اسم المضيف"
 
-#: ../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 "معلومات"
@@ -804,24 +801,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 "أغلق"
 
-#: ../finch/gntconn.c:125
+#: ../finch/gntconn.c:124
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:127
 #, c-format
 msgid "%s disconnected."
 msgstr "%s قطع الاتصال."
 
-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:128
 #, c-format
 msgid ""
 "%s\n"
@@ -833,7 +830,7 @@
 "\n"
 "لن يحاول فِنش إعادة اتصال الحساب قبل أن تصحح الخطأ وتعيد تفعيل الحساب."
 
-#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4323
+#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
 msgid "Re-enable Account"
 msgstr "أعِد تفعيل الحساب"
 
@@ -841,23 +838,23 @@
 msgid "No such command."
 msgstr "لا أمر من هذا القبيل."
 
-#: ../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 "Syntax Error:  كتبت رقم خاطئ من المعاملات لهذا الأمر."
 
-#: ../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 "أمرك فشل لسبب مجهول."
 
-#: ../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 "يعمل هذا الأمر فقط مع الدردشات، وليس الرسائل الفورية."
 
-#: ../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 "يعمل هذا الأمر فقط مع الرسائل الفورية، وليس الدردشات."
 
-#: ../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 "لايعمل هذا الأمر مع هذا البروتوكول."
 
@@ -875,7 +872,7 @@
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
 #, c-format
 msgid ""
 "\n"
@@ -888,61 +885,62 @@
 msgid "You have left this chat."
 msgstr "لقد غادرت هذه الدردشة."
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1415
+#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "بدأ التسجيل. الرسائل المستقبلية في هذه المحادثة ستسجل."
 
-#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1423
-msgid "Logging stopped. Future messages in this conversation will not be logged."
+#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
 msgstr "أُوقِف التسجيل. الرسائل المستقبلية في هذه المحادثة لن تسجل."
 
-#: ../finch/gntconv.c:469
+#: ../finch/gntconv.c:442
 msgid "Send To"
 msgstr "أرسل إلى"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:486
 msgid "Conversation"
 msgstr "محادثات"
 
-#: ../finch/gntconv.c:519
+#: ../finch/gntconv.c:492
 msgid "Clear Scrollback"
 msgstr "امسح نافذة المحادثة"
 
-#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "اعرض الطوابع الزمنية"
 
-#: ../finch/gntconv.c:539
+#: ../finch/gntconv.c:512
 #, fuzzy
 msgid "Add Buddy Pounce..."
 msgstr "أضف إشعار صديق..."
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:527
 msgid "Enable Logging"
 msgstr "فعّل التسجيل"
 
-#: ../finch/gntconv.c:560
+#: ../finch/gntconv.c:533
 msgid "Enable Sounds"
 msgstr "فعّل الأصوات"
 
-#: ../finch/gntconv.c:766
+#: ../finch/gntconv.c:739
 msgid "<AUTO-REPLY> "
 msgstr "<رد-تلقائي>"
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:889
+#: ../finch/gntconv.c:861
 msgid "List of users:\n"
 msgstr "قائمة المستخدمين:\n"
 
-#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:370
+#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
 msgid "Supported debug options are:  version"
 msgstr "خيارات التنقيح المدعومة هي: النسخة"
 
-#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:422
+#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr "لا أمر من هذا القبيل (في هذا السياق)."
 
-#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -950,64 +948,60 @@
 "استخدم  \"/help &lt;command&gt;\" للمساعدة في أمر بعينه.\n"
 "الأوامر التالية متاحة في هذا السياق:\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."
 msgstr "say &lt;رسالة&gt;: ارسل رسالة بشكل عادي كأنك لم تستخدم هذا الأمر."
 
-#: ../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;إجراء&gt;: أرسل  إجراء من طور آي‌آر‌سي للصديق أو الدردشة."
 
-#: ../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;option&gt;:  ارسل معلومات التنقيح المتنوعة إلى المحادثة الحالية."
-
-#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7651
+msgstr ""
+"debug &lt;option&gt;:  ارسل معلومات التنقيح المتنوعة إلى المحادثة الحالية."
+
+#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: يمسح نافذة المحادثة."
 
-#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7657
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  مساعدة حول أمر بعينه."
 
-#: ../finch/gntconv.c:1163
+#: ../finch/gntconv.c:1135
 msgid "users:  Show the list of users in the chat."
 msgstr "users: اعرض قائمة بالمستخدمين في الدردشة"
 
-#: ../finch/gntconv.c:1168
+#: ../finch/gntconv.c:1140
 msgid "plugins: Show the plugins window."
 msgstr "plugins: اعرض نافذة الملحقات."
 
-#: ../finch/gntconv.c:1171
+#: ../finch/gntconv.c:1143
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: اعرض قائمة الأصدقاء."
 
-#: ../finch/gntconv.c:1174
+#: ../finch/gntconv.c:1146
 msgid "accounts: Show the accounts window."
 msgstr "accounts: اعرض نافذة الحسابات."
 
-#: ../finch/gntconv.c:1177
+#: ../finch/gntconv.c:1149
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: اعرض نافذة التنقيح."
 
-#: ../finch/gntconv.c:1180
+#: ../finch/gntconv.c:1152
 msgid "prefs: Show the preference window."
 msgstr "prefs: اعرض نافذة التفضيلات."
 
-#: ../finch/gntconv.c:1183
+#: ../finch/gntconv.c:1155
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: اعرض نافذة الحالات المحفوظة."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:988 ../pidgin/gtkconv.c:2657
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "تعذّر فتح الملف."
-
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "نافذة التنقيح"
 
@@ -1015,15 +1009,16 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "امسح"
 
-#: ../finch/gntdebug.c:303
-msgid "Filter:"
+#: ../finch/gntdebug.c:262
+#, fuzzy
+msgid "Filter: "
 msgstr "مرشِّح:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "قف مؤقّتا"
 
@@ -1067,8 +1062,8 @@
 #: ../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
@@ -1076,8 +1071,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:3780
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
+#: ../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 "الحالة"
@@ -1121,7 +1116,7 @@
 msgid "Finished"
 msgstr "انتهى"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:386
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "نقل"
 
@@ -1156,33 +1151,33 @@
 msgid "New Mail"
 msgstr "بريد جديد"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:942
+#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
 msgid "Info for %s"
 msgstr "معلومات عن %s"
 
 #: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:943
+#: ../pidgin/gtknotify.c:941
 msgid "Buddy Information"
 msgstr "معلومات الصديق"
 
-#: ../finch/gntnotify.c:380 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "استمر"
 
-#: ../finch/gntnotify.c:389 ../pidgin/gtkconv.c:1649
+#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
 msgstr "رسالة فورية"
 
-#: ../finch/gntnotify.c:392
+#: ../finch/gntnotify.c:389
 msgid "Join"
 msgstr "انضم"
 
-#: ../finch/gntnotify.c:395 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "ادعُ"
 
-#: ../finch/gntnotify.c:398
+#: ../finch/gntnotify.c:395
 msgid "(none)"
 msgstr "(بدون)"
 
@@ -1237,7 +1232,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 "التفضيلات"
 
@@ -1424,6 +1419,7 @@
 msgstr "%s ارسل لك رسالة. (%s)"
 
 #: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "حدث إشعار مجهول. من فضلك أبلغ عنها!"
 
@@ -1431,12 +1427,12 @@
 msgid "Based on keyboard use"
 msgstr "مبني على استخدام لوحة المفاتيح"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
 msgid "From last sent message"
 msgstr "من آخر رسالة أُرسِلت"
 
 #: ../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 "أبداً"
@@ -1486,12 +1482,12 @@
 msgstr "غيّر الحالة إلى"
 
 #. 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 "محادثات"
 
-#: ../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 "تسجيل"
 
@@ -1557,8 +1553,8 @@
 msgid "GStreamer failed to initialize."
 msgstr "فشل بدأ GStreamer."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
-#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
+#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
 msgid "(default)"
 msgstr "(الإفتراضي)"
 
@@ -1574,7 +1570,7 @@
 msgid "Profiles"
 msgstr "لاحات"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
 msgid "Automatic"
 msgstr "تلقائي"
 
@@ -1582,7 +1578,7 @@
 msgid "Console Beep"
 msgstr "صافرة الكونسول"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
 msgid "Command"
 msgstr "أمر"
 
@@ -1590,7 +1586,7 @@
 msgid "No Sound"
 msgstr "بدون صوت"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
 msgid "Sound Method"
 msgstr "طريقة الصوت"
 
@@ -1608,7 +1604,7 @@
 "(%s لاسم الملف)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
 msgid "Sound Options"
 msgstr "خيارات الصوت"
 
@@ -1617,17 +1613,17 @@
 msgstr "أصدر صوتاً عندما تصبح المحادثة في البؤرة"
 
 #: ../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 "دائماً"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1763
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when available"
 msgstr "عندما يكون متاح"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
 msgid "Only when not available"
 msgstr "عندما لا يكون متاح"
 
@@ -1636,11 +1632,11 @@
 msgstr "الحجم(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
 msgid "Sound Events"
 msgstr "الأحداث الصوتيّة"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
 msgid "Event"
 msgstr "حدث"
 
@@ -1648,15 +1644,15 @@
 msgid "File"
 msgstr "ملف"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
 msgid "Test"
 msgstr "اختبر"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
 msgid "Reset"
 msgstr "صفّر"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
 msgid "Choose..."
 msgstr "اختر..."
 
@@ -1676,7 +1672,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 "العنوان"
@@ -1707,20 +1703,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:5556
-#: ../libpurple/protocols/oscar/oscar.c:5774
-#: ../libpurple/protocols/oscar/oscar.c:5788
-#: ../libpurple/protocols/oscar/oscar.c:5804
-#: ../libpurple/protocols/oscar/oscar.c:5811
-#: ../libpurple/protocols/oscar/oscar.c:5818
+#: ../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
@@ -1728,8 +1721,8 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3753
-#: ../libpurple/protocols/yahoo/yahoo.c:3759
+#: ../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"
@@ -1785,7 +1778,7 @@
 msgid "Certificates"
 msgstr "الشّهادات"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
 msgid "Sounds"
 msgstr "الأصوات"
 
@@ -1886,16 +1879,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>محادثة مع %s على %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 "ملحق المحفوظات يتطلب التسجيل"
 
-#: ../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"
@@ -1910,11 +1903,11 @@
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../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 "اعرض المحادثات المسجلة حديثاً في محادثات جديدة."
 
-#: ../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."
@@ -1967,7 +1960,7 @@
 msgstr "لا يوجد ملحق بروتوكول لـ %s"
 
 #: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4318
+#: ../pidgin/gtkblist.c:4036
 msgid "Connection Error"
 msgstr "خطأ في الاتصال"
 
@@ -2012,16 +2005,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 "مجهول"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3249 ../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"
@@ -2140,11 +2133,13 @@
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
-msgstr "لا تملك قاعدة بيانات بالشهادات الجذر، لذا لا يمكن التحقق من هذه الشهادة."
+msgstr ""
+"لا تملك قاعدة بيانات بالشهادات الجذر، لذا لا يمكن التحقق من هذه الشهادة."
 
 #. vrq will be completed by user_auth
 #: ../libpurple/certificate.c:1382
-msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "الشهادة الجذر التي تزعم هذه أنها أُصدِرت منها مجهولة لبِدْجِن."
 
 #: ../libpurple/certificate.c:1408
@@ -2203,9 +2198,9 @@
 msgstr "+++ %s قام بالخروج"
 
 #: ../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 "خطأ مجهول"
 
@@ -2321,6 +2316,7 @@
 "%s"
 
 #: ../libpurple/dnsquery.c:578
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "نهاية الملف (EOF) أثناء قراءة عملية الإقرار"
 
@@ -2429,6 +2425,7 @@
 msgstr "اكتمل نقل الملف %s"
 
 #: ../libpurple/ft.c:685
+#, c-format
 msgid "File transfer complete"
 msgstr "اكتمل نقل الملف"
 
@@ -2438,6 +2435,7 @@
 msgstr "ألغيتَ نقل %s"
 
 #: ../libpurple/ft.c:1108
+#, c-format
 msgid "File transfer cancelled"
 msgstr "أُلغِيَ نقل الملف"
 
@@ -2533,49 +2531,57 @@
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
-msgstr "صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"aim\"."
+msgstr ""
+"صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"aim\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
-msgstr "صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"gg\"."
+msgstr ""
+"صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"gg\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
-msgstr "صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"icq\"."
+msgstr ""
+"صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"icq\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
-msgstr "صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"irc\"."
+msgstr ""
+"صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"irc\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
-msgstr "صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"msnim\"."
+msgstr ""
+"صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"msnim\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
-msgstr "صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"sip\"."
+msgstr ""
+"صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"sip\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
-msgstr "صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"xmpp\"."
+msgstr ""
+"صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"xmpp\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
-msgstr "صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"ymsgr\"."
+msgstr ""
+"صحيح إذا كان على الأمر المحدّد في المفتاح \"command\" معالجة عناوين \"ymsgr\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
@@ -2679,6 +2685,7 @@
 msgstr "تستخدم %s، ولكن هذا الملحق يتطلب %s."
 
 #: ../libpurple/plugin.c:380
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "لم يحدد هذا الملحق معرفا."
 
@@ -2760,11 +2767,11 @@
 #: ../libpurple/protocols/oscar/oscar.c:1453
 #: ../libpurple/protocols/oscar/oscar.c:2233
 #: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5888
-#: ../libpurple/protocols/oscar/oscar.c:5943
-#: ../libpurple/protocols/oscar/oscar.c:6169
-#: ../libpurple/protocols/oscar/oscar.c:6239 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
+#: ../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 "ا_لغِ"
 
@@ -2805,8 +2812,8 @@
 "أبلغِ بنافذة منبثقة عندما يكتمل نقل الملفات التلقائي\n"
 "(فقط إذا لم تكن هناك محادثة مع المرسل)"
 
-#: ../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 "ملاحظات"
 
@@ -2961,7 +2968,8 @@
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
-msgstr "ملحق اختباري لدعم IPC. يحدد موضع الملحق الخادم ويستدعي الأوامر المسجلة."
+msgstr ""
+"ملحق اختباري لدعم IPC. يحدد موضع الملحق الخادم ويستدعي الأوامر المسجلة."
 
 #. *< type
 #. *< ui_requirement
@@ -3236,9 +3244,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
@@ -3248,9 +3256,9 @@
 msgstr "نعم"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:622
-#: ../libpurple/protocols/novell/novell.c:1920
+#: ../libpurple/protocols/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
@@ -3481,15 +3489,15 @@
 "idle."
 msgstr "تنبيهي في نافذة محادثة عندما يصبح الصديق أو يعود من حالة بعيد أو خمول."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "محمل ملحقات Tcl"
 
-#: ../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"
 
-#: ../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"
@@ -3503,7 +3511,8 @@
 msgstr "تعذّر الاستماع لاتصالات التراسل الفوري الواردة\n"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "تعذر الاتصال بخادم mDNS المحلّي. هل يعمل؟"
 
 #. Creating the options for the protocol
@@ -3525,7 +3534,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
@@ -3716,7 +3725,7 @@
 msgid "Year of birth"
 msgstr "سنة الميلاد"
 
-#: ../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:3732
 #: ../libpurple/protocols/qq/buddy_info.c:46
@@ -3798,25 +3807,25 @@
 msgstr "أضف إلى الدردشة..."
 
 #: ../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:5606
+#: ../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:3101 ../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 "غير متصل"
 
 #: ../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:3103 ../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 "متاح"
@@ -3826,18 +3835,19 @@
 #. 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:4547
-#: ../libpurple/protocols/oscar/oscar.c:5634
+#: ../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:3655
-#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../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 "بعيد"
 
@@ -3848,8 +3858,8 @@
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/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
@@ -3905,7 +3915,7 @@
 msgid "Connection failed."
 msgstr "فشل الاتصال."
 
-#: ../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 "محظور"
 
@@ -4043,7 +4053,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:2361
+#: ../libpurple/protocols/myspace/myspace.c:2356
 msgid "Server has disconnected"
 msgstr "قُطِع اتصال الخادم"
 
@@ -4069,14 +4079,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:2941
+#: ../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 "يتّصل"
@@ -4090,20 +4100,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 "لا يمكن إنشاء مقبس"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2474
+#: ../libpurple/protocols/myspace/myspace.c:2469
 #: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "لا يمكن الاتصال بالخادم"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2357
+#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr "خطأ في القراءة"
 
@@ -4143,22 +4153,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:6673
+#: ../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 "خادم"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2302
-#: ../libpurple/protocols/oscar/oscar.c:6676
+#: ../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
@@ -4361,7 +4371,8 @@
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr "لقد اخترت اسم حساب رفضه الخادم.  من المحتمل أنها تحتوي محارف غير صالحة."
+msgstr ""
+"لقد اخترت اسم حساب رفضه الخادم.  من المحتمل أنها تحتوي محارف غير صالحة."
 
 #: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
@@ -4520,7 +4531,7 @@
 "اعرض المستخدمين في القناة حاليا."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2299
+#: ../libpurple/protocols/jabber/jabber.c:2261
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 "nick &lt;new nickname&gt;:\n"
@@ -4682,7 +4693,7 @@
 msgid "Ad-Hoc Command Failed"
 msgstr "فشل الأمر المخصص"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:176
+#: ../libpurple/protocols/jabber/adhoccommands.c:173
 msgid "execute"
 msgstr "نفِّذ"
 
@@ -4700,7 +4711,8 @@
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
-msgstr "يتطلب %s استيثاق نص صِرف عبر اتصال غير معمّى. أأسمح بهذا وأكمل الاستيثاق؟ "
+msgstr ""
+"يتطلب %s استيثاق نص صِرف عبر اتصال غير معمّى. أأسمح بهذا وأكمل الاستيثاق؟ "
 
 #: ../libpurple/protocols/jabber/auth.c:321
 #: ../libpurple/protocols/jabber/auth.c:322
@@ -4825,7 +4837,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1768
+#: ../libpurple/protocols/msn/msn.c:1658
 #: ../libpurple/protocols/oscar/oscar.c:3749
 msgid "Birthday"
 msgstr "تاريخ الميلاد"
@@ -4833,7 +4845,7 @@
 #: ../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 "الوصف"
@@ -4847,7 +4859,8 @@
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
-msgstr "جميع العناصر التالية اختيارية. أدخل فقط المعلومات التي تشعرك بالارتياح."
+msgstr ""
+"جميع العناصر التالية اختيارية. أدخل فقط المعلومات التي تشعرك بالارتياح."
 
 #: ../libpurple/protocols/jabber/buddy.c:795
 #: ../libpurple/protocols/jabber/buddy.c:960
@@ -5164,71 +5177,72 @@
 msgid "Logo"
 msgstr "شعار"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr "الغِ الإخفاء من"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr "اخفِ مؤقتا من"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr "الغِ تنبيه التواجد"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr "(أعِد) طلب الاستيثاق"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
+#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Unsubscribe"
 msgstr "الغِ الاشتراك"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
+#: ../libpurple/protocols/jabber/buddy.c:1985
 msgid "Log In"
 msgstr "لُجْ"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:1989
 msgid "Log Out"
 msgstr "اخرج"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/buddy.c:2035
 #: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "ثرثار"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr "مُمَدَّد بعيدا"
 
-#: ../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:5810
+#: ../libpurple/protocols/oscar/oscar.c:5808
 #: ../libpurple/protocols/sametime/sametime.c:3297
+#, c-format
 msgid "Do Not Disturb"
 msgstr "الرجاء عدم الإزعاج"
 
-#: ../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/jabber/buddy.c:2212
+#: ../libpurple/protocols/jabber/buddy.c:2391
 #: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "Last Name"
 msgstr "الاسم الاخير"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr "التالي هي نتائج بحثك"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2322
+#: ../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 (%)"
@@ -5236,39 +5250,39 @@
 "ابحث عن مُراسل عن طريق ادخال معايير البحث في الحقول المناسبة. ملاحظة: الحقول "
 "تدعم البحث بالبطاقات الهوجاء (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2342
+#: ../libpurple/protocols/jabber/buddy.c:2339
 msgid "Directory Query Failed"
 msgstr "فشل استعلام الدليل"
 
-#: ../libpurple/protocols/jabber/buddy.c:2343
+#: ../libpurple/protocols/jabber/buddy.c:2340
 msgid "Could not query the directory server."
 msgstr "لايمكن استعلام خادم الدليل."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2377
+#: ../libpurple/protocols/jabber/buddy.c:2374
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "تعليمات الخادم: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2384
+#: ../libpurple/protocols/jabber/buddy.c:2381
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "املأ واحدة او أكثر من الحقول للبحث عن مستخدمي XMPP المتطابقين."
 
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/novell/novell.c:1490
+#: ../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 "عنوان البريد الالكتروني"
 
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/jabber/buddy.c:2410
+#: ../libpurple/protocols/jabber/buddy.c:2411
 msgid "Search for XMPP users"
 msgstr "ابحث عن مستخدمي XMPP"
 
 #. "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
@@ -5280,19 +5294,19 @@
 msgid "Search"
 msgstr "ابحث"
 
-#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2427
 msgid "Invalid Directory"
 msgstr "دليل غير صالح"
 
-#: ../libpurple/protocols/jabber/buddy.c:2447
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Enter a User Directory"
 msgstr "ادخِل دليل مستخدم"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Select a user directory to search"
 msgstr "اختر دليل مستخدم للبحث"
 
-#: ../libpurple/protocols/jabber/buddy.c:2451
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Search Directory"
 msgstr "دليل البحث"
 
@@ -5408,9 +5422,9 @@
 msgstr "خطأ في القراءة"
 
 #: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2560
-#: ../libpurple/protocols/yahoo/yahoo.c:2592
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2558
+#: ../libpurple/protocols/yahoo/yahoo.c:2590
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5501,7 +5515,8 @@
 msgstr "الغ التسجيل"
 
 #: ../libpurple/protocols/jabber/jabber.c:994
-msgid "Please fill out the information below to change your account registration."
+msgid ""
+"Please fill out the information below to change your account registration."
 msgstr "من فضلك املأ المعلومات أدناه لتتغير تسجيل حسابك."
 
 #: ../libpurple/protocols/jabber/jabber.c:997
@@ -5551,7 +5566,7 @@
 msgstr "بدأ SSL/TLS"
 
 #: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:390
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "الاستيثاق"
 
@@ -5564,7 +5579,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1909
 #: ../libpurple/protocols/jabber/jabber.c:1945
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5602
 msgid "Not Authorized"
 msgstr "غير مصرح"
 
@@ -5728,7 +5743,7 @@
 msgstr "من فضلك أدخل كلمة السر الجديدة"
 
 #: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6390
+#: ../libpurple/protocols/oscar/oscar.c:6388
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -5736,7 +5751,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6401
+#: ../libpurple/protocols/oscar/oscar.c:6399
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -5997,67 +6012,49 @@
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "تعذّر الرنّ، لأن المستخدم %s لا يدعمه."
 
-#: ../libpurple/protocols/jabber/jabber.c:2250
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-msgid "Buzz"
-msgstr "رن"
-
-#: ../libpurple/protocols/jabber/jabber.c:2251
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
-#, c-format
-msgid "%s has buzzed you!"
-msgstr "%s قام بالرن عليك"
-
-#: ../libpurple/protocols/jabber/jabber.c:2252
-#: ../libpurple/protocols/yahoo/yahoo.c:4123
-#, c-format
-msgid "Buzzing %s..."
-msgstr "يرن على %s..."
-
-#: ../libpurple/protocols/jabber/jabber.c:2291
+#: ../libpurple/protocols/jabber/jabber.c:2253
 msgid "config:  Configure a chat room."
 msgstr ""
 "config:\n"
 "اضبط غرفة الدردشة."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2257
 msgid "configure:  Configure a chat room."
 msgstr ""
 "configure:\n"
 "اضبط غرفة دردشة."
 
-#: ../libpurple/protocols/jabber/jabber.c:2304
+#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
 msgstr ""
 "part [room]:\n"
 "غادر الغرفة."
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr ""
 "register:\n"
 "سجّل في غرفة دردشة."
 
-#: ../libpurple/protocols/jabber/jabber.c:2315
+#: ../libpurple/protocols/jabber/jabber.c:2277
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 "topic [new topic]:\n"
 "اعرض أو غيّر الموضوع."
 
-#: ../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;user&gt; [room]:\n"
 "اطرد مستخدم من الغرفة."
 
-#: ../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."
 msgstr ""
 
-#: ../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."
@@ -6065,36 +6062,37 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;:\n"
 "حدد دور مستخدم في غرفة."
 
-#: ../libpurple/protocols/jabber/jabber.c:2339
+#: ../libpurple/protocols/jabber/jabber.c:2301
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;user&gt; [message]:\n"
 "ادع مستخدم إلى غرفة."
 
-#: ../libpurple/protocols/jabber/jabber.c:2345
+#: ../libpurple/protocols/jabber/jabber.c:2307
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;room&gt; [server]:\n"
 "انضم إلى دردشة على هذا الخادم"
 
-#: ../libpurple/protocols/jabber/jabber.c:2351
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 "kick &lt;user&gt; [room]:\n"
 "اركل مستخدم خارج الغرفة."
 
-#: ../libpurple/protocols/jabber/jabber.c:2356
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: ../libpurple/protocols/jabber/jabber.c:2318
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;user&gt; &lt;message&gt;:\n"
 "ارسل رسالة خاصة لمستخدم آخر."
 
-#: ../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:4147
+#: ../libpurple/protocols/jabber/jabber.c:2329
+#: ../libpurple/protocols/yahoo/yahoo.c:4145
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: رن على مستخدم لتجذب انتباهه."
 
@@ -6131,8 +6129,8 @@
 msgstr "اسمح لاستيثاق النص العادي عبر تيارات غير مُعمّاة"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3282
-#: ../libpurple/protocols/simple/simple.c:1904
+#: ../libpurple/protocols/myspace/myspace.c:3277
+#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Connect port"
 msgstr "منفذ الاتصال"
 
@@ -6140,7 +6138,7 @@
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3279
+#: ../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"
@@ -6175,6 +6173,12 @@
 msgid "XMPP Message Error"
 msgstr "رسالة خطأ XMPP"
 
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s قام بالرن عليك"
+
 #: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
@@ -6184,35 +6188,35 @@
 msgid "XML Parse error"
 msgstr "خطأ في تحليل XML"
 
-#: ../libpurple/protocols/jabber/presence.c:422
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "خطأ مجهول في التواجد"
 
-#: ../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 "أنشئ غرفة جديدة"
 
-#: ../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?"
 msgstr "تنشئ غرفة جديدة.  هل تود إعدادها، أو قبول الإعدادات الافتراضية؟"
 
-#: ../libpurple/protocols/jabber/presence.c:511
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "ا_ضبط الغرفة"
 
-#: ../libpurple/protocols/jabber/presence.c:512
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "ا_قبل الافتراضيات"
 
-#: ../libpurple/protocols/jabber/presence.c:554
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "خطأ في دردشة %s"
 
-#: ../libpurple/protocols/jabber/presence.c:558
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "خطأ أثناء الانضمام للدردشة %s"
@@ -6284,7 +6288,7 @@
 "something appropriate."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usernick.c:100
+#: ../libpurple/protocols/jabber/usernick.c:99
 msgid "Set Nickname..."
 msgstr "حدد الكنية..."
 
@@ -6296,21 +6300,12 @@
 msgid "Select an action"
 msgstr "اختر إجراءا"
 
-#: ../libpurple/protocols/msn/contact.c:188
-msgid "Unable to connect to contact server"
-msgstr "تعذّر الاتصال بخادم الاتصال."
-
-#: ../libpurple/protocols/msn/contact.c:948
-#, fuzzy
-msgid "Unable to retrieve MSN Address Book"
-msgstr "اختر دفتر عناوين ملاحظات"
-
-#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "تعقب تزامن قائمة الأصدقاء في %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6319,203 +6314,250 @@
 "%s على القائمة المحلية في مجموعة \"%s\" لكن ليس على قائمة الخادم. هل تريد أن "
 "يضاف هذا الصديق؟"
 
-#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
-msgstr "%s على القائمة المحلية وليس على قائمة الخادم. هل تريد أن يضاف هذا الصديق؟"
+msgstr ""
+"%s على القائمة المحلية وليس على قائمة الخادم. هل تريد أن يضاف هذا الصديق؟"
 
 #: ../libpurple/protocols/msn/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "تعذّر تحليل الرسالة"
 
 #: ../libpurple/protocols/msn/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "خطأ في بناء الجملة (على الأغلب مشكلة في العميل)"
 
 #: ../libpurple/protocols/msn/error.c:46
+#, c-format
 msgid "Invalid e-mail address"
 msgstr "عنوان بريد إلكترونى غير صالح"
 
 #: ../libpurple/protocols/msn/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "المستخدم لا وجود له"
 
 #: ../libpurple/protocols/msn/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "يفتقد اسم نطاق كامل"
 
 #: ../libpurple/protocols/msn/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "ولج بالفعل"
 
 #: ../libpurple/protocols/msn/error.c:59
+#, c-format
 msgid "Invalid screen name"
 msgstr "اسم شاشة غير صالح"
 
 #: ../libpurple/protocols/msn/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "اسم ودّي غير صالح"
 
 #: ../libpurple/protocols/msn/error.c:65
+#, c-format
 msgid "List full"
 msgstr "القائمة ممتلئة"
 
 #: ../libpurple/protocols/msn/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "دائماً هنا"
 
 #: ../libpurple/protocols/msn/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "ليس بالقائمة"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "المستخدم غير متصل"
 
 #: ../libpurple/protocols/msn/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "في الطور مسبقا"
 
 #: ../libpurple/protocols/msn/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "بالفعل في القائمة المقابلة"
 
 #: ../libpurple/protocols/msn/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "مجموعات كثيرة جدا"
 
 #: ../libpurple/protocols/msn/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "المجموعة غير صالحة"
 
 #: ../libpurple/protocols/msn/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "المستخدم ليس بالمجموعة"
 
 #: ../libpurple/protocols/msn/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "اسم المجموعة طويل جداً"
 
 #: ../libpurple/protocols/msn/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "لايمكن إزالة المجموعة صفر"
 
 #: ../libpurple/protocols/msn/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "حاولت إضافة مستخدم إلى مجموعة لا وجود لها"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, fuzzy
+#, fuzzy, c-format
 msgid "Switchboard failed"
 msgstr "فشل لوحة المفاتيح"
 
 #: ../libpurple/protocols/msn/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "تنبيه فشل النقل"
 
 #: ../libpurple/protocols/msn/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "حقول مطلوبة مفقودة"
 
 #: ../libpurple/protocols/msn/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
+#, c-format
 msgid "Not logged in"
 msgstr "لم يلج"
 
 #: ../libpurple/protocols/msn/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "الخدمة غير متوفّرة مُؤقّتاً"
 
 #: ../libpurple/protocols/msn/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "خطأ في خادم قاعدة البيانات"
 
 #: ../libpurple/protocols/msn/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "عُطِّل الأمر"
 
 #: ../libpurple/protocols/msn/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "خطأ في عملية الملف"
 
 #: ../libpurple/protocols/msn/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "خطأ في تخصيص الذاكرة"
 
 #: ../libpurple/protocols/msn/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "أُرسِلت قيمة CHL خطأ للخادم"
 
 #: ../libpurple/protocols/msn/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "الخادم مشغول"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "الخادم غير متوفر"
 
 #: ../libpurple/protocols/msn/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "خادم تنبيهات النظير أطفئ"
 
 #: ../libpurple/protocols/msn/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "خطأ في الاتصال بقاعدة البيانات"
 
 #: ../libpurple/protocols/msn/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "الخادم سيُطفأ (abandon ship)"
 
 #: ../libpurple/protocols/msn/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "خطأ في إنشاء الاتصال"
 
 #: ../libpurple/protocols/msn/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "معاملات CVR إما مجهولة أو ممنوعة"
 
 #: ../libpurple/protocols/msn/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "لا أستطيع الكتابة"
 
 #: ../libpurple/protocols/msn/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "الجلسة ممتلئة"
 
 #: ../libpurple/protocols/msn/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "المستخدم نشط جداً"
 
 #: ../libpurple/protocols/msn/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "لجلسا كثيرة جدات"
 
 #: ../libpurple/protocols/msn/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "جواز سفر غير مُوثّق"
 
 #: ../libpurple/protocols/msn/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "ملف صديق سيء"
 
 #: ../libpurple/protocols/msn/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "غير متوقع"
 
 #: ../libpurple/protocols/msn/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "الاسم الودّي تغير بسرعة كبيرة"
 
 #: ../libpurple/protocols/msn/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "الخادم مشغول جداً"
 
@@ -6524,26 +6566,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 "فشل الاستيثاق"
 
 #: ../libpurple/protocols/msn/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "غير مسموح عند عدم الاتصال"
 
 #: ../libpurple/protocols/msn/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "لا يقبل المستخدمين الجدد"
 
 #: ../libpurple/protocols/msn/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "جواز سفر أطفال بدون موافقة الأبوين"
 
 #: ../libpurple/protocols/msn/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "حساب جواز السفر لم يُوثّق"
 
 #: ../libpurple/protocols/msn/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "تذكرة سيّئة"
 
@@ -6575,31 +6623,31 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "اسمك الودّي في MSN طويل جداً."
 
-#: ../libpurple/protocols/msn/msn.c:285
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "ضع اسمك الودّي."
 
-#: ../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 "هذا هو الاسم الذي سيراك به أصدقاء MSN "
 
-#: ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "ضع رقم هاتف منزلك."
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "ضع رقم هاتف عملك."
 
-#: ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "ضع رقم هاتفك المحمول."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "أأسمح بصفحات MSN المتنقلة؟"
 
-#: ../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?"
@@ -6607,119 +6655,116 @@
 "هل تريد أن تسمح للناس في قائمة أصدقاؤك أن يرسلوا صفحات MSN متنقلة إلى هاتفك "
 "المحمول أو اجهزتك النقالة الاخرى؟"
 
-#: ../libpurple/protocols/msn/msn.c:360
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "اسمح"
 
-#: ../libpurple/protocols/msn/msn.c:361
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "ارفض"
 
-#: ../libpurple/protocols/msn/msn.c:377
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "حساب هوتميل هذا قد لا يكون نشط."
 
-#: ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "ارسل رسالة محمول."
 
-#: ../libpurple/protocols/msn/msn.c:405
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "صفحة"
 
-#: ../libpurple/protocols/msn/msn.c:610 ../libpurple/protocols/msn/msn.c:635
-#: ../libpurple/protocols/msn/msn.c:642 ../libpurple/protocols/msn/msn.c:649
-#: ../libpurple/protocols/msn/msn.c:656 ../libpurple/protocols/msn/msn.c:662
-#: ../libpurple/protocols/msn/msn.c:668
-msgid "Current media"
-msgstr "الوسيط الحالي"
-
-#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3763
+#: ../libpurple/protocols/msn/msn.c:549
+msgid "Has you"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3077
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Be Right Back"
 msgstr "سأعود حالاً"
 
-#: ../libpurple/protocols/msn/msn.c:654 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2827
-#: ../libpurple/protocols/novell/novell.c:2957
+#: ../libpurple/protocols/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:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Busy"
 msgstr "مشغول"
 
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On the Phone"
 msgstr "على الهاتف"
 
-#: ../libpurple/protocols/msn/msn.c:666
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Out to Lunch"
 msgstr "خرجت للغداء"
 
-#: ../libpurple/protocols/msn/msn.c:697
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "ضع اسما ودّيا..."
 
-#: ../libpurple/protocols/msn/msn.c:702
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "ضع رقم هاتف المنزل..."
 
-#: ../libpurple/protocols/msn/msn.c:706
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "ضع رقم هاتف العمل..."
 
-#: ../libpurple/protocols/msn/msn.c:710
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "ضع رقم الهاتف المحمول..."
 
-#: ../libpurple/protocols/msn/msn.c:716
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "فعّل/عطّل الأجهزة المحمولة..."
 
-#: ../libpurple/protocols/msn/msn.c:721
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "اسمح/ارفض الصفحات المتنقلة..."
 
-#: ../libpurple/protocols/msn/msn.c:732
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "افتح وارد هوتميل"
 
-#: ../libpurple/protocols/msn/msn.c:756
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "ارسل إلى محمول"
 
-#: ../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 "ابدأ _دردشة"
 
-#: ../libpurple/protocols/msn/msn.c:804
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "تحتاج إلى دعم SSL لـMSN. رجاءً قم بتثبيت مكتبة SSL مدعومة."
 
-#: ../libpurple/protocols/msn/msn.c:832
+#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr "فشل في الاتصال بالخادم."
 
-#: ../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 "خطأ في جلب اللاحة"
 
-#: ../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 "عام"
 
-#: ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1588
 #: ../libpurple/protocols/myspace/user.c:110
 #: ../libpurple/protocols/oscar/oscar.c:3755
 #: ../libpurple/protocols/qq/buddy_info.c:45
@@ -6728,203 +6773,203 @@
 msgid "Age"
 msgstr "العمر"
 
-#: ../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 "المهنة"
 
-#: ../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 "الموقع"
 
-#: ../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 "الهوايات والاهتمامات"
 
-#: ../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 "القليل عني"
 
-#: ../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 "الحالة الزوجية"
 
-#: ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Interests"
 msgstr "الاهتمامات"
 
-#: ../libpurple/protocols/msn/msn.c:1733
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Pets"
 msgstr "الحيوانات الأليفة"
 
-#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Hometown"
 msgstr "مسقط الرأس"
 
-#: ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
 msgstr "أماكن الإقامة"
 
-#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
 msgstr "الموضة"
 
-#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
 msgstr "المرح"
 
-#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
 msgstr "موسيقى"
 
-#: ../libpurple/protocols/msn/msn.c:1739 ../libpurple/protocols/msn/msn.c:1920
-#: ../libpurple/protocols/msn/msn.c:1926
+#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1816
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "الاستعلام المفضل"
 
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1646
 msgid "Contact Info"
 msgstr "معلومات المراسل"
 
-#: ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Personal"
 msgstr "شخصي"
 
-#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Significant Other"
 msgstr "آخر مهم"
 
-#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Home Phone"
 msgstr "هاتف المنزل"
 
-#: ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Phone 2"
 msgstr "هاتف المنزل الثّاني"
 
-#: ../libpurple/protocols/msn/msn.c:1763
+#: ../libpurple/protocols/msn/msn.c:1653
 #: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Home Address"
 msgstr "عنوان المنزل"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal Mobile"
 msgstr "المحمول الشخصي"
 
-#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Home Fax"
 msgstr "فاكس المنزل"
 
-#: ../libpurple/protocols/msn/msn.c:1766
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Personal E-Mail"
 msgstr "البريد الإلكتروني الشخصي"
 
-#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Personal IM"
 msgstr "التراسل الفوري الشخصي"
 
-#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr "الذكرى السنويّة"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
 msgstr "العمل"
 
-#: ../libpurple/protocols/msn/msn.c:1787
+#: ../libpurple/protocols/msn/msn.c:1677
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "المسمّى الوظيفي"
 
-#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1678
 #: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Company"
 msgstr "الشركة"
 
-#: ../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 "القِسْم"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1680
 msgid "Profession"
 msgstr "المهنة"
 
-#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Phone"
 msgstr "هاتف العمل"
 
-#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Phone 2"
 msgstr "هاتف العمل الثاني"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1683
 #: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Work Address"
 msgstr "عنوان العمل"
 
-#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work Mobile"
 msgstr "محمول العمل"
 
-#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work Pager"
 msgstr "جهاز استدعاء العمل"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
 msgstr "فاكس العمل"
 
-#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work E-Mail"
 msgstr "البريد الإلكتروني للعمل"
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
 msgstr "تراسل العمل الفوري"
 
-#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msn/msn.c:1689
 msgid "Start Date"
 msgstr "تاريخ البدء"
 
-#: ../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 "الأشياء المفضلة"
 
-#: ../libpurple/protocols/msn/msn.c:1934
+#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr "التحديث الأخير"
 
-#: ../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 "الصفحة الرئيسية"
 
-#: ../libpurple/protocols/msn/msn.c:1969
+#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr "لم ينشئ المستخدم لاحة علنيّة."
 
-#: ../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 "
@@ -6933,13 +6978,14 @@
 "أجاب MSN بعدم تمكنه من العثور على ملف المستخدم. يعني هذا أن المستخدم غير "
 "موجود أو انه موجود ولكنه لم يُنشئ لاحة علنية."
 
-#: ../libpurple/protocols/msn/msn.c:1974
+#: ../libpurple/protocols/msn/msn.c:1864
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
-msgstr "لا يمكن العثور على أية معلومات في لاحة المستخدم. المستخدم غالباً لا وجود له."
-
-#: ../libpurple/protocols/msn/msn.c:1982
+msgstr ""
+"لا يمكن العثور على أية معلومات في لاحة المستخدم. المستخدم غالباً لا وجود له."
+
+#: ../libpurple/protocols/msn/msn.c:1872
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "مسار اللاحة"
@@ -6954,106 +7000,103 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2269 ../libpurple/protocols/msn/msn.c:2271
-msgid "Windows Live Messenger Protocol Plugin"
-msgstr "ملحق بروتوكول Windows Live Messenger"
-
-#: ../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"
+
+#: ../libpurple/protocols/msn/msn.c:2194
 msgid "Use HTTP Method"
 msgstr "استخدم طريقة HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2311
+#: ../libpurple/protocols/msn/msn.c:2199
 msgid "HTTP Method Server"
 msgstr "خادم طريقة HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2316
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "Show custom smileys"
 msgstr "اعرض الابتسامات المخصصة"
 
-#: ../libpurple/protocols/msn/msn.c:2324
+#: ../libpurple/protocols/msn/msn.c:2212
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 "nudge:\n"
 "أوكز شخص من اجل الحصول على انتباهه."
 
-#: ../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 "فشل: فشل الاستيثاق"
-
-#: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "تعذّر الاتصال"
+
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ليست مجموعة صالحة."
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:934
-#: ../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 "خطأ مجهول."
 
-#: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s على %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:512
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s ارسل لك رسالة"
-
-#: ../libpurple/protocols/msn/notification.c:839
-#, c-format
-msgid "Unknown error (%d)"
-msgstr "خطأ مجهول (%d)"
-
-#: ../libpurple/protocols/msn/notification.c:840
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "تعذّر إضافة مستخدم"
-
-#: ../libpurple/protocols/msn/notification.c:900
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "تعذّر إضافة مستخدم على %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:904
+#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "تعذّر حظر مستخدم على %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:908
+#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "تعذّر اللسماح لمستخدم على %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:916
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "لا يمكن إضافة %s لأن قائمة اصدقاؤك ممتلئة."
 
-#: ../libpurple/protocols/msn/notification.c:925
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ليس حساب جواز سفر صالح."
 
-#: ../libpurple/protocols/msn/notification.c:930
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "الخدمة غير متوفرة مؤقتاً."
 
-#: ../libpurple/protocols/msn/notification.c:1268
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "تعذّر إعادة تسمية المجموعة"
 
-#: ../libpurple/protocols/msn/notification.c:1323
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "تعذّر حذف المجموعة"
 
-#: ../libpurple/protocols/msn/notification.c:1939
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7100,30 +7143,6 @@
 "\n"
 "بعد انتهاء الصيانة، سيمكنك الدخول مرّة أخرى."
 
-#: ../libpurple/protocols/msn/oim.c:141
-#, fuzzy
-msgid "Unable to connect to OIM server"
-msgstr "تعذّر الاتصال بالخادم."
-
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "تعذّر الاتصال"
-
 #: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "خطأ في الكتابة"
@@ -7141,55 +7160,56 @@
 "خطأ اتصال من خادم %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:336
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "لا يدعم الخادم هذا البروتوكول."
 
-#: ../libpurple/protocols/msn/session.c:340
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "خطأ في تحليل HTTP."
 
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/msn/session.c:307
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:207
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "قمت بالدخول من موقع آخر."
 
-#: ../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 غير متوفرة مؤقتاً. من فضلك انتظر وحاول مرة ثانية."
 
-#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "خادم MSN سيتوقف عن العمل بشكل مؤقت."
 
-#: ../libpurple/protocols/msn/session.c:359
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "تعذّر الاستيثاق: %s"
 
-#: ../libpurple/protocols/msn/session.c:364
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+#: ../libpurple/protocols/msn/session.c:325
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "صديقك في قائمة MSN غير متوفر مؤقتاً. من فضلك انتظر وحاول مرة ثانية."
 
-#: ../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 "المصافحة"
 
-#: ../libpurple/protocols/msn/session.c:388
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "ابدء بالاستيثاق"
 
-#: ../libpurple/protocols/msn/session.c:389
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "يحصل على السكاكر"
 
-#: ../libpurple/protocols/msn/session.c:391
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "يُرسِل السكاكر"
 
-#: ../libpurple/protocols/msn/session.c:392
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "يحصُل على قائمة الأصدقاء"
 
@@ -7234,32 +7254,30 @@
 "الخادم، حاول ثانية بعد بضعة دقائق:"
 
 #: ../libpurple/protocols/msn/switchboard.c:431
-msgid "Message could not be sent because an error with the switchboard occurred:"
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
 msgstr "لم يمكن إرسال الرسالة لحدوث خطأ مع لوحة المفاتيح:"
 
 #: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "الرسالة يبدو أنها لم ترسل لحدوث خطأ مجهول:"
 
-#: ../libpurple/protocols/msn/userlist.c:249
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s قام بإضافتك إلى قائمة الأصدقاء."
 
-#: ../libpurple/protocols/msn/userlist.c:318
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s قام بإزالتك من قائمة الأصدقاء."
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:699
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "تعذّر إضافة \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:702
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "اسم الشاشة المخصص غير صالح."
 
@@ -7286,194 +7304,194 @@
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1805
+#: ../libpurple/protocols/myspace/myspace.c:1801
 msgid "MySpaceIM Error"
 msgstr "خطأ MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:350
+#: ../libpurple/protocols/myspace/myspace.c:349
 msgid "Reading challenge"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:356
+#: ../libpurple/protocols/myspace/myspace.c:355
 msgid "Unexpected challenge length from server"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:360
+#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr "يجري الولوج"
 
-#: ../libpurple/protocols/myspace/myspace.c:1288
+#: ../libpurple/protocols/myspace/myspace.c:1286
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "فقد الاتصال بالخادم (لم تُستقبل أي بيانات خلال %d ثانية)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1328
 msgid "New mail messages"
 msgstr "رسالة بريد جديدة"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1329
 msgid "New blog comments"
 msgstr "تعليق مدوّنة جديد"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1330
 msgid "New profile comments"
 msgstr "تعليقات لاحة جديدة"
 
-#: ../libpurple/protocols/myspace/myspace.c:1333
+#: ../libpurple/protocols/myspace/myspace.c:1331
 msgid "New friend requests!"
 msgstr "طلبات صداقة جديدة"
 
-#: ../libpurple/protocols/myspace/myspace.c:1334
+#: ../libpurple/protocols/myspace/myspace.c:1332
 msgid "New picture comments"
 msgstr "تعليقات صورة جديدة"
 
-#: ../libpurple/protocols/myspace/myspace.c:1362
+#: ../libpurple/protocols/myspace/myspace.c:1360
 msgid "MySpace"
 msgstr "MySpace"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1545
+#: ../libpurple/protocols/myspace/myspace.c:1543
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "متَّصل"
 
+#: ../libpurple/protocols/myspace/myspace.c:1554
 #: ../libpurple/protocols/myspace/myspace.c:1556
-#: ../libpurple/protocols/myspace/myspace.c:1558
 msgid "No username set"
 msgstr "لم يحدد اسم مستخدم"
 
-#: ../libpurple/protocols/myspace/myspace.c:1557
+#: ../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:1784
+#: ../libpurple/protocols/myspace/myspace.c:1782
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "خطأ بروتوكول، رمز %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1977
-#: ../libpurple/protocols/myspace/myspace.c:2011
+#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:2006
 msgid "Failed to add buddy"
 msgstr "فشلت إضافة صديق"
 
-#: ../libpurple/protocols/myspace/myspace.c:1977
+#: ../libpurple/protocols/myspace/myspace.c:1972
 msgid "'addbuddy' command failed."
 msgstr "فشل أمر 'addbuddy'"
 
-#: ../libpurple/protocols/myspace/myspace.c:2011
-#: ../libpurple/protocols/myspace/myspace.c:2252
+#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:2247
 msgid "persist command failed"
 msgstr "فشل أمر persist"
 
-#: ../libpurple/protocols/myspace/myspace.c:2120
+#: ../libpurple/protocols/myspace/myspace.c:2115
 #, c-format
 msgid "No such user: %s"
 msgstr "لا مستخدِم: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2121
+#: ../libpurple/protocols/myspace/myspace.c:2116
 msgid "User lookup"
 msgstr "البحث عن المستخدمين"
 
-#: ../libpurple/protocols/myspace/myspace.c:2233
-#: ../libpurple/protocols/myspace/myspace.c:2252
-#: ../libpurple/protocols/myspace/myspace.c:2274
+#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2269
 msgid "Failed to remove buddy"
 msgstr "فشلت إزالة الصديق"
 
-#: ../libpurple/protocols/myspace/myspace.c:2233
+#: ../libpurple/protocols/myspace/myspace.c:2228
 msgid "'delbuddy' command failed"
 msgstr "فشل أمر 'delbuddy' "
 
-#: ../libpurple/protocols/myspace/myspace.c:2274
+#: ../libpurple/protocols/myspace/myspace.c:2269
 msgid "blocklist command failed"
 msgstr "فشل أمر blocklist"
 
-#: ../libpurple/protocols/myspace/myspace.c:2320
+#: ../libpurple/protocols/myspace/myspace.c:2315
 msgid "Invalid input condition"
 msgstr "حالة دخل غير صحيحة"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2338
-#: ../libpurple/protocols/myspace/myspace.c:2369
+#: ../libpurple/protocols/myspace/myspace.c:2333
+#: ../libpurple/protocols/myspace/myspace.c:2364
 msgid "Read buffer full"
 msgstr "صوان القرائة ممتليء"
 
-#: ../libpurple/protocols/myspace/myspace.c:2407
+#: ../libpurple/protocols/myspace/myspace.c:2402
 msgid "Unparseable message"
 msgstr "رسالة يتعذّر تحليلها"
 
-#: ../libpurple/protocols/myspace/myspace.c:2476
+#: ../libpurple/protocols/myspace/myspace.c:2471
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "لا يمكن الاتصال بالخادم: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2647
+#: ../libpurple/protocols/myspace/myspace.c:2642
 msgid "IM Friends"
 msgstr "أصدقاء التراسل الفوري"
 
-#: ../libpurple/protocols/myspace/myspace.c:2746
+#: ../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:2747
+#: ../libpurple/protocols/myspace/myspace.c:2742
 msgid "Add contacts from server"
 msgstr "أضف المراسلين من الخادم"
 
-#: ../libpurple/protocols/myspace/myspace.c:2799
-#: ../libpurple/protocols/myspace/myspace.c:2864
+#: ../libpurple/protocols/myspace/myspace.c:2794
+#: ../libpurple/protocols/myspace/myspace.c:2859
 msgid "Add friends from MySpace.com"
 msgstr "أضف أصدقائي من  MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2800
+#: ../libpurple/protocols/myspace/myspace.c:2795
 msgid "Importing friends failed"
 msgstr "فشل استيراد الأصدقاء"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2856
+#: ../libpurple/protocols/myspace/myspace.c:2851
 msgid "Find people..."
 msgstr "ابحث عن الناس..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2854
 msgid "Change IM name..."
 msgstr "غيّر اسم التراسل الفوري..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3161
+#: ../libpurple/protocols/myspace/myspace.c:3156
 msgid "myim URL handler"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3162
+#: ../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:3163
+#: ../libpurple/protocols/myspace/myspace.c:3158
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3286
+#: ../libpurple/protocols/myspace/myspace.c:3281
 msgid "Show display name in status text"
 msgstr ""
 
+#: ../libpurple/protocols/myspace/myspace.c:3284
+msgid "Show headline in status text"
+msgstr ""
+
 #: ../libpurple/protocols/myspace/myspace.c:3289
-msgid "Show headline in status text"
+msgid "Send emoticons"
 msgstr ""
 
 #: ../libpurple/protocols/myspace/myspace.c:3294
-msgid "Send emoticons"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3299
 msgid "Screen resolution (dots per inch)"
 msgstr "استبانة الشاشة (نقطة في البوصة)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/myspace/myspace.c:3297
 msgid "Base font size (points)"
 msgstr "حجم الخط الأساس (نقاط)"
 
@@ -7779,39 +7797,39 @@
 msgid "Login failed (%s)."
 msgstr "فشل الولوج (%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 "تعذّر ارسال الرسالة. لا يمكن الحصول على تفاصيل المستخدم (%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 "تعذّر إضافة %s لقائمة أصدقائك (%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 "تعذّر إرسال الرسالة (%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 "تعذّر دعوة مستخدم (%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 "تعذّر ارسال رسالة إلى %s. لا يمكن إنشاء الاجتماع (%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 "تعذّر ارسال رسالة. لا يمكن إنشاء الاجتماع (%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 "
@@ -7820,68 +7838,68 @@
 "تعذّر نقل المستخدم %s إلى المجلد %s في جهة الخادم. خطأ أثناء إنشاء المجلد (%"
 "s)."
 
-#: ../libpurple/protocols/novell/novell.c:634
+#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "تعذّر إضافة %s إلى قائمة أصدقائك. خطأ إنشاء مجلد في قائمة الخادم (%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 "لا يمكن الحصول على تفاصيل المستخدم %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:753
-#: ../libpurple/protocols/novell/novell.c:899
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "تعذّر إضافة مستخدم لقائمة الخصوصية (%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 "تعذّر إضافة %s لقائمة المنع (%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 "تعذّر إضافة %s لقائمة السماح (%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 "تعذّر إزالة %s من قائمة الخصوصية (%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 "تعذّر تغيير خصائص الخصوصية من جهة الخادم (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1014
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "تعذّر إنشاء اجتماع (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1123
-#: ../libpurple/protocols/novell/novell.c:1694
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "خطأ أثناء التواصل مع الخادم. سأغلق الاتصال."
 
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "رقم الهاتف"
 
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "العنوان الشخصي"
 
-#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "توقف البريد"
 
-#: ../libpurple/protocols/novell/novell.c:1504
+#: ../libpurple/protocols/novell/novell.c:1502
 #: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "هويّة المستخدم"
@@ -7892,41 +7910,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 "الاسم الكامل"
 
-#: ../libpurple/protocols/novell/novell.c:1639
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "اجتماع GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1670
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "تعذّر إقامة اتصال SSL مع الخادم."
 
-#: ../libpurple/protocols/novell/novell.c:1722
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "يستوثق..."
 
-#: ../libpurple/protocols/novell/novell.c:1734
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "تعذّر الاتصال بالخادم."
 
-#: ../libpurple/protocols/novell/novell.c:1737
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "ينتظر الرد..."
 
-#: ../libpurple/protocols/novell/novell.c:1872
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s تم دعوته لهذه المحادثة."
 
-#: ../libpurple/protocols/novell/novell.c:1900
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "دعوة إلى محادثة"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7937,34 +7955,37 @@
 "\n"
 "أُرسِلت: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1903
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "هل تود الانضمام للمحادثة؟"
 
-#: ../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 "أولجت خارجا خروجك لأنك ولجت من محطة عمل آخرى."
 
-#: ../libpurple/protocols/novell/novell.c:2074
-#, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+#: ../libpurple/protocols/novell/novell.c:2069
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s غير متصل ولم يستقبل الرسالة التي أرسلتها."
 
 #. TODO: Would be nice to prompt if not set!
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...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."
 msgstr "تعذّر الاتصال بالخادم. من فضلك أدخل عنوان الخادم الذي تود الاتصال به."
 
-#: ../libpurple/protocols/novell/novell.c:2200
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "خطأ. دعم SSL غير مثبت."
 
-#: ../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 "أُغلق هذا الاجتماع. لا يمكن إرسال المزيد من الرسائل."
 
@@ -7978,31 +7999,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3523
-#: ../libpurple/protocols/novell/novell.c:3525
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "ملحق بروتوكول Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "عنوان الخادم"
 
-#: ../libpurple/protocols/novell/novell.c:3554
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "منفذ الخادم"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2471
-#: ../libpurple/protocols/yahoo/yahoo.c:2638
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2469
+#: ../libpurple/protocols/yahoo/yahoo.c:2636
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
 #: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
 #: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
 msgid "Server closed the connection."
 msgstr "أَغلق الخادم الاتصال"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2465
-#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:593
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2463
+#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
 #: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, c-format
@@ -8013,7 +8034,7 @@
 "فقد الاتصال مع الخادم:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
 #: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
 #: ../libpurple/proxy.c:1478
@@ -8051,7 +8072,7 @@
 msgstr "ملحق بروتوكول ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "الترميز"
@@ -8226,7 +8247,7 @@
 msgstr "دردشة"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6012
+#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr "احصل على ملف"
 
@@ -8299,38 +8320,44 @@
 msgstr "كاميرا"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5782
+#: ../libpurple/protocols/oscar/oscar.c:5780
+#, c-format
 msgid "Free For Chat"
 msgstr "مجاناً للدردشة"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5817
+#: ../libpurple/protocols/oscar/oscar.c:5815
+#, c-format
 msgid "Not Available"
 msgstr "غير موجود"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5803
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#, c-format
 msgid "Occupied"
 msgstr "محتل"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
+#, c-format
 msgid "Web Aware"
 msgstr "مدرك لوِب"
 
 #: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157
+#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr "خفي"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
+#, c-format
 msgid "Online"
 msgstr "متصل"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
 #: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
 msgid "IP Address"
 msgstr "عنوان IP"
 
@@ -8385,14 +8412,14 @@
 "بريد صحيح، أو يبدأ بحرف ويحتوي فقط على حروف، وأرقام ومسافات، أو أرقام فقط."
 
 #: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2107
+#: ../libpurple/protocols/yahoo/yahoo.c:2105
 msgid "Invalid screen name."
 msgstr "اسم شاشة غير صالح."
 
 #: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1047
-#: ../libpurple/protocols/yahoo/yahoo.c:2128
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1045
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Incorrect password."
 msgstr "كلمة سر خطأ."
 
@@ -8445,8 +8472,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:1452
 #: ../libpurple/protocols/oscar/oscar.c:2232
 #: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5887
-#: ../libpurple/protocols/oscar/oscar.c:6168 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_موافق"
 
@@ -8498,7 +8525,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:2280
 #: ../libpurple/protocols/oscar/oscar.c:2407
 #: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/yahoo/yahoo.c:1030
 msgid "No reason given."
 msgstr "لا سبب معطى."
 
@@ -8606,8 +8633,10 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:2614
 #, c-format
-msgid "You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "لم تفقد أي رسائل (%hu) من %s لكون حد المعدل قد تم تجاوزه."
 msgstr[1] "فقدت رسالة واحدة (%hu) من %s لأن حد المعدل قد تم تجاوزه."
 msgstr[2] "فقدت رسالتين (%hu) من %s لأن حد المعدل قد تم تجاوزه."
@@ -8779,6 +8808,7 @@
 msgstr "طلب تأكيد الحساب"
 
 #: ../libpurple/protocols/oscar/oscar.c:4002
+#, c-format
 msgid "Error Changing Account Info"
 msgstr "خطأ في تغيير معلومات حساب"
 
@@ -8787,7 +8817,8 @@
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
-msgstr "خطأ 0x%04x: تعذّر تنسيق اسم الشاشة لأن اسم الشاشة المطلوب مختلف عن الأصلي."
+msgstr ""
+"خطأ 0x%04x: تعذّر تنسيق اسم الشاشة لأن اسم الشاشة المطلوب مختلف عن الأصلي."
 
 #: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
@@ -8806,7 +8837,8 @@
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
-msgstr "خطأ 0x%04x: تعذّر تغيير عنوان البريد الإلكتروني لوجود طلب مسبق لهذا الاسم."
+msgstr ""
+"خطأ 0x%04x: تعذّر تغيير عنوان البريد الإلكتروني لوجود طلب مسبق لهذا الاسم."
 
 #: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
@@ -8822,7 +8854,8 @@
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
-msgstr "خطأ 0x%04x: تعذّر تغيير عنوان البريد الإلكتروني لأن العنوان المعطى غير صالح."
+msgstr ""
+"خطأ 0x%04x: تعذّر تغيير عنوان البريد الإلكتروني لأن العنوان المعطى غير صالح."
 
 #: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
@@ -8839,7 +8872,8 @@
 msgstr "معلومات الحساب"
 
 #: ../libpurple/protocols/oscar/oscar.c:4218
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "صورة رسالتك الفورية لم ترسل. يجب ان تكون متصل مباشرة لإرسال صور الرسالة "
 "الفورية."
@@ -8998,99 +9032,100 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:5409
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "صورة رسالتك الفورية لم ترسل. لا يمكنك ارسال صور التراسل الفوري في دردشات AIM."
-
-#: ../libpurple/protocols/oscar/oscar.c:5571
-#: ../libpurple/protocols/oscar/oscar.c:5576
+msgstr ""
+"صورة رسالتك الفورية لم ترسل. لا يمكنك ارسال صور التراسل الفوري في دردشات AIM."
+
+#: ../libpurple/protocols/oscar/oscar.c:5569
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "Away Message"
 msgstr "رسالة \"بعيد\""
 
-#: ../libpurple/protocols/oscar/oscar.c:5576
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(يُنزِّل)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5776
+#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "iTunes Music Store Link"
 msgstr "وصلة إلى متجر موسيقى iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "تعليق الصديق %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr "تعليق الصديق:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/oscar/oscar.c:5930
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "اخترت فتح اتصال رسالة فورية مباشرة مع %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "لأنه يكشف IP الخاص بك، قد يعتبر ثغرة أمنية.  هل تود الاستمرار؟"
 
-#: ../libpurple/protocols/oscar/oscar.c:5942
+#: ../libpurple/protocols/oscar/oscar.c:5940
 #: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "ا_تّصل"
 
-#: ../libpurple/protocols/oscar/oscar.c:5977
+#: ../libpurple/protocols/oscar/oscar.c:5975
 msgid "Get AIM Info"
 msgstr "احصل على معلومات AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5983
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
 msgstr "حرِّر تعليق الصديق"
 
-#: ../libpurple/protocols/oscar/oscar.c:5991
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr "احصل على رسالة الحالة"
 
-#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
 msgstr "رسالة فورية مباشرة"
 
-#: ../libpurple/protocols/oscar/oscar.c:6026
+#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr "أعِد طلب الاستيثاق"
 
-#: ../libpurple/protocols/oscar/oscar.c:6085
+#: ../libpurple/protocols/oscar/oscar.c:6083
 msgid "Require authorization"
 msgstr "الاستيثاق مطلوب"
 
-#: ../libpurple/protocols/oscar/oscar.c:6088
+#: ../libpurple/protocols/oscar/oscar.c:6086
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "مدرِك لوِب (تفعيل هذا سيجعلك تستقبل رسائل السخام)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/oscar/oscar.c:6091
 msgid "ICQ Privacy Options"
 msgstr "خيارات خصوصية ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6112
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
 msgstr "التنسيق الجديد غير صالح."
 
-#: ../libpurple/protocols/oscar/oscar.c:6113
+#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "تنسيق اسم الشاشة يمكنه فقط تغيير حالة الحرف والمسافة البيضاء. "
 
-#: ../libpurple/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "Change Address To:"
 msgstr "غيّر العنوان إلى:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>لم تقم بانتظار الاستيثاق</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6215
+#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "You are awaiting authorization from the following buddies"
 msgstr "أنت في انتظار الاستيثاق من الأصدقاء التاليين"
 
-#: ../libpurple/protocols/oscar/oscar.c:6216
+#: ../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.\""
@@ -9098,73 +9133,73 @@
 "يمكنك إعادة طلب الاستيثاق من هؤلاء الأصدقاء عن طريق النقر باليمين عليهم "
 "واختيار \"أعِد طلب الاستيثاق.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by E-Mail"
 msgstr "ابحث عن صديق بواسطة البريد الإلكتروني"
 
-#: ../libpurple/protocols/oscar/oscar.c:6234
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by e-mail address"
 msgstr "ابحث عن صديق بواسطة عنوان البريد الإلكتروني"
 
-#: ../libpurple/protocols/oscar/oscar.c:6235
+#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "اكتب عنوان البريد الإلكتروني للصديق الذي تبحث عنه."
 
-#: ../libpurple/protocols/oscar/oscar.c:6238
+#: ../libpurple/protocols/oscar/oscar.c:6236
 msgid "_Search"
 msgstr "ا_بحث"
 
-#: ../libpurple/protocols/oscar/oscar.c:6396
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Set User Info (URL)..."
 msgstr "ضع معلومات المستخدم (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6407
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Change Password (URL)"
 msgstr "غيّر كلمة السر (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6411
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Configure IM Forwarding (URL)"
 msgstr "اضبط تمرير التراسل الفوري  (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6421
+#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "Set Privacy Options..."
 msgstr "حدد خيارات الخصوصية..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6428
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr "أكّد الحساب"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Display Currently Registered E-Mail Address"
 msgstr "اعرض عناوين البريد الإلكتروني المسجلة حالياً"
 
-#: ../libpurple/protocols/oscar/oscar.c:6436
+#: ../libpurple/protocols/oscar/oscar.c:6434
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "غيّر عناوين البريد الإلكتروني المسجلة حالياً..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6443
+#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
 msgstr "اعرض الأصدقاء الذين ينتظرون الاستيثاق"
 
-#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/oscar/oscar.c:6447
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "ابحث عن صديق بواسطة عنوان البريد الإلكتروني..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6454
+#: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
 msgstr "ابحث عن صديق بواسطة المعلومات"
 
-#: ../libpurple/protocols/oscar/oscar.c:6522
+#: ../libpurple/protocols/oscar/oscar.c:6520
 msgid "Use recent buddies group"
 msgstr "استخدم مجموعة الأصدقاء الأخيرة"
 
-#: ../libpurple/protocols/oscar/oscar.c:6525
+#: ../libpurple/protocols/oscar/oscar.c:6523
 msgid "Show how long you have been idle"
 msgstr "اعرض مدة الوقت الذي كنت فيه خامل"
 
-#: ../libpurple/protocols/oscar/oscar.c:6680
+#: ../libpurple/protocols/oscar/oscar.c:6678
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9183,6 +9218,7 @@
 msgstr "محاولة الاتصال بـ %s:%hu."
 
 #: ../libpurple/protocols/oscar/peer.c:856
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "محاولة الاتصال عن طريق خادم الوكيل."
 
@@ -9644,7 +9680,7 @@
 msgid "Error requesting login token"
 msgstr ""
 
-#: ../libpurple/protocols/qq/login_logout.c:488
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "تعذّر الولوج، افحص سجل التنقيح"
 
@@ -9902,7 +9938,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
 msgstr "وضع مدير Sametime الإعلان التالي على الخادم %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
@@ -10016,7 +10053,7 @@
 msgid "Send TEST Announcement"
 msgstr "أرسل إعلان TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr "الموضوع:"
 
@@ -10041,7 +10078,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "لم يُحدد أي خادم مجتمع Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4323
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
 msgid "Connect"
 msgstr "اتصل"
 
@@ -10094,6 +10131,10 @@
 "لم يطابق المعرف '%s' أي مستخدم في مجتمع Sametime الخاص بك. حذُف هذا العنصر من "
 "قائمة أصدقائك."
 
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "تعذّر إضافة مستخدم"
+
 #: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
@@ -10214,7 +10255,7 @@
 "المستخدمين إلى قائمة أصدقائك أو إرسال رسالة لهم بواسطة أزرار الإجراءات في "
 "الأسفل."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:757
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
 msgid "Search Results"
 msgstr "نتائج البحث"
 
@@ -10787,6 +10828,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>أوضاع القناة:</b> "
 
@@ -10825,6 +10867,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 "
@@ -10957,7 +11000,8 @@
 #: ../libpurple/protocols/silc/chat.c:1045
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr "يجب عليك الانضمام للقناة %s قبل أن تتمكن من الانضمام للمجموعة الخاصة"
 
 #: ../libpurple/protocols/silc/chat.c:1047
@@ -11416,7 +11460,8 @@
 
 #: ../libpurple/protocols/silc/silc.c:238
 #: ../libpurple/protocols/silc10/ops.c:1714
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "فشل استكمال الجلسة المفصولة. اضغط \"أعِد الاتصال\" لتُنشئ اتصالا جديدا."
 
 #: ../libpurple/protocols/silc/silc.c:265
@@ -11437,6 +11482,7 @@
 msgstr "يتصّل بخادم SILC"
 
 #: ../libpurple/protocols/silc/silc.c:352
+#, c-format
 msgid "Could not load SILC key pair"
 msgstr "تعذّر تحميل زوج مفاتيح SILC"
 
@@ -11465,7 +11511,8 @@
 msgstr "مزاجك الحالي"
 
 #: ../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 "عادي"
 
@@ -11902,7 +11949,7 @@
 msgstr "بروتوكول اجتماعات الإنترنت المباشرة المؤمنة (SILC)"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
 msgid "Network"
 msgstr "الشبكة"
 
@@ -12096,42 +12143,52 @@
 msgstr "لا تتوفر إحصائيات للخادم"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "فشل: نسخة قديمة. قم بتحديث العميل."
 
 #: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "فشل: لا يدعم البعيد أو لا يقبل مفتاحك العلني"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "فشل: لا يدعم البعيد مجموعة KE المقترحة"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "فشل: لا يدعم البعيد الشفرة المقترحة"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "فشل: لا يدعم البعيد PKCS المقترحة"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "فشل: لا يدعم البعيد دالة التلبيد المقترحة"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "فشل: لا يدعم البعيد HMAC المقترحة"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "فشل: توقيع خطأ"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "فشل: سكاكر غير صالحة"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "فشل: فشل الاستيثاق"
 
@@ -12158,30 +12215,30 @@
 msgstr "لايمكن الكتابة"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1531
+#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr "لايمكن الاتصال"
 
-#: ../libpurple/protocols/simple/simple.c:1061
+#: ../libpurple/protocols/simple/simple.c:1059
 msgid "Unknown server response."
 msgstr "استجابة خادم مجهولة."
 
-#: ../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 "لايمكن إنشاء مقبس استماع"
 
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't resolve host"
 msgstr "لا يمكن إحلال الخادم"
 
-#: ../libpurple/protocols/simple/simple.c:1679
+#: ../libpurple/protocols/simple/simple.c:1677
 msgid "Could not resolve hostname"
 msgstr "لا يمكن احلال اسم المضيف"
 
-#: ../libpurple/protocols/simple/simple.c:1696
+#: ../libpurple/protocols/simple/simple.c:1694
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "لا يمكن أن تحتوي أسماء الشاشة في SIP على فراغات أو رمز @"
 
@@ -12193,36 +12250,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "ملحق بروتوكول SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1873
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "ملحق بروتوكول SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1901
+#: ../libpurple/protocols/simple/simple.c:1899
 msgid "Publish status (note: everyone may watch you)"
 msgstr "انشر الحالة (ملحوطة: يمكن لأي شخص مشاهدتك)"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:1905
 msgid "Use UDP"
 msgstr "استخدم UDP"
 
+#: ../libpurple/protocols/simple/simple.c:1907
+msgid "Use proxy"
+msgstr "استخدم الوكيل"
+
 #: ../libpurple/protocols/simple/simple.c:1909
-msgid "Use proxy"
-msgstr "استخدم الوكيل"
-
-#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Proxy"
 msgstr "الوكيل"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Auth User"
 msgstr "استوثق من المستخدم"
 
-#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth Domain"
 msgstr "استوثق من النطاق"
 
@@ -12267,6 +12324,7 @@
 msgstr "تحذير أن %s غير مسموح به."
 
 #: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "أُسقِطت رسالة، أنت تتجاوز حدّ سرعة الخادم."
 
@@ -12291,38 +12349,47 @@
 msgstr "فقدت رسالة فورية من %s لأنها أرسلت بسرعة جداً."
 
 #: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "فشل."
 
 #: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "الكثير جدا من التطابقات"
 
 #: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "تحتاج لمزيد من الكلمات المقيدة."
 
 #: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "لا تتوفر خدمة الدليل مؤقتا."
 
 #: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "E-mail lookup restricted."
 msgstr "البحث في البريد محدود."
 
 #: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "الكلمات المفتاحية التي تم تجاهلها."
 
 #: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "لا كلمات مفتاحية."
 
 #: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "ليس للمستخدم معلومات دليل."
 
 #: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "البلد غير مدعومة."
 
@@ -12332,18 +12399,22 @@
 msgstr "فشل مجهول: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect screen name or password."
 msgstr "اسم شاشة أو كلمة سر غير صحيحة."
 
 #: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "الخدمة غير متوفرة مؤقتاً."
 
 #: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "مستوى تحذيرك حالياً مرتفع جداً للولوج."
 
 #: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -12381,8 +12452,8 @@
 msgid "Password Change Successful"
 msgstr "تغيّرت كلمة السر بنجاح"
 
-#: ../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 "_مجموعة:"
 
@@ -12446,41 +12517,41 @@
 msgid "TOC Protocol Plugin"
 msgstr "ملحق بروتوكول TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
+#: ../libpurple/protocols/yahoo/yahoo.c:782
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr "أرسل لك %s دعوة كاميرا وب، لكنها ليست مدعومة بعد."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:840
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "لم تُرسل رسالة ياهوو!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:962
+#: ../libpurple/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "رسالة نظام ياهو! لـ %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "Authorization denied message:"
 msgstr "رسالة مُنِع الاستيثاق:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1050
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr "أضِف صديق رُفِضت"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12490,11 +12561,11 @@
 "لقد طلب خادم ياهو استخدام طريقة استيثاق لم نتعرف عليها. قد لا تتمكن من "
 "الدخول على ياهو بنجاح. راجع %s بحثا عن تحديثات."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1999
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr "فشل استيثاق ياهو!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12503,48 +12574,48 @@
 "حاولتَ تجاهل %s، ولكن المستخدم موجود في قائمة اصدقاؤك. الضغط على \"نعم\" "
 "سيحذف ويتجاهل الصديق."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2068
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
 msgstr "أأتجاهل الصديق؟"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2131
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "حسابك مقفل، من فضلك لُج من موقع ياهوو!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "خطأ مجهول رقم %d. الولوج في موقع ياهوو! قد يصحح هذه المشكلة."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2188
+#: ../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 "تعذر إضافة الصديق %s للمجموعة %s لقائمة الخادم على الحساب %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2191
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr "تعذر إضافة الصديق إلى قائمة الخادم."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2310
+#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ %s/%s/%s.swf مسموع] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2653
+#: ../libpurple/protocols/yahoo/yahoo.c:2651
 msgid "Received unexpected HTTP response from server."
 msgstr "تلقيت استجابة غير متوقّعة من خادم HTTP."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2677
-#: ../libpurple/protocols/yahoo/yahoo.c:2863
-#: ../libpurple/protocols/yahoo/yahoo.c:2966
-#: ../libpurple/protocols/yahoo/yahoo.c:2976
+#: ../libpurple/protocols/yahoo/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 "مشكلة اتصال"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2703
+#: ../libpurple/protocols/yahoo/yahoo.c:2701
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12553,7 +12624,7 @@
 "فقدت الاتصال مع %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2728
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12562,107 +12633,116 @@
 "لايمكن تأسيس اتصال مع %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Home"
 msgstr "ليس بالمنزل"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not at Desk"
 msgstr "ليس على المكتب"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "Not in Office"
 msgstr "ليس في المكتب"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "On Vacation"
 msgstr "في إجازة"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3095
-#: ../libpurple/protocols/yahoo/yahoo.c:3787
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3785
 msgid "Stepped Out"
 msgstr "خرج"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3188
-#: ../libpurple/protocols/yahoo/yahoo.c:3218
+#: ../libpurple/protocols/yahoo/yahoo.c:3186
+#: ../libpurple/protocols/yahoo/yahoo.c:3216
 msgid "Not on server list"
 msgstr "ليس على قائمة الخادم"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3293
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Appear Online"
 msgstr "يظهر متصل"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3238
-#: ../libpurple/protocols/yahoo/yahoo.c:3314
+#: ../libpurple/protocols/yahoo/yahoo.c:3236
+#: ../libpurple/protocols/yahoo/yahoo.c:3312
 msgid "Appear Permanently Offline"
 msgstr "يظهر غير متصل دائماً"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
+#: ../libpurple/protocols/yahoo/yahoo.c:3254
 msgid "Presence"
 msgstr "التواجد"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3299
+#: ../libpurple/protocols/yahoo/yahoo.c:3297
 msgid "Appear Offline"
 msgstr "يظهر غير متصل"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3308
+#: ../libpurple/protocols/yahoo/yahoo.c:3306
 msgid "Don't Appear Permanently Offline"
 msgstr "لا تظهر غير متصل للأبد"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3356
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr "انضم إلى دردشة"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3362
+#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr "ابدأ اجتماع"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3390
+#: ../libpurple/protocols/yahoo/yahoo.c:3388
 msgid "Presence Settings"
 msgstr "خصائص التواجد"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3396
+#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
 msgstr "إبدأ Doodling"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 msgid "Activate which ID?"
 msgstr "أأنشط أية هوية؟"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Join whom in chat?"
 msgstr "أأضم مَن إلى الدردشة؟"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3520
+#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr "نشّط هوية..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3524
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "Join User in Chat..."
 msgstr "ضمّ مستخدم للدردشة..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3529
+#: ../libpurple/protocols/yahoo/yahoo.c:3527
 msgid "Open Inbox"
 msgstr "افتح صندوق الوارد"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4138
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
+msgid "Buzz"
+msgstr "رن"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+#, c-format
+msgid "Buzzing %s..."
+msgstr "يرن على %s..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4136
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 "join &lt;room&gt;: \n"
 "انضم لغرفة دردشة في شبكة ياهو"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4143
+#: ../libpurple/protocols/yahoo/yahoo.c:4141
 msgid "list: List rooms on the Yahoo network"
 msgstr ""
 "list: \n"
 "اسرد الغرف في شبكة ياهو"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4151
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 "doodle: \n"
@@ -12678,56 +12758,56 @@
 #. *< version
 #. *  summary
 #. *  description
+#: ../libpurple/protocols/yahoo/yahoo.c:4358
 #: ../libpurple/protocols/yahoo/yahoo.c:4360
-#: ../libpurple/protocols/yahoo/yahoo.c:4362
 msgid "Yahoo Protocol Plugin"
 msgstr "ملحق بروتوكول ياهو"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4385
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Yahoo Japan"
 msgstr "ياهو اليابان"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4388
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Pager server"
 msgstr "خادم الاستدعاء"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4391
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Japan Pager server"
 msgstr "خادم استدعاء اليابان"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr "منفذ الاستدعاء"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "File transfer server"
 msgstr "خادم نقل الملفات"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "Japan file transfer server"
 msgstr "خادم نقل ملفّات ياباني"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr "منفذ نقل الملفات"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Chat room locale"
 msgstr "محليّة غرفة الدردشة"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
 msgstr "تجاهل دعوات الاجتماعات وغرف الدردشة"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room list URL"
 msgstr "مسار قائمة غرفة المحادثة."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat server"
 msgstr "خادم دردشة ياهو"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4423
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 msgid "Yahoo Chat port"
 msgstr "منفذ دردشة ياهو"
 
@@ -12927,7 +13007,8 @@
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
-msgstr "(حدث خطأ اثناء تحويل الرسالة. \t افحص خيارات 'الترميز' في محرر الحسابات)"
+msgstr ""
+"(حدث خطأ اثناء تحويل الرسالة. \t افحص خيارات 'الترميز' في محرر الحسابات)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
@@ -12998,7 +13079,8 @@
 "انضم لدردشة جديدة"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instance&gt;: \n"
 "أرسل رسالة إلى &lt;message,<i>instance</i>,*&gt;"
@@ -13167,7 +13249,7 @@
 msgid "%s has requested your attention!"
 msgstr "طلب %s انتباهك"
 
-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:796
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13176,12 +13258,12 @@
 "%s يدعو %s إلى غرفة الدردشة %s:\n"
 "%s"
 
-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:801
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s يدعو %s إلى غرفة الدردشة %s\n"
 
-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
 msgstr "أأقبل دعوة الدردشة؟"
 
@@ -13222,77 +13304,62 @@
 msgid "%s changed status from %s to %s"
 msgstr "%s تغيير الحالة من %s إلى %s"
 
-#: ../libpurple/status.c:612
-#, fuzzy, c-format
-msgid "%s (%s) changed status from %s to %s"
-msgstr "%s تغيير الحالة من %s إلى %s"
-
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:619
 #, c-format
 msgid "%s is now %s"
 msgstr "%s حالياً %s"
 
-#: ../libpurple/status.c:625
-#, fuzzy, c-format
-msgid "%s (%s) is now %s"
-msgstr "%s حالياً %s"
-
-#: ../libpurple/status.c:631
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s لم يعد موجوداً %s"
 
-#: ../libpurple/status.c:633
-#, fuzzy, c-format
-msgid "%s (%s) is no longer %s"
-msgstr "%s لم يعد موجوداً %s"
-
-#: ../libpurple/status.c:1244
+#: ../libpurple/status.c:1234
 #, c-format
 msgid "%s became idle"
 msgstr "%s يصبح خامل"
 
-#: ../libpurple/status.c:1261
+#: ../libpurple/status.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s لم يعد خاملا"
 
-#: ../libpurple/status.c:1324
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s يصبح خامل"
 
-#: ../libpurple/status.c:1326
+#: ../libpurple/status.c:1316
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s يصبح غير خامل"
 
-#: ../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 "خطأ td قرائة %s"
 
-#: ../libpurple/util.c:2706
+#: ../libpurple/util.c:2723
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr "حدث خطأ اثناء قرائة %s. لم يتم تحميلها، وحُفِظ الملف القديم باسم %s~"
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3223
 msgid "Calculating..."
 msgstr "يحسب..."
 
-#: ../libpurple/util.c:3209
+#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr "مجهول."
 
-#: ../libpurple/util.c:3235
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -13303,7 +13370,7 @@
 msgstr[4] "%d ثانية"
 msgstr[5] "%d ثانية"
 
-#: ../libpurple/util.c:3247
+#: ../libpurple/util.c:3264
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -13314,7 +13381,7 @@
 msgstr[4] "%d يوما"
 msgstr[5] "%d يوم"
 
-#: ../libpurple/util.c:3255
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -13325,7 +13392,7 @@
 msgstr[4] "%s، %d ساعة"
 msgstr[5] "%s، %d ساعة"
 
-#: ../libpurple/util.c:3261
+#: ../libpurple/util.c:3278
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -13336,7 +13403,7 @@
 msgstr[4] "%d ساعة"
 msgstr[5] "%d ساعة"
 
-#: ../libpurple/util.c:3269
+#: ../libpurple/util.c:3286
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -13347,7 +13414,7 @@
 msgstr[4] "%s، %d دقيقة"
 msgstr[5] "%s، %d دقيقة"
 
-#: ../libpurple/util.c:3275
+#: ../libpurple/util.c:3292
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -13358,17 +13425,17 @@
 msgstr[4] "%d ثانية"
 msgstr[5] "%d ثانية"
 
-#: ../libpurple/util.c:3535
+#: ../libpurple/util.c:3552
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "لم أستطع فتح %s: أعاد التوجيه مرات كثيرة"
 
-#: ../libpurple/util.c:3572 ../libpurple/util.c:3868
+#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "اعجز عن الاتصال ب%s"
 
-#: ../libpurple/util.c:3695
+#: ../libpurple/util.c:3712
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13377,17 +13444,17 @@
 "فشل حجز ذاكرة كافية من اجل حفظ المعلومات من %s. قد تكون هذه محاولة تخريب من "
 "قبل الخادم."
 
-#: ../libpurple/util.c:3730
+#: ../libpurple/util.c:3747
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "خطأ في القراءة من %s: %s"
 
-#: ../libpurple/util.c:3761
+#: ../libpurple/util.c:3778
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "خطأ في الكتابة إلى %s: %s"
 
-#: ../libpurple/util.c:3786
+#: ../libpurple/util.c:3803
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "تعذّر الاتصال بـ %s: %s"
@@ -13477,7 +13544,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 "استخدم إعدادات البيئة"
 
@@ -13499,15 +13566,15 @@
 msgid "Proxy Options"
 msgstr "خيارات الوكيل"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
 msgstr "نوع ال_وكيل:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
 msgstr "م_ضيف:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr "_منفذ:"
 
@@ -13515,7 +13582,7 @@
 msgid "_Username:"
 msgstr "اسم ال_شاشة:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
 msgstr "كل_مة السر:"
 
@@ -13573,285 +13640,246 @@
 "يمكنك الرجوع للنافذة لإضافة، تحرير، أو لإزالة الحسابات من <b>حسابات->أضِف/"
 "حرِّر</b> في نافذة قائمة الأصدقاء"
 
-#: ../pidgin/gtkblist.c:524
-#, c-format
-msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: ../pidgin/gtkblist.c:525
-msgid ""
-"Merging these contacts will cause them to share a single entry on the buddy "
-"list and use a single conversation window. You can separate them again by "
-"choosing 'Expand' from the contact's context menu"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:527
-#, fuzzy
-msgid "_Merge"
-msgstr "ال_رسالة:"
-
-#: ../pidgin/gtkblist.c:924
+#: ../pidgin/gtkblist.c:767
 msgid "Join a Chat"
 msgstr "انضم لدردشة"
 
-#: ../pidgin/gtkblist.c:945
+#: ../pidgin/gtkblist.c:788
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "من فضلك أدخل المعلومات المناسبة حول الدردشة التي تود الانضمام لها.\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 "_حساب:"
 
-#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "اح_ظر"
 
-#: ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1088
 msgid "Un_block"
 msgstr "الغِ الح_ظر"
 
-#: ../pidgin/gtkblist.c:1288
-msgid "Move to"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:1328
+#: ../pidgin/gtkblist.c:1139
 msgid "Get _Info"
 msgstr "احصل على ال_معلومات"
 
-#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_تراسل فوري"
 
-#: ../pidgin/gtkblist.c:1337
-#, fuzzy
-msgid "_Send File..."
-msgstr "أرسل _ملفا"
-
-#: ../pidgin/gtkblist.c:1344
-#, fuzzy
-msgid "Add Buddy _Pounce..."
-msgstr "أضف إشعار صديق..."
-
-#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
-#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
+#: ../pidgin/gtkblist.c:1148
+#, fuzzy
+msgid "_Send File"
+msgstr "أرسل ملفا"
+
+#: ../pidgin/gtkblist.c:1155
+#, fuzzy
+msgid "Add Buddy _Pounce"
+msgstr "أضف إشعار صديق"
+
+#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
+#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
 msgid "View _Log"
 msgstr "اعرض ال_سجل"
 
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Hide when offline"
-msgstr "غير مسموح عند عدم الاتصال"
-
-#: ../pidgin/gtkblist.c:1359
-#, fuzzy
-msgid "Show when offline"
-msgstr "غير مسموح عند عدم الاتصال"
-
-#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
-#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
+#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Alias..."
 msgstr "كنية..."
 
-#: ../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 "أ_زِل"
 
-#: ../pidgin/gtkblist.c:1434
-#, fuzzy
-msgid "Add _Buddy..."
+#: ../pidgin/gtkblist.c:1238
+#, fuzzy
+msgid "Add a _Buddy"
 msgstr "أضف صديق"
 
-#: ../pidgin/gtkblist.c:1437
-#, fuzzy
-msgid "Add C_hat..."
+#: ../pidgin/gtkblist.c:1241
+#, fuzzy
+msgid "Add a C_hat"
 msgstr "أضف دردشة"
 
-#: ../pidgin/gtkblist.c:1440
+#: ../pidgin/gtkblist.c:1244
 msgid "_Delete Group"
 msgstr "ا_حذف المجموعة"
 
-#: ../pidgin/gtkblist.c:1442
+#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr "أ_عد التسمية"
 
 #. 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 "ا_نضمّ"
 
-#: ../pidgin/gtkblist.c:1464
+#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
 msgstr "انضمّ تلقائيا"
 
-#: ../pidgin/gtkblist.c:1466
-#, fuzzy
-msgid "Persistent"
-msgstr "فارسي"
-
-#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
+#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
 msgid "_Collapse"
 msgstr "قلّ_ص"
 
-#: ../pidgin/gtkblist.c:1532
+#: ../pidgin/gtkblist.c:1334
 msgid "_Expand"
 msgstr "_مدّد"
 
-#: ../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 "/الأدوات/اصمت الأصوات"
 
-#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4903
+#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
 #: ../pidgin/gtkpounce.c:430
-msgid "You are not currently signed on with an account that can add that buddy."
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
 msgstr "لم تسجل دخول حالياً بالحساب الذي يمكنك من إضافة هذا الصديق."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3067
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr "/الأ_صدقاء"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr "/الأصدقاء/رسالة فورية _جديدة..."
 
-#: ../pidgin/gtkblist.c:3069
+#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr "/الأصدقاء/انضم ل_دردشة..."
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:2872
 msgid "/Buddies/Get User _Info..."
 msgstr "/الأصدقاء/احصل على _معلومات المستخدم..."
 
-#: ../pidgin/gtkblist.c:3071
+#: ../pidgin/gtkblist.c:2873
 msgid "/Buddies/View User _Log..."
 msgstr "/الأصدقاء/اعرض _سجل المستخدم..."
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:2875
 msgid "/Buddies/Show"
 msgstr "/الأصدقاء/اعرض"
 
-#: ../pidgin/gtkblist.c:3074
+#: ../pidgin/gtkblist.c:2876
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/الأصدقاء/اعرض/الأصدقاء _غير المتصلين"
 
-#: ../pidgin/gtkblist.c:3075
+#: ../pidgin/gtkblist.c:2877
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/الأصدقاء/اعرض/المجموعات ال_خالية"
 
-#: ../pidgin/gtkblist.c:3076
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/الأصدقاء/اعرض/_تفاصيل الأصدقاء"
 
-#: ../pidgin/gtkblist.c:3077
+#: ../pidgin/gtkblist.c:2879
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/الأصدقاء/اعرض/أوقات _الخمول"
 
-#: ../pidgin/gtkblist.c:3078
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/الأصدقاء/اعرض/المجموعات _الخالية"
 
-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/_Sort Buddies"
 msgstr "/الأصدقاء/_رتّب الأصدقاء"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
 msgstr "/الأصدقاء/أ_ضف صديق..."
 
-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr "/الأصدقاء/أضف د_ردشة..."
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr "/الأصدقاء/أضف م_جموعة..."
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr "/الأصدقاء/ا_خرج"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:2890
 msgid "/_Accounts"
 msgstr "/ال_حسابات"
 
-#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6889
-#, fuzzy
-msgid "/Accounts/Manage"
+#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
+#, fuzzy
+msgid "/Accounts/Add\\/Edit"
 msgstr "/الحسابات"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr "/الأ_دوات"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Buddy _Pounces"
 msgstr "/الأدوات/إشعارات _الأصدقاء"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/_Certificates"
 msgstr "/الأدوات/ال_شهادات"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:2897
 msgid "/Tools/Plu_gins"
 msgstr "/الأدوات/_الملحقات"
 
-#: ../pidgin/gtkblist.c:3096
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr "/الأدوات/ال_تفضيلات"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr "/الأدوات/ال_خصوصيّة"
 
-#: ../pidgin/gtkblist.c:3099
+#: ../pidgin/gtkblist.c:2901
 msgid "/Tools/_File Transfers"
 msgstr "/الأدوات/نقل ا_لملفات"
 
-#: ../pidgin/gtkblist.c:3100
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/R_oom List"
 msgstr "/الأدوات/قائمة ال_غرف"
 
-#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:2903
 msgid "/Tools/System _Log"
 msgstr "/الأدوات/_سجل النظام"
 
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:2905
 msgid "/Tools/Mute _Sounds"
 msgstr "/الأدوات/اصمت الأ_صوات"
 
 #. Help
-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:2907
 msgid "/_Help"
 msgstr "/_مساعدة"
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:2908
 msgid "/Help/Online _Help"
 msgstr "/مساعدة/_مساعدة على الخط"
 
-#: ../pidgin/gtkblist.c:3107
+#: ../pidgin/gtkblist.c:2909
 msgid "/Help/_Debug Window"
 msgstr "/مساعدة/_نافذة التنقيح"
 
-#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
+#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
 msgid "/Help/_About"
 msgstr "/مساعدة/_حوْل"
 
-#: ../pidgin/gtkblist.c:3140
+#: ../pidgin/gtkblist.c:2942
 #, c-format
 msgid ""
 "\n"
@@ -13860,78 +13888,78 @@
 "\n"
 "<b>الحساب:</b> %s"
 
-#: ../pidgin/gtkblist.c:3218
+#: ../pidgin/gtkblist.c:3020
 msgid "Buddy Alias"
 msgstr "الاسم المستعار لصديق"
 
-#: ../pidgin/gtkblist.c:3247
+#: ../pidgin/gtkblist.c:3049
 msgid "Logged In"
 msgstr "والِج بالفعل"
 
-#: ../pidgin/gtkblist.c:3293
+#: ../pidgin/gtkblist.c:3095
 msgid "Last Seen"
 msgstr "أخر مرّة شوهد"
 
-#: ../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
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "خامل %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3659
+#: ../pidgin/gtkblist.c:3455
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "خمول %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3661
+#: ../pidgin/gtkblist.c:3457
 #, c-format
 msgid "Idle %dm"
 msgstr "خمول %dm"
 
-#: ../pidgin/gtkblist.c:3806
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/New Instant Message..."
 msgstr "/الأصدقاء/رسالة فورية جديدة..."
 
-#: ../pidgin/gtkblist.c:3807 ../pidgin/gtkblist.c:3840
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Join a Chat..."
 msgstr "/الأصدقاء/انضم لدردشة..."
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Get User Info..."
 msgstr "/الأصدقاء/احصل على معلومات المستخدم..."
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3605
 msgid "/Buddies/Add Buddy..."
 msgstr "/الأصدقاء/أضف صديق..."
 
-#: ../pidgin/gtkblist.c:3810 ../pidgin/gtkblist.c:3843
+#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
 msgid "/Buddies/Add Chat..."
 msgstr "/الأصدقاء/أضف دردشة..."
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3607
 msgid "/Buddies/Add Group..."
 msgstr "/الأصدقاء/أضف مجموعة..."
 
-#: ../pidgin/gtkblist.c:3846
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Privacy"
 msgstr "/الأدوات/الخصوصيّة"
 
-#: ../pidgin/gtkblist.c:3849
+#: ../pidgin/gtkblist.c:3645
 msgid "/Tools/Room List"
 msgstr "/الأدوات/قائمة الغرف"
 
-#: ../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"
@@ -13942,52 +13970,56 @@
 msgstr[4] "%d رسالة غير مقروءة من %s\n"
 msgstr[5] "%d رسالة غير مقروءة من %s\n"
 
-#: ../pidgin/gtkblist.c:4104
+#: ../pidgin/gtkblist.c:3822
 msgid "Manually"
 msgstr "يدويا"
 
-#: ../pidgin/gtkblist.c:4107
+#: ../pidgin/gtkblist.c:3824
+msgid "Alphabetically"
+msgstr "أبجديًّا"
+
+#: ../pidgin/gtkblist.c:3825
 msgid "By status"
 msgstr "حسب الحالة"
 
-#: ../pidgin/gtkblist.c:4108
+#: ../pidgin/gtkblist.c:3826
 msgid "By log size"
 msgstr "حسب حجم السجل"
 
-#: ../pidgin/gtkblist.c:4313 ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
 #, c-format
 msgid "%s disconnected"
 msgstr "انقطع %s"
 
-#: ../pidgin/gtkblist.c:4349
+#: ../pidgin/gtkblist.c:4067
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s قطع الاتصال: %s</span>"
 
-#: ../pidgin/gtkblist.c:4501
+#: ../pidgin/gtkblist.c:4219
 msgid "<b>Username:</b>"
 msgstr "<b>اسم المستخدم:</b>"
 
-#: ../pidgin/gtkblist.c:4508
+#: ../pidgin/gtkblist.c:4226
 msgid "<b>Password:</b>"
 msgstr "<b>كلمة السر:</b>"
 
-#: ../pidgin/gtkblist.c:4519
+#: ../pidgin/gtkblist.c:4237
 msgid "_Login"
 msgstr "_لُج"
 
-#: ../pidgin/gtkblist.c:4602
+#: ../pidgin/gtkblist.c:4320
 msgid "/Accounts"
 msgstr "/الحسابات"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:4334
 #, fuzzy, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>مرحباً بك في %s!</span>\n"
@@ -13998,27 +14030,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4879
+#: ../pidgin/gtkblist.c:4597
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/الأصدقاء/اعرض/الأصدقاء غير المتصلين"
 
-#: ../pidgin/gtkblist.c:4882
+#: ../pidgin/gtkblist.c:4600
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/الأصدقاء/اعرض/المجموعات الخالية"
 
-#: ../pidgin/gtkblist.c:4888
+#: ../pidgin/gtkblist.c:4606
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/الأصدقاء/اعرض/تفاصيل الصديق"
 
-#: ../pidgin/gtkblist.c:4891
+#: ../pidgin/gtkblist.c:4609
 msgid "/Buddies/Show/Idle Times"
 msgstr "/الأصدقاء/اعرض/أوقات الخمول"
 
-#: ../pidgin/gtkblist.c:4894
+#: ../pidgin/gtkblist.c:4612
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/الأصدقاء/اعرض/المجموعات الخالية"
 
-#: ../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. "
@@ -14028,32 +14060,26 @@
 "اختيارياً ادخال الكنية أو الاسم المستعار،  للصديق. الكنية ستعرض في مكان اسم "
 "الشاشة عندما يكون ممكناً.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:5819
-#, fuzzy
-msgid "A_ccount:"
-msgstr "حساب:"
-
 #. End of account box
-#: ../pidgin/gtkblist.c:5831
+#: ../pidgin/gtkblist.c:5542
 msgid "_Screen name:"
 msgstr "ا_سم الشاشة:"
 
-#: ../pidgin/gtkblist.c:5853 ../pidgin/gtkblist.c:6209
+#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
 msgid "A_lias:"
 msgstr "الك_نية:"
 
-#: ../pidgin/gtkblist.c:6121
+#: ../pidgin/gtkblist.c:5826
 msgid "This protocol does not support chat rooms."
 msgstr "البروتوكول لايدعم غرف الدردشة."
 
-#: ../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 "حالياً لم تقم بالولوج بأية بروتوكول لديه القدرة على الدردشة."
 
-#: ../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"
@@ -14061,47 +14087,39 @@
 "من فضلك أدخل الاسم المستعار، والمعلومات المناسبة حول الدردشة التي تود "
 "إضافتها لقائمة الأصدقاء لديك.\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 "من فضلك أدخل اسم المجموعة لإضافتها."
 
-#: ../pidgin/gtkblist.c:6909
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/الحسابات/"
 
-#: ../pidgin/gtkblist.c:6933
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_حرِّر الحساب"
 
-#: ../pidgin/gtkblist.c:6946 ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
 msgid "No actions available"
 msgstr "لا إجراءات متاحة"
 
-#: ../pidgin/gtkblist.c:6954
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_عطّل"
 
-#: ../pidgin/gtkblist.c:6966
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "فعّل الحساب"
 
-#: ../pidgin/gtkblist.c:6972
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/الحسابات/فعّل الحساب"
 
-#: ../pidgin/gtkblist.c:7021
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/أدوات"
 
-#: ../pidgin/gtkblist.c:7091
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/الأصدقاء/رتّب الأصدقاء"
 
@@ -14110,7 +14128,7 @@
 msgid "SSL Servers"
 msgstr "خادم SSL"
 
-#: ../pidgin/gtkconn.c:181
+#: ../pidgin/gtkconn.c:180
 #, c-format
 msgid ""
 "%s\n"
@@ -14122,206 +14140,212 @@
 "\n"
 "لن يحاول %s إعادة الاتصال بالحساب قبل أن تصحح الخطأ وتعيد تفعيل الحساب."
 
-#: ../pidgin/gtkconv.c:523
+#: ../pidgin/gtkconv.c:482
 msgid "Unknown command."
 msgstr "أمرٌ مجهول."
 
-#: ../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 "هذا الصديق ليس على نفس البروتوكول مثل هذه الدردشة."
 
-#: ../pidgin/gtkconv.c:815
-msgid "You are not currently signed on with an account that can invite that buddy."
+#: ../pidgin/gtkconv.c:774
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
 msgstr "حالياً لم تقم بالولوج بالحساب الذي يمكنك دعوة ذلك الصديق."
 
-#: ../pidgin/gtkconv.c:868
+#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
 msgstr "ادعُ صديق إلى غرفة الدردشة"
 
 #. 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."
 msgstr "من فضلك أدخل اسم المستخدم الذي ترغب في دعوته، مع رسالة دعوة اختيارية."
 
-#: ../pidgin/gtkconv.c:919
+#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
 msgstr "ال_صديق:"
 
-#: ../pidgin/gtkconv.c:930 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
 #: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "ال_رسالة:"
 
-#: ../pidgin/gtkconv.c:994
+#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "تعذّر فتح الملف."
+
+#: ../pidgin/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>محادثة مع %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1032
+#: ../pidgin/gtkconv.c:991
 msgid "Save Conversation"
 msgstr "احفظ المحادثة"
 
-#: ../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 "ابحث"
 
-#: ../pidgin/gtkconv.c:1204 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "ا_بحث عن:"
 
-#: ../pidgin/gtkconv.c:1675
+#: ../pidgin/gtkconv.c:1622
 msgid "Un-Ignore"
 msgstr "الغِ التجاهل"
 
-#: ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr "تجاهل"
 
-#: ../pidgin/gtkconv.c:1698
+#: ../pidgin/gtkconv.c:1645
 msgid "Get Away Message"
 msgstr "احصل على رسالة \"بعيد\""
 
-#: ../pidgin/gtkconv.c:1721
+#: ../pidgin/gtkconv.c:1668
 msgid "Last said"
 msgstr "آخر ماقيل"
 
-#: ../pidgin/gtkconv.c:2665
+#: ../pidgin/gtkconv.c:2606
 msgid "Unable to save icon file to disk."
 msgstr "لايمكن حفظ ملف الأيقونة إلى القرص."
 
-#: ../pidgin/gtkconv.c:2716
+#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr "احفظ الأيقونة"
 
-#: ../pidgin/gtkconv.c:2768
+#: ../pidgin/gtkconv.c:2709
 msgid "Animate"
 msgstr "رسوم متحركة"
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2714
 msgid "Hide Icon"
 msgstr "اخفِ الأيقونة"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2717
 msgid "Save Icon As..."
 msgstr "احفظ الأيقونة كـ..."
 
-#: ../pidgin/gtkconv.c:2780
+#: ../pidgin/gtkconv.c:2721
 msgid "Set Custom Icon..."
 msgstr "حدد أيقونة مخصصة..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2734
 msgid "Remove Custom Icon"
 msgstr "أزِل الأيقونة المخصصة"
 
-#: ../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 "/_محادثة"
 
-#: ../pidgin/gtkconv.c:2945
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/New Instant _Message..."
 msgstr "/محادثة/رسالة فورية _جديدة..."
 
-#: ../pidgin/gtkconv.c:2950
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Find..."
 msgstr "/محادثة/ا_بحث..."
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/View _Log"
 msgstr "/محادثة/اعرض _السجل"
 
-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr "/محادثة/ا_حفظ كـ..."
 
-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/محادثة/امس_ح نافذة المحادثة"
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/Se_nd File..."
 msgstr "/محادثة/أر_سل ملف..."
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/محادثة/أضف إشعار _صديق..."
 
-#: ../pidgin/gtkconv.c:2962
+#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr "/محادثة/ا_حصل على المعلومات"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/محادثة/اد_عُ..."
 
-#: ../pidgin/gtkconv.c:2966
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/M_ore"
 msgstr "/محادثة/ال_مزيد"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2907
 msgid "/Conversation/Al_ias..."
 msgstr "/محادثة/اسم_مستعار..."
 
-#: ../pidgin/gtkconv.c:2972
+#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/محادثة/ا_حظر..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Unblock..."
 msgstr "/محادثة/ال_غ الحظر..."
 
-#: ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Add..."
 msgstr "/محادثة/أ_ضف..."
 
-#: ../pidgin/gtkconv.c:2978
+#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Remove..."
 msgstr "/محادثة/أ_زِل..."
 
-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/محادثة/أدرج _وصلة..."
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/محادثة/أدرج _صورة..."
 
-#: ../pidgin/gtkconv.c:2991
+#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/_Close"
 msgstr "/محادثة/أ_غلِق"
 
 #. Options
-#: ../pidgin/gtkconv.c:2995
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Options"
 msgstr "/_خيارات"
 
-#: ../pidgin/gtkconv.c:2996
+#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr "/خيارات/فعّل _التسجيل"
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr "/خيارات/فعّل _الأصوات"
 
-#: ../pidgin/gtkconv.c:2999
+#: ../pidgin/gtkconv.c:2936
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/خيارات/اعرض أ_شرطة أدوات التنسيق"
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:2937
 msgid "/Options/Show Ti_mestamps"
 msgstr "/خيارات/اعرض ال_طوابع الزمنية"
 
-#: ../pidgin/gtkconv.c:3124
+#: ../pidgin/gtkconv.c:3061
 msgid "/Conversation/More"
 msgstr "/محادثة/المزيد"
 
-#: ../pidgin/gtkconv.c:3180
+#: ../pidgin/gtkconv.c:3117
 msgid "/Options"
 msgstr "/خيارات"
 
@@ -14330,98 +14354,98 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3215 ../pidgin/gtkconv.c:3247
+#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
 msgid "/Conversation"
 msgstr "/محادثة"
 
-#: ../pidgin/gtkconv.c:3255
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/View Log"
 msgstr "/محادثة/اعرض السجل"
 
-#: ../pidgin/gtkconv.c:3261
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Send File..."
 msgstr "/محادثة/أرسل ملف..."
 
-#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/محادثة/أضف إشعار صديق..."
 
-#: ../pidgin/gtkconv.c:3271
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Get Info"
 msgstr "/محادثة/احصل على المعلومات"
 
-#: ../pidgin/gtkconv.c:3275
+#: ../pidgin/gtkconv.c:3212
 msgid "/Conversation/Invite..."
 msgstr "/محادثة/ادعُ..."
 
-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Alias..."
 msgstr "/محادثة/كنية..."
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr "/محادثة/احظر..."
 
-#: ../pidgin/gtkconv.c:3289
+#: ../pidgin/gtkconv.c:3226
 msgid "/Conversation/Unblock..."
 msgstr "/محادثة/الغِ الحظر..."
 
-#: ../pidgin/gtkconv.c:3293
+#: ../pidgin/gtkconv.c:3230
 msgid "/Conversation/Add..."
 msgstr "/محادثة/أضف..."
 
-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Remove..."
 msgstr "/محادثة/أزِل..."
 
-#: ../pidgin/gtkconv.c:3303
+#: ../pidgin/gtkconv.c:3240
 msgid "/Conversation/Insert Link..."
 msgstr "/محادثة/أدرج وصلة..."
 
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Insert Image..."
 msgstr "/محادثة/أدرج صورة..."
 
-#: ../pidgin/gtkconv.c:3313
+#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr "/خيارات/فعّل التسجيل"
 
-#: ../pidgin/gtkconv.c:3316
+#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr "/خيارات/فعّل الأصوات"
 
-#: ../pidgin/gtkconv.c:3329
+#: ../pidgin/gtkconv.c:3266
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/خيارات/اعرض أشرطة أدوات التنسيق"
 
-#: ../pidgin/gtkconv.c:3332
+#: ../pidgin/gtkconv.c:3269
 msgid "/Options/Show Timestamps"
 msgstr "/خيارات/اعرض الطوابع الزمنية"
 
-#: ../pidgin/gtkconv.c:3409 ../pidgin/gtkconv.c:3451
+#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
 msgstr "المستخدم يكتب..."
 
-#: ../pidgin/gtkconv.c:3454
+#: ../pidgin/gtkconv.c:3391
 msgid "User has typed something and stopped"
 msgstr "كتب المستخدم ثم توقّف"
 
 #. 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 "أرسل إلى"
 
-#: ../pidgin/gtkconv.c:4349
+#: ../pidgin/gtkconv.c:4286
 msgid "_Send"
 msgstr "أر_سل"
 
 #. 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 شخص في الغرفة"
 
-#: ../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"
@@ -14432,77 +14456,77 @@
 msgstr[4] "%d شخصا"
 msgstr[5] "%d شخص"
 
-#: ../pidgin/gtkconv.c:6550 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "يكتب"
 
-#: ../pidgin/gtkconv.c:6554
+#: ../pidgin/gtkconv.c:6490
 msgid "Stopped Typing"
 msgstr "أوقَفَ الكتابة"
 
-#: ../pidgin/gtkconv.c:6557
+#: ../pidgin/gtkconv.c:6493
 msgid "Nick Said"
 msgstr "الكنية قيلت"
 
-#: ../pidgin/gtkconv.c:6560 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "رسائل غير مقروءة"
 
-#: ../pidgin/gtkconv.c:6563
+#: ../pidgin/gtkconv.c:6499
 msgid "New Event"
 msgstr "حدث جديد"
 
-#: ../pidgin/gtkconv.c:7654
+#: ../pidgin/gtkconv.c:7572
 msgid "clear: Clears all conversation scrollbacks."
 msgstr ""
 "clear:\n"
 "يمسح سجل نافذة المحادثة."
 
-#: ../pidgin/gtkconv.c:7817
+#: ../pidgin/gtkconv.c:7736
 msgid "Confirm close"
 msgstr "أكِّد الإغلاق"
 
-#: ../pidgin/gtkconv.c:7849
+#: ../pidgin/gtkconv.c:7768
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "لديك رسائل غير مقروءة.هل تريد إغلاق النافذة؟"
 
-#: ../pidgin/gtkconv.c:8436
+#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
 msgstr "أغلِق الألسنة الأخرى"
 
-#: ../pidgin/gtkconv.c:8442
+#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
 msgstr "أغلِق جميع الألسنة"
 
-#: ../pidgin/gtkconv.c:8450
+#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
 msgstr "افصل هذا اللسان"
 
-#: ../pidgin/gtkconv.c:8456
+#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
 msgstr "أغلق هذا اللسان"
 
-#: ../pidgin/gtkconv.c:8951
+#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr "أغلق المحادثة"
 
-#: ../pidgin/gtkconv.c:9553
+#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
 msgstr "آخر نافذة منشأة"
 
-#: ../pidgin/gtkconv.c:9555
+#: ../pidgin/gtkconv.c:9479
 msgid "Separate IM and Chat windows"
 msgstr "افصل نوافذ التراسل الفوري والدردشة"
 
-#: ../pidgin/gtkconv.c:9557 ../pidgin/gtkprefs.c:1417
+#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr "نافذة جديدة"
 
-#: ../pidgin/gtkconv.c:9559
+#: ../pidgin/gtkconv.c:9483
 msgid "By group"
 msgstr "حسب المجموعة"
 
-#: ../pidgin/gtkconv.c:9561
+#: ../pidgin/gtkconv.c:9485
 msgid "By account"
 msgstr "حسب الحساب"
 
@@ -14627,7 +14651,7 @@
 msgid "Afrikaans"
 msgstr "أفريكاني"
 
-#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
 msgstr "عربي"
 
@@ -14636,7 +14660,7 @@
 msgstr "بلاروسي لاتيني"
 
 #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "بلغاري"
 
@@ -14649,8 +14673,8 @@
 msgid "Bosnian"
 msgstr "بوسني"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "كاتالوني"
 
@@ -14658,7 +14682,7 @@
 msgid "Valencian-Catalan"
 msgstr "ڤاليشيان-كاتلان"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "تشيكي"
 
@@ -14667,7 +14691,7 @@
 msgstr "دانماركي"
 
 #: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "ألماني"
 
@@ -14696,9 +14720,9 @@
 msgid "Esperanto"
 msgstr "إسبرانتو"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "إسباني"
 
@@ -14716,19 +14740,19 @@
 msgid "Persian"
 msgstr "فارسي"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "فنلندي"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "فرنسي"
 
 #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr "قاليتشي"
 
@@ -14740,7 +14764,7 @@
 msgid "Gujarati Language Team"
 msgstr "فريق اللغة الكوجراتية"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "عبري"
 
@@ -14748,7 +14772,7 @@
 msgid "Hindi"
 msgstr "هندي"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "مجري"
 
@@ -14756,16 +14780,16 @@
 msgid "Indonesian"
 msgstr "إندونيسي"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "إيطالي"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "ياباني"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "جورجي"
 
@@ -14781,8 +14805,8 @@
 msgid "Kannada Translation team"
 msgstr "فريق ترجمة الكانادا"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "كوري"
 
@@ -14791,132 +14815,138 @@
 msgid "Kurdish"
 msgstr "كردي"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:249
-#: ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:185
+#, fuzzy
+msgid "Lao"
+msgstr "الأسد"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "لتواني"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "مقدوني"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 msgid "Bokmål Norwegian"
 msgstr "بوكمال نرويجي"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
 msgstr "نيبالي"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:192
 #, fuzzy
 msgid "Dutch, Flemish"
 msgstr "هولندي"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:193
 #, fuzzy
 msgid "Norwegian Nynorsk"
 msgstr "النرويجية"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:193
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
 msgid "Polish"
 msgstr "بولندي"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Portuguese"
 msgstr "برتغالي"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese-Brazil"
 msgstr "برتغالي (البرازيل)"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:199
 msgid "Pashto"
 msgstr "باشتو"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "Romanian"
 msgstr "روماني"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:254
-#: ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "روسي"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:256 ../pidgin/gtkdialogs.c:257
-#: ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "سلوفاكي"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "سلوفيني"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:205
 msgid "Albanian"
 msgstr "ألباني"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "صربي"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:262
-#: ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:267
 msgid "Swedish"
 msgstr "سويدي"
 
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:209
 msgid "Tamil"
 msgstr "تاميلي"
 
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "تلوغو"
 
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
 msgstr "تايلندي"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "تركي"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "Vietnamese"
 msgstr "فيتنامي"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh و فريق  Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "صيني مبسّط"
 
-#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
 msgstr "صيني هونج كونج"
 
-#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:217
-#: ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "صيني تقليدي"
 
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "أمهري"
 
-#: ../pidgin/gtkdialogs.c:353
+#: ../pidgin/gtkdialogs.c:357
 #, c-format
 msgid "About %s"
 msgstr "حوْل %s"
 
-#: ../pidgin/gtkdialogs.c:396
+#: ../pidgin/gtkdialogs.c:400
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -14937,88 +14967,89 @@
 "المُوزّع مع %s. حقوق نسخ %s محفوظة للمساهمين فيه. انظر ملف  'COPYRIGHT' لترى "
 "القائمة الكاملة بالمساهمين. لا تقدم أي ضمان على هذا البرنامج.<BR><BR> "
 
-#: ../pidgin/gtkdialogs.c:414
+#: ../pidgin/gtkdialogs.c:418
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin على irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:419
+#: ../pidgin/gtkdialogs.c:423
 msgid "Current Developers"
 msgstr "المطورون الحاليون"
 
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:438
 msgid "Crazy Patch Writers"
 msgstr "كتاب الرقع المجانين"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:453
 msgid "Retired Developers"
 msgstr "المطورون المتقاعدون"
 
-#: ../pidgin/gtkdialogs.c:464
+#: ../pidgin/gtkdialogs.c:468
 msgid "Retired Crazy Patch Writers"
 msgstr "كتاب الرقع المجانين المتقاعدين"
 
-#: ../pidgin/gtkdialogs.c:479
+#: ../pidgin/gtkdialogs.c:483
 msgid "Artists"
 msgstr "الفنانون"
 
-#: ../pidgin/gtkdialogs.c:494
+#: ../pidgin/gtkdialogs.c:498
 msgid "Current Translators"
 msgstr "المترجمون الحاليون"
 
-#: ../pidgin/gtkdialogs.c:514
+#: ../pidgin/gtkdialogs.c:518
 msgid "Past Translators"
 msgstr "المترجمون السابقون"
 
-#: ../pidgin/gtkdialogs.c:532
+#: ../pidgin/gtkdialogs.c:536
 msgid "Debugging Information"
 msgstr "معلومات التنقيح"
 
-#: ../pidgin/gtkdialogs.c:902
+#: ../pidgin/gtkdialogs.c:906
 msgid "Get User Info"
 msgstr "احصل على معلومات المستخدم"
 
-#: ../pidgin/gtkdialogs.c:904
+#: ../pidgin/gtkdialogs.c:908
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "الرجاء إدخال اسم الشاشة أو الكنية للشخص الذي تود عرض معلوماته."
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:998
 msgid "View User Log"
 msgstr "اعرض سجل المستخدم"
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1000
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "الرجاء إدخال اسم الشاشة أو الاسم المستعار للشخص الذي تود عرض سجله."
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Alias Contact"
 msgstr "اسم المراسل المستعار"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1021
 msgid "Enter an alias for this contact."
 msgstr "أدخل الاسم المستعار لهذا المراسل."
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1043
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "أدخل الاسم المستعار لـ%s."
 
-#: ../pidgin/gtkdialogs.c:1041
+#: ../pidgin/gtkdialogs.c:1045
 msgid "Alias Buddy"
 msgstr "الاسم المستعار للصديق"
 
-#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1066
 msgid "Alias Chat"
 msgstr "اسم الدردشة المستعار"
 
-#: ../pidgin/gtkdialogs.c:1063
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Enter an alias for this chat."
 msgstr "أدخل الاسم المستعار لهذه الدردشة"
 
-#: ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1106
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15045,30 +15076,30 @@
 "أنت بصدد إزالة مراسل يحتوي %s و %d صديق آخر من قائمة أصدقائك.  هل تريد "
 "الاستمرار؟"
 
-#: ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Remove Contact"
 msgstr "أزِل المراسل"
 
-#: ../pidgin/gtkdialogs.c:1113
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Remove Contact"
 msgstr "أ_زِل المراسل"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1148
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "أنت بصدد دمج مجموعة تدعى %s داخل مجموعة تدعى %s. هل تريد الاستمرار؟"
 
-#: ../pidgin/gtkdialogs.c:1151
+#: ../pidgin/gtkdialogs.c:1155
 msgid "Merge Groups"
 msgstr "ادمج المجموعات"
 
-#: ../pidgin/gtkdialogs.c:1154
+#: ../pidgin/gtkdialogs.c:1158
 msgid "_Merge Groups"
 msgstr "ا_دمج مجموعات"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1208
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15077,39 +15108,40 @@
 "أنت بصدد إزالة المجموعة %s وجميع أعضائها من قائمة الأصدقاء لديك.  هل تريد "
 "الاستمرار؟"
 
-#: ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1211
 msgid "Remove Group"
 msgstr "أزِل مجموعة"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1214
 msgid "_Remove Group"
 msgstr "أزِل ال_مجموعة"
 
-#: ../pidgin/gtkdialogs.c:1243
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+#: ../pidgin/gtkdialogs.c:1247
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "أنت بصدد إزالة %s من قائمة الأصدقاء لديك.  هل تريد الاستمرار؟"
 
-#: ../pidgin/gtkdialogs.c:1246
+#: ../pidgin/gtkdialogs.c:1250
 msgid "Remove Buddy"
 msgstr "أزِل الصديق"
 
-#: ../pidgin/gtkdialogs.c:1249
+#: ../pidgin/gtkdialogs.c:1253
 msgid "_Remove Buddy"
 msgstr "أزِل ال_صديق"
 
-#: ../pidgin/gtkdialogs.c:1270
+#: ../pidgin/gtkdialogs.c:1274
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "أنت بصدد إزالة دردشة %s من قائمة الأصدقاء لديك.  هل تريد الاستمرار؟"
 
-#: ../pidgin/gtkdialogs.c:1273
+#: ../pidgin/gtkdialogs.c:1277
 msgid "Remove Chat"
 msgstr "أزِل الدردشة"
 
-#: ../pidgin/gtkdialogs.c:1276
+#: ../pidgin/gtkdialogs.c:1280
 msgid "_Remove Chat"
 msgstr "أزِل ال_دردشة"
 
@@ -15135,7 +15167,7 @@
 
 #: ../pidgin/gtkdocklet.c:535
 #, fuzzy
-msgid "Blink on New Message"
+msgid "Blink on new message"
 msgstr "أومِض عند الرسائل الجديدة"
 
 #: ../pidgin/gtkdocklet.c:542
@@ -15232,7 +15264,7 @@
 msgid "Paste as Plain _Text"
 msgstr "الصق كنص _صِرف"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1195
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Reset formatting"
 msgstr "صفّر ال_تنسيق"
 
@@ -15311,6 +15343,7 @@
 msgstr "احفظ الصورة"
 
 #: ../pidgin/gtkimhtml.c:3522
+#, c-format
 msgid "_Save Image..."
 msgstr "ا_حفظ الصورة..."
 
@@ -15348,7 +15381,7 @@
 msgid "Insert Link"
 msgstr "أدرج وصلة"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1263
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr "أ_درج"
 
@@ -15370,7 +15403,7 @@
 msgid "Smile!"
 msgstr "ابتسامة!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1220
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
 msgid "_Font"
 msgstr "الخ_ط"
 
@@ -15430,66 +15463,66 @@
 msgid "Insert Smiley"
 msgstr "أدرِج ابتسامة"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<b>_Bold</b>"
 msgstr "<b>_عريض</b>"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1180
+msgid "<i>_Italic</i>"
+msgstr "<i>_مائل</i>"
+
 #: ../pidgin/gtkimhtmltoolbar.c:1181
-msgid "<i>_Italic</i>"
-msgstr "<i>_مائل</i>"
+msgid "<u>_Underline</u>"
+msgstr "<u>_تسطير</u>"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1182
-msgid "<u>_Underline</u>"
-msgstr "<u>_تسطير</u>"
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>مشطوب</span>"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1183
-msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr "<span strikethrough='true'>مشطوب</span>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>أ_كبر</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "_Normal"
 msgstr "عا_دي"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>أ_صغر</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1191
 msgid "_Font face"
 msgstr "شكل ال_خط"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1192
+msgid "Foreground _color"
+msgstr "لون ال_مقدمة"
+
 #: ../pidgin/gtkimhtmltoolbar.c:1193
-msgid "Foreground _color"
-msgstr "لون ال_مقدمة"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Bac_kground color"
 msgstr "لون ال_خلفية"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1271
+#: ../pidgin/gtkimhtmltoolbar.c:1270
+#, fuzzy
+msgid "_Smiley"
+msgstr "ابتسامة!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1276
 msgid "_Image"
 msgstr "_صورة"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1277
+#: ../pidgin/gtkimhtmltoolbar.c:1282
 msgid "_Link"
 msgstr "_وصلة"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1283
+#: ../pidgin/gtkimhtmltoolbar.c:1288
 msgid "_Horizontal rule"
 msgstr "قاعدة أ_فقية"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1305
-#, fuzzy
-msgid "_Smile!"
-msgstr "ابتسامة!"
-
 #: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
@@ -15537,10 +15570,12 @@
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
-msgstr "الرسائل الفورية ستسجل فقط إذا كان خيار \"سجل جميع الرسائل الفورية\" مفعل."
+msgstr ""
+"الرسائل الفورية ستسجل فقط إذا كان خيار \"سجل جميع الرسائل الفورية\" مفعل."
 
 #: ../pidgin/gtklog.c:557
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "الدردشات ستسجل فقط إذا كان خيار \"سجل جميع الدردشات\" مفعل.."
 
 #: ../pidgin/gtklog.c:561
@@ -15588,7 +15623,6 @@
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
-"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -15603,10 +15637,10 @@
 "                             الحسابات التي ستستخدم، مفصولة بفاصلة)\n"
 "  -v, --version       اعرض النسخة الحالية واخرج\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"
@@ -15627,7 +15661,7 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "بِدْجِن"
 
@@ -15652,8 +15686,8 @@
 
 #: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>%d new e-mail.</b>"
-msgid_plural "<b>%d new e-mails.</b>"
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>لا بريد جديد.</b>"
 msgstr[1] "<b>لديك بريد واحد جديد.</b>"
 msgstr[2] "<b>لديك رسالتي بريد جديدتين.</b>"
@@ -15661,23 +15695,24 @@
 msgstr[4] "<b>لديك %d رسالة بريد جديدة.</b>"
 msgstr[5] "<b>لديك %d رسالة بريد جديدة.</b>"
 
-#: ../pidgin/gtknotify.c:991
+#: ../pidgin/gtknotify.c:989
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "أمر المتصفح \"%s\" غير صالح."
 
-#: ../pidgin/gtknotify.c:993 ../pidgin/gtknotify.c:1005
-#: ../pidgin/gtknotify.c:1018 ../pidgin/gtknotify.c:1146
+#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
+#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
 msgid "Unable to open URL"
 msgstr "تعذّر فتح المسار"
 
-#: ../pidgin/gtknotify.c:1003 ../pidgin/gtknotify.c:1016
+#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "خطأ في إطلاق \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1147
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
+#: ../pidgin/gtknotify.c:1145
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "أمر المتصفح \"اليدوي\" تم اختياره، ولكن لم يُحدد أي أمر."
 
 #: ../pidgin/gtkplugin.c:265
@@ -15865,7 +15900,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "ا_خفِ محادثات التراسل الفوري الجديدة"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 msgid "When away"
 msgstr "عند الغياب"
 
@@ -15918,177 +15953,173 @@
 msgid "Show _formatting on incoming messages"
 msgstr "اعرض _تنسيق الرسائل الواردة"
 
-#: ../pidgin/gtkprefs.c:997
-msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+#: ../pidgin/gtkprefs.c:998
+msgid "Show _detailed information"
+msgstr "اعرض معلومات _تفصيلية"
 
 #: ../pidgin/gtkprefs.c:1000
-msgid "Show _detailed information"
-msgstr "اعرض معلومات _تفصيلية"
-
-#: ../pidgin/gtkprefs.c:1002
 msgid "Enable buddy ic_on animation"
 msgstr "فعّل أيقو_نة الصديق المتحركة"
 
-#: ../pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1007
 msgid "_Notify buddies that you are typing to them"
 msgstr "_نبّه الأصدقاء الذين أكتب لهم"
 
-#: ../pidgin/gtkprefs.c:1012
+#: ../pidgin/gtkprefs.c:1010
 msgid "Highlight _misspelled words"
 msgstr "أبرز _الكلمات المهجأة خطأ"
 
-#: ../pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
 msgstr "استخدم التمرير السلس"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1017
 msgid "F_lash window when IMs are received"
 msgstr "أ_ومض النافذة عند استقبال الرسائل الفورية"
 
-#: ../pidgin/gtkprefs.c:1021
+#: ../pidgin/gtkprefs.c:1019
 msgid "Minimi_ze new conversation windows"
 msgstr "_صغّر نوافذ المحادثات الجديدة"
 
+#: ../pidgin/gtkprefs.c:1023
+msgid "Font"
+msgstr "الخط"
+
 #: ../pidgin/gtkprefs.c:1025
-msgid "Font"
-msgstr "الخط"
+msgid "Use document font from _theme"
+msgstr "استخدم خط المستند من ال_سمة"
 
 #: ../pidgin/gtkprefs.c:1027
-msgid "Use document font from _theme"
-msgstr "استخدم خط المستند من ال_سمة"
+msgid "Use font from _theme"
+msgstr "استخدم خط ال_سِمة"
 
 #: ../pidgin/gtkprefs.c:1029
-msgid "Use font from _theme"
-msgstr "استخدم خط ال_سِمة"
-
-#: ../pidgin/gtkprefs.c:1031
 msgid "Conversation _font:"
 msgstr "_خط المحادثة:"
 
-#: ../pidgin/gtkprefs.c:1045
+#: ../pidgin/gtkprefs.c:1043
 msgid "Default Formatting"
 msgstr "التنسيق الافتراضي"
 
-#: ../pidgin/gtkprefs.c:1064
+#: ../pidgin/gtkprefs.c:1062
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr "هكذا سيظهر نص الرسالة الصادرة عندما تستخدم بروتوكول يدعم التنسيق."
 
-#: ../pidgin/gtkprefs.c:1130
+#: ../pidgin/gtkprefs.c:1128
 msgid "ST_UN server:"
 msgstr "خادم ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1142
+#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">مثال: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1146
+#: ../pidgin/gtkprefs.c:1144
 msgid "_Autodetect IP address"
 msgstr "ا_كشف عنوان IP تلقائيا"
 
-#: ../pidgin/gtkprefs.c:1155
+#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
 msgstr "IP عمومي:"
 
-#: ../pidgin/gtkprefs.c:1184
+#: ../pidgin/gtkprefs.c:1182
 msgid "Ports"
 msgstr "منافذ"
 
-#: ../pidgin/gtkprefs.c:1187
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Manually specify range of ports to listen on"
 msgstr "حدد _يدوياً نطاق منافذ ليستمع إليه"
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1188
 msgid "_Start port:"
 msgstr "_منفذ البداية:"
 
-#: ../pidgin/gtkprefs.c:1197
+#: ../pidgin/gtkprefs.c:1195
 msgid "_End port:"
 msgstr "_منفذ النهاية:"
 
-#: ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkprefs.c:1203
 msgid "Proxy Server"
 msgstr "خادم الوكيل"
 
-#: ../pidgin/gtkprefs.c:1209
+#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr "بدون وكيل"
 
-#: ../pidgin/gtkprefs.c:1265
+#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr "_مستخدم:"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1328
 msgid "Seamonkey"
 msgstr "سي‌منكي"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1329
 msgid "Opera"
 msgstr "أوبرا"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1330
 msgid "Netscape"
 msgstr "نتسكيب"
 
+#: ../pidgin/gtkprefs.c:1331
+msgid "Mozilla"
+msgstr "موزيلا"
+
+#: ../pidgin/gtkprefs.c:1332
+msgid "Konqueror"
+msgstr "كونكرر"
+
 #: ../pidgin/gtkprefs.c:1333
-msgid "Mozilla"
-msgstr "موزيلا"
+msgid "GNOME Default"
+msgstr "افتراضي جنوم"
 
 #: ../pidgin/gtkprefs.c:1334
-msgid "Konqueror"
-msgstr "كونكرر"
+msgid "Galeon"
+msgstr "جاليون"
 
 #: ../pidgin/gtkprefs.c:1335
-msgid "GNOME Default"
-msgstr "افتراضي جنوم"
+msgid "Firefox"
+msgstr "فايرفوكس"
 
 #: ../pidgin/gtkprefs.c:1336
-msgid "Galeon"
-msgstr "جاليون"
+msgid "Firebird"
+msgstr "فايربيرد"
 
 #: ../pidgin/gtkprefs.c:1337
-msgid "Firefox"
-msgstr "فايرفوكس"
-
-#: ../pidgin/gtkprefs.c:1338
-msgid "Firebird"
-msgstr "فايربيرد"
-
-#: ../pidgin/gtkprefs.c:1339
 msgid "Epiphany"
 msgstr "إبِفيني"
 
-#: ../pidgin/gtkprefs.c:1348
+#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr "يدوي"
 
-#: ../pidgin/gtkprefs.c:1401
+#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr "اختيار المتصفح"
 
-#: ../pidgin/gtkprefs.c:1405
+#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr "ال_متصفح:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1411
 msgid "_Open link in:"
 msgstr "ا_فتح الوصلة في:"
 
-#: ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkprefs.c:1413
 msgid "Browser default"
 msgstr "المتصفح الافتراضي"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1414
 msgid "Existing window"
 msgstr "نافذة موجودة"
 
-#: ../pidgin/gtkprefs.c:1418
+#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr "لسان جديد"
 
-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16097,63 +16128,69 @@
 "_يدوياً:\n"
 "(%s للمسار)"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log _format:"
 msgstr "تنسيق ال_سجل:"
 
+#: ../pidgin/gtkprefs.c:1475
+msgid "Log all _instant messages"
+msgstr "سجّل جميع _الرسائل الفورية"
+
 #: ../pidgin/gtkprefs.c:1477
-msgid "Log all _instant messages"
-msgstr "سجّل جميع _الرسائل الفورية"
-
-#: ../pidgin/gtkprefs.c:1479
 msgid "Log all c_hats"
 msgstr "سجّل جميع ا_لدردشات"
 
-#: ../pidgin/gtkprefs.c:1481
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
 msgstr "سجّل جميع تغييرات ال_حالة إلى سجل النظام"
 
-#: ../pidgin/gtkprefs.c:1627
+#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr "اختيار الصّوت"
 
-#: ../pidgin/gtkprefs.c:1637
+#: ../pidgin/gtkprefs.c:1635
+#, c-format
 msgid "Quietest"
 msgstr "هاديء جداً"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1637
+#, c-format
 msgid "Quieter"
 msgstr "أهدأ"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1639
+#, c-format
 msgid "Quiet"
 msgstr "هاديء"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1643
+#, c-format
 msgid "Loud"
 msgstr "عالي"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1645
+#, c-format
 msgid "Louder"
 msgstr "أعلى"
 
-#: ../pidgin/gtkprefs.c:1649
+#: ../pidgin/gtkprefs.c:1647
+#, c-format
 msgid "Loudest"
 msgstr "صاخب"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr "ال_طريقة:"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
 msgstr "صافرة الكونسول"
 
-#: ../pidgin/gtkprefs.c:1724
+#: ../pidgin/gtkprefs.c:1722
 msgid "No sounds"
 msgstr "بدون صوت"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16162,81 +16199,81 @@
 "أ_مر الصوت:\n"
 "(%s لاسم الملف)"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1757
 msgid "Sounds when conversation has _focus"
 msgstr "أصدر صوتاً عندما تكون المحادثة _نشطة"
 
-#: ../pidgin/gtkprefs.c:1761
+#: ../pidgin/gtkprefs.c:1759
 msgid "Enable sounds:"
 msgstr "فعّل الأ_صوات:"
 
-#: ../pidgin/gtkprefs.c:1772
+#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
 msgstr "الحجم:"
 
-#: ../pidgin/gtkprefs.c:1852
+#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr "شغّل"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1927
 msgid "_Report idle time:"
 msgstr "أ_بلغ عن وقت الخمول:"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr "مبني على استخدام لوحة المفاتيح أو الفأرة"
 
-#: ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:1941
 msgid "_Auto-reply:"
 msgstr "_رد تلقائي:"
 
-#: ../pidgin/gtkprefs.c:1947
+#: ../pidgin/gtkprefs.c:1945
 msgid "When both away and idle"
 msgstr "عند الغياب والخمول معاً"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
 msgstr "غياب تلقائي"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:1953
 msgid "Change status when _idle"
 msgstr "غير الحالة عند ال_خمول"
 
-#: ../pidgin/gtkprefs.c:1959
+#: ../pidgin/gtkprefs.c:1957
 msgid "_Minutes before becoming idle:"
 msgstr "ال_دقائق قبل تغيير الحالة:"
 
-#: ../pidgin/gtkprefs.c:1967
+#: ../pidgin/gtkprefs.c:1965
 msgid "Change _status to:"
 msgstr "غيّر _الحالة إلى:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:1986
 msgid "Status at Startup"
 msgstr "الحالة عند بدء التشغيل"
 
-#: ../pidgin/gtkprefs.c:1990
+#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
 msgstr "استخدم الحالة من الخروج _الأخير في بدء التشغيل"
 
-#: ../pidgin/gtkprefs.c:1996
+#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
 msgstr "الحالة التي س_تطبق في بدء التشغيل:"
 
+#: ../pidgin/gtkprefs.c:2032
+msgid "Interface"
+msgstr "الواجهة"
+
 #: ../pidgin/gtkprefs.c:2034
-msgid "Interface"
-msgstr "الواجهة"
-
-#: ../pidgin/gtkprefs.c:2036
 msgid "Smiley Themes"
 msgstr "سِمات الإبتسامات"
 
-#: ../pidgin/gtkprefs.c:2043
+#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr "المتصفح"
 
-#: ../pidgin/gtkprefs.c:2047
+#: ../pidgin/gtkprefs.c:2045
 msgid "Status / Idle"
 msgstr "الحالة / خمول"
 
@@ -16518,7 +16555,8 @@
 
 #: ../pidgin/gtkutils.c:2793
 #, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "فشل تحميل الصورة '%s': السبب مجهول، ربما يكون ملف الصورة تالفاً"
 
 #: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
@@ -16655,7 +16693,8 @@
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
-msgstr "الصديق ذو <i>الحاصل الأكبر</i> هو الصديق الذي لديه أولوية في الاتصال.\n"
+msgstr ""
+"الصديق ذو <i>الحاصل الأكبر</i> هو الصديق الذي لديه أولوية في الاتصال.\n"
 
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -16679,7 +16718,8 @@
 #. *< version
 #. *< summary
 #: ../pidgin/plugins/contact_priority.c:190
-msgid "Allows for controlling the values associated with different buddy states."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
 msgstr "يسمح بالتحكم بالقيم المرتبطة مع حالات الأصدقاء المختلفة."
 
 #. *< description
@@ -16687,7 +16727,8 @@
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
-msgstr "يسمح بتغيير قيم النقاط لحالات خمول/بعيد/غير متصل عند حساب أولويات الاتصال."
+msgstr ""
+"يسمح بتغيير قيم النقاط لحالات خمول/بعيد/غير متصل عند حساب أولويات الاتصال."
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
@@ -16717,7 +16758,7 @@
 msgid "Received Messages"
 msgstr "الرسائل المستقبلة"
 
-#: ../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 "اختر لون لـ %s"
@@ -16747,7 +16788,8 @@
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
-msgstr "ملحوظة: تفضيل \"محادثات جديدة\" يجب أن يكون مضبوطا إلى \"بتعداد المحادثة\"."
+msgstr ""
+"ملحوظة: تفضيل \"محادثات جديدة\" يجب أن يكون مضبوطا إلى \"بتعداد المحادثة\"."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -16779,7 +16821,8 @@
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
-msgstr "قيد الأرقام للمحادثات لكل نافذة، اختيارياً افصل الرسائل الفورية والدردشات"
+msgstr ""
+"قيد الأرقام للمحادثات لكل نافذة، اختيارياً افصل الرسائل الفورية والدردشات"
 
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
@@ -16983,7 +17026,7 @@
 "\n"
 "<b>ملاحظات الصديق</b>: %s"
 
-#: ../pidgin/plugins/history.c:192
+#: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "التاريخ"
 
@@ -17234,36 +17277,47 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr "فصْل GtkTreeView الأفقي"
 
-#: ../pidgin/plugins/pidginrc.c:69
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "دخول المحادثة"
 
-#: ../pidgin/plugins/pidginrc.c:70
+#: ../pidgin/plugins/pidginrc.c:74
+#, fuzzy
+msgid "Conversation History"
+msgstr "دخول المحادثة"
+
+#: ../pidgin/plugins/pidginrc.c:75
+#, fuzzy
+msgid "Log Viewer"
+msgstr "قارىء السجلات"
+
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "حوار الطلب"
 
-#: ../pidgin/plugins/pidginrc.c:71
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "حوار التذكير"
 
-#: ../pidgin/plugins/pidginrc.c:247
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "حدد اللون"
 
-#: ../pidgin/plugins/pidginrc.c:294
+#: ../pidgin/plugins/pidginrc.c:300
+#, c-format
 msgid "Select Interface Font"
 msgstr "حدد خط الواجهة"
 
-#: ../pidgin/plugins/pidginrc.c:297
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "حدد خط %s"
 
-#: ../pidgin/plugins/pidginrc.c:365
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "خط واجهة جتك+"
 
-#: ../pidgin/plugins/pidginrc.c:385
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "سِمة اختصارات جتك+"
 
@@ -17287,36 +17341,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "ألوان الواجهة"
 
-#: ../pidgin/plugins/pidginrc.c:446
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "أحجام الوِدج"
 
-#: ../pidgin/plugins/pidginrc.c:467
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "الخطوط"
 
-#: ../pidgin/plugins/pidginrc.c:491
+#: ../pidgin/plugins/pidginrc.c:497
 msgid "Gtkrc File Tools"
 msgstr "أدوات ملف Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:496
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "اكتب الإعدادات في %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:505
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "أعد_قراءة ملفات gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:538
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "تحكم سِمات جتك+ لبِدْجِن"
 
-#: ../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 استخداما."
 
@@ -17492,6 +17546,7 @@
 msgstr "خيارات تنسيق الخاتم الزمني"
 
 #: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "أ_جبر على تنسيق 24 ساعة للوقت"
 
@@ -17654,7 +17709,8 @@
 msgstr "خيارات خاصة لبِدْجِن من أجل ويندوز"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "يتيح خيارات خاصة بويندوز، مثل إرساء قائمة الأصدقاء."
 
 #: ../pidgin/plugins/xmppconsole.c:667
@@ -17704,3 +17760,101 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "يفيد هذا الملحق في تنقيح خوادم وعملاء XMPXMPPP."
 
+#~ msgid "Show"
+#~ msgstr "اعرض"
+
+#~ msgid "Offline buddies"
+#~ msgstr "الأصدقاء غير المتَّصلين"
+
+#~ msgid "Sort"
+#~ msgstr "رتِّب"
+
+#~ msgid "By Status"
+#~ msgstr "حسب الحالة"
+
+#~ msgid "By Log Size"
+#~ msgstr "حسب حجم السجل"
+
+#~ msgid "Unable to connect to contact server"
+#~ msgstr "تعذّر الاتصال بخادم الاتصال."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "اختر دفتر عناوين ملاحظات"
+
+#~ msgid "Current media"
+#~ msgstr "الوسيط الحالي"
+
+#~ msgid "Windows Live Messenger Protocol Plugin"
+#~ msgstr "ملحق بروتوكول Windows Live Messenger"
+
+#, fuzzy
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "فشل: فشل الاستيثاق"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s ارسل لك رسالة"
+
+#~ msgid "Unknown error (%d)"
+#~ msgstr "خطأ مجهول (%d)"
+
+#, fuzzy
+#~ msgid "Unable to connect to OIM server"
+#~ msgstr "تعذّر الاتصال بالخادم."
+
+#, fuzzy
+#~ msgid "%s (%s) changed status from %s to %s"
+#~ msgstr "%s تغيير الحالة من %s إلى %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is now %s"
+#~ msgstr "%s حالياً %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is no longer %s"
+#~ msgstr "%s لم يعد موجوداً %s"
+
+#, fuzzy
+#~ msgid "_Merge"
+#~ msgstr "ال_رسالة:"
+
+#, fuzzy
+#~ msgid "_Send File..."
+#~ msgstr "أرسل _ملفا"
+
+#, fuzzy
+#~ msgid "Add Buddy _Pounce..."
+#~ msgstr "أضف إشعار صديق..."
+
+#, fuzzy
+#~ msgid "Hide when offline"
+#~ msgstr "غير مسموح عند عدم الاتصال"
+
+#, fuzzy
+#~ msgid "Show when offline"
+#~ msgstr "غير مسموح عند عدم الاتصال"
+
+#, fuzzy
+#~ msgid "Add _Buddy..."
+#~ msgstr "أضف صديق"
+
+#, fuzzy
+#~ msgid "Add C_hat..."
+#~ msgstr "أضف دردشة"
+
+#, fuzzy
+#~ msgid "Persistent"
+#~ msgstr "فارسي"
+
+#, fuzzy
+#~ msgid "/Accounts/Manage"
+#~ msgstr "/الحسابات"
+
+#, fuzzy
+#~ msgid "A_ccount:"
+#~ msgstr "حساب:"
+
+#, fuzzy
+#~ msgid "S_end To"
+#~ msgstr "أرسل إلى"