changeset 14862:d6a98c79ef84

[gaim-migrate @ 17631] several translation updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 30 Oct 2006 22:45:28 +0000
parents dd2ef00759a7
children be6b841cd1f4
files gtk/gtkdialogs.c po/ChangeLog po/fa.po po/sq.po po/zh_TW.po
diffstat 5 files changed, 15207 insertions(+), 13526 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/gtkdialogs.c	Mon Oct 30 21:48:42 2006 +0000
+++ b/gtk/gtkdialogs.c	Mon Oct 30 22:45:28 2006 +0000
@@ -136,6 +136,7 @@
 	{N_("Euskera(Basque)"),     "eu", "Iñaki Larrañaga Murgoitio", "dooteo@zundan.com"},
 	{N_("Persian"),             "fa", "Elnaz Sarbar", "elnaz@farsiweb.info"},
 	{N_("Persian"),             "fa", "Meelad Zakaria", "meelad@farsiweb.info"},
+	{N_("Persian"),             "fa", "Roozbeh Pournader ", "roozbeh@farsiweb.info"},
 	{N_("Finnish"),             "fi", "Timo Jyrinki", "timo.jyrinki@iki.fi"},
 	{N_("French"),              "fr", "Éric Boumaour", "zongo_fr@users.sourceforge.net"},
 	{N_("Galician"),            "gl", "Ignacio Casal Quinteiro", "nacho.resa@gmail.com"},
@@ -166,6 +167,7 @@
 	{N_("Serbian"),             "sr", "Aleksandar Urosevic", "urke@users.sourceforge.net"},
 	{N_("Slovak"),              "sk", "Richard Golier", "golierr@gmail.com"},
 	{N_("Slovenian"),           "sl", "Matjaz Horvat", "matjaz@owca.info"},
+	{N_("Albanian"),            "sq", "Programe Shqip", "anbleta@users.sf.net"},
 	{N_("Swedish"),             "sv", "Tore Lundqvist", "tlt@mima.x.se"},
 	{N_("Tamil"),               "ta", "Viveka Nathan K", "vivekanathan@users.sourceforge.net"},
 	{N_("Telugu"),              "te", "Mr. Subbaramaih", "info.gist@cdac.in"},
--- a/po/ChangeLog	Mon Oct 30 21:48:42 2006 +0000
+++ b/po/ChangeLog	Mon Oct 30 22:45:28 2006 +0000
@@ -1,6 +1,7 @@
 Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
 
 version 2.0.0:
+	* Albanian translation updated (Programe Shqip)
 	* Arabic translation added (Mohamed Magdy)
 	* Bengali translation added (INDRANIL DAS GUPTA and Samia Nimatullah)
 	* Bosnian translation added (Lejla Hadzialic)
@@ -36,7 +37,8 @@
 	* Lithuanian win32 translation added (Laurynas Biveinis)
 	* Macedonian translation updated (Арангел Ангов)
 	* Nepali translation added (Shyam Krishna Bal)
-	* Persian translation added (Elnaz Sarbar, Meelad Zakaria)
+	* Persian translation added (Elnaz Sarbar, Meelad Zakaria, Roozbeh
+	  Pournader)
 	* Polish translation updated (Emil Nowak)
 	* Portuguese translation updated (Duarte Henriques)
 	* Portuguese (Brazilian) translation updated (Rodrigo Torres,  Mauricio de
--- a/po/fa.po	Mon Oct 30 21:48:42 2006 +0000
+++ b/po/fa.po	Mon Oct 30 22:45:28 2006 +0000
@@ -1,14 +1,15 @@
-# Gaim Persian translation.
+# Persian translation of gaim.
 # Copyright (C) 2005, 2006 Sharif Farsiweb, Inc,
 # This file is distributed under the same license as the gaim package.
-# Elnaz Sarbar <elnaz@farsiweb.info>, 2005, 2006.
+# Elnaz Sarbar <elnaz@farsiwevb.info>, 2005, 2006.
 # Meelad Zakaria <meelad@farsiweb.info>, 2006.
+# Roozbeh Pournader <roozbeh@farsiweb.info>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 00:00-0500\n"
-"PO-Revision-Date: 2006-03-02 15:29+0330\n"
+"POT-Creation-Date: 2006-06-17 00:00-0400\n"
+"PO-Revision-Date: 2006-06-17 21:01+0330\n"
 "Last-Translator: Elnaz Sarbar <elnaz@farsiweb.info>\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +27,7 @@
 
 #: ../gaim.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
-msgstr "ارسال پیغام فوری با قراردادهای متعدد"
+msgstr "ارسال پیغام اینترنتی با قراردادهای متعدد"
 
 #. *< type
 #. *< ui_requirement
@@ -55,13 +56,14 @@
 msgstr "رفیقتان رفته است"
 
 #: ../plugins/contact_priority.c:63
+#, fuzzy
 msgid "Buddy is \"extended\" away"
-msgstr "رفیقتان رفته‌ی «بیشتر» است"
+msgstr "رفیقتان برای مدتی رفته است"
 
 #. Not used yet.
 #: ../plugins/contact_priority.c:66
 msgid "Buddy is mobile"
-msgstr "رفیقتان در حال حرکت است"
+msgstr "رفیقتان در راه است"
 
 #: ../plugins/contact_priority.c:68
 msgid "Buddy is offline"
@@ -76,7 +78,8 @@
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
 msgstr ""
-"رفیقی که <i>بالاترین امتیاز</i> را دارد، رفیقی است که در تماس اولویت خواهد داشت.\n"
+"رفیقی که <i>بالاترین امتیاز</i> را بیاورد برای تماس اولویت خواهد "
+"داشت.\n"
 
 #: ../plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -102,7 +105,7 @@
 #: ../plugins/contact_priority.c:185
 msgid ""
 "Allows for controlling the values associated with different buddy states."
-msgstr "اجازه‌ی کنترل مقادیر مرتبط با وضعیت‌های مختلف رفقا را به شما می‌دهد."
+msgstr "اجازهٔ کنترل مقادیر مرتبط با وضعیت‌های مختلف رفقا را به شما می‌دهد."
 
 #. *< description
 #: ../plugins/contact_priority.c:187
@@ -110,7 +113,7 @@
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"اجازه‌ی تغییر بارم‌بندی وضعیت‌های بی‌کار/رفته/برون‌خط رفقا در محاسبات اولویت تماس "
+"اجازهٔ تغییر بارم‌بندی وضعیت‌های بی‌کار/رفته/برون‌خط رفقا در محاسبات اولویت تماس "
 "را به شما می‌دهد."
 
 #. *< api_version
@@ -121,8 +124,9 @@
 #. *< priority
 #. *< id
 #: ../plugins/crazychat/cc_gaim_plugin.c:146
+#, fuzzy
 msgid "Crazychat"
-msgstr "گپِ خَف"
+msgstr "گپ"
 
 #. *< name
 #. *< version
@@ -134,8 +138,8 @@
 #. *  description
 #: ../plugins/crazychat/cc_gaim_plugin.c:151
 msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr 
-"از گیم برای به دست آوردن ip رفقا جهت اتصال برای یک نشست گپِ خَف استفاده می‌کند"
+msgstr ""
+"برای به دست آوردن IP رفقا جهت اتصال برای یک نشست گپِ خَف از گیم استفاده می‌کند"
 
 #. make the network configuration frame
 #: ../plugins/crazychat/cc_gaim_plugin.c:295
@@ -156,14 +160,14 @@
 msgstr "تنظیم امکانات"
 
 #. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
-#: ../src/gtkplugin.c:577
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2262
+#: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "به کار انداخته شده"
 
 #: ../plugins/crazychat/cc_gaim_plugin.c:350
 msgid "Disabled"
-msgstr "از کار انداخته شده"
+msgstr "از کار انداخته شد"
 
 #. *< type
 #. *< ui_requirement
@@ -171,7 +175,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/dbus-example.c:135
+#: ../plugins/dbus-example.c:152
 msgid "DBus"
 msgstr "DBus"
 
@@ -179,54 +183,58 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
+#: ../plugins/dbus-example.c:155 ../plugins/dbus-example.c:157
 msgid "DBus Plugin Example"
-msgstr "نمونه‌ی متصل شونده‌ی DBus"
+msgstr "نمونهٔ متصل شوندهٔ DBus"
 
 #: ../plugins/docklet/docklet.c:154
 msgid "Right-click for more unread messages...\n"
-msgstr "برای دیدن پیغام‌های خوانده نشده‌ی بیشتر کلیک راست کنید...\n"
-
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3274
+msgstr "برای دیدن بقیهٔ پیغام‌های خوانده نشده کلیک راست کنید...\n"
+
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3241
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "‏%Id پیغام خوانده نشده از %s\n"
+msgstr[0] "%Idپیغام نخوانده از %s\n"
 
 #: ../plugins/docklet/docklet.c:432
 msgid "Change Status"
 msgstr "تغییر وضعیت"
 
 #: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
-#: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2734 ../src/status.c:155
+#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1363
+#: ../src/protocols/msn/state.c:29 ../src/protocols/msn/state.c:30
+#: ../src/protocols/msn/state.c:37 ../src/protocols/msn/state.c:38
+#: ../src/protocols/novell/novell.c:2843 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/status.c:155
 msgid "Available"
 msgstr "در دسترس"
 
 #. Away stuff
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
-#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:729
-#: ../src/protocols/oscar/oscar.c:6759 ../src/protocols/oscar/oscar.c:7800
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3188
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
+#: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
+#: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
+#: ../src/protocols/jabber/buddy.c:1367 ../src/protocols/novell/novell.c:2846
+#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4398
+#: ../src/protocols/oscar/oscar.c:5441 ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3185 ../src/protocols/yahoo/yahoo.c:3258
 #: ../src/status.c:158
 msgid "Away"
 msgstr "رفته"
 
 #: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:733 ../src/protocols/yahoo/yahoo.c:2728
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2725
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "نامرئی"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3004
-#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:795
-#: ../src/protocols/oscar/oscar.c:7772 ../src/protocols/yahoo/yahoo.c:2732
-#: ../src/status.c:154
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2971
+#: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
+#: ../src/protocols/jabber/buddy.c:1361 ../src/protocols/novell/novell.c:2855
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5413
+#: ../src/protocols/yahoo/yahoo.c:2729 ../src/status.c:154
 msgid "Offline"
 msgstr "برون‌خط"
 
@@ -236,29 +244,29 @@
 
 #: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
 msgid "Saved..."
-msgstr "ذخیره‌ی شد..."
+msgstr "ذخیره شد..."
 
 #: ../plugins/docklet/docklet.c:484
 msgid "Show Buddy List"
-msgstr "فهرست رفقا نمایش داده شود"
-
-#: ../plugins/docklet/docklet.c:489
+msgstr "نمایش فهرست رفقا"
+
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5680
 msgid "Unread Messages"
-msgstr "پیغام‌های خوانده نشده"
+msgstr "‌پیغام‌های خوانده نشده"
 
 #: ../plugins/docklet/docklet.c:510
 msgid "New Message..."
 msgstr "پیغام جدید..."
 
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2478
 msgid "Accounts"
 msgstr "حساب‌ها"
 
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
 msgid "Plugins"
 msgstr "متصل شونده‌ها"
 
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1915
 msgid "Preferences"
 msgstr "ترجیحات"
 
@@ -279,11 +287,11 @@
 
 #: ../plugins/docklet/docklet.c:682
 msgid "_Instant Messages:"
-msgstr "پیغام‌های _فوری:"
+msgstr "پیغام‌های _اینترنتی:"
 
 #: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
+#: ../plugins/win32/winprefs/winprefs.c:462 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1764 ../src/gtkprefs.c:1778
 msgid "Never"
 msgstr "هرگز"
 
@@ -293,7 +301,7 @@
 
 #: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
 #: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
+#: ../plugins/win32/winprefs/winprefs.c:463 ../src/gtkprefs.c:825
 msgid "Always"
 msgstr "همیشه"
 
@@ -303,7 +311,7 @@
 
 #: ../plugins/docklet/docklet.c:693
 msgid "When my nick is said"
-msgstr "وقتی لقب من گفته شد"
+msgstr "وقتی لقب شما گفته شد"
 
 #. *< type
 #. *< ui_requirement
@@ -313,14 +321,14 @@
 #. *< id
 #: ../plugins/docklet/docklet.c:720
 msgid "System Tray Icon"
-msgstr "شمایل سینی سیستم"
+msgstr "شمایل محوطهٔ اعلانات"
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../plugins/docklet/docklet.c:723
 msgid "Displays an icon for Gaim in the system tray."
-msgstr "شمایلی برای گیم در سینی سیستم نمایش می‌دهد."
+msgstr "شمایلی برای گیم محوطهٔ اعلانات سیستم نمایش می‌دهد."
 
 #. *  description
 #: ../plugins/docklet/docklet.c:725
@@ -330,10 +338,10 @@
 "and to toggle display of the buddy list. Also provides options to blink for "
 "unread messages."
 msgstr ""
-"برای بیان وضعیت گیم در لحظه، دسترسی آسان به کارکردهایی که معمولاً مورد "
-"استفاده هستند و زدن ضامن نمایش فهرست رفقا، شمایلی در سینی سیستم (مثلاً در"
-" گنوم، KDE یا ویندوز) نمایش می‌دهد. همچنین گزینه‌هایی برای چشمک زدن "
-"وقتی پیغام نخوانده‌ای وجود دارد در اختیار می‌گذارد."
+"برای بیان وضعیت گیم در لحظه، دسترسی آسان به کارکردهایی که زیاد مورد "
+"استفاده هستند و نمایش یا عدم نمایش فهرست رفقا، شمایلی در "
+"محوطهٔ اعلانات سیستم (مثلاً در گنوم، KDE یا ویندوز) نمایش می‌دهد. همچنین گزینه‌ای "
+"برای چشمک زدن هنگام وجود پیغام خوانده نشده دارد."
 
 #: ../plugins/docklet/eggtrayicon.c:123
 msgid "Orientation"
@@ -341,7 +349,7 @@
 
 #: ../plugins/docklet/eggtrayicon.c:124
 msgid "The orientation of the tray."
-msgstr "جهت سینی."
+msgstr "جهت محوطهٔ اعلانات سیستم.."
 
 #: ../plugins/extplacement.c:80
 msgid "By conversation count"
@@ -373,7 +381,7 @@
 #. *< version
 #: ../plugins/extplacement.c:137
 msgid "Extra conversation placement options."
-msgstr "گزینه‌های اضافی تعیین جای گفتگوها"
+msgstr "گزینه‌های اضافی تعیین جای گفتگوها."
 
 #. *< summary
 #. *  description
@@ -382,7 +390,7 @@
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"محدود کردن تعداد گفتگوها در هر پنجره، جدا کردن پیغام‌های فوری و گپ‌ها به طور "
+"محدود کردن تعداد گفتگوها در هر پنجره، جدا کردن پیغام‌های اینترنتی و گپ‌ها به طور "
 "اختیاری"
 
 #. *< type
@@ -391,15 +399,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/filectl.c:245
+#: ../plugins/filectl.c:248
 msgid "Gaim File Control"
-msgstr "کنترل پرونده‌ی گیم"
+msgstr "کنترل پروندهٔ گیم"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
+#: ../plugins/filectl.c:251 ../plugins/filectl.c:253
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr ""
 "شما را قادر می‌سازد با وارد کردن فرمان‌ها در یک پرونده گیم را کنترل کنید."
@@ -412,14 +420,14 @@
 #. *< id
 #: ../plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
-msgstr "متصل‌شونده‌ی نمایشی گیم"
+msgstr "متصل‌شوندهٔ نمایشی گیم"
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
-msgstr "متصل شونده‌ی نمونه که کارهای بسیار خطیری انجام می‌دهد ـ شرح را ببینید."
+msgstr "یک متصل شوندهٔ نمونه که شیرین‌کاری می‌کند ـ شرح را ببینید."
 
 #. *  description
 #: ../plugins/gaiminc.c:96
@@ -429,11 +437,11 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"این متصل‌شونده خیلی خیلی باحال است و کارهای خیلی خیلی مهمی انجام می‌دهد:\n"
-"‐ می‌گوید چه کسی این برنامه را نوشته و شما کی وارد سیستم شده‌اید\n"
-"‐ همه‌ی متن‌های دریافتی را برعکس می‌کند\n"
-"‐ به محض این که هر یک از رفقای موجود در فهرست شما وارد سیستم شد پیغامی برای "
-"او می‌فرستد"
+"این متصل‌شونده خیلی باحال است و کلی شیرین‌کاری بلد است:\n"
+"‐ می‌گوید چه کسی این برنامه را نوشته و شما کِی وارد سیستم شده‌اید\n"
+"‐ همهٔ متن‌های دریافتی را برعکس می‌کند\n"
+"‐ به محض این که هر یک از رفقای موجود در فهرست شما وارد سیستم شدند پیغامی برایشان "
+"می‌فرستد"
 
 #: ../plugins/gaimrc.c:41
 msgid "Cursor Color"
@@ -445,15 +453,15 @@
 
 #: ../plugins/gaimrc.c:43
 msgid "Hyperlink Color"
-msgstr "رنگ پیوند"
+msgstr "رنگ پیوند اینترنتی"
 
 #: ../plugins/gaimrc.c:56
 msgid "GtkTreeView Expander Size"
-msgstr "اندازه‌ی باز کننده GtkTreeView"
+msgstr "اندازهٔ باز کنندهٔ نمای درختی GTK"
 
 #: ../plugins/gaimrc.c:57
 msgid "GtkTreeView Horizontal Separation"
-msgstr ""
+msgstr "جداسازی افقی نمای درختی GTK"
 
 #: ../plugins/gaimrc.c:76
 msgid "Conversation Entry"
@@ -461,28 +469,28 @@
 
 #: ../plugins/gaimrc.c:77
 msgid "Conversation History"
-msgstr "تاریخچه‌ی گفتگو"
+msgstr "تاریخچهٔ گفتگو"
 
 #: ../plugins/gaimrc.c:78
 msgid "Log Viewer"
-msgstr "نمایش‌دهنده‌ی تاریخچه"
+msgstr "نمایش‌دهندهٔ تاریخچه"
 
 #: ../plugins/gaimrc.c:79
 msgid "Request Dialog"
-msgstr "محاوره‌ی درخواست"
+msgstr "محاورهٔ درخواست"
 
 #: ../plugins/gaimrc.c:80
 msgid "Notify Dialog"
-msgstr "محاوره‌ی اطلاع دادن"
+msgstr "محاورهٔ اطلاع‌رسانی"
 
 #: ../plugins/gaimrc.c:91
 msgid "GtkTreeView Indent Expanders"
-msgstr ""
+msgstr "بازکننده‌های تورفتگی نمای درختی GTK"
 
 #: ../plugins/gaimrc.c:287
 #, c-format
 msgid "Select Color for %s"
-msgstr "انتخاب رنگ %s"
+msgstr "رنگ %s را انتخاب کنید"
 
 #: ../plugins/gaimrc.c:289
 msgid "Select Color"
@@ -493,52 +501,52 @@
 msgid "Select Font for %s"
 msgstr "قلم %s را انتخاب کنید"
 
-#: ../plugins/gaimrc.c:362
+#: ../plugins/gaimrc.c:364
 msgid "Select Interface Font"
-msgstr "انتخاب قلم واسط"
-
-#: ../plugins/gaimrc.c:415
+msgstr "انتخاب قلم برای واسط"
+
+#: ../plugins/gaimrc.c:420
 msgid "General"
 msgstr "عمومی"
 
-#: ../plugins/gaimrc.c:420
+#: ../plugins/gaimrc.c:425
 msgid "GTK+ Interface Font"
 msgstr "قلم واسط GTK+"
 
-#: ../plugins/gaimrc.c:440
+#: ../plugins/gaimrc.c:445
 msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: ../plugins/gaimrc.c:475
+msgstr "تم میان‌بر متنی GTK+"
+
+#: ../plugins/gaimrc.c:480
 msgid "Interface colors"
 msgstr "رنگ‌های واسط"
 
-#: ../plugins/gaimrc.c:499
+#: ../plugins/gaimrc.c:504
 msgid "Widget Sizes"
-msgstr "اندازه‌های ویجت"
-
-#: ../plugins/gaimrc.c:520
+msgstr "اندازهٔ ویجت‌ها"
+
+#: ../plugins/gaimrc.c:525
 msgid "Fonts"
 msgstr "قلم‌ها"
 
-#: ../plugins/gaimrc.c:543
+#: ../plugins/gaimrc.c:548
 msgid "Tools"
 msgstr "ابزارها"
 
-#: ../plugins/gaimrc.c:548
+#: ../plugins/gaimrc.c:553
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "تنظیمات در %s%sgtkrc-2.0 نوشته شود"
 
-#: ../plugins/gaimrc.c:556
+#: ../plugins/gaimrc.c:561
 msgid "Re-read gtkrc files"
 msgstr "بازخوانی پرونده‌های gtkrc"
 
-#: ../plugins/gaimrc.c:583
+#: ../plugins/gaimrc.c:588
 msgid "Gaim GTK+ Theme Control"
 msgstr "کنترل تم GTK+ گیم"
 
-#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
+#: ../plugins/gaimrc.c:590 ../plugins/gaimrc.c:591
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "دسترسی به تنظیمات معمول gtkrc را ممکن می‌سازد."
 
@@ -549,11 +557,11 @@
 
 #: ../plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
-msgstr "دکمه‌ی وسط موشی"
+msgstr "دکمهٔ وسط موشی"
 
 #: ../plugins/gestures/gestures.c:247
 msgid "Right mouse button"
-msgstr "دکمه‌ی راست موشی"
+msgstr "دکمهٔ راست موشی"
 
 #. "Visual gesture display" checkbox
 #: ../plugins/gestures/gestures.c:259
@@ -588,50 +596,63 @@
 "Drag up and then to the right to switch to the next conversation."
 msgstr ""
 "پشتبیانی ژست‌های موشی در پنجره‌های گفتگو را ممکن می‌سازد.\n"
-"برای انجام این کنش‌ها دکمه‌ی وسط موشی را پایین نگه دارید:\n"
+"برای انجام این کنش‌ها دکمهٔ وسط موشی را پایین نگه دارید:\n"
 "\n"
 "برای بستن گفتگو موشی را به پایین و سپس به راست بکشید.\n"
 "برای تعویض به گفتگوی قبلی موشی را  به بالا و سپس به چپ بکشید.\n"
 "برای تعویض به گفتگوی بعدی موشی را به بالا و سپس به راست بکشید."
 
+#. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
 #: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1524
+#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:759
+#: ../src/protocols/msn/msn.c:1527 ../src/protocols/msn/msn.c:1580
+#: ../src/protocols/msn/msn.c:1601
 msgid "Name"
 msgstr "نام"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:142
 msgid "Instant Messaging"
-msgstr "پیغام فوری"
+msgstr "پیغام‌رسانی اینترنتی"
+
+#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4527
+#: ../src/protocols/silc/buddy.c:736 ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/buddy.c:1075 ../src/protocols/silc/buddy.c:1174
+#: ../src/protocols/yahoo/yahoo.c:2974
+msgid "Add Buddy"
+msgstr "اضافه کردن رفیق"
 
 #. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:454
+#: ../plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr "شخصی را از دفترجه نشانی‌تان در زیر انتخاب کنید یا شخص جدیدی اضافه کنید."
 
 #. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/add_buddy_dialog.c:468
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8320
-#: ../src/protocols/sametime/sametime.c:5532
+#: ../src/protocols/jabber/buddy.c:1720 ../src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/sametime/sametime.c:5524
 msgid "Search"
 msgstr "جستجو"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4570
-#: ../src/gtkblist.c:4934
+#: ../plugins/gevolution/add_buddy_dialog.c:549
+#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4611
+#: ../src/gtkblist.c:4975
 msgid "Group:"
 msgstr "گروه:"
 
 #. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/add_buddy_dialog.c:575
 #: ../plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/new_person_dialog.c:251
 msgid "New Person"
 msgstr "شخص جدید"
 
 #. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:591
+#: ../plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "انتخاب رفیق"
 
@@ -641,7 +662,7 @@
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr ""
-"از دفترچه نشانی‌تان شخصی را انتخاب کنید تا این رفیق به او اضافه شود یا شخص "
+"از دفترچهٔ نشانی‌تان شخصی را انتخاب کنید تا این رفیق به اطلاعات او اضافه شود، و یا شخص "
 "جدیدی ایجاد کنید."
 
 #. Add the expander
@@ -660,15 +681,15 @@
 msgstr "هیچ‌کدام"
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1270 ../src/blist.c:1495
-#: ../src/gtkblist.c:4379 ../src/protocols/jabber/roster.c:65
+#: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
+#: ../src/gtkblist.c:4420 ../src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "رفقا"
 
 #: ../plugins/gevolution/gevolution.c:262
 #: ../plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
-msgstr "نمی‌توان نامه‌ی الکترونیکی فرستاد."
+msgstr "نمی‌توان نامهٔ الکترونیکی فرستاد"
 
 #: ../plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
@@ -680,11 +701,11 @@
 
 #: ../plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
-msgstr "اضافه کردن به دفترچه نشانی"
+msgstr "اضافه کردن به دفترچهٔ نشانی"
 
 #: ../plugins/gevolution/gevolution.c:290
 msgid "Send E-Mail"
-msgstr "ارسال نامه‌ی الکترونیکی"
+msgstr "ارسال نامهٔ الکترونیکی"
 
 #. Configuration frame
 #: ../plugins/gevolution/gevolution.c:417
@@ -694,11 +715,11 @@
 #. Label
 #: ../plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"همه‌ی حساب‌هایی را که رفقا باید به طور خودکار به‌ آن‌ها اضافه شوند انتخاب کنید."
-
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:371 ../src/gtkpounce.c:1260
+msgstr "همهٔ حساب‌هایی که رفقا به طور خودکار به آنها اضافه شوند را انتخاب کنید."
+"همهٔ حساب‌هایی را که رفقا باید به طور خودکار به آن‌ها اضافه شوند انتخاب کنید."
+
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:150
+#: ../plugins/idle.c:186 ../src/gtknotify.c:399 ../src/gtkpounce.c:1244
 msgid "Account"
 msgstr "حساب"
 
@@ -721,42 +742,43 @@
 msgid "Provides integration with Evolution."
 msgstr "یکپارچگی با اوولوشن را ممکن می‌کند."
 
-#: ../plugins/gevolution/new_person_dialog.c:266
+#: ../plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "لطفاً اطلاعات شخص را در زیر وارد کنید."
 
-#: ../plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "لطفاً نام کاربری رفیق و نوع حساب را در زیر وارد کنید."
 
-#: ../plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "نوع حساب:"
 
-#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+#: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4573
 msgid "Screen name:"
 msgstr "نام کاربری:"
 
 #. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "اطلاعات اختیاری:"
 
 #. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:635
+#: ../plugins/gevolution/new_person_dialog.c:338 ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:625
 msgid "Buddy Icon"
 msgstr "شمایل رفیق"
 
-#: ../plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "نام:"
 
-#: ../plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "نام خانوادگی:"
 
-#: ../plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "پست الکترونیکی:"
 
@@ -776,8 +798,8 @@
 #. *  description
 #: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
-msgstr ""
-"آزمایش برای اطمینان از این که همه‌ی سیگنال‌های رابط کاربر درست کار می‌کنند."
+msgstr "درست کار کردن سیگنال‌های واسط کاربر را آزمایش کنید."
+"آزمایش برای اطمینان از این که همهٔ سیگنال‌های رابط کاربر درست کار می‌کنند."
 
 #: ../plugins/history.c:120
 #, c-format
@@ -786,7 +808,7 @@
 
 #: ../plugins/history.c:147
 msgid "History Plugin Requires Logging"
-msgstr "متصل شونده‌ی تاریخچه نیازمند تاریخچه‌نویسی است"
+msgstr "متصل شوندهٔ تاریخچه نیازمند ثبت وقایع است"
 
 #: ../plugins/history.c:148
 msgid ""
@@ -795,9 +817,10 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"تاریخچه‌نویسی را می‌توان در ابزارها -> ترجیحات -> تاریخچه‌نویسی به کار انداخت.\n"
+"ثبت وقایع را می‌توان در منوی ابزارها -> ترجیحات -> ثبت وقایع به کار انداخت.\n"
 "\n"
-"به کار انداختن تاریخچه‌نویسی برای پیغام‌های فوری و/یا گپ‌ها، تاریخچه را برای همان نوع گفتگو به کار می‌اندازد."
+"به کار انداختن ثبت وقایع برای پیغام‌های اینترنتی و/یا گپ‌ها، تاریخچه را برای "
+"همان نوع گفتگو به کار می‌اندازد."
 
 #: ../plugins/history.c:188
 msgid "History"
@@ -805,14 +828,14 @@
 
 #: ../plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
-msgstr "نمایش گفتگوهای اخیراً ثبت شده در گفتگوهای جدید."
+msgstr "نمایش گفتگوهای اخیراً ثبت شده در پنجرهٔ گفتگوهای جدید."
 
 #: ../plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"هر وقت گفتگوی جدیدی باز می‌شود این متصل شونده آخرین گفتگو را در گفتگوی فعلی "
+"هر وقت گفتگوی جدیدی باز می‌شود این متصل شونده آخرین گفتگو را در پنجرهٔ گفتگوی فعلی "
 "درج خواهد کرد."
 
 #. *< type
@@ -823,7 +846,7 @@
 #. *< id
 #: ../plugins/iconaway.c:82
 msgid "Iconify on Away"
-msgstr "شمایل‌سازی هنگام رفته"
+msgstr "شمایل‌سازی هنگام غیبت"
 
 #. *< name
 #. *< version
@@ -833,51 +856,53 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "هنگامی که نیستید فهرست رفقا و گفتگوهای شما را تبدیل به شمایل می‌کند."
 
-#: ../plugins/idle.c:152 ../plugins/idle.c:210
+#: ../plugins/idle.c:155 ../plugins/idle.c:213
 msgid "Minutes"
 msgstr "دقیقه"
 
-#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
-#: ../plugins/idle.c:306
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../plugins/idle.c:162 ../plugins/idle.c:195 ../plugins/idle.c:220
+#: ../plugins/idle.c:312
 msgid "I'dle Mak'er"
-msgstr "بی‌کار آفرین"
-
-#: ../plugins/idle.c:160 ../plugins/idle.c:249
+msgstr "بی‌کار ساز"
+
+#: ../plugins/idle.c:163 ../plugins/idle.c:252
 msgid "Set Account Idle Time"
 msgstr "تنظیم زمان بی‌کار شدن حساب"
 
-#: ../plugins/idle.c:163 ../plugins/idle.c:221
+#: ../plugins/idle.c:166 ../plugins/idle.c:224
 msgid "_Set"
 msgstr "تن_ظیم"
 
-#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
+#: ../plugins/idle.c:167 ../plugins/idle.c:200 ../plugins/idle.c:225
 msgid "_Cancel"
 msgstr "ان_صراف"
 
-#: ../plugins/idle.c:177
+#: ../plugins/idle.c:180
 msgid "None of your accounts are idle."
 msgstr "هیچ یک از حساب‌های شما بی‌کار نیست."
 
-#: ../plugins/idle.c:193 ../plugins/idle.c:253
+#: ../plugins/idle.c:196 ../plugins/idle.c:256
 msgid "Unset Account Idle Time"
-msgstr "پاک کردن زمان بی‌کار شدن حساب"
-
-#: ../plugins/idle.c:196
+msgstr "لغو زمان بی‌کار شدن حساب"
+
+#: ../plugins/idle.c:199
 msgid "_Unset"
-msgstr "_تنظیم نشده"
-
-#: ../plugins/idle.c:218 ../plugins/idle.c:257
+msgstr "ل_غو"
+
+#: ../plugins/idle.c:221 ../plugins/idle.c:260
 msgid "Set Idle Time for All Accounts"
-msgstr "تنظیم زمان بی‌کار شدن برای همه‌ی حساب ها"
-
-#: ../plugins/idle.c:262
+msgstr "تنظیم زمان بی‌کار شدن برای همهٔ حساب‌ها"
+
+#: ../plugins/idle.c:265
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "پاک کردن زمان بی‌کاری برای همه‌ی حساب‌های بی‌کار شده"
-
-#: ../plugins/idle.c:308 ../plugins/idle.c:309
+msgstr "لغو زمان بی‌کاری برای همهٔ حساب‌های بی‌کار شده"
+
+#: ../plugins/idle.c:314 ../plugins/idle.c:315
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
-"شما را قادر می سازد به طور دستی زمانی را که بی‌کار بوده‌اید پیکربندی کنید."
+"شما را قادر می سازد به طور دستی زمانی را که بی‌کار بوده‌اید پیکربندی کنید"
 
 #. *< type
 #. *< ui_requirement
@@ -894,7 +919,7 @@
 #. *  summary
 #: ../plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
-msgstr "آزمایش پشتیبانی متصل‌شونده‌ی ICP، به شکل کارگیر."
+msgstr "آزمایش پشتیبانی متصل‌شوندهٔ ICP، به شکل کارگیر."
 
 #. *  description
 #: ../plugins/ipc-test-client.c:92
@@ -902,8 +927,8 @@
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"آزمایش پشتیبانی متصل‌شونده‌ی ICP به شکل کارگیر. متصل‌شونده‌ی کارگزار را پیدا "
-"کرده و فرمان‌های ثبت شده را فراخوانی می‌کند."
+"آزمایش پشتیبانی متصل‌شوندهٔ ICP به شکل کارگیر. متصل‌شوندهٔ کارگزار را پیدا کرده "
+"و فرمان‌های ثبت شده را فراخوانی می‌کند."
 
 #. *< type
 #. *< ui_requirement
@@ -920,87 +945,103 @@
 #. *  summary
 #: ../plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
-msgstr "آزمایش پشتیبانی  متصل‌شونده‌ی IPC، به شکل کارگزار."
+msgstr "آزمایش پشتیبانی  متصل‌شوندهٔ IPC، به شکل کارگزار."
 
 #. *  description
 #: ../plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "آزمایش متصل‌شونده‌ی IPC، به شکل کارگزار. فرمان‌های IPC را ثبت می‌کند."
-
-#: ../plugins/log_reader.c:1407
+msgstr "آزمایش متصل‌شوندهٔ IPC، به شکل کارگزار. فرمان‌های IPC را ثبت می‌کند."
+
+#: ../plugins/log_reader.c:1405
 msgid "User is offline."
 msgstr "کاربر برون‌خط است."
 
-#: ../plugins/log_reader.c:1413
+#: ../plugins/log_reader.c:1411
 msgid "Auto-response sent:"
-msgstr "پاسخ خودکار فرستاده شد:"
-
-#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
-#, c-format
-msgid "%s logged out."
-msgstr "%s از سیستم خارج شد."
-
-#: ../plugins/log_reader.c:1440
+msgstr "پاسخ خودکار ارسال شد:"
+
+#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
+#: ../plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "‏%s از سیستم خارج شد."
+
+#: ../plugins/log_reader.c:1438
 msgid "One or more messages may have been undeliverable."
-msgstr "ممکن است یک یا چند پیغام غیر قابل تحویل باشند"
+msgstr "ممکن است یک یا چند پیغام به دست او نرسیده باشد."
 
 #. MSG_SERVER_DISCONNECTING
 #. we have been kicked off =^(
-#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
+#: ../plugins/log_reader.c:1448 ../src/protocols/napster/napster.c:363
 msgid "You were disconnected from the server."
 msgstr "شما از کارگزار قطع شدید."
 
-#: ../plugins/log_reader.c:1458
+#: ../plugins/log_reader.c:1456
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr ""
-
-#: ../plugins/log_reader.c:1473
+msgstr "اتصال شما در حال حاضر قطع شده است. تا زمانی که وارد سیستم نشوید پیغامی به شما نخواهد رسید."
+
+#: ../plugins/log_reader.c:1471
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "نمی‌توان پیغام را فرستاد چون طول پیغام از حداکثر طول مجاز بیشتر است:"
-
-#: ../plugins/log_reader.c:1478
+msgstr "نمی‌توان پیغام را فرستاد چون طول آن از حداکثر مجاز بیشتر است."
+
+#: ../plugins/log_reader.c:1476
 msgid "Message could not be sent."
-msgstr "نمی‌توان پیغام را فرستاد."
+msgstr "فرستادن پیغام ممکن نیست."
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1838 ../plugins/log_reader.c:1943
+msgid "Adium"
+msgstr "Adium"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1850 ../plugins/log_reader.c:1947
+msgid "Fire"
+msgstr "Fire"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1951
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1874 ../plugins/log_reader.c:1955
+msgid "MSN Messenger"
+msgstr "پیغام‌رسان MSN"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1886 ../plugins/log_reader.c:1959
+msgid "Trillian"
+msgstr "Trillian"
 
 #. Add general preferences.
-#: ../plugins/log_reader.c:1912
+#: ../plugins/log_reader.c:1925
 msgid "General Log Reading Configuration"
 msgstr "پیکربندی عمومی خواندن تاریخچه"
 
-#: ../plugins/log_reader.c:1916
+#: ../plugins/log_reader.c:1929
 msgid "Fast size calculations"
 msgstr "محاسبات سریع اندازه"
 
-#: ../plugins/log_reader.c:1920
+#: ../plugins/log_reader.c:1933
 msgid "Use name heuristics"
-msgstr ""
+msgstr "استفاده از نام‌های تجربی"
 
 #. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1926
+#: ../plugins/log_reader.c:1939
 msgid "Log Directory"
-msgstr "شاخه‌ی تاریخچه"
-
-#: ../plugins/log_reader.c:1930
-msgid "Adium"
-msgstr "Adium"
-
-#: ../plugins/log_reader.c:1934
-msgid "Fire"
-msgstr "فایر"
-
-#: ../plugins/log_reader.c:1938
-msgid "Messenger Plus!"
-msgstr "پیغام‌رسان Plus!"
-
-#: ../plugins/log_reader.c:1942
-msgid "MSN Messenger"
-msgstr "پیغام‌رسان MSN"
-
-#: ../plugins/log_reader.c:1946
-msgid "Trillian"
-msgstr "Trillian"
+msgstr "شاخهٔ ثبت وقایع"
 
 #. *< type
 #. *< ui_requirement
@@ -1008,26 +1049,28 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/log_reader.c:1969
+#: ../plugins/log_reader.c:1982
 msgid "Log Reader"
 msgstr "تاریخچه‌خوان"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../plugins/log_reader.c:1973
+#: ../plugins/log_reader.c:1986
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "تاریخچه‌های کارگیران پیغام فوری دیگر را در نمایش‌دهنده‌ی تاریخچه قرار می‌دهد."
+msgstr ""
+"تاریخچه‌های کارگیرهای پیغام اینترنتی دیگر را در نمایش‌دهندهٔ تاریخچه قرار می‌دهد."
 
 #. * description
-#: ../plugins/log_reader.c:1977
+#: ../plugins/log_reader.c:1990
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
 "Trillian."
 msgstr ""
-"این متصل شونده، هنگام نمایش تاریخچه‌ها، تاریخچه‌های کارگیران پیغام فوری دیگر را نشان می‌دهد. "
-"در حال حاضر، این متصل شونده شامل Adium، فایر، پیغام‌رسانPlus !، پیغام‌رسان MSN، و Trillian است."
+"این متصل شونده، هنگام نمایش تاریخچه‌ها، تاریخچه‌های کارگیرهای پیغام اینترنتی دیگر "
+"را نیز نشان می‌دهد. در حال حاضر، این متصل شونده شامل Adium، Fire، پیغام‌رسانPlus!‎"
+"، پیغام‌رسان MSN، و Trillian است."
 
 #: ../plugins/mailchk.c:160
 msgid "Mail Checker"
@@ -1035,17 +1078,16 @@
 
 #: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
-msgstr "بررسی می‌کند که نامه‌ی محلی جدیدی رسیده یا نه."
+msgstr "بررسی می‌کند که نامهٔ محلی جدیدی رسیده یا نه."
 
 #: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
-"جعبه‌ی کوچکی به فهرست رفقا اضافه می‌کند که نشان می‌دهد شما نامه‌ی جدید دارید یا "
-"نه."
+"جعبهٔ کوچکی به فهرست رفقا اضافه می‌کند که نشان می‌دهد شما نامهٔ جدید دارید یا نه."
 
 #: ../plugins/mono/loader/mono.c:213
 msgid "Mono Plugin Loader"
-msgstr "بارکننده‌ی متصل شونده‌ی مونو"
+msgstr "بارکنندهٔ متصل شوندهٔ مونو"
 
 #: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
 msgid "Loads .NET plugins with Mono."
@@ -1055,20 +1097,19 @@
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
-msgstr ""
+msgstr "یک نشست پیفام موسیقیایی درخواست شده است. برای قبول درخواست روی شمایل MM کلیک کنید."
 
 #: ../plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
-msgstr ""
+msgstr "نشست پیغام موسیقیایی تأیید شد."
 
 #: ../plugins/musicmessaging/musicmessaging.c:414
-#, fuzzy
 msgid "Music Messaging"
-msgstr "پیغام فوری"
+msgstr "پیغام‌رسانی موسیقیایی"
 
 #: ../plugins/musicmessaging/musicmessaging.c:415
 msgid "There was a conflict in running the command:"
-msgstr ""
+msgstr "در اجرای فرمان مغایرتی به وجود آمد:"
 
 #: ../plugins/musicmessaging/musicmessaging.c:523
 msgid "Error Running Editor"
@@ -1080,9 +1121,8 @@
 
 #. Configuration frame
 #: ../plugins/musicmessaging/musicmessaging.c:623
-#, fuzzy
 msgid "Music Messaging Configuration"
-msgstr "پیکربندی ژست‌های موشی"
+msgstr "پیکربندی پیغام‌رسانی موسیقیایی"
 
 #: ../plugins/musicmessaging/musicmessaging.c:627
 msgid "Score Editor Path"
@@ -1102,14 +1142,14 @@
 #. *< version
 #: ../plugins/musicmessaging/musicmessaging.c:663
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+msgstr "متصل شوندهٔ پیغام‌رسانی موسیقیایی برای آهنگ‌سازی چند نفری."
 
 #. *  summary
 #: ../plugins/musicmessaging/musicmessaging.c:665
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
-msgstr ""
+msgstr "با متصل شوندهٔ پیغام‌رسانی موسیقیایی چند کاربر می‌توانند هم‌زمان روی یک قطعهٔ موسیقی کار کنند."
 
 #. ---------- "Notify For" ----------
 #: ../plugins/notify.c:638
@@ -1118,15 +1158,15 @@
 
 #: ../plugins/notify.c:642
 msgid "_IM windows"
-msgstr "پنجره‌های _پیغام فوری"
+msgstr "پنجره‌های _پیغام اینترنتی"
 
 #: ../plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "پنجره‌های _گپ"
 
 #: ../plugins/notify.c:657
-msgid "\t_Only when someone says your nick"
-msgstr "\t_فقط وقتی کسی لقب شما را می‌گوید"
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_فقط وقتی کسی نام کاربری شما را در گپ می‌گوید"
 
 #: ../plugins/notify.c:667
 msgid "_Focused windows"
@@ -1135,11 +1175,11 @@
 #. ---------- "Notification Methods" ----------
 #: ../plugins/notify.c:675
 msgid "Notification Methods"
-msgstr "روش‌های اطلاع"
+msgstr "روش‌های اطلاع‌رسانی"
 
 #: ../plugins/notify.c:682
 msgid "Prepend _string into window title:"
-msgstr "نمایش _رشته‌ی متنی در عنوان پنجره:"
+msgstr "نمایش _رشتهٔ متنی در عنوان پنجره:"
 
 #. Count method button
 #: ../plugins/notify.c:701
@@ -1149,12 +1189,12 @@
 #. Urgent method button
 #: ../plugins/notify.c:710
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "تنظیم راهنمایی «فوری» مدیر پنجره"
+msgstr "تنظیم راهنمایی «_فوری» مدیر پنجره"
 
 #. Raise window method button
 #: ../plugins/notify.c:719
 msgid "R_aise conversation window"
-msgstr "_بالا آوردن پنجره‌ی گفتگو"
+msgstr "پنجرهٔ گفتگو _بالا آورده شود"
 
 #. ---------- "Notification Removals" ----------
 #: ../plugins/notify.c:727
@@ -1164,17 +1204,17 @@
 #. Remove on focus button
 #: ../plugins/notify.c:732
 msgid "Remove when conversation window _gains focus"
-msgstr "حذف وقتی پنجره‌ی گفتگو تمرکز _می‌گیرد"
+msgstr "حذف وقتی پنجرهٔ گفتگو تمرکز _می‌گیرد"
 
 #. Remove on click button
 #: ../plugins/notify.c:739
 msgid "Remove when conversation window _receives click"
-msgstr "حذف وقتی روی پنجره‌ی گفتگو _کلیک می‌شود"
+msgstr "حذف وقتی روی پنجرهٔ گفتگو _کلیک می‌شود"
 
 #. Remove on type button
 #: ../plugins/notify.c:747
 msgid "Remove when _typing in conversation window"
-msgstr "حذف وقتی در پنجره‌ی گفتگو _تایپ می‌شود"
+msgstr "حذف وقتی در پنجرهٔ گفتگو _تایپ می‌شود"
 
 #. Remove on message send button
 #: ../plugins/notify.c:755
@@ -1184,7 +1224,7 @@
 #. Remove on conversation switch button
 #: ../plugins/notify.c:764
 msgid "Remove on switch to conversation ta_b"
-msgstr "حذف وقتی به _زبانه‌ی گفتگو تعویض می‌شود"
+msgstr "حذف وقتی به _زبانهٔ گفتگو تعویض می‌شود"
 
 #. *< type
 #. *< ui_requirement
@@ -1203,7 +1243,7 @@
 #: ../plugins/notify.c:856 ../plugins/notify.c:858
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
-"راه‌های متنوعی برای اطلاع شما از پیغام‌های خوانده نشده در اختیار می‌گذارد."
+"راه‌های متنوعی برای اطلاع دادن پیغام‌های خوانده نشده در اختیار شما می‌گذارد."
 
 #. *< type
 #. *< ui_requirement
@@ -1213,45 +1253,53 @@
 #. *< id
 #: ../plugins/perl/perl.c:583
 msgid "Perl Plugin Loader"
-msgstr "بارکننده‌ی متصل شونده‌ی پِرل"
+msgstr "بارکنندهٔ متصل شوندهٔ پِرل"
 
 #. *< name
 #. *< version
 #. *< summary
 #: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
-msgstr "برای بارکردن متصل شونده‌های پرل پشتیبانی فراهم می‌کند"
-
-#: ../plugins/psychic.c:22
+msgstr "برای بار کردن متصل شونده‌های پرل پشتیبانی فراهم می‌کند"
+
+#: ../plugins/psychic.c:19
 msgid "Psychic Mode"
-msgstr ""
-
-#: ../plugins/psychic.c:23
+msgstr "حالت غیب‌گویی"
+
+#: ../plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
-msgstr ""
-
-#: ../plugins/psychic.c:24
+msgstr "حالت غیب‌گویی برای پیغام‌های وارده"
+
+#: ../plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
-
-#: ../plugins/psychic.c:60
+"باعث می‌شود یه محض این که کاربران دیگر شروع به وارد کردن پیغام برای شما می‌کنند، پنجرهٔ گفتگویشان برای شما ظاهر شود."
+"این قابلیت برای AIM، ‏ICQ، ‏Jabber، ‏Sametime و یاهو کار می‌کند."
+
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../plugins/psychic.c:63
 msgid "You feel a disturbance in the force..."
-msgstr ""
-
-#: ../plugins/psychic.c:79
+msgstr "از دوردست صدایی به گوش می‌رسد..."
+
+#: ../plugins/psychic.c:82
 msgid "Only enable for users on the buddy list"
 msgstr ""
-"فقط برای کاربرانی که در فهرست رفقای من هستند به کار انداخته شود"
-
-#: ../plugins/psychic.c:84
+"فقط برای کاربرانی که در فهرست رفقای شما هستند به کار انداخته شود"
+
+#: ../plugins/psychic.c:87
 msgid "Disable when away"
-msgstr "‏وقتی رفته‌ام از کار انداخته شود"
-
-#: ../plugins/psychic.c:88
+msgstr "‏هنگامی که رفته‌ام از کار انداخته شود"
+
+#: ../plugins/psychic.c:91
 msgid "Display notification message in conversations"
-msgstr "نمایش پیغام‌های اطلاع دادن در گفتگوها"
+msgstr "نمایش پیغام‌های اطلاع‌رسانی در گفتگوها"
 
 #: ../plugins/raw.c:175
 msgid "Raw"
@@ -1259,21 +1307,20 @@
 
 #: ../plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
-msgstr "به شما اجازه می‌دهد ورودی خام را به قراردادهای متنی ارسال کنید."
+msgstr "شما را قادر می‌سازد ورودی خام را به قراردادهای متنی ارسال کنید."
 
 #: ../plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"به شما اجازه می‌دهد ورودی خام را به قراردادهای متنی (Jabber، MSN، IRC، TOC) "
-"ارسال کنید. برای ارسال «ورود» را در جعبه‌ی مدخل فشار دهید. پنجره‌ی اشکال‌زدایی "
-"را ببینید."
+"شما را قادر می‌سازد ورودی خام را به قراردادهای متنی (Jabber، ‏MSN‏، ‏IRC، ‏TOC) "
+"ارسال کنید. برای ارسال در جعبهٔ مدخل کلید «ورود» را فشار دهید. مراقب پنجرهٔ اشکال‌زدایی باشید."
 
 #: ../plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "شما از نسخه‌ی %s گیم استفاده می‌کنید. نسخه‌ی فعلی %s است.<hr>"
+msgstr "شما در حال استفاده از نسخهٔ %s گیم هستید. نسخهٔ فعلی %s است.<hr>"
 
 #: ../plugins/relnot.c:69
 #, c-format
@@ -1281,7 +1328,7 @@
 "<b>ChangeLog:</b>\n"
 "%s<br><br>"
 msgstr ""
-"<b>ثبت تغییرات:</b>\n"
+"<b>تغییرات ثبت شده:</b>\n"
 "%s<br><br>"
 
 #: ../plugins/relnot.c:74
@@ -1290,12 +1337,12 @@
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
 "\">http://gaim.sourceforge.net</a>."
 msgstr ""
-"می‌توانید نسخه‌ی %s را از اینجا بگیرید:<br><a href=\"http://gaim.sourceforge."
+"می‌توانید نسخهٔ %s را از اینجا بگیرید:<br><a href=\"http://gaim.sourceforge."
 "net/\">http://gaim.sourceforge.net</a>."
 
 #: ../plugins/relnot.c:78 ../plugins/relnot.c:79
 msgid "New Version Available"
-msgstr "نسخه‌ی جدیدی موجود است"
+msgstr "نسخهٔ جدیدی موجود است"
 
 #. *< type
 #. *< ui_requirement
@@ -1312,7 +1359,7 @@
 #. *  summary
 #: ../plugins/relnot.c:140
 msgid "Checks periodically for new releases."
-msgstr "به طور منظم وجود انتشارهای جدید را بررسی می‌کند."
+msgstr "به طور منظم رسیدن انتشارهای جدید گیم را بررسی می‌کند."
 
 #. *  description
 #: ../plugins/relnot.c:142
@@ -1320,7 +1367,7 @@
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"به طور منظم وجود انتشارهای جدید را بررسی می‌کند و ثبت تغییرات را به اطلاع "
+"به طور منظم رسیدن انتشارهای جدید گیم را بررسی می‌کند و تغییرات آن با نسخه‌های قبلی را به اطلاع "
 "کاربر می‌رساند."
 
 #. *< type
@@ -1339,7 +1386,7 @@
 #. *  description
 #: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
-msgstr "آزمایش برای اطمینان از این که همه‌ی سیگنال‌ها درست کار می‌کنند."
+msgstr "آزمایش برای اطمینان از این که همهٔ سیگنال‌ها درست کار می‌کنند آنها را آزمایش می‌کند."
 
 #. *< type
 #. *< ui_requirement
@@ -1347,80 +1394,80 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/simple.c:34
+#: ../plugins/simple.c:37
 msgid "Simple Plugin"
-msgstr "متصل شونده‌ی ساده"
+msgstr "متصل شوندهٔ ساده"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/simple.c:37 ../plugins/simple.c:39
+#: ../plugins/simple.c:40 ../plugins/simple.c:42
 msgid "Tests to see that most things are working."
-msgstr "آزمایش‌هایی برای اطمینان از این که اغلب چیزها کار می‌کنند."
-
-#: ../plugins/spellchk.c:1917
-msgid "Duplicate Correction"
-msgstr ""
+msgstr "برای اطمینان از این که اغلب چیزها کار می‌کنند آزمایش‌هایی انجام می‌دهد."
 
 #: ../plugins/spellchk.c:1918
+msgid "Duplicate Correction"
+msgstr "تصحیح مقادیر تکراری"
+
+#: ../plugins/spellchk.c:1919
 msgid "The specified word already exists in the correction list."
-msgstr "کلمه‌ی مشخص شده از قبل در فهرست اصلاحات قرار دارد."
-
-#: ../plugins/spellchk.c:2127
+msgstr "کلمهٔ مشخص شده از قبل در فهرست اصلاحات قرار دارد."
+
+#: ../plugins/spellchk.c:2128
 msgid "Text Replacements"
 msgstr "جای‌گزینی متن"
 
-#: ../plugins/spellchk.c:2150
+#: ../plugins/spellchk.c:2151
 msgid "You type"
 msgstr "تایپ می‌کنید"
 
-#: ../plugins/spellchk.c:2164
+#: ../plugins/spellchk.c:2165
 msgid "You send"
 msgstr "ارسال می‌شود"
 
-#: ../plugins/spellchk.c:2178
+#: ../plugins/spellchk.c:2179
 msgid "Whole words only"
-msgstr "فقط کل کلمه"
-
-#: ../plugins/spellchk.c:2190
+msgstr "فقط کلمه‌های کامل"
+
+#: ../plugins/spellchk.c:2191
 msgid "Case sensitive"
 msgstr "حساس به بزرگی و کوچکی حروف"
 
-#: ../plugins/spellchk.c:2216
+#: ../plugins/spellchk.c:2217
 msgid "Add a new text replacement"
 msgstr "اضافه کردن جای‌گزینی متن جدید"
 
-#: ../plugins/spellchk.c:2232
+#: ../plugins/spellchk.c:2233
 msgid "You _type:"
 msgstr "_تایپ می‌کنید:"
 
-#: ../plugins/spellchk.c:2249
+#: ../plugins/spellchk.c:2250
 msgid "You _send:"
 msgstr "_ارسال می‌شود:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2261
+#: ../plugins/spellchk.c:2262
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-
-#: ../plugins/spellchk.c:2263
+msgstr "مطابقت _دقیق بزرگی و کوچکی حروف (برای ادارهٔ خودکار بزرگی و کوچکی حروف، نشانه را بردارید)"
+
+#: ../plugins/spellchk.c:2264
 msgid "Only replace _whole words"
-msgstr "فقط جای‌گزینی _کل کلمه"
-
-#: ../plugins/spellchk.c:2288
+msgstr "فقط جای‌گزینی _کلمات کامل"
+
+#: ../plugins/spellchk.c:2289
 msgid "General Text Replacement Options"
 msgstr "گزینه‌های عمومی جای‌گزینی متن"
 
-#: ../plugins/spellchk.c:2289
+#: ../plugins/spellchk.c:2290
 msgid "Enable replacement of last word on send"
 msgstr "جای‌گزینی آخرین کلمه هنگام ارسال به کار انداخته شود"
 
-#: ../plugins/spellchk.c:2314
+#: ../plugins/spellchk.c:2315
 msgid "Text replacement"
 msgstr "جای‌گزینی متن"
 
-#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
+#: ../plugins/spellchk.c:2317 ../plugins/spellchk.c:2318
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "جای‌گزینی متن در پیغام‌های ارسالی با توجه به قوانین تعریف شده توسط کاربر."
@@ -1479,51 +1526,46 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "پوششی برای کتابخانه‌های پشتیبانی SSL در اختیار می‌گذارد."
 
-#: ../plugins/statenotify.c:49
+#: ../plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
-msgstr "%s برگشته است."
-
-#: ../plugins/statenotify.c:51
+msgstr "%s برگشت."
+
+#: ../plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
-msgstr "%s رفته است."
-
-#: ../plugins/statenotify.c:61
+msgstr "%s رفت."
+
+#: ../plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
-msgstr "%s بی‌کار شده است."
-
-#: ../plugins/statenotify.c:63
+msgstr "%s بی‌کار شد."
+
+#: ../plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s دیگر بی‌کار نیست."
 
-#: ../plugins/statenotify.c:72
+#: ../plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
-msgstr "‏%s وارد سیستم شده است."
-
-#: ../plugins/statenotify.c:79
-#, c-format
-msgid "%s has signed off."
-msgstr "‏%s از سیستم خارج شده است."
-
-#: ../plugins/statenotify.c:90
+msgstr "‏%s وارد سیستم شد."
+
+#: ../plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "دادن اطلاع زمانی که"
 
-#: ../plugins/statenotify.c:93
+#: ../plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "رفیق _می‌رود"
 
-#: ../plugins/statenotify.c:96
+#: ../plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "رفیق _بی‌کار می‌شود"
 
-#: ../plugins/statenotify.c:99
+#: ../plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
-msgstr "رفیقتان وارد سیستم/از سیستم خارج می‌شود"
+msgstr "رفیق وارد سیستم می‌شود/ از سیستم خارج می‌شود"
 
 #. *< type
 #. *< ui_requirement
@@ -1531,7 +1573,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/statenotify.c:141
+#: ../plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "اطلاع وضعیت رفیق"
 
@@ -1539,21 +1581,21 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
+#: ../plugins/statenotify.c:145 ../plugins/statenotify.c:148
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
 "وقتی رفیقی می‌رود یا بی‌کار می‌شود یا از وضعیت رفته یا بی‌کاری در می‌آید، در یک "
-"پنجره‌ی گفتگو اطلاع می‌دهد."
-
-#: ../plugins/tcl/tcl.c:369
+"پنجرهٔ گفتگو اطلاع می‌دهد."
+
+#: ../plugins/tcl/tcl.c:402
 msgid "Tcl Plugin Loader"
-msgstr "بارکننده‌ی متصل شونده‌ی  Tcl"
-
-#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
+msgstr "بارکنندهٔ متصل شوندهٔ tcl"
+
+#: ../plugins/tcl/tcl.c:404 ../plugins/tcl/tcl.c:405
 msgid "Provides support for loading Tcl plugins"
-msgstr "برای بار کردن متصل شونده‌های Tcl پشتیبانی فراهم می‌کند"
+msgstr "برای بار کردن متصل شونده‌های tcl پشتیبانی فراهم می‌کند"
 
 #. *< type
 #. *< ui_requirement
@@ -1571,17 +1613,17 @@
 #. *  description
 #: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "نسخه‌ی افقی و لغزنده‌ی فهرست رفقا."
-
-#: ../plugins/timestamp.c:188
+msgstr "نسخهٔ افقی و لغزان فهرست رفقا."
+
+#: ../plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "مُهر زمانی آی‌چَت"
 
-#: ../plugins/timestamp.c:195
+#: ../plugins/timestamp.c:193
 msgid "Delay"
 msgstr "تأخیر"
 
-#: ../plugins/timestamp.c:202
+#: ../plugins/timestamp.c:200
 msgid "minutes."
 msgstr "دقیقه."
 
@@ -1591,7 +1633,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:264
+#: ../plugins/timestamp.c:256
 msgid "Timestamp"
 msgstr "مُهر زمانی"
 
@@ -1599,7 +1641,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:267 ../plugins/timestamp.c:269
+#: ../plugins/timestamp.c:259 ../plugins/timestamp.c:261
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "هر N دقیقه یک مُهر زمانی به سبک آی‌چت به گفتگو اضافه می‌کند."
 
@@ -1621,15 +1663,15 @@
 
 #: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
 msgid "For delayed messages"
-msgstr "برای پیغام‌های با تأخیر"
+msgstr "برای پیغام‌های تأخیر دار"
 
 #: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
 msgid "For delayed messages and in chats"
-msgstr "برای پیغام‌های باتأخیر و در گپ‌ها"
+msgstr "برای پیغام‌های تأخیر دار و در گپ‌ها"
 
 #: ../plugins/timestamp_format.c:44
 msgid "_Message Logs:"
-msgstr "تاریخچه‌های _پیغام:"
+msgstr "تاریخچهٔ _پیغام‌ها:"
 
 #. *< type
 #. *< ui_requirement
@@ -1654,7 +1696,8 @@
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"این متصل شونده کاربران را قادر می‌سازد قالب‌های مهر زمانی پیغام گفتگو و تاریخچه‌نویسی را سفارشی کنند."
+"این متصل شونده کاربران را قادر می‌سازد قالب‌های مهر زمانی پیغام گفتگو و "
+"تاریخچهٔ آن را سفارشی کنند."
 
 #: ../plugins/win32/transparency/win2ktrans.c:183
 #: ../plugins/win32/transparency/win2ktrans.c:569
@@ -1665,19 +1708,19 @@
 #. IM Convo trans options
 #: ../plugins/win32/transparency/win2ktrans.c:533
 msgid "IM Conversation Windows"
-msgstr "پنجره‌های گفتگوی پیغام فوری"
+msgstr "پنجره‌های گفتگوی پیغام اینترنتی"
 
 #: ../plugins/win32/transparency/win2ktrans.c:534
 msgid "_IM window transparency"
-msgstr "_شفافیت پنجره‌ی پیغام فوری"
+msgstr "_شفافیت پنجرهٔ پیغام اینترنتی"
 
 #: ../plugins/win32/transparency/win2ktrans.c:548
 msgid "_Show slider bar in IM window"
-msgstr "_نمایش نوار لغزش در پنجره‌ی پیغام فوری"
+msgstr "_نمایش نوار لغزش در پنجرهٔ پیغام اینترنتی"
 
 #: ../plugins/win32/transparency/win2ktrans.c:555
 msgid "Remove IM window transparency on focus"
-msgstr "حذف شفافیت پنجره‌ی پیغام فوری هنگام تمرکز"
+msgstr "حذف شفافیت پنجرهٔ پیغام اینترنتی هنگام تمرکز"
 
 #: ../plugins/win32/transparency/win2ktrans.c:558
 #: ../plugins/win32/transparency/win2ktrans.c:606
@@ -1687,15 +1730,15 @@
 #. Buddy List trans options
 #: ../plugins/win32/transparency/win2ktrans.c:590
 msgid "Buddy List Window"
-msgstr "پنجره‌ی فهرست رفقا"
+msgstr "پنجرهٔ فهرست رفقا"
 
 #: ../plugins/win32/transparency/win2ktrans.c:591
 msgid "_Buddy List window transparency"
-msgstr "شفافیت پنجره‌ی فهرست _رفقا"
+msgstr "شفافیت پنجرهٔ فهرست _رفقا"
 
 #: ../plugins/win32/transparency/win2ktrans.c:604
 msgid "Remove Buddy List window transparency on focus"
-msgstr "حذف شفافیت پنجره‌ی فهرست رفقا هنگام تمرکز"
+msgstr "حذف شفافیت پنجرهٔ فهرست رفقا هنگام تمرکز"
 
 #. *< type
 #. *< ui_requirement
@@ -1703,19 +1746,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/win32/transparency/win2ktrans.c:658
 msgid "Transparency"
 msgstr "شفافیت"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:660
+#: ../plugins/win32/transparency/win2ktrans.c:661
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "شفافیت متغیر برای فهرست رفقا و گفتگوها"
+msgstr "شفافیت متغیر برای فهرست رفقا و گفتگوها."
 
 #. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:662
+#: ../plugins/win32/transparency/win2ktrans.c:663
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1727,192 +1770,199 @@
 "\n"
 "* توجه: این متصل شونده نیازمند ویندوز 2000 یا بالاتر است."
 
-#: ../plugins/win32/winprefs/winprefs.c:397
+#: ../plugins/win32/winprefs/winprefs.c:434
 msgid "GTK+ Runtime Version"
-msgstr "نسخه‌ی دارای GTK+ در زمان اجرا"
+msgstr "نسخهٔ دارای GTK+ در زمان اجرا"
 
 #. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "Startup"
 msgstr "راه‌اندازی"
 
-#: ../plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:443
 msgid "_Start Gaim on Windows startup"
 msgstr "آ_غاز گیم هنگام راه‌اندازی ویندوز"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3623
+#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3667
 msgid "Buddy List"
 msgstr "فهرست رفقا"
 
-#: ../plugins/win32/winprefs/winprefs.c:418
+#: ../plugins/win32/winprefs/winprefs.c:456
 msgid "_Dockable Buddy List"
 msgstr "فهرست رفقای _جدا شدنی"
 
 #. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
+#: ../plugins/win32/winprefs/winprefs.c:460
 msgid "_Keep Buddy List window on top:"
-msgstr "_رو نگه داشتن پنجره‌ی فهرست رفقا:"
+msgstr "رو نگه داشتن پنجرهٔ فهرست رفقا_:"
 
 #. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
+#: ../plugins/win32/winprefs/winprefs.c:465
 msgid "Only when docked"
 msgstr "فقط وقتی جدا شده است"
 
 #. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1864
+#: ../plugins/win32/winprefs/winprefs.c:469 ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1879
 msgid "Conversations"
 msgstr "گفتگوها"
 
-#: ../plugins/win32/winprefs/winprefs.c:432
+#: ../plugins/win32/winprefs/winprefs.c:470
 msgid "_Flash window when messages are received"
 msgstr "_چشمک زدن پنجره وقتی پیغامی دریافت می‌شود"
 
-#: ../plugins/win32/winprefs/winprefs.c:456
+#: ../plugins/win32/winprefs/winprefs.c:494
 msgid "WinGaim Options"
 msgstr "گزینه‌های گیم ویندوز"
 
-#: ../plugins/win32/winprefs/winprefs.c:458
+#: ../plugins/win32/winprefs/winprefs.c:496
 msgid "Options specific to Windows Gaim."
 msgstr "گزینه‌های خاص گیم ویندوز."
 
-#: ../plugins/win32/winprefs/winprefs.c:459
+#: ../plugins/win32/winprefs/winprefs.c:497
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
 msgstr ""
+"گزینه‌های خاص گیم ویندوزی مانند جدا کردن فهرست و چشمک زدن گفتگو را فراهم می‌کند."
 
 #: ../src/account.c:773
 msgid "accounts"
 msgstr "حساب‌ها"
 
-#: ../src/account.c:923
+#: ../src/account.c:918
 msgid "Password is required to sign on."
 msgstr "برای ورود به سیستم گذرواژه لازم است."
 
-#: ../src/account.c:948
+#: ../src/account.c:943
 #, c-format
 msgid "Enter password for %s (%s)"
-msgstr "گذواژه‌ی %s را وارد کنید (%s)"
+msgstr "گذرواژهٔ %s را وارد کنید (%s)"
+
+#: ../src/account.c:950
+msgid "Enter Password"
+msgstr "گذرواژه را وارد کنید"
 
 #: ../src/account.c:955
-msgid "Enter Password"
-msgstr "گذرواژه را وارد کنید"
-
-#: ../src/account.c:960
 msgid "Save password"
-msgstr "گذرواژه ذخیره شود"
-
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3507
-#: ../src/gtkdialogs.c:581 ../src/gtkdialogs.c:718 ../src/gtkdialogs.c:786
-#: ../src/gtkrequest.c:287 ../src/protocols/gg/gg.c:454
-#: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
+msgstr "گذرواژهٔ ذخیره شود"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../src/account.c:963 ../src/account.c:1134 ../src/gtkblist.c:3551
+#: ../src/gtkdialogs.c:613 ../src/gtkdialogs.c:750 ../src/gtkdialogs.c:824
+#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
+#: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
 #: ../src/protocols/jabber/jabber.c:1322 ../src/protocols/jabber/xdata.c:337
 #: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
 #: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
-#: ../src/protocols/oscar/oscar.c:2999 ../src/protocols/oscar/oscar.c:4542
-#: ../src/protocols/oscar/oscar.c:4623 ../src/protocols/oscar/oscar.c:8051
-#: ../src/protocols/oscar/oscar.c:8174 ../src/protocols/oscar/oscar.c:8199
-#: ../src/protocols/oscar/oscar.c:8251 ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
-#: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
+#: ../src/protocols/oscar/oscar.c:1408 ../src/protocols/oscar/oscar.c:2168
+#: ../src/protocols/oscar/oscar.c:2261 ../src/protocols/oscar/oscar.c:5691
+#: ../src/protocols/oscar/oscar.c:5871 ../src/protocols/oscar/oscar.c:5896
+#: ../src/protocols/oscar/oscar.c:5952 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:424
+#: ../src/protocols/silc/chat.c:462 ../src/protocols/silc/chat.c:725
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:749 ../src/protocols/yahoo/yahoo.c:3062
-#: ../src/protocols/yahoo/yahoo.c:3071
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3059
+#: ../src/protocols/yahoo/yahoo.c:3068 ../src/request.h:1344
 msgid "OK"
 msgstr "تأیید"
 
-#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4975
-#: ../src/gtkdialogs.c:582 ../src/gtkdialogs.c:719 ../src/gtkdialogs.c:787
-#: ../src/gtkdialogs.c:806 ../src/gtkdialogs.c:828 ../src/gtkdialogs.c:848
-#: ../src/gtkdialogs.c:892 ../src/gtkdialogs.c:947 ../src/gtkdialogs.c:984
-#: ../src/gtkdialogs.c:1009 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1093 ../src/gtkprivacy.c:568
+#: ../src/account.c:964 ../src/account.c:1135 ../src/account.c:1172
+#: ../src/gtkaccount.c:2182 ../src/gtkaccount.c:2649 ../src/gtkblist.c:5016
+#: ../src/gtkdialogs.c:614 ../src/gtkdialogs.c:751 ../src/gtkdialogs.c:825
+#: ../src/gtkdialogs.c:844 ../src/gtkdialogs.c:866 ../src/gtkdialogs.c:886
+#: ../src/gtkdialogs.c:930 ../src/gtkdialogs.c:985 ../src/gtkdialogs.c:1022
+#: ../src/gtkdialogs.c:1047 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1077 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:288 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
-#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
-#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
-#: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1323
+#: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
+#: ../src/protocols/jabber/buddy.c:594 ../src/protocols/jabber/buddy.c:1721
+#: ../src/protocols/jabber/buddy.c:1755 ../src/protocols/jabber/chat.c:778
+#: ../src/protocols/jabber/jabber.c:828 ../src/protocols/jabber/jabber.c:1323
 #: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
 #: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
 #: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
-#: ../src/protocols/oscar/oscar.c:1641 ../src/protocols/oscar/oscar.c:3000
-#: ../src/protocols/oscar/oscar.c:4500 ../src/protocols/oscar/oscar.c:4543
-#: ../src/protocols/oscar/oscar.c:4580 ../src/protocols/oscar/oscar.c:4624
-#: ../src/protocols/oscar/oscar.c:8052 ../src/protocols/oscar/oscar.c:8175
-#: ../src/protocols/oscar/oscar.c:8200 ../src/protocols/oscar/oscar.c:8252
-#: ../src/protocols/oscar/oscar.c:8321
-#: ../src/protocols/sametime/sametime.c:3376
-#: ../src/protocols/sametime/sametime.c:3461
-#: ../src/protocols/sametime/sametime.c:3631
-#: ../src/protocols/sametime/sametime.c:5320
-#: ../src/protocols/sametime/sametime.c:5409
-#: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/oscar/oscar.c:1409 ../src/protocols/oscar/oscar.c:2169
+#: ../src/protocols/oscar/oscar.c:2210 ../src/protocols/oscar/oscar.c:2262
+#: ../src/protocols/oscar/oscar.c:5692 ../src/protocols/oscar/oscar.c:5744
+#: ../src/protocols/oscar/oscar.c:5872 ../src/protocols/oscar/oscar.c:5897
+#: ../src/protocols/oscar/oscar.c:5953 ../src/protocols/oscar/oscar.c:6022
+#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3623
+#: ../src/protocols/sametime/sametime.c:5312
+#: ../src/protocols/sametime/sametime.c:5401
+#: ../src/protocols/sametime/sametime.c:5525 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:750
-#: ../src/protocols/silc/silc.c:955 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072
+#: ../src/protocols/silc/chat.c:597 ../src/protocols/silc/chat.c:726
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3069 ../src/request.h:1344
+#: ../src/request.h:1354
 msgid "Cancel"
 msgstr "انصراف"
 
-#: ../src/account.c:994 ../src/connection.c:96
+#: ../src/account.c:989 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "متصل شونده‌ی قرارداد %s موجود نیست"
-
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3499
-#: ../src/gtkblist.c:3505
+msgstr "متصل شوندهٔ قرارداد %s موجود نیست"
+
+#: ../src/account.c:991 ../src/connection.c:99 ../src/gtkblist.c:3549
 msgid "Connection Error"
 msgstr "خطای اتصال"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
+#: ../src/account.c:1071 ../src/protocols/gg/gg.c:696
 #: ../src/protocols/jabber/jabber.c:1275
 msgid "New passwords do not match."
 msgstr "گذرواژه‌های جدید مطابقت ندارند."
 
-#: ../src/account.c:1085
+#: ../src/account.c:1080
 msgid "Fill out all fields completely."
-msgstr "همه‌ی فیلدها را پر کنید."
-
-#: ../src/account.c:1108
+msgstr "همهٔ فیلدها را پر کنید."
+
+#: ../src/account.c:1103
 msgid "Original password"
-msgstr "گذرواژه‌ی اصلی"
-
-#: ../src/account.c:1115
+msgstr "گذرواژهٔ اصلی"
+
+#: ../src/account.c:1110
 msgid "New password"
-msgstr "گذرواژه‌ی جدید"
-
-#: ../src/account.c:1122
+msgstr "گذرواژهٔ جدید"
+
+#: ../src/account.c:1117
 msgid "New password (again)"
-msgstr "گذرواژه‌ی جدید (دوباره)"
-
-#: ../src/account.c:1128
+msgstr "گذرواژهٔ جدید (دوباره)"
+
+#: ../src/account.c:1123
 #, c-format
 msgid "Change password for %s"
-msgstr "تغییر گذرواژه‌ی %s"
-
-#: ../src/account.c:1136
+msgstr "تغییر گذرواژهٔ %s"
+
+#: ../src/account.c:1131
 msgid "Please enter your current password and your new password."
-msgstr "لطفاً گذرواژه‌ی فعلی و گذرواژه جدیدتان را وارد کنید."
-
-#: ../src/account.c:1169
+msgstr "لطفاً گذرواژهٔ فعلی و گذرواژه جدیدتان را وارد کنید."
+
+#: ../src/account.c:1164
 #, c-format
 msgid "Change user information for %s"
 msgstr "تغییر اطلاعات کاربر %s"
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:294
-#: ../src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1167 ../src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "تنظیم اطلاعات کاربر"
+
+#: ../src/account.c:1171 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
+#: ../src/protocols/jabber/buddy.c:593
 msgid "Save"
 msgstr "ذخیره"
 
-#: ../src/account.c:1679 ../src/gtkft.c:157
-#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
-#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
+#: ../src/account.c:1681 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
+#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:1357
+#: ../src/protocols/jabber/buddy.c:1374 ../src/protocols/novell/novell.c:2858
 msgid "Unknown"
 msgstr "نامعلوم"
 
@@ -1920,11 +1970,11 @@
 msgid "buddy list"
 msgstr "فهرست رفقا"
 
-#: ../src/blist.c:1173
+#: ../src/blist.c:1179
 msgid "Chats"
 msgstr "گپ‌ها"
 
-#: ../src/blist.c:1886
+#: ../src/blist.c:1901
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because it belongs to an account "
@@ -1934,10 +1984,10 @@
 "which are currently disabled or offline.  These buddies and the group were "
 "not removed.\n"
 msgstr[0] ""
-"‏%Id رفیق از گروه %s حذف نشد چون به حسابی تعلق دارد که از کار انداخته شده یا برون‌خط است. این رفیق"
-"(ها) و گروه حذف نشد.\n"
-
-#: ../src/blist.c:1896
+"‏%Id رفیق از گروه %s حذف نشد چون حساب برون‌خط یا از کار انداخته شده است. این رفیق(ها)"
+"و گروه حذف نشدند.\n"
+
+#: ../src/blist.c:1911
 msgid "Group not removed"
 msgstr "گروه حذف نشد"
 
@@ -1950,15 +2000,14 @@
 msgid "+++ %s signed on"
 msgstr "+++ ‏%s وارد سیستم شد"
 
-#: ../src/connection.c:322
+#: ../src/connection.c:313
 #, c-format
 msgid "+++ %s signed off"
-msgstr 
-"+++ ‏%s خارج شد"
+msgstr "+++ %s از سیستم خارج شد"
 
 #: ../src/conversation.c:163
 msgid "Unable to send message: The message is too large."
-msgstr "نمی‌توان پیغام را فرستاد: پیغام خیلی بزرگ است."
+msgstr "نمی‌توان پیغام را فرستاد: پیغام خیلی بلند است."
 
 #: ../src/conversation.c:166 ../src/conversation.c:179
 #, c-format
@@ -1967,11 +2016,11 @@
 
 #: ../src/conversation.c:167
 msgid "The message is too large."
-msgstr "پیغام خیلی بزرگ است."
+msgstr "پیغام خیلی بلند است."
 
 #: ../src/conversation.c:176
 msgid "Unable to send message."
-msgstr "نمی‌توان پیغام فرستاد."
+msgstr "نمی‌توان پیغام را فرستاد."
 
 #: ../src/conversation.c:1517
 #, c-format
@@ -2003,11 +2052,11 @@
 msgid "%s left the room (%s)."
 msgstr "‏%s از اتاق خارج شد (%s)."
 
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:875
+#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
 msgid "No name"
 msgstr "بدون نام"
 
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2036,7 +2085,7 @@
 
 #: ../src/ft.c:230
 msgid "Cannot send a file of 0 bytes."
-msgstr "نمی‌توان پرونده‌ی ۰ بایتی را فرستاد."
+msgstr "نمی‌توان پروندهٔ ۰ بایتی را فرستاد."
 
 #: ../src/ft.c:240
 msgid "Cannot send a directory."
@@ -2046,7 +2095,7 @@
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
-"‏%s یک پرونده‌ی معمولی نیست. در نهایت بزدلی از رونویسی آن خودداری می‌شود.\n"
+"‏%s یک پروندهٔ معمولی نیست. در نهایت بزدلی از رونویسی آن خودداری می‌شود.\n"
 
 #: ../src/ft.c:307
 #, c-format
@@ -2061,7 +2110,7 @@
 #: ../src/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr "درخواست انتقال پرونده‌ی %s پذیرفته شود؟"
+msgstr "درخواست انتقال پروندهٔ %s پذیرفته شود؟"
 
 #: ../src/ft.c:359
 #, c-format
@@ -2071,63 +2120,63 @@
 "Remote port: %d"
 msgstr ""
 "پرونده‌ای برای بارگیری موجود است:\n"
-"میزبان دوردست: %s\n"
+"میزبان دوردست: ‎%s\n"
 "درگاه دوردست: %Id"
 
 #: ../src/ft.c:391
 #, c-format
 msgid "%s is offering to send file %s"
-msgstr "‏%s مایل است پرونده‌ی %s را برای شما بفرستد"
-
-#: ../src/ft.c:442
+msgstr "‏%s مایل است پروندهٔ %s را برای شما بفرستد"
+
+#: ../src/ft.c:443
 #, c-format
 msgid "%s is not a valid filename.\n"
-msgstr "‏%s نام پرونده‌ی معتبری نیست.\n"
-
-#: ../src/ft.c:463
+msgstr "‏%s نام پروندهٔ معتبری نیست.\n"
+
+#: ../src/ft.c:464
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "پیشنهادِ فرستادن %s به %s"
-
-#: ../src/ft.c:474
+msgstr "پیشنهاد فرستادن %s به %s"
+
+#: ../src/ft.c:476
 #, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "انتقال %s از %s آغاز می‌شود"
-
-#: ../src/ft.c:628
+msgstr "در حال آغاز انتقال پروندهٔ %s از %s"
+
+#: ../src/ft.c:630
 #, c-format
 msgid "Transfer of file %s complete"
-msgstr "انتقال پرونده‌ی %s انجام شد"
-
-#: ../src/ft.c:631
+msgstr "انتقال پروندهٔ %s انجام شد"
+
+#: ../src/ft.c:633
 msgid "File transfer complete"
 msgstr "انتقال پرونده انجام شد"
 
-#: ../src/ft.c:1022
+#: ../src/ft.c:1030
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "شما از انتقال %s صرف نظر کردید"
 
-#: ../src/ft.c:1027
+#: ../src/ft.c:1035
 msgid "File transfer cancelled"
 msgstr "از انتقال پرونده صرف نظر شد"
 
-#: ../src/ft.c:1084
+#: ../src/ft.c:1093
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "‏%s از انتقال %s صرف نظر کرد"
 
-#: ../src/ft.c:1089
+#: ../src/ft.c:1098
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "‏%s از انتقال پرونده صرف نظر کرد"
 
-#: ../src/ft.c:1146
+#: ../src/ft.c:1155
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "انتقال پرونده به %s شکست خورد."
 
-#: ../src/ft.c:1148
+#: ../src/ft.c:1157
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "انتقال پرونده از %s شکست خورد."
@@ -2140,15 +2189,15 @@
 "<b>Image size:</b> %dx%d"
 msgstr ""
 "<b>پرونده:</b> %s\n"
-"<b>اندازه‌ی پرونده:</b> %s\n"
-"<b>اندازه‌ی تصویر:</b> %Id×%Id"
+"<b>اندازهٔ پرونده:</b> %s\n"
+"<b>اندازهٔ تصویر:</b> %Id×%Id"
 
 #. Build the login options frame.
 #: ../src/gtkaccount.c:762
 msgid "Login Options"
 msgstr "گزینه‌های ورود به سیستم"
 
-#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
+#: ../src/gtkaccount.c:779 ../src/gtkft.c:642
 msgid "Protocol:"
 msgstr "قرارداد:"
 
@@ -2156,13 +2205,13 @@
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4553 ../src/gtkblist.c:4919
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4594 ../src/gtkblist.c:4960
 msgid "Alias:"
 msgstr "اسم مستعار:"
 
 #: ../src/gtkaccount.c:867
 msgid "Remember password"
-msgstr "به خاطر سپردن گذرواژه"
+msgstr "گذرواژه به خاطر سپرده شود"
 
 #. Build the user options frame.
 #: ../src/gtkaccount.c:919
@@ -2171,7 +2220,7 @@
 
 #: ../src/gtkaccount.c:932
 msgid "New mail notifications"
-msgstr "اطلاع‌های نامه‌ی جدید"
+msgstr "اطلاع‌های نامهٔ جدید"
 
 #: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
@@ -2203,95 +2252,101 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
+#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1058
 msgid "Use Environmental Settings"
 msgstr "استفاده از تنظیمات محیطی"
 
-#: ../src/gtkaccount.c:1297
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../src/gtkaccount.c:1302
+msgid "If you look real closely"
+msgstr "اگر خوب دقت کنید"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../src/gtkaccount.c:1305
 msgid "you can see the butterflies mating"
-msgstr "می‌توانید پروانه‌ها را ببینید که جفت‌گیری می‌کنند"
-
-#: ../src/gtkaccount.c:1301
-msgid "If you look real closely"
-msgstr "اگر خوبِ خوبِ خوب نگاه کنید"
-
-#: ../src/gtkaccount.c:1317
+msgstr "می‌توانید جفت‌گیری پروانه‌ها را ببینید"
+
+#: ../src/gtkaccount.c:1326
 msgid "Proxy Options"
 msgstr "گزینه‌های پیشکار"
 
-#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1052
 msgid "Proxy _type:"
 msgstr "_نوع پیشکار:"
 
-#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
+#: ../src/gtkaccount.c:1349 ../src/gtkprefs.c:1073
 msgid "_Host:"
 msgstr "میزبان:"
 
-#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
+#: ../src/gtkaccount.c:1353 ../src/gtkprefs.c:1091
 msgid "_Port:"
 msgstr "_درگاه:"
 
-#: ../src/gtkaccount.c:1352
+#: ../src/gtkaccount.c:1361
 msgid "_Username:"
-msgstr "نام _کاربر:"
-
-#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
+msgstr "نام _کاربری:"
+
+#: ../src/gtkaccount.c:1367 ../src/gtkprefs.c:1128
 msgid "Pa_ssword:"
-msgstr "_گذرواژه"
-
-#: ../src/gtkaccount.c:1736
+msgstr "_گذرواژه:"
+
+#: ../src/gtkaccount.c:1747
 msgid "Add Account"
 msgstr "اضافه کردن حساب"
 
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3508
+#: ../src/gtkaccount.c:1749 ../src/gtkblist.c:3552
 msgid "Modify Account"
 msgstr "تغییر حساب"
 
-#: ../src/gtkaccount.c:1760
+#: ../src/gtkaccount.c:1771
 msgid "_Basic"
-msgstr "_پایه"
-
-#: ../src/gtkaccount.c:1771
+msgstr "ا_صلی"
+
+#: ../src/gtkaccount.c:1782
 msgid "_Advanced"
-msgstr "پ_یشرفته"
+msgstr "_پیشرفته"
 
 #. Register button
-#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
+#: ../src/gtkaccount.c:1797 ../src/protocols/jabber/jabber.c:827
 msgid "Register"
 msgstr "ثبت"
 
-#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
+#: ../src/gtkaccount.c:2176 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "آیا مطمئنید می‌خواهید %s را حذف کنید؟"
 
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1092 ../src/gtkrequest.c:291
+#: ../src/gtkaccount.c:2181 ../src/gtkpounce.c:1076 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "حذف"
 
-#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
-#: ../src/protocols/oscar/oscar.c:5187
+#: ../src/gtkaccount.c:2239 ../src/gtksavedstatuses.c:889
+#: ../src/protocols/oscar/oscar.c:2824
 msgid "Screen Name"
 msgstr "نام کاربری"
 
-#: ../src/gtkaccount.c:2259
+#: ../src/gtkaccount.c:2270
 msgid "Protocol"
 msgstr "قرارداد"
 
-#: ../src/gtkaccount.c:2586
+#: ../src/gtkaccount.c:2597
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s‏، %s را رفیق خودش کرده است %s%s"
-
-#: ../src/gtkaccount.c:2635
+msgstr "%s%s%s%s‏، %s را در میان رفقای خود پذیرفت %s%s"
+
+#: ../src/gtkaccount.c:2646
 msgid "Add buddy to your list?"
-msgstr "رفیق به فهرست‌تان اضافه شود؟"
-
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4974 ../src/gtkconv.c:1616
-#: ../src/gtkrequest.c:292 ../src/protocols/gg/gg.c:811
-#: ../src/protocols/oscar/oscar.c:4812
-#: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
+msgstr "این شخص به فهرست رفقایتان اضافه شود؟"
+
+#: ../src/gtkaccount.c:2648 ../src/gtkblist.c:5015 ../src/gtkconv.c:1625
+#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
+#: ../src/protocols/oscar/oscar.c:2454
+#: ../src/protocols/sametime/sametime.c:5400 ../src/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "اضافه شود"
 
@@ -2304,9 +2359,9 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
-"لطفاً اطلاعات مناسب را درباره‌ی گفتگویی که مایلید به آن بپیوندید وارد کنید.\n"
-
-#: ../src/gtkblist.c:705 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+"لطفاً اطلاعات مناسب را دربارهٔ گفتگویی که مایلید به آن بپیوندید وارد کنید.\n"
+
+#: ../src/gtkblist.c:705 ../src/gtkpounce.c:519 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_حساب:"
 
@@ -2316,7 +2371,7 @@
 
 #: ../src/gtkblist.c:952 ../src/gtkstock.c:141
 msgid "I_M"
-msgstr "_پیغام فوری"
+msgstr "_پیغام اینترنتی"
 
 #: ../src/gtkblist.c:958
 msgid "_Send File"
@@ -2335,7 +2390,7 @@
 msgid "Alias..."
 msgstr "اسم مستعار..."
 
-#: ../src/gtkblist.c:987 ../src/gtkconv.c:1613 ../src/gtkrequest.c:293
+#: ../src/gtkblist.c:987 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "حذف"
 
@@ -2381,138 +2436,138 @@
 msgid "_Expand"
 msgstr "_باز کردن"
 
-#: ../src/gtkblist.c:1414 ../src/gtkblist.c:1426 ../src/gtkblist.c:3768
-#: ../src/gtkblist.c:3778
+#: ../src/gtkblist.c:1382 ../src/gtkblist.c:1394 ../src/gtkblist.c:3812
+#: ../src/gtkblist.c:3822
 msgid "/Tools/Mute Sounds"
 msgstr "/ابزارها/ساکت کردن صداها"
 
-#: ../src/gtkblist.c:1889 ../src/gtkconv.c:4215 ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1854 ../src/gtkconv.c:4245 ../src/gtkpounce.c:418
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
-"شما در حال حاضر با حسابی که بتواند این رفیق را اضافه کند وارد سیستم نشده‌اید."
+"شما در حال حاضر با حسابی وارد سیستم نشده‌اید که بتواند این رفیق را اضافه کند."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2463
+#: ../src/gtkblist.c:2428
 msgid "/_Buddies"
 msgstr "/_رفقا"
 
-#: ../src/gtkblist.c:2464
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/New Instant _Message..."
-msgstr "/رفقا/_پیغام فوری جدید..."
-
-#: ../src/gtkblist.c:2465
+msgstr "/رفقا/_پیغام اینترنتی جدید..."
+
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/Join a _Chat..."
 msgstr "/رفقا/پیوستن به _گپ..."
 
-#: ../src/gtkblist.c:2466
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/Get User _Info..."
 msgstr "/رفقا/گرفتن _اطلاعات کاربر..."
 
-#: ../src/gtkblist.c:2467
+#: ../src/gtkblist.c:2432
 msgid "/Buddies/View User _Log..."
-msgstr "/رفقا/نمایش _تاریخچه‌ی کاربر..."
-
-#: ../src/gtkblist.c:2469
+msgstr "/رفقا/نمایش _تاریخچهٔ کاربر..."
+
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/رفقا/نمایش رفقای بر_ون‌خط"
 
-#: ../src/gtkblist.c:2470
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/رفقا/نمایش گروه‌های _خالی"
 
-#: ../src/gtkblist.c:2471
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/رفقا/نمایش _جزئیات رفقا"
 
-#: ../src/gtkblist.c:2472
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/Show Idle _Times"
 msgstr "/رفقا/نمایش _زمان بی‌کاری"
 
-#: ../src/gtkblist.c:2473
+#: ../src/gtkblist.c:2438
 msgid "/Buddies/_Sort Buddies"
-msgstr "/رفقا/_مرتب‌سازی رفقا"
-
-#: ../src/gtkblist.c:2475
+msgstr "/رفقا/_مرتب کردن رفقا"
+
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/_Add Buddy..."
 msgstr "/رفقا/ا_ضافه کردن رفیق..."
 
-#: ../src/gtkblist.c:2476
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Add C_hat..."
 msgstr "/رفقا/اضافه کردن _گپ..."
 
-#: ../src/gtkblist.c:2477
+#: ../src/gtkblist.c:2442
 msgid "/Buddies/Add _Group..."
 msgstr "/رفقا/اضافه کردن گ_روه..."
 
-#: ../src/gtkblist.c:2479
+#: ../src/gtkblist.c:2444
 msgid "/Buddies/_Quit"
-msgstr "/رفقا/_ترک"
+msgstr "/رفقا/_خروج"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2482
+#: ../src/gtkblist.c:2447
 msgid "/_Accounts"
-msgstr "/_حساب‌ها"
-
-#: ../src/gtkblist.c:2483 ../src/gtkblist.c:5553
+msgstr "_حساب‌ها"
+
+#: ../src/gtkblist.c:2448 ../src/gtkblist.c:5592
 msgid "/Accounts/Add\\/Edit"
 msgstr "/حساب‌ها/اضافه کردن\\/ویرایش"
 
 #. Tools
-#: ../src/gtkblist.c:2486
+#: ../src/gtkblist.c:2451
 msgid "/_Tools"
 msgstr "/ا_بزارها"
 
-#: ../src/gtkblist.c:2487
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Buddy _Pounces"
-msgstr "/ابزارها/_کمین‌های رفقا"
-
-#: ../src/gtkblist.c:2488
+msgstr "/ابزارها/_کمینِ رفیق"
+
+#: ../src/gtkblist.c:2453
 msgid "/Tools/Plu_gins"
-msgstr "/ابزارها/متص_ل شونده‌ها"
-
-#: ../src/gtkblist.c:2489
+msgstr "/ابزارها/_متصل شونده‌ها"
+
+#: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_eferences"
 msgstr "/ابزارها/تر_جیحات"
 
-#: ../src/gtkblist.c:2490
+#: ../src/gtkblist.c:2455
 msgid "/Tools/Pr_ivacy"
 msgstr "/ابزارها/_حریم خصوصی"
 
-#: ../src/gtkblist.c:2492
+#: ../src/gtkblist.c:2457
 msgid "/Tools/_File Transfers"
 msgstr "/ابزارها/انت_قال ‌پرونده"
 
-#: ../src/gtkblist.c:2493
+#: ../src/gtkblist.c:2458
 msgid "/Tools/R_oom List"
 msgstr "/ابزارها/فهرست _اتاق‌ها"
 
-#: ../src/gtkblist.c:2494
+#: ../src/gtkblist.c:2459
 msgid "/Tools/System _Log"
-msgstr "/ابزارها/_تاریخچه‌ی وقایع سیستم"
-
-#: ../src/gtkblist.c:2496
+msgstr "/ابزارها/_تاریخچهٔ وقایع سیستم"
+
+#: ../src/gtkblist.c:2461
 msgid "/Tools/Mute _Sounds"
 msgstr "/ابزارها/ساکت کردن _صداها"
 
 #. Help
-#: ../src/gtkblist.c:2499
+#: ../src/gtkblist.c:2464
 msgid "/_Help"
-msgstr "/_راهنما"
-
-#: ../src/gtkblist.c:2500
+msgstr "/را_هنما"
+
+#: ../src/gtkblist.c:2465
 msgid "/Help/Online _Help"
 msgstr "/راهنما/_راهنمای برخط"
 
-#: ../src/gtkblist.c:2501
+#: ../src/gtkblist.c:2466
 msgid "/Help/_Debug Window"
-msgstr "/راهنما/_پنجره‌ی اشکال‌زدایی"
-
-#: ../src/gtkblist.c:2502
+msgstr "/راهنما/_پنجرهٔ اشکال‌زدایی"
+
+#: ../src/gtkblist.c:2467
 msgid "/Help/_About"
 msgstr "/راهنما/_درباره"
 
-#: ../src/gtkblist.c:2534 ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2499 ../src/gtkblist.c:2568
 #, c-format
 msgid ""
 "\n"
@@ -2521,16 +2576,16 @@
 "\n"
 "<b>حساب:</b> %s"
 
-#: ../src/gtkblist.c:2615
+#: ../src/gtkblist.c:2580
 #, c-format
 msgid ""
 "\n"
 "<b>Buddy Alias:</b> %s"
 msgstr ""
 "\n"
-"<b>اسم مستعار رفیق:</b> %s"
-
-#: ../src/gtkblist.c:2627
+"<b>اسم مستعار:</b> %s"
+
+#: ../src/gtkblist.c:2592
 #, c-format
 msgid ""
 "\n"
@@ -2539,7 +2594,7 @@
 "\n"
 "<b>لقب:</b> %s"
 
-#: ../src/gtkblist.c:2636
+#: ../src/gtkblist.c:2601
 #, c-format
 msgid ""
 "\n"
@@ -2548,25 +2603,25 @@
 "\n"
 "<b>ورود به سیستم:</b> %s"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2612
 #, c-format
 msgid ""
 "\n"
 "<b>Idle:</b> %s"
 msgstr ""
 "\n"
-"<b>بی‌کار:</b> %s"
-
-#: ../src/gtkblist.c:2682
+"<b>مدت بی‌کاری:</b> %s"
+
+#: ../src/gtkblist.c:2647
 #, c-format
 msgid ""
 "\n"
 "<b>Last Seen:</b> %s ago"
 msgstr ""
 "\n"
-"<b>آخرین مشاهده:</b> %s پیش"
-
-#: ../src/gtkblist.c:2691
+"<b>آخرین حضور:</b> %s قبل"
+
+#: ../src/gtkblist.c:2656
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2574,7 +2629,7 @@
 "\n"
 "<b>وضعیت:</b> برون‌خط"
 
-#: ../src/gtkblist.c:2702
+#: ../src/gtkblist.c:2667
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2582,298 +2637,219 @@
 "\n"
 "<b>شرح:</b> عصبی"
 
-#: ../src/gtkblist.c:2704
+#: ../src/gtkblist.c:2669
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
 msgstr ""
 "\n"
-"<b>وضعیت:</b> محشر"
-
-#: ../src/gtkblist.c:2706
+"<b>وضعیت</b>: محشر"
+
+#: ../src/gtkblist.c:2671
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
-"<b>وضعیت:</b> سرحال"
-
-#: ../src/gtkblist.c:2995
+"<b>وضعیت</b>: سرحال"
+
+#: ../src/gtkblist.c:2962
 #, c-format
 msgid "Idle %dh %02dm"
-msgstr "بی‌کار %Idس%I02dد"
-
-#: ../src/gtkblist.c:2997
+msgstr "بی‌کار (%Idس و %I02dد)"
+
+#: ../src/gtkblist.c:2964
 #, c-format
 msgid "Idle %dm"
-msgstr "بی‌کار %Idد"
+msgstr "بی‌کار (%Idد)"
 
 #. Idle stuff
-#: ../src/gtkblist.c:3000 ../src/gtkprefs.c:1745
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5208 ../src/protocols/yahoo/yahoo.c:2730
+#: ../src/gtkblist.c:2967 ../src/gtkprefs.c:1760
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/jabber/buddy.c:641
+#: ../src/protocols/jabber/buddy.c:672 ../src/protocols/msn/msn.c:550
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2852
+#: ../src/protocols/oscar/oscar.c:2845 ../src/protocols/yahoo/yahoo.c:2727
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "بی‌کار"
 
-#: ../src/gtkblist.c:3132
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/New Instant Message..."
-msgstr "/رفقا/پیغام فوری جدید..."
-
-#: ../src/gtkblist.c:3133 ../src/gtkblist.c:3166
+msgstr "/رفقا/پیغام اینترنتی جدید..."
+
+#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
 msgid "/Buddies/Join a Chat..."
 msgstr "/رفقا/پیوستن به گپ..."
 
-#: ../src/gtkblist.c:3134
+#: ../src/gtkblist.c:3101
 msgid "/Buddies/Get User Info..."
 msgstr "/رفقا/گرفتن اطلاعات کاربر..."
 
-#: ../src/gtkblist.c:3135
+#: ../src/gtkblist.c:3102
 msgid "/Buddies/Add Buddy..."
 msgstr "/رفقا/اضافه کردن رفیق..."
 
-#: ../src/gtkblist.c:3136 ../src/gtkblist.c:3169
+#: ../src/gtkblist.c:3103 ../src/gtkblist.c:3136
 msgid "/Buddies/Add Chat..."
 msgstr "/رفقا/اضافه کردن گپ..."
 
-#: ../src/gtkblist.c:3137
+#: ../src/gtkblist.c:3104
 msgid "/Buddies/Add Group..."
 msgstr "/رفقا/اضافه کردن گروه..."
 
-#: ../src/gtkblist.c:3172
+#: ../src/gtkblist.c:3139
 msgid "/Tools/Buddy Pounces"
-msgstr "/ابزارها/کمین‌های رفقا"
-
-#: ../src/gtkblist.c:3175
+msgstr "/ابزارها/کمینِ رفیق"
+
+#: ../src/gtkblist.c:3142
 msgid "/Tools/Privacy"
 msgstr "/ابزارها/حریم خصوصی"
 
-#: ../src/gtkblist.c:3178
+#: ../src/gtkblist.c:3145
 msgid "/Tools/Room List"
 msgstr "/ابزارها/فهرست اتاق‌ها"
 
-#: ../src/gtkblist.c:3372
+#: ../src/gtkblist.c:3339
 msgid "Manually"
 msgstr "دستی"
 
-#: ../src/gtkblist.c:3374
+#: ../src/gtkblist.c:3341
 msgid "Alphabetically"
 msgstr "الفبایی"
 
-#: ../src/gtkblist.c:3375
+#: ../src/gtkblist.c:3342
 msgid "By status"
 msgstr "از روی وضعیت"
 
-#: ../src/gtkblist.c:3376
+#: ../src/gtkblist.c:3343
 msgid "By log size"
-msgstr "از روی اندازه‌ی تاریخچه"
-
-#: ../src/gtkblist.c:3493 ../src/gtkconn.c:191
+msgstr "از روی اندازهٔ تاریخچه"
+
+#: ../src/gtkblist.c:3544 ../src/gtkconn.c:184
 #, c-format
 msgid "%s disconnected"
 msgstr "%s قطع شد"
 
-#: ../src/gtkblist.c:3509 ../src/protocols/sametime/sametime.c:3630
+#: ../src/gtkblist.c:3553 ../src/protocols/sametime/sametime.c:3622
 msgid "Connect"
 msgstr "اتصال"
 
-#: ../src/gtkblist.c:3509 ../src/gtkblist.c:5652
-msgid "Enable Account"
-msgstr "به کار انداختن حساب"
-
-#: ../src/gtkblist.c:3530
+#: ../src/gtkblist.c:3553
+msgid "Re-enable Account"
+msgstr "به کار انداختن مجدد حساب"
+
+#: ../src/gtkblist.c:3574
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s قطع شد: %s</span>"
-
-#: ../src/gtkblist.c:3657
+msgstr "<span color=\"red\">‏%s قطع شد: %s</span>"
+
+
+#: ../src/gtkblist.c:3701
 msgid "/Accounts"
 msgstr "/حساب‌ها"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3762
+#: ../src/gtkblist.c:3806
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/رفقا/نمایش رفقای برون‌خط"
 
-#: ../src/gtkblist.c:3765
+#: ../src/gtkblist.c:3809
 msgid "/Buddies/Show Empty Groups"
 msgstr "/رفقا/نمایش گروه‌های خالی"
 
-#: ../src/gtkblist.c:3771
+#: ../src/gtkblist.c:3815
 msgid "/Buddies/Show Buddy Details"
 msgstr "/رفقا/نمایش جزئیات رفقا"
 
-#: ../src/gtkblist.c:3774
+#: ../src/gtkblist.c:3818
 msgid "/Buddies/Show Idle Times"
 msgstr "/رفقا/نمایش زمان بی‌کاری"
 
-#: ../src/gtkblist.c:4486 ../src/protocols/silc/buddy.c:736
-#: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2977
-msgid "Add Buddy"
-msgstr "اضافه کردن رفیق"
-
-#: ../src/gtkblist.c:4510
+#: ../src/gtkblist.c:4551
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
-"لطفاً نام کاربری شخصی را که می‌خواهید به فهرست رفقایتان اضافه کنید، وارد کنید. "
+"لطفاً نام کاربری شخصی را که می‌خواهید به فهرست رفقایتان اضافه شود، وارد کنید. "
 "اگر بخواهید می‌توانید برای این رفیق اسم مستعار یا لقب هم وارد کنید. اسم "
 "مستعار هر وقت که ممکن باشد به جای نام کاربری نمایش داده می‌شود.\n"
 
-#: ../src/gtkblist.c:4532
-msgid "Screen Name:"
-msgstr "نام کاربری:"
-
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4580 ../src/gtkblist.c:4899
+#: ../src/gtkblist.c:4621 ../src/gtkblist.c:4940
 msgid "Account:"
 msgstr "حساب:"
 
-#: ../src/gtkblist.c:4832
+#: ../src/gtkblist.c:4873
 msgid "This protocol does not support chat rooms."
 msgstr "این قرارداد از اتاق‌های گپ پشتیبانی نمی‌کند."
 
-#: ../src/gtkblist.c:4848
+#: ../src/gtkblist.c:4889
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "شما در حال حاضر با قراردادهایی که قابلیت گپ دارند وارد سیستم نشده‌اید."
-
-#: ../src/gtkblist.c:4865
+msgstr "شما در حال حاضر با قراردادی که قابلیت گپ داشته باشد وارد سیستم نشده‌اید."
+
+#: ../src/gtkblist.c:4906
 msgid "Add Chat"
 msgstr "اضافه کردن گپ"
 
-#: ../src/gtkblist.c:4889
+#: ../src/gtkblist.c:4930
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"لطفاً اسم مستعار و اطلاعات مناسبی درباره‌ی گپی که مایلید به فهرست رفقایتان "
+"لطفاً اسم مستعار و اطلاعات مناسبی دربارهٔ گپی که مایلید به فهرست رفقایتان "
 "اضافه کنید وارد کنید.\n"
 
-#: ../src/gtkblist.c:4971 ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5406
+#: ../src/gtkblist.c:5012 ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5398
 msgid "Add Group"
 msgstr "اضافه کردن گروه"
 
-#: ../src/gtkblist.c:4972
+#: ../src/gtkblist.c:5013
 msgid "Please enter the name of the group to be added."
 msgstr "لطفاً نام گروهی که اضافه می‌شود را وارد کنید."
 
-#: ../src/gtkblist.c:5593
+#: ../src/gtkblist.c:5632
 msgid "_Edit Account"
 msgstr "_ویرایش حساب"
 
-#: ../src/gtkblist.c:5626 ../src/gtkblist.c:5632
+#: ../src/gtkblist.c:5665 ../src/gtkblist.c:5671 ../src/gtkconv.c:2753
 msgid "No actions available"
-msgstr "هیچ کنشی موجود نیست"
-
-#: ../src/gtkblist.c:5640
+msgstr "هیچ کُنشی موجود نیست"
+
+#: ../src/gtkblist.c:5679
 msgid "_Disable"
-msgstr "-از کار انداخته شود"
-
-#: ../src/gtkblist.c:5705
+msgstr "_از کار انداختن"
+
+#: ../src/gtkblist.c:5691
+msgid "Enable Account"
+msgstr "به کار انداختن حساب"
+
+#: ../src/gtkblist.c:5744
 msgid "/Tools"
 msgstr "/ابزارها"
 
-#: ../src/gtkblist.c:5800
+#: ../src/gtkblist.c:5830
 msgid "/Buddies/Sort Buddies"
-msgstr "/رفقا/مرتب‌سازی رفقا"
-
-#: ../src/gtkcellview.c:198
-msgid "Background color name"
-msgstr "نام رنگ پس‌زمینه"
-
-#: ../src/gtkcellview.c:199
-msgid "Background color as a string"
-msgstr "رنگ پس‌زمینه به شکل رشته"
-
-#: ../src/gtkcellview.c:205 ../src/gtkimhtmltoolbar.c:1014
-msgid "Background color"
-msgstr "رنگ پس‌زمینه"
-
-#: ../src/gtkcellview.c:206
-msgid "Background color as a GdkColor"
-msgstr "رنگ پس‌زمینه به شکل GdkColor"
-
-#: ../src/gtkcellview.c:213
-msgid "Background set"
-msgstr "پس‌زمینه تنظیم شد"
-
-#: ../src/gtkcellview.c:214
-msgid "Whether this tag affects the background color"
-msgstr "این که این برچسب روی رنگ پس‌زمینه تأثیر می‌گذارد یا نه"
-
-#: ../src/gtkcombobox.c:490
-msgid "ComboBox model"
-msgstr ""
-
-#: ../src/gtkcombobox.c:491
-msgid "The model for the combo box"
-msgstr ""
-
-#: ../src/gtkcombobox.c:498
-msgid "Wrap width"
-msgstr ""
-
-#: ../src/gtkcombobox.c:499
-msgid "Wrap width for layouting the items in a grid"
-msgstr ""
-
-#: ../src/gtkcombobox.c:508
-msgid "Row span column"
-msgstr ""
-
-#: ../src/gtkcombobox.c:509
-msgid "TreeModel column containing the row span values"
-msgstr ""
-
-#: ../src/gtkcombobox.c:518
-msgid "Column span column"
-msgstr ""
-
-#: ../src/gtkcombobox.c:520
-msgid "TreeModel column containing the column span values"
-msgstr ""
-
-#: ../src/gtkcombobox.c:529
-msgid "Active item"
-msgstr "مورد فعال"
-
-#: ../src/gtkcombobox.c:530
-msgid "The item which is currently active"
-msgstr "موردی که در حال حاضر فعال است"
-
-#: ../src/gtkcombobox.c:538
-msgid "Appears as list"
-msgstr "به شکل فهرست نمایش داده می‌شود"
-
-#: ../src/gtkcombobox.c:539
-msgid "Whether combobox dropdowns should look like lists rather than menus"
-msgstr ""
-
-#: ../src/gtkconn.c:192
+msgstr "/رفقا/مرتب کردن رفقا"
+
+#: ../src/gtkconn.c:185
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 msgstr ""
-
-#: ../src/gtkconv.c:364
-#, c-format
-msgid "me is using Gaim v%s."
-msgstr "‏me از گیم نسخه‌ی %s استفاده می‌کند."
+"اتصال %s به دلیل خطایی قطع شد: %s\n"
+"گِیم تا زمانی که خطا را تصحیح نکنید و حساب را مجدداً به کار نیندازید برای اتصال مجدد آن تلاش نخواهد کرد."
 
 #: ../src/gtkconv.c:373
 msgid "Supported debug options are:  version"
-msgstr "گزینه‌های اشکال‌زدایی پشتیبانی شده عبارتند از: نسخه"
+msgstr "گزینه‌های اشکال‌زدایی پشتیبانی شده عبارت‌اند از: نسخه"
 
 #: ../src/gtkconv.c:409
 msgid "No such command (in this context)."
@@ -2884,427 +2860,455 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"برای راهنمایی گرفتن درباره‌ی یک فرمان مشخص از «help &lt;command&gt;» استفاده "
+"برای راهنمایی گرفتن دربارهٔ یک فرمان مشخص از «help &lt;command&gt;» استفاده "
 "کنید.\n"
 "فرمان‌های زیر در این زمینه موجودند:\n"
 
-#: ../src/gtkconv.c:484
+#: ../src/gtkconv.c:482
 msgid "No such command."
 msgstr "چنین فرمانی وجود ندارد."
 
-#: ../src/gtkconv.c:491
+#: ../src/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "خطای نحوی: تعداد آرگومان‌هایی که برای این فرمان تایپ کرده‌اید غلط است."
-
-#: ../src/gtkconv.c:496
+msgstr "خطای نحوی: تعداد آرگومان‌هایی که برای این فرمان وارد کرده‌اید غلط است."
+
+#: ../src/gtkconv.c:494
 msgid "Your command failed for an unknown reason."
 msgstr "فرمان شما به دلیل نامعلومی شکست خورد."
 
-#: ../src/gtkconv.c:503
+#: ../src/gtkconv.c:501
 msgid "That command only works in chats, not IMs."
-msgstr "این فرمان فقط در گپ‌ها کار می‌کند، نه در پیغام‌های فوری."
-
-#: ../src/gtkconv.c:506
+msgstr "این فرمان فقط در گپ‌ها کار می‌کند، نه در پیغام‌های اینترنتی."
+
+#: ../src/gtkconv.c:504
 msgid "That command only works in IMs, not chats."
-msgstr "این فرمان فقط در پیغام‌های فوری کار می‌کند، نه در گپ‌ها."
-
-#: ../src/gtkconv.c:510
+msgstr "این فرمان فقط در پیغام‌های اینترنتی کار می‌کند، نه در گپ‌ها."
+
+#: ../src/gtkconv.c:508
 msgid "That command doesn't work on this protocol."
 msgstr "این فرمان در این قرارداد کار نمی‌کند."
 
-#: ../src/gtkconv.c:744 ../src/gtkconv.c:770
+#: ../src/gtkconv.c:743 ../src/gtkconv.c:769
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "این رفیق با این گپ قرارداد مشترکی ندارد."
-
-#: ../src/gtkconv.c:764
+msgstr "این رفیق و این گپ در یک قرارداد مشترک نیستند."
+
+#: ../src/gtkconv.c:763
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
-"شما در حال حاضر با حسابی که می‌تواند این رفیق را دعوت کند وارد سیستم نشده‌اید."
-
-#: ../src/gtkconv.c:817
+"شما در حال حاضر با حسابی که بتواند این رفیق را دعوت کند وارد سیستم نشده‌اید."
+
+#: ../src/gtkconv.c:816
 msgid "Invite Buddy Into Chat Room"
 msgstr "دعوت رفیق به اتاق گپ"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:847
+#: ../src/gtkconv.c:846
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
 "لطفاً نام کاربری را که مایلید از او دعوت کنید، در صورت تمایل همراه با پیغام "
-"دعوت، وارد کنید."
-
-#: ../src/gtkconv.c:868
+"دعوت‌نامه، وارد کنید."
+
+#: ../src/gtkconv.c:867
 msgid "_Buddy:"
 msgstr "_رفیق:"
 
-#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
-#: ../src/gtksavedstatuses.c:1444
+#: ../src/gtkconv.c:887 ../src/gtksavedstatuses.c:1107
+#: ../src/gtksavedstatuses.c:1443
 msgid "_Message:"
 msgstr "_پیغام:"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2399 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:488
+#: ../src/gtkconv.c:944 ../src/gtkconv.c:2370 ../src/gtkdebug.c:217
+#: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "نمی‌توان پرونده را باز کرد."
 
-#: ../src/gtkconv.c:951
+#: ../src/gtkconv.c:950
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>گفتگو با %s</h1>\n"
 
-#: ../src/gtkconv.c:975
+#: ../src/gtkconv.c:974
 msgid "Save Conversation"
-msgstr "ذخیره‌ی گفتگو."
-
-#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+msgstr "ذخیرهٔ گفتگو."
+
+#: ../src/gtkconv.c:1095 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "پیدا کردن"
 
-#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1121 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_جستجو به دنبال:"
 
-#: ../src/gtkconv.c:1290
+#: ../src/gtkconv.c:1292
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "تاریخچه‌نویسی آغاز شد. پیغام‌های بعدی این گفتگو ثبت خواهند شد."
-
-#: ../src/gtkconv.c:1298
+msgstr "ثبت وقایع آغاز شد. پیغام‌های بعدی این گفتگو ثبت خواهند شد."
+
+#: ../src/gtkconv.c:1300
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "تاریخچه‌نویسی متوقف شد. پیغام‌های بعدی این گفتگو ثبت نخواهند شد."
-
-#: ../src/gtkconv.c:1578
+msgstr "ثبت وقایع متوقف شد. پیغام‌های بعدی این گفتگو ثبت نخواهند شد."
+
+#: ../src/gtkconv.c:1562
 msgid "IM"
-msgstr "پیغام فوری"
-
-#: ../src/gtkconv.c:1584 ../src/protocols/oscar/oscar.c:650
+msgstr "پیغام اینترنتی"
+
+#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:640
 msgid "Send File"
 msgstr "فرستادن پرونده"
 
+#: ../src/gtkconv.c:1588
+msgid "Un-Ignore"
+msgstr "لغو نادیده گرفتن"
+
 #: ../src/gtkconv.c:1591
-msgid "Un-Ignore"
-msgstr "لغو نادیده گرفتن"
-
-#: ../src/gtkconv.c:1594
 msgid "Ignore"
 msgstr "نادیده گرفتن"
 
-#: ../src/gtkconv.c:1600
+#: ../src/gtkconv.c:1601
 msgid "Info"
 msgstr "اطلاعات"
 
-#: ../src/gtkconv.c:1606
+#: ../src/gtkconv.c:1611
 msgid "Get Away Message"
-msgstr "گرفتن پیغام رفتن"
-
-#: ../src/gtkconv.c:1621
+msgstr ""
+
+#: ../src/gtkconv.c:1634
 msgid "Last said"
 msgstr "آخرین گفته"
 
-#: ../src/gtkconv.c:2407
+#: ../src/gtkconv.c:2378
 msgid "Unable to save icon file to disk."
-msgstr "نمی‌توان پرونده‌ی شمایل را روی دیسک ذخیره کرد."
-
-#: ../src/gtkconv.c:2430
+msgstr "نمی‌توان پروندهٔ شمایل را روی دیسک ذخیره کرد."
+
+#: ../src/gtkconv.c:2402
 msgid "Save Icon"
-msgstr "ذخیره‌ی شمایل"
-
-#: ../src/gtkconv.c:2479
+msgstr "ذخیرهٔ شمایل"
+
+#: ../src/gtkconv.c:2451
 msgid "Animate"
 msgstr "پویانماسازی"
 
-#: ../src/gtkconv.c:2484
+#: ../src/gtkconv.c:2456
 msgid "Hide Icon"
 msgstr "مخفی کردن شمایل"
 
-#: ../src/gtkconv.c:2490
+#: ../src/gtkconv.c:2462
 msgid "Save Icon As..."
-msgstr "ذخیره‌ی شمایل با نام..."
+msgstr "ذخیرهٔ شمایل با نام..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2631
+#: ../src/gtkconv.c:2602
 msgid "/_Conversation"
 msgstr "/_گفتگو"
 
-#: ../src/gtkconv.c:2633
+#: ../src/gtkconv.c:2604
 msgid "/Conversation/New Instant _Message..."
-msgstr "/گفتگو/پیغام _فوری جدید..."
-
-#: ../src/gtkconv.c:2638
+msgstr "/گفتگو/پیغام _اینترنتی جدید..."
+
+#: ../src/gtkconv.c:2609
 msgid "/Conversation/_Find..."
 msgstr "/گفتگو/_پیدا کردن..."
 
-#: ../src/gtkconv.c:2640
+#: ../src/gtkconv.c:2611
 msgid "/Conversation/View _Log"
 msgstr "/گفتگو/نمایش _تاریخچه"
 
-#: ../src/gtkconv.c:2641
+#: ../src/gtkconv.c:2612
 msgid "/Conversation/_Save As..."
 msgstr "/گفتگو/_ذخیره با نام..."
 
-#: ../src/gtkconv.c:2643
+#: ../src/gtkconv.c:2614
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/گفتگو/پا_ک کردن صفحه"
-
-#: ../src/gtkconv.c:2647
+msgstr "/گفتگو/پا_ک کردن پیغام‌های گذشته"
+
+#: ../src/gtkconv.c:2618
 msgid "/Conversation/Se_nd File..."
 msgstr "/گفتگو/_فرستادن پرونده...."
 
-#: ../src/gtkconv.c:2648
+#: ../src/gtkconv.c:2619
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/گفتگو/اضافه کردن _کمینِ رفیق..."
 
-#: ../src/gtkconv.c:2650
+#: ../src/gtkconv.c:2621
 msgid "/Conversation/_Get Info"
 msgstr "/گفتگو/_گرفتن اطلاعات"
 
-#: ../src/gtkconv.c:2652
+#: ../src/gtkconv.c:2623
 msgid "/Conversation/In_vite..."
 msgstr "/گفتگو/د_عوت..."
 
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2625
+msgid "/Conversation/M_ore"
+msgstr "/گفتگو/_بیشتر"
+
+#: ../src/gtkconv.c:2629
 msgid "/Conversation/Al_ias..."
 msgstr "/گفتگو/_اسم مستعار..."
 
-#: ../src/gtkconv.c:2659
+#: ../src/gtkconv.c:2631
 msgid "/Conversation/_Block..."
 msgstr "/گفتگو/_قطع رابطه..."
 
-#: ../src/gtkconv.c:2661
+#: ../src/gtkconv.c:2633
 msgid "/Conversation/_Add..."
 msgstr "/گفتگو/ا_ضافه کردن..."
 
-#: ../src/gtkconv.c:2663
+#: ../src/gtkconv.c:2635
 msgid "/Conversation/_Remove..."
 msgstr "/گفتگو/_حذف..."
 
-#: ../src/gtkconv.c:2668
+#: ../src/gtkconv.c:2640
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/گفتگو/درج _پیوند..."
 
-#: ../src/gtkconv.c:2670
+#: ../src/gtkconv.c:2642
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/گفتگو/درج _تصویر..."
 
-#: ../src/gtkconv.c:2675
+#: ../src/gtkconv.c:2647
 msgid "/Conversation/_Close"
 msgstr "/گفتگو/_بستن"
 
 #. Options
-#: ../src/gtkconv.c:2679
+#: ../src/gtkconv.c:2651
 msgid "/_Options"
 msgstr "/_گزینه‌ها"
 
-#: ../src/gtkconv.c:2680
+#: ../src/gtkconv.c:2652
 msgid "/Options/Enable _Logging"
-msgstr "/گزینه‌ها/به کار انداختن _تاریخچه‌نویسی"
-
-#: ../src/gtkconv.c:2681
+msgstr "/گزینه‌ها/به کار انداختن _ثبت وقایع"
+
+#: ../src/gtkconv.c:2653
 msgid "/Options/Enable _Sounds"
 msgstr "/گزینه‌ها/به کار انداختن _صداها"
 
-#: ../src/gtkconv.c:2682
+#: ../src/gtkconv.c:2654
 msgid "/Options/Show Buddy _Icon"
 msgstr "/گزینه‌ها/نمایش _شمایل رفقا"
 
-#: ../src/gtkconv.c:2684
+#: ../src/gtkconv.c:2656
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/گزینه‌ها/نمایش _نوار ابزارهای قالب‌بندی"
-
-#: ../src/gtkconv.c:2685
+msgstr "/گزینه‌ها/نمایش _نوار ابزار قالب‌بندی"
+
+#: ../src/gtkconv.c:2657
 msgid "/Options/Show Ti_mestamps"
 msgstr "/گزینه‌ها/نمایش _مُهرهای زمانی"
 
-#: ../src/gtkconv.c:2777
+#: ../src/gtkconv.c:2732
+msgid "/Conversation/More"
+msgstr "/گفتگو/بیشتر"
+
+#: ../src/gtkconv.c:2770 ../src/gtkconv.c:2797
+msgid "/Conversation"
+msgstr "/گفتگو"
+
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/View Log"
 msgstr "/گفتگو/نمایش تاریخچه"
 
-#: ../src/gtkconv.c:2783
+#: ../src/gtkconv.c:2813
 msgid "/Conversation/Send File..."
 msgstr "/گفتگو/فرستادن پرونده..."
 
-#: ../src/gtkconv.c:2787
+#: ../src/gtkconv.c:2817
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/گفتگو/اضافه کردن کمینِ رفیق..."
 
-#: ../src/gtkconv.c:2793
+#: ../src/gtkconv.c:2823
 msgid "/Conversation/Get Info"
 msgstr "/گفتگو/گرفتن اطلاعات"
 
-#: ../src/gtkconv.c:2797
+#: ../src/gtkconv.c:2827
 msgid "/Conversation/Invite..."
 msgstr "/گفتگو/دعوت..."
 
-#: ../src/gtkconv.c:2803
+#: ../src/gtkconv.c:2833
 msgid "/Conversation/Alias..."
 msgstr "/گفتگو/اسم مستعار..."
 
-#: ../src/gtkconv.c:2807
+#: ../src/gtkconv.c:2837
 msgid "/Conversation/Block..."
 msgstr "/گفتگو/قطع رابطه..."
 
-#: ../src/gtkconv.c:2811
+#: ../src/gtkconv.c:2841
 msgid "/Conversation/Add..."
 msgstr "/گفتگو/اضافه کردن..."
 
-#: ../src/gtkconv.c:2815
+#: ../src/gtkconv.c:2845
 msgid "/Conversation/Remove..."
 msgstr "/گفتگو/حذف..."
 
-#: ../src/gtkconv.c:2821
+#: ../src/gtkconv.c:2851
 msgid "/Conversation/Insert Link..."
 msgstr "/گفتگو/درج پیوند..."
 
-#: ../src/gtkconv.c:2825
+#: ../src/gtkconv.c:2855
 msgid "/Conversation/Insert Image..."
 msgstr "/گفتگو/درج تصویر..."
 
-#: ../src/gtkconv.c:2831
+#: ../src/gtkconv.c:2861
 msgid "/Options/Enable Logging"
 msgstr "گزینه‌ها/به کار انداختن تاریخچه‌نویسی"
 
-#: ../src/gtkconv.c:2834
+#: ../src/gtkconv.c:2864
 msgid "/Options/Enable Sounds"
 msgstr "/گزینه‌ها/به کار انداختن صداها"
 
-#: ../src/gtkconv.c:2847
+#: ../src/gtkconv.c:2877
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/گزینه‌ها/نمایش نوار ابزارهای قالب‌بندی"
-
-#: ../src/gtkconv.c:2850
+msgstr "/گزینه‌ها/نمایش نوار ابزار قالب‌بندی"
+
+#: ../src/gtkconv.c:2880
 msgid "/Options/Show Timestamps"
 msgstr "/گزینه‌ها/نمایش مُهرهای زمانی"
 
-#: ../src/gtkconv.c:2853
+#: ../src/gtkconv.c:2883
 msgid "/Options/Show Buddy Icon"
 msgstr "/گزینه‌ها/نمایش شمایل رفقا"
 
-#: ../src/gtkconv.c:2933
+#: ../src/gtkconv.c:2963
 msgid "User is typing..."
 msgstr "کاربر در حال تایپ است..."
 
-#: ../src/gtkconv.c:2936
+#: ../src/gtkconv.c:2966
 msgid "User has typed something and stopped"
 msgstr "کاربر چیزی تایپ کرد و مکث کرد"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3119
+#: ../src/gtkconv.c:3149
 msgid "_Send To"
-msgstr "_ارسال به"
-
-#: ../src/gtkconv.c:3771
+msgstr "_فرستادن به"
+
+#: ../src/gtkconv.c:3801
 msgid "_Send"
-msgstr "_ارسال"
-
-#: ../src/gtkconv.c:3826 ../src/protocols/sametime/sametime.c:3572
+msgstr "_فرستادن"
+
+#: ../src/gtkconv.c:3856 ../src/protocols/sametime/sametime.c:3564
 msgid "Topic:"
 msgstr "موضوع:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3878
+#: ../src/gtkconv.c:3908
 msgid "0 people in room"
 msgstr "۰ نفر در این اتاق"
 
-#: ../src/gtkconv.c:3957
+#: ../src/gtkconv.c:3987
 msgid "IM the user"
-msgstr "پیغام فوری به کاربر"
-
-#: ../src/gtkconv.c:3970
+msgstr "پیغام اینترنتی به کاربر"
+
+#: ../src/gtkconv.c:4000
 msgid "Ignore the user"
 msgstr "نادیده گرفتن کاربر"
 
-#: ../src/gtkconv.c:3982
+#: ../src/gtkconv.c:4012
 msgid "Get the user's information"
 msgstr "گرفتن اطلاعات کاربر"
 
-#: ../src/gtkconv.c:4954 ../src/gtkconv.c:5063
+#: ../src/gtkconv.c:4998 ../src/gtkconv.c:5107
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%Id نفر در این اتاق"
 
-#: ../src/gtkconv.c:6533
+#: ../src/gtkconv.c:5664 ../src/gtkstatusbox.c:366
+msgid "Typing"
+msgstr "‏در حال تایپ"
+
+#: ../src/gtkconv.c:5670
+msgid "Stopped Typing"
+msgstr "تایپ کردن را متوقف کرد"
+
+#: ../src/gtkconv.c:5675
+msgid "Nick Said"
+msgstr "لقب گفته شد"
+
+#: ../src/gtkconv.c:5685
+msgid "New Event"
+msgstr "رویداد جدید"
+
+#: ../src/gtkconv.c:6575
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 "‏say &lt;message&gt;: ارسال معمولی پیغام انگار از فرمان استفاده نکرده باشید."
 
-#: ../src/gtkconv.c:6536
+#: ../src/gtkconv.c:6578
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "‏me &lt;action&gt;: ارسال کنش به سبک IRC به رفیق یا گپ"
 
-#: ../src/gtkconv.c:6539
+#: ../src/gtkconv.c:6581
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "‏debug &lt;option&gt;:  ارسال اطلاعات اشکال‌زدایی مختلف در گفتگوی فعلی."
 
-#: ../src/gtkconv.c:6542
+#: ../src/gtkconv.c:6584
 msgid "clear: Clears the conversation scrollback."
 msgstr "‏clear: گفتگوهای آمده در صفحه را پاک می‌کند."
 
-#: ../src/gtkconv.c:6545
+#: ../src/gtkconv.c:6587
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "‏help &lt;command&gt;: راهنمایی در مورد یک فرمان مشخص."
 
-#: ../src/gtkconv.c:6704
+#: ../src/gtkconv.c:6746
 msgid "Confirm close"
 msgstr "تأیید بستن"
 
-#: ../src/gtkconv.c:6736
+#: ../src/gtkconv.c:6778
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "پیغام نخوانده دارید. آیا واقعاً می‌خواهید پنجره را ببندید؟"
-
-#: ../src/gtkconv.c:7258
+msgstr "شما یک یا چند پیغام نخوانده دارید. آیا مطمئنید می‌خواهید پنجره را ببندید؟"
+
+#: ../src/gtkconv.c:7300
 msgid "Close other tabs"
 msgstr "بستن زبانه‌های دیگر"
 
-#: ../src/gtkconv.c:7264
+#: ../src/gtkconv.c:7306
 msgid "Close all tabs"
-msgstr "بستن همه‌ی زبانه‌ها"
-
-#: ../src/gtkconv.c:7272
+msgstr "بستن همهٔ زبانه‌ها"
+
+#: ../src/gtkconv.c:7314
 msgid "Detach this tab"
 msgstr "جدا کردن این زبانه"
 
-#: ../src/gtkconv.c:7278
+#: ../src/gtkconv.c:7320
 msgid "Close this tab"
 msgstr "بستن این زبانه"
 
-#: ../src/gtkconv.c:7540
+#: ../src/gtkconv.c:7580
 msgid "Close conversation"
 msgstr "بستن گفتگو"
 
-#: ../src/gtkconv.c:8004
+#: ../src/gtkconv.c:8044
 msgid "Last created window"
-msgstr "آخرین پنجره‌ی ایجاد شده"
-
-#: ../src/gtkconv.c:8006
+msgstr "آخرین پنجرهٔ ایجاد شده"
+
+#: ../src/gtkconv.c:8046
 msgid "Separate IM and Chat windows"
-msgstr "جدا کردن پنجره‌های گپ و پیغام فوری"
-
-#: ../src/gtkconv.c:8008 ../src/gtkprefs.c:1243
+msgstr "جدا کردن پنجره‌های گپ و پیغام اینترنتی"
+
+#: ../src/gtkconv.c:8048 ../src/gtkprefs.c:1258
 msgid "New window"
-msgstr "پنجره‌ی جدید"
-
-#: ../src/gtkconv.c:8010
+msgstr "پنجرهٔ جدید"
+
+#: ../src/gtkconv.c:8050
 msgid "By group"
 msgstr "از روی گروه"
 
-#: ../src/gtkconv.c:8012
+#: ../src/gtkconv.c:8052
 msgid "By account"
 msgstr "از روی حساب"
 
 #: ../src/gtkdebug.c:232
 msgid "Save Debug Log"
-msgstr "ذخیره‌ی تاریخچه‌ی اشکال‌زدایی"
+msgstr "ذخیرهٔ تاریخچهٔ اشکال‌زدایی"
 
 #: ../src/gtkdebug.c:586
 msgid "Invert"
-msgstr "معکوس کردن"
+msgstr "معکوس"
 
 #: ../src/gtkdebug.c:589
 msgid "Highlight matches"
@@ -3312,7 +3316,7 @@
 
 #: ../src/gtkdebug.c:636
 msgid "Debug Window"
-msgstr "پنجره‌ی اشکال‌زدایی"
+msgstr "پنجرهٔ اشکال‌زدایی"
 
 #: ../src/gtkdebug.c:689
 msgid "Clear"
@@ -3332,16 +3336,17 @@
 
 #: ../src/gtkdebug.c:743
 msgid "Right click for more options."
-msgstr "برای گزینه‌های بیشتر کلیک راست کنید."
-
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
+msgstr "برای نمایش گزینه‌های بیشتر کلیک راست کنید."
+
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:104
 msgid "lead developer"
 msgstr "برنامه‌ساز ارشد"
 
 #: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
-#: ../src/gtkdialogs.c:74
+#: ../src/gtkdialogs.c:66 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
+#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:72
+#: ../src/gtkdialogs.c:73 ../src/gtkdialogs.c:75 ../src/gtkdialogs.c:76
+#: ../src/gtkdialogs.c:77
 msgid "developer"
 msgstr "برنامه‌ساز"
 
@@ -3349,214 +3354,235 @@
 msgid "win32 port"
 msgstr "درگاه win32"
 
-#: ../src/gtkdialogs.c:66
+#: ../src/gtkdialogs.c:67
 msgid "developer & webmaster"
 msgstr "برنامه‌ساز و مدیر وب"
 
-#: ../src/gtkdialogs.c:72
+#: ../src/gtkdialogs.c:74
 msgid "support"
 msgstr "پشتیبانی"
 
-#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
+#: ../src/gtkdialogs.c:97 ../src/gtkdialogs.c:98
 msgid "maintainer"
 msgstr "نگهدارنده"
 
-#: ../src/gtkdialogs.c:96
+#: ../src/gtkdialogs.c:99
 msgid "libfaim maintainer"
-msgstr "نگهدارنده‌ی libfaim"
-
-#: ../src/gtkdialogs.c:97
+msgstr "نگهدارندهٔ libfaim"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../src/gtkdialogs.c:101
 msgid "hacker and designated driver [lazy bum]"
-msgstr ""
-
-#: ../src/gtkdialogs.c:98
+msgstr "هَکر و رانندهٔ انتخابی (علاف)"
+
+#: ../src/gtkdialogs.c:102
 msgid "Jabber developer"
 msgstr "برنامه‌ساز Jabber"
 
-#: ../src/gtkdialogs.c:99
+#: ../src/gtkdialogs.c:103
 msgid "original author"
 msgstr "مؤلف اصلی"
 
-#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:174
 msgid "Bulgarian"
 msgstr "بلغاری"
 
-#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:113
 msgid "Bengali"
 msgstr "بنگالی"
 
-#: ../src/gtkdialogs.c:110
+#: ../src/gtkdialogs.c:114
 msgid "Bosnian"
 msgstr "بوسنیایی"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
 msgid "Catalan"
 msgstr "کاتالونیایی"
 
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:117
+msgid "Valencian-Catalan"
+msgstr "کاتالونیایی والنسیا"
+
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:177
 msgid "Czech"
 msgstr "چکی"
 
-#: ../src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:119
 msgid "Danish"
 msgstr "دانمارکی"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:162
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:178
 msgid "German"
 msgstr "آلمانی"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:123
 msgid "Greek"
 msgstr "یونانی"
 
-#: ../src/gtkdialogs.c:117
+#: ../src/gtkdialogs.c:124
 msgid "Australian English"
 msgstr "انگلیسی استرالیایی"
 
-#: ../src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:125
 msgid "Canadian English"
 msgstr "انگلیسی کانادایی"
 
-#: ../src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:126
 msgid "British English"
 msgstr "انگلیسی بریتانیایی"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:163 ../src/gtkdialogs.c:164
-#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "Spanish"
 msgstr "اسپانیایی"
 
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:129
+msgid "Euskera(Basque)"
+msgstr "اوسکرا(باسکی)"
+
+#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:131
+msgid "Persian"
+msgstr "فارسی"
+
+#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:183 ../src/gtkdialogs.c:184
 msgid "Finnish"
 msgstr "فنلاندی"
 
-#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
-#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:187 ../src/gtkdialogs.c:188
 msgid "French"
 msgstr "فرانسوی"
 
-#: ../src/gtkdialogs.c:123
+#: ../src/gtkdialogs.c:134
+msgid "Galician"
+msgstr "گالیسیایی"
+
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:189
 msgid "Hebrew"
 msgstr "عبری"
 
-#: ../src/gtkdialogs.c:124
+#: ../src/gtkdialogs.c:136
 msgid "Hindi"
 msgstr "هندی"
 
-#: ../src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:137
 msgid "Hungarian"
 msgstr "مجاری"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:173
+#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:190
 msgid "Italian"
 msgstr "ایتالیایی"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:174 ../src/gtkdialogs.c:175
-#: ../src/gtkdialogs.c:176
+#: ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:191 ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:193
 msgid "Japanese"
 msgstr "ژاپنی"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:177
+#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:194
 msgid "Georgian"
 msgstr "گرجی"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:195
 msgid "Korean"
 msgstr "کره‌ای"
 
-#: ../src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
 msgid "Kurdish"
 msgstr "کردی"
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:196 ../src/gtkdialogs.c:197
 msgid "Lithuanian"
 msgstr "لیتوانیایی"
 
-#: ../src/gtkdialogs.c:132
+#: ../src/gtkdialogs.c:146
 msgid "Macedonian"
 msgstr "مقدونی"
 
-#: ../src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:147
 msgid "Dutch, Flemish"
-msgstr "هلندی"
-
-#: ../src/gtkdialogs.c:134
+msgstr "هلندی؛ فلاندری"
+
+#: ../src/gtkdialogs.c:148
 msgid "Norwegian"
 msgstr "نروژی"
 
-#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:198
 msgid "Polish"
 msgstr "لهستانی"
 
-#: ../src/gtkdialogs.c:137
+#: ../src/gtkdialogs.c:151
 msgid "Portuguese"
 msgstr "پرتغالی"
 
-#: ../src/gtkdialogs.c:138
+#: ../src/gtkdialogs.c:152
 msgid "Portuguese-Brazil"
 msgstr "پرتغالی‌‐‌برزیل"
 
-#: ../src/gtkdialogs.c:139
+#: ../src/gtkdialogs.c:153
 msgid "Romanian"
 msgstr "رومانیایی"
 
-#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:199 ../src/gtkdialogs.c:200
 msgid "Russian"
 msgstr "روسی"
 
-#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:142
+#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:156
 msgid "Serbian"
 msgstr "صربی"
 
-#: ../src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:201
+msgid "Slovak"
+msgstr "اسلوواکی"
+
+#: ../src/gtkdialogs.c:158
 msgid "Slovenian"
 msgstr "اسلوونیایی"
 
-#: ../src/gtkdialogs.c:144 ../src/gtkdialogs.c:184
+#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:202
 msgid "Swedish"
 msgstr "سوئدی"
 
-#: ../src/gtkdialogs.c:145
+#: ../src/gtkdialogs.c:160
 msgid "Tamil"
 msgstr "تامیلی"
 
-#: ../src/gtkdialogs.c:146
+#: ../src/gtkdialogs.c:161
 msgid "Telugu"
 msgstr "تلوگویی"
 
-#: ../src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:162
+msgid "Thai"
+msgstr "تایلندی"
+
+#: ../src/gtkdialogs.c:163
 msgid "Turkish"
 msgstr "ترکی"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:164
 msgid "Vietnamese"
 msgstr "ویتنامی"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:164
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "تی ام تان و تیم گنوم وی‌آی"
 
-#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:185
+#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:203
 msgid "Simplified Chinese"
 msgstr "چینی ساده شده"
 
-#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:166 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:204
 msgid "Traditional Chinese"
 msgstr "چینی سنتی"
 
-#: ../src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:173
 msgid "Amharic"
 msgstr "امهری"
 
-#: ../src/gtkdialogs.c:183
-msgid "Slovak"
-msgstr "اسلوواکی"
-
-#: ../src/gtkdialogs.c:227
+#: ../src/gtkdialogs.c:245
 msgid "About Gaim"
-msgstr "درباره‌ی گیم"
-
-#: ../src/gtkdialogs.c:251
+msgstr "دربارهٔ گیم"
+
+#: ../src/gtkdialogs.c:269
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
@@ -3567,107 +3593,111 @@
 "file for the complete list of contributors.  We provide no warranty for this "
 "program.<BR><BR>"
 msgstr ""
-
-#: ../src/gtkdialogs.c:265
+"گِیم یککارگیر پیغام‌رسانی پیمانه‌ای است که قابلیت استغادهٔ هم‌زمان از AIM، ‏MSN، ‏Yahoo!‎، ‏Jabber، ‏ICQ، ‏IRC، ‏Novell Groupwise، ‏Lotus Sametime، ‏Zephyr "
+"و Gadu-Gadu را دارد. این برنامه با استفاده از GTK+‎ نوشته شده است.<BR><BR>شما می‌توانید این برنامه را تحت شرایط مجوز عمومی همگانی گنو (نسخهٔ 2 یا بالاتر) تغییر داده و "
+"توزیع کنید. نسخه‌ای از مجوز عمومی همگانی گنو در پروندهٔ «COPYING» هست که همراه گیم توزیع می‌شود. حقوق مؤلف گیم متعلق به مشارکت‌کنندگان ساخت آن است. "
+"برای فهرست کامل مشارکت کنندگان پروندهٔ «COPYRIGHT» را ببینید. ما تضمینی در قبال این برنامه ارائه نمی‌کنیم."
+
+#: ../src/gtkdialogs.c:283
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim در irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:268
+#: ../src/gtkdialogs.c:286
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim در irc.freenode.net<BR><BR"
 
-#: ../src/gtkdialogs.c:274
+#: ../src/gtkdialogs.c:292
 msgid "Current Developers"
 msgstr "برنامه‌سازان فعلی"
 
-#: ../src/gtkdialogs.c:289
+#: ../src/gtkdialogs.c:307
 msgid "Crazy Patch Writers"
 msgstr "وصله‌نویسان دیوانه"
 
-#: ../src/gtkdialogs.c:304
+#: ../src/gtkdialogs.c:322
 msgid "Retired Developers"
 msgstr "برنامه‌سازان بازنشسته"
 
-#: ../src/gtkdialogs.c:319
+#: ../src/gtkdialogs.c:337
 msgid "Current Translators"
 msgstr "مترجمان فعلی"
 
-#: ../src/gtkdialogs.c:339
+#: ../src/gtkdialogs.c:357
 msgid "Past Translators"
 msgstr "مترجمان قبلی"
 
-#: ../src/gtkdialogs.c:357
+#: ../src/gtkdialogs.c:375
 msgid "Debugging Information"
 msgstr "اطلاعات اشکال‌زدایی"
 
-#: ../src/gtkdialogs.c:563 ../src/gtkdialogs.c:700 ../src/gtkdialogs.c:767
+#: ../src/gtkdialogs.c:595 ../src/gtkdialogs.c:732 ../src/gtkdialogs.c:795
 msgid "_Name"
 msgstr "_نام"
 
-#: ../src/gtkdialogs.c:568 ../src/gtkdialogs.c:705 ../src/gtkdialogs.c:772
+#: ../src/gtkdialogs.c:600 ../src/gtkdialogs.c:737 ../src/gtkdialogs.c:800
 msgid "_Account"
 msgstr "_حساب"
 
-#: ../src/gtkdialogs.c:576
+#: ../src/gtkdialogs.c:608
 msgid "New Instant Message"
-msgstr "پیغام فوری جدید"
-
-#: ../src/gtkdialogs.c:578
+msgstr "پیغام اینترنتی جدید"
+
+#: ../src/gtkdialogs.c:610
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
-msgstr "لطفاً نام کاربری یا نام مستعار شخصی را که مایلید برایش پیغام فوری بفرستید وارد کنید."
-
-#: ../src/gtkdialogs.c:713
+msgstr "لطفاً نام کاربری شخصی را که مایلید برایش پیغام اینترنتی بفرستید وارد کنید."
+
+#: ../src/gtkdialogs.c:745
 msgid "Get User Info"
 msgstr "گرفتن اطلاعات کاربر"
 
-#: ../src/gtkdialogs.c:715
+#: ../src/gtkdialogs.c:747
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
-msgstr "لطفاً نام کاربری یا نام مستعار شخصی را که می‌خواهید اطلاعاتش را ببینید وارد کنید."
-
-#: ../src/gtkdialogs.c:781
+msgstr "لطفاً نام کاربری شخصی را که می‌خواهید اطلاعاتش را ببینید وارد کنید."
+
+#: ../src/gtkdialogs.c:819
 msgid "View User Log"
-msgstr "نمایش تاریخچه‌ی کاربر"
-
-#: ../src/gtkdialogs.c:783
+msgstr "نمایش تاریخچهٔ کاربر"
+
+#: ../src/gtkdialogs.c:821
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
-msgstr "لطفاً نام کاربری یا نام مستعار شخصی را که می‌خواهید تاریخچه‌اش را ببینید وارد کنید."
-
-#: ../src/gtkdialogs.c:802
+msgstr "لطفاً نام کاربری شخصی را که می‌خواهید تاریخچه‌اش را ببینید وارد کنید."
+
+#: ../src/gtkdialogs.c:840
 msgid "Alias Contact"
-msgstr "اسم مستعار برای آشنا"
-
-#: ../src/gtkdialogs.c:803
+msgstr "اسم مستعار برای اطلاعات تماس"
+
+#: ../src/gtkdialogs.c:841
 msgid "Enter an alias for this contact."
-msgstr "برای این آشنا اسم مستعار وارد کنید."
-
-#: ../src/gtkdialogs.c:805 ../src/gtkdialogs.c:827 ../src/gtkdialogs.c:847
-#: ../src/gtkrequest.c:295 ../src/protocols/silc/chat.c:586
+msgstr "برای این اطلاعات تماس اسم مستعار وارد کنید."
+
+#: ../src/gtkdialogs.c:843 ../src/gtkdialogs.c:865 ../src/gtkdialogs.c:885
+#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "اسم مستعار"
 
-#: ../src/gtkdialogs.c:823
+#: ../src/gtkdialogs.c:861
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "اسم مستعاری برای %s وارد کنید."
 
-#: ../src/gtkdialogs.c:825
+#: ../src/gtkdialogs.c:863
 msgid "Alias Buddy"
 msgstr "اسم مستعار رفیق"
 
-#: ../src/gtkdialogs.c:844
+#: ../src/gtkdialogs.c:882
 msgid "Alias Chat"
 msgstr "اسم مستعار گپ"
 
-#: ../src/gtkdialogs.c:845
+#: ../src/gtkdialogs.c:883
 msgid "Enter an alias for this chat."
 msgstr "اسم مستعاری برای این گپ وارد کنید."
 
-#: ../src/gtkdialogs.c:882
+#: ../src/gtkdialogs.c:920
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3676,50 +3706,50 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"با این کار اطلاعات تماسی را که حاوی %s و %Id رفیق دیگر است از فهرست رفقایتان حذف خواهید کرد. "
+"با این کار اطلاعات تماسی را که حاوی %s و %Id رفیق دیگر است حذف خواهید کرد. "
 "آیا می‌خواهید ادامه دهید؟"
 
-#: ../src/gtkdialogs.c:890
+#: ../src/gtkdialogs.c:928
 msgid "Remove Contact"
-msgstr "حذف آشنا"
-
-#: ../src/gtkdialogs.c:891
+msgstr "حذف اطلاعات تماس"
+
+#: ../src/gtkdialogs.c:929
 msgid "_Remove Contact"
-msgstr "_حذف آشنا"
-
-#: ../src/gtkdialogs.c:942
+msgstr "_حذف اطلاعات تماس"
+
+#: ../src/gtkdialogs.c:980
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"با این کار گروه %s و همه‌ی اعضای آن را از فهرست رفقایتان حذف خواهید کرد. آیا "
+"با این کار گروه %s و همهٔ اعضای آن را از فهرست رفقایتان حذف خواهید کرد. آیا "
 "می‌خواهید ادامه دهید؟"
 
-#: ../src/gtkdialogs.c:945
+#: ../src/gtkdialogs.c:983
 msgid "Remove Group"
 msgstr "حذف گروه"
 
-#: ../src/gtkdialogs.c:946
+#: ../src/gtkdialogs.c:984
 msgid "_Remove Group"
 msgstr "_حذف گروه"
 
-#: ../src/gtkdialogs.c:979
+#: ../src/gtkdialogs.c:1017
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "با این کار %s را از فهرست رفقایتان حذف خواهید کرد. آیا می‌خواهید ادامه دهید؟"
 
-#: ../src/gtkdialogs.c:982
+#: ../src/gtkdialogs.c:1020
 msgid "Remove Buddy"
 msgstr "حذف رفیق"
 
-#: ../src/gtkdialogs.c:983
+#: ../src/gtkdialogs.c:1021
 msgid "_Remove Buddy"
 msgstr "_حذف رفیق"
 
-#: ../src/gtkdialogs.c:1004
+#: ../src/gtkdialogs.c:1042
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3728,134 +3758,138 @@
 "با این کار گپ %s را از فهرست رفقایتان حذف خواهید کرد. آیا می‌خواهید ادامه "
 "دهید؟"
 
-#: ../src/gtkdialogs.c:1007
+#: ../src/gtkdialogs.c:1045
 msgid "Remove Chat"
 msgstr "حذف گپ"
 
-#: ../src/gtkdialogs.c:1008
+#: ../src/gtkdialogs.c:1046
 msgid "_Remove Chat"
 msgstr "_حذف گپ"
 
-#: ../src/gtkft.c:139
+#: ../src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
-msgstr "%.2f کیلوبایت در ثانیه"
-
-#: ../src/gtkft.c:160 ../src/gtkft.c:1063
+msgstr "%I.2f کیلوبایت در ثانیه"
+
+#: ../src/gtkft.c:153
+msgid "Not started"
+msgstr "آغاز نشده است"
+
+#: ../src/gtkft.c:162 ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "تمام شد"
 
-#: ../src/gtkft.c:163 ../src/gtkft.c:1003
+#: ../src/gtkft.c:165 ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "صرف نظر شد"
 
-#: ../src/gtkft.c:166 ../src/gtkft.c:922
+#: ../src/gtkft.c:168 ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "در حال انتظار برای آغاز انتقال"
 
-#: ../src/gtkft.c:219
+#: ../src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>در حال دریافت با نام:</b>"
 
-#: ../src/gtkft.c:221
+#: ../src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>در حال دریافت از:</b>"
 
-#: ../src/gtkft.c:225
-msgid "<b>Sending To:</b>"
-msgstr "<b>درحال فرستادن به:</b>"
-
 #: ../src/gtkft.c:227
+msgid "<b>Sending To:</b>"
+msgstr "<b>در حال فرستادن به:</b>"
+
+#: ../src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>در حال فرستادن با نام:</b>"
 
-#: ../src/gtkft.c:443
+#: ../src/gtkft.c:445
 msgid "There is no application configured to open this type of file."
 msgstr "هیچ برنامه‌ای برای باز کردن این نوع پرونده پیکربندی نشده است."
 
-#: ../src/gtkft.c:448
+#: ../src/gtkft.c:450
 msgid "An error occurred while opening the file."
 msgstr "هنگام باز کردن پرونده خطایی رخ داد."
 
-#: ../src/gtkft.c:485
+#: ../src/gtkft.c:487
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "خطا هنگام راه‌اندازی %s: %s"
 
-#: ../src/gtkft.c:494
+#: ../src/gtkft.c:496
 #, c-format
 msgid "Error running %s"
 msgstr "خطا هنگام اجرای %s"
 
-#: ../src/gtkft.c:495
+#: ../src/gtkft.c:497
 #, c-format
 msgid "Process returned error code %d"
-msgstr "فراروند کد خطای %d را بازگرداند"
-
-#: ../src/gtkft.c:589
+msgstr "فراروند کُد خطای %d را بازگرداند"
+
+#: ../src/gtkft.c:591
 msgid "Progress"
 msgstr "پیشرفت"
 
-#: ../src/gtkft.c:596
+#: ../src/gtkft.c:598
 msgid "Filename"
 msgstr "نام پرونده"
 
-#: ../src/gtkft.c:603
+#: ../src/gtkft.c:605
 msgid "Size"
 msgstr "اندازه"
 
-#: ../src/gtkft.c:610
+#: ../src/gtkft.c:612
 msgid "Remaining"
 msgstr "باقی مانده"
 
-#: ../src/gtkft.c:641
-msgid "Filename:"
-msgstr "نام پرونده:"
-
-#: ../src/gtkft.c:642
-msgid "Local File:"
-msgstr "پروند‌ه‌ی محلی:"
-
 #: ../src/gtkft.c:643
+msgid "Filename:"
+msgstr "نام پرونده:"
+
+#: ../src/gtkft.c:644
+msgid "Local File:"
+msgstr "پروندهٔ محلی:"
+
+#: ../src/gtkft.c:645
 msgid "Status:"
 msgstr "وضعیت:"
 
-#: ../src/gtkft.c:644
+#: ../src/gtkft.c:646
 msgid "Speed:"
 msgstr "سرعت:"
 
-#: ../src/gtkft.c:645
+#: ../src/gtkft.c:647
 msgid "Time Elapsed:"
-msgstr "مدتِ سپری‌شده:"
-
-#: ../src/gtkft.c:646
+msgstr "مدتِ سپری شده:"
+
+#: ../src/gtkft.c:648
 msgid "Time Remaining:"
 msgstr "مدتِ باقی‌مانده:"
 
-#: ../src/gtkft.c:708
+#: ../src/gtkft.c:710
 msgid "File Transfers"
-msgstr "انتقالات پرونده"
-
-#: ../src/gtkft.c:731
+msgstr "انتقالات پرونده‌ها"
+
+#: ../src/gtkft.c:733
 msgid "Close this window when all transfers _finish"
-msgstr "بستن این پنجره وقتی همه‌ی انتقالات _تمام شد"
-
-#: ../src/gtkft.c:741
+msgstr "وقتی همهٔ انتقالات _تمام شد این پنجره بسته شود"
+
+#: ../src/gtkft.c:743
 msgid "C_lear finished transfers"
-msgstr "_پاک کردن انتقالات تمام شده"
+msgstr "انتقالات انجام شده _پاک شود"
 
 #. "Download Details" arrow
-#: ../src/gtkft.c:750
+#: ../src/gtkft.c:752
 msgid "File transfer _details"
 msgstr "_جزئیات انتقال پرونده"
 
 #. Pause button
-#: ../src/gtkft.c:780 ../src/gtkstock.c:146
+#: ../src/gtkft.c:782 ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "_مکث"
 
 #. Resume button
-#: ../src/gtkft.c:790
+#: ../src/gtkft.c:792
 msgid "_Resume"
 msgstr "_از سر گیری"
 
@@ -3865,91 +3899,89 @@
 
 #: ../src/gtkimhtml.c:821
 msgid "Paste as Plain _Text"
-msgstr "چسباندن به شکل _متنی ساده"
-
-#. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
-msgstr "پاک کردن قالب‌بندی"
+msgstr "چسباندن به شکل _متن ساده"
+
+#: ../src/gtkimhtml.c:833
+msgid "_Reset formatting"
+msgstr "_پاک کردن قالب‌بندی"
+
+#: ../src/gtkimhtml.c:1327
+msgid "Hyperlink color"
+msgstr "رنگ پیوند"
 
 #: ../src/gtkimhtml.c:1328
-msgid "Hyperlink color"
-msgstr "رنگ پیوند"
-
-#: ../src/gtkimhtml.c:1329
 msgid "Color to draw hyperlinks."
 msgstr "رنگ پیوندها."
 
+#: ../src/gtkimhtml.c:1331
+msgid "Hyperlink prelight color"
+msgstr "رنگ مقدماتی پیوند"
+
 #: ../src/gtkimhtml.c:1332
-#, fuzzy
-msgid "Hyperlink prelight color"
-msgstr "رنگ پیوند"
-
-#: ../src/gtkimhtml.c:1333
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "رنگ ترسیم پیوندها وقتی موشی روی آنها قرار می‌گیرد."
-
-#: ../src/gtkimhtml.c:1554
+msgstr "رنگ پیوندهای اینترنتی وقتی موشی روی آنها قرار می‌گیرد."
+
+#: ../src/gtkimhtml.c:1553
 msgid "_Copy E-Mail Address"
 msgstr "_نسخه‌برداری از نشانی پست الکترونیکی"
 
-#: ../src/gtkimhtml.c:1566
+#: ../src/gtkimhtml.c:1565
 msgid "_Open Link in Browser"
 msgstr "_باز کردن پیوند در مرورگر"
 
-#: ../src/gtkimhtml.c:1576
+#: ../src/gtkimhtml.c:1575
 msgid "_Copy Link Location"
 msgstr "_نسخه‌برداری از مکان پیوند"
 
-#: ../src/gtkimhtml.c:3273
+#: ../src/gtkimhtml.c:3272
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"<span size='larger' weight='bold'>نوع پرونده‌ی ناشناخته</span>\n"
+"<span size='larger' weight='bold'>نوع پروندهٔ ناشناخته</span>\n"
 "\n"
 "فرض می‌شود PNG است."
 
-#: ../src/gtkimhtml.c:3276
+#: ../src/gtkimhtml.c:3275
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"نوع پرونده‌ی ناشناخته\n"
+"نوع پروندهٔ ناشناخته\n"
 "\n"
 "فرض می‌شود PNG است."
 
-#: ../src/gtkimhtml.c:3289
+#: ../src/gtkimhtml.c:3288
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span size='larger' weight='bold'>خطا هنگام ذخیره‌ی تصویر</span>\n"
+"<span size='larger' weight='bold'>خطا هنگام ذخیرهٔ تصویر</span>\n"
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3292
+#: ../src/gtkimhtml.c:3291
 #, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
 msgstr ""
-"خطا هنگام ذخیره‌ی تصویر\n"
+"خطا هنگام ذخیرهٔ تصویر\n"
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
+#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
 msgid "Save Image"
-msgstr "ذخیره‌ی تصویر"
-
-#: ../src/gtkimhtml.c:3412
+msgstr "ذخیرهٔ تصویر"
+
+#: ../src/gtkimhtml.c:3411
 msgid "_Save Image..."
-msgstr "_ذخیره‌ی تصویر..."
+msgstr "_ذخیرهٔ تصویر..."
 
 #: ../src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
@@ -3994,7 +4026,7 @@
 #: ../src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
-msgstr "ذخیره‌ی تصویر شکست خورد: %s\n"
+msgstr "ذخیرهٔ تصویر شکست خورد: %s\n"
 
 #: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
@@ -4023,11 +4055,11 @@
 
 #: ../src/gtkimhtmltoolbar.c:961
 msgid "Larger font size"
-msgstr "اندازه‌ی قلم بزرگ‌تر"
+msgstr "قلم درشت‌تر"
 
 #: ../src/gtkimhtmltoolbar.c:973
 msgid "Smaller font size"
-msgstr "اندازه‌ی قلم کوچک‌تر"
+msgstr "قلم ریزتر"
 
 #: ../src/gtkimhtmltoolbar.c:990
 msgid "Font Face"
@@ -4037,6 +4069,14 @@
 msgid "Foreground font color"
 msgstr "رنگ قلم پیش‌زمینه"
 
+#: ../src/gtkimhtmltoolbar.c:1014
+msgid "Background color"
+msgstr "رنگ پس‌زمینه"
+
+#: ../src/gtkimhtmltoolbar.c:1030
+msgid "Reset formatting"
+msgstr "پاک کردن قالب‌بندی"
+
 #: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "درج پیوند"
@@ -4049,67 +4089,73 @@
 msgid "Insert smiley"
 msgstr "درج صورتک"
 
-#: ../src/gtklog.c:202
+#: ../src/gtklog.c:207
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>گفتگو در %s در %s</span>"
-
-#: ../src/gtklog.c:207
+msgstr "<span size='larger' weight='bold'>گفتگو در %s روی %s</span>"
+
+
+#: ../src/gtklog.c:212
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>گفتگو با %s در %s</span>"
-
-#: ../src/gtklog.c:258
+msgstr "<span size='larger' weight='bold'>گفتگو با %s روی %s</span>"
+
+
+#: ../src/gtklog.c:261
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:311
+#: ../src/gtklog.c:308
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"رویدادهای سیستم تنها زمانی ثبت خواهند شد که ترجیح «ثبت همه‌ی تغییر وضعیت‌ها در تاریخچه سیستم» به کار انداخته شده باشد."
-
-#: ../src/gtklog.c:315
+"رویدادهای سیستم تنها زمانی ثبت خواهند شد که «ثبت همهٔ تغییر وضعیت‌ها در "
+"تاریخچه سیستم» در ترجیحات به کار انداخته شده باشد."
+
+#: ../src/gtklog.c:312
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"پیغام‌های فوری تنها زمانی ثبت خواهند شد که ترجیح «ثبت همه‌ی پیغام‌های فوری» به کار انداخته شده باشد."
-
-#: ../src/gtklog.c:318
+"پیغام‌های اینترنتی تنها زمانی ثبت خواهند شد که «ثبت همهٔ پیغام‌های اینترنتی» در ترجیحات به "
+"کار انداخته شده باشد."
+
+#: ../src/gtklog.c:315
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"گپ‌ها تنها زمانی ثبت خواهند شد که ترجیح «ثبت همه‌ی گپ‌ها» به کار انداخته شده باشد."
-#: ../src/gtklog.c:322
+"گپ‌ها تنها زمانی ثبت خواهند شد که «ثبت همهٔ گپ‌ها» در ترجیحات به کار انداخته شده "
+"باشد."
+
+#: ../src/gtklog.c:319
 msgid "No logs were found"
 msgstr "تاریخچه‌ای پیدا نشد"
 
 #: ../src/gtklog.c:398
 msgid "Total log size:"
-msgstr "اندازه‌ی کل تاریخچه:"
-
-#: ../src/gtklog.c:474
+msgstr "اندازهٔ کل تاریخچه:"
+
+#: ../src/gtklog.c:464
 #, c-format
 msgid "Conversations in %s"
-msgstr "گفتگوها در %s"
-
-#: ../src/gtklog.c:482 ../src/gtklog.c:533
+msgstr "گفتگوهای %s"
+
+#: ../src/gtklog.c:472 ../src/gtklog.c:523
 #, c-format
 msgid "Conversations with %s"
 msgstr "گفتگوها با %s"
 
-#: ../src/gtklog.c:558
+#: ../src/gtklog.c:548
 msgid "System Log"
-msgstr "ثبت سیستم"
-
-#: ../src/gtkmain.c:308
+msgstr "تاریخچهٔ سیستم"
+
+#: ../src/gtkmain.c:307
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Try `%s -h' for more information.\n"
 
-#: ../src/gtkmain.c:310
+#: ../src/gtkmain.c:309
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4134,7 +4180,7 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 
-#: ../src/gtkmain.c:493
+#: ../src/gtkmain.c:492
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4155,34 +4201,51 @@
 "on other protocols is at\n"
 "%scontactinfo.php\n"
 msgstr ""
-
-#: ../src/gtknotify.c:305
+"Gaim has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the gaim\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+
+#: ../src/gtknotify.c:329
 msgid "New Mail"
-msgstr "نامه‌ی جدید"
-
-#: ../src/gtknotify.c:321
+msgstr "نامهٔ جدید"
+
+#: ../src/gtknotify.c:345
 msgid "Open All Messages"
-msgstr "همه‌ی پیغام‌ها باز شوند"
-
-#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1118
+msgstr "همهٔ پیغام‌ها باز شوند"
+
+#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1118
 msgid "From"
 msgstr "فرستنده"
 
-#: ../src/gtknotify.c:390
+#: ../src/gtknotify.c:420
 msgid "Subject"
 msgstr "موضوع"
 
-#: ../src/gtknotify.c:399
+#: ../src/gtknotify.c:429
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">نامه دارید!</span>"
 
-#: ../src/gtknotify.c:451
+#: ../src/gtknotify.c:495
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "‏%s ‏%Id پیغام جدید دارد."
 
-#: ../src/gtknotify.c:456
+#: ../src/gtknotify.c:500
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4193,63 +4256,63 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:643 ../src/protocols/sametime/sametime.c:5459
+#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5451
 msgid "Search Results"
 msgstr "نتایج جستجو"
 
-#: ../src/gtknotify.c:799 ../src/protocols/oscar/oscar.c:4996
+#: ../src/gtknotify.c:844 ../src/protocols/oscar/oscar.c:2635
 #, c-format
 msgid "Info for %s"
 msgstr "اطلاعات %s"
 
-#: ../src/gtknotify.c:800 ../src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:845 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "اطلاعات رفیق"
 
-#: ../src/gtknotify.c:840
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "فرمان مرورگر <b>%s</b> نامعتبر است."
-
-#: ../src/gtknotify.c:842 ../src/gtknotify.c:854 ../src/gtknotify.c:867
-#: ../src/gtknotify.c:992
+#: ../src/gtknotify.c:884
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "فرمان مرورگر «%s» نامعتبر است."
+
+#: ../src/gtknotify.c:886 ../src/gtknotify.c:898 ../src/gtknotify.c:911
+#: ../src/gtknotify.c:1034
 msgid "Unable to open URL"
 msgstr "نمی‌توان نشانی اینترنتی را باز کرد"
 
-#: ../src/gtknotify.c:852 ../src/gtknotify.c:865
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "خطا هنگام راه‌اندازی <b>%s</b>: %s"
-
-#: ../src/gtknotify.c:993
+#: ../src/gtknotify.c:896 ../src/gtknotify.c:909
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "خطا هنگام راه‌اندازی «%s»: %s"
+
+#: ../src/gtknotify.c:1035
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "فرمان مرورگر «دستی» انتخاب شده‌ است، ولی فرمانی تنظیم نشده است."
-
-#: ../src/gtkplugin.c:275
+msgstr "فرمان مرورگر «دستی» انتخاب شده است، ولی فرمانی تنظیم نشده است."
+
+#: ../src/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
-msgstr "متصل شونده‌های زیر خارج خواهند شد."
-
-#: ../src/gtkplugin.c:294
+msgstr "متصل شونده‌های زیر از حافظه خارج خواهند شد."
+
+#: ../src/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
-msgstr "متصل شونده‌های متعددی خارج خواهند شد."
-
-#: ../src/gtkplugin.c:296
+msgstr "متصل شونده‌های متعددی از حافظه خارج خواهند شد."
+
+#: ../src/gtkplugin.c:295
 msgid "Unload Plugins"
-msgstr "متصل شونده‌ها خارج شوند"
-
-#: ../src/gtkplugin.c:410
-#, c-format
+msgstr "از حافظه خارج کردن متصل شونده‌ها"
+
+#: ../src/gtkplugin.c:407
+#,  c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
 "<span weight=\"bold\">Website:</span>\t\t%s\n"
 "<span weight=\"bold\">Filename:</span>\t\t%s"
 msgstr ""
-"‏%s %s<span weight=\"bold\">نوشته‌ی:</span>\t%s\n"
-"<span weight=\"bold\">وبگاه:</span>\t\t%s\n"
-"<span weight=\"bold\">نام پرونده:</span>\t%s"
-
-#: ../src/gtkplugin.c:420
+"%s%s<span weight=\"bold\">نوشتهٔ:</span>\t%s\n"
+"<span weight=\"bold\">وب‌گاه:</span>\t\t%s\n"
+"<span weight=\"bold\">نام پرونده:</span>\t\t%s"
+
+#: ../src/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4258,203 +4321,201 @@
 msgstr ""
 "‏%s\n"
 "<span foreground=\"#ff0000\" weight=\"bold\">خطا: %s\n"
-"برای به‌هنگام‌سازی وبگاه متصل شونده را بررسی کنید.</span>"
-
-#: ../src/gtkplugin.c:546
+"برای به‌هنگام‌سازی وب‌گاه متصل شونده را بررسی کنید.</span>"
+
+#: ../src/gtkplugin.c:543
 msgid "Configure Pl_ugin"
-msgstr "پیکربندی متصل _شونده"
-
-#: ../src/gtkplugin.c:604
+msgstr "پیکربندی _متصل شونده"
+
+#: ../src/gtkplugin.c:601
 msgid "<b>Plugin Details</b>"
 msgstr "<b>جزئیات متصل شونده</b>"
 
-#: ../src/gtkpounce.c:162
+#: ../src/gtkpounce.c:154
 msgid "Select a file"
 msgstr "یک پرونده انتخاب کنید"
 
-#: ../src/gtkpounce.c:259
+#: ../src/gtkpounce.c:251
 msgid "Please enter a buddy to pounce."
 msgstr "لطفاً نام رفیقی را که می‌خواهید برایش کمین کنید وارد کنید."
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:495
 msgid "New Buddy Pounce"
 msgstr "کمینِ رفیق جدید"
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:495
 msgid "Edit Buddy Pounce"
 msgstr "ویرایش کمینِ رفیق"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:520
+#: ../src/gtkpounce.c:512
 msgid "Pounce on Whom"
 msgstr "کمین برای"
 
-#: ../src/gtkpounce.c:547
+#: ../src/gtkpounce.c:539
 msgid "_Buddy name:"
 msgstr "_نام رفیق:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:571
+#: ../src/gtkpounce.c:565
 msgid "Pounce When Buddy..."
-msgstr "حمله وقتی که رفیق..."
+msgstr "زمان حمله وقتی رفیق..."
+
+#: ../src/gtkpounce.c:573
+msgid "Si_gns on"
+msgstr "_وارد سیستم می‌شود"
+
+#: ../src/gtkpounce.c:575
+msgid "Signs o_ff"
+msgstr "_از سیستم  خارج می‌شود"
+
+#: ../src/gtkpounce.c:577
+msgid "Goes a_way"
+msgstr "_می‌رود"
 
 #: ../src/gtkpounce.c:579
-msgid "Si_gns on"
-msgstr "به سیستم _وارد می‌شود"
+msgid "Ret_urns from away"
+msgstr "_بازمی‌گردد"
 
 #: ../src/gtkpounce.c:581
-msgid "Signs o_ff"
-msgstr "از سیستم _خارج می‌شود"
+msgid "Becomes _idle"
+msgstr "بی‌_کار می‌شود"
 
 #: ../src/gtkpounce.c:583
-msgid "Goes a_way"
-msgstr "_می‌رود"
+msgid "Is no longer i_dle"
+msgstr "دیگر _بی‌کار نیست"
 
 #: ../src/gtkpounce.c:585
-msgid "Ret_urns from away"
-msgstr "ب_ر می‌گردد"
+msgid "Starts _typing"
+msgstr "شروع به _تایپ کردن می‌کند"
 
 #: ../src/gtkpounce.c:587
-msgid "Becomes _idle"
-msgstr "_بی‌کار می‌شود"
+msgid "Stops t_yping"
+msgstr "تا_یپ کردن را متوقف می‌کند"
 
 #: ../src/gtkpounce.c:589
-msgid "Is no longer i_dle"
-msgstr "دیگر بی‌_کار نیست"
-
-#: ../src/gtkpounce.c:591
-msgid "Starts _typing"
-msgstr "شروع به _تایپ کردن می‌کند"
-
-#: ../src/gtkpounce.c:593
-msgid "Stops t_yping"
-msgstr "تا_یپ کردن را متوقف می‌کند"
-
-#: ../src/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "_پیغام می‌فرستد"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:627
-
+#: ../src/gtkpounce.c:621
 msgid "Action"
-msgstr "کنش"
+msgstr "اقدام"
+
+#: ../src/gtkpounce.c:629
+msgid "Ope_n an IM window"
+msgstr "باز کردن پنجرهٔ پیغام اینترنتی_"
+
+#: ../src/gtkpounce.c:631
+msgid "_Pop up a notification"
+msgstr "اطلاع _واشو"
+
+#: ../src/gtkpounce.c:633
+msgid "Send a _message"
+msgstr "فرستادن _پیغام"
 
 #: ../src/gtkpounce.c:635
-msgid "Ope_n an IM window"
-msgstr "پنجره‌ی پیغام فوری _باز شود"
+msgid "E_xecute a command"
+msgstr "ا_جرای فرمان"
 
 #: ../src/gtkpounce.c:637
-msgid "_Pop up a notification"
-msgstr "اطلاع _واشو باز شود"
-
-#: ../src/gtkpounce.c:639
-msgid "Send a _message"
-msgstr "_پیغام ارسال شود"
-
-#: ../src/gtkpounce.c:641
-msgid "E_xecute a command"
-msgstr "فرمان ا_جرا شود"
-
-#: ../src/gtkpounce.c:643
 msgid "P_lay a sound"
-msgstr "صدا پ_خش شود"
-
-#: ../src/gtkpounce.c:648
+msgstr "پ_خش صدا"
+
+#: ../src/gtkpounce.c:642
 msgid "Brows_e..."
+msgstr "_مرور..."
+
+#: ../src/gtkpounce.c:644
+msgid "Br_owse..."
 msgstr "م_رور..."
 
-#: ../src/gtkpounce.c:650
-msgid "Br_owse..."
-msgstr "_مرور..."
-
-#: ../src/gtkpounce.c:651
+#: ../src/gtkpounce.c:645
 msgid "Pre_view"
 msgstr "پی_ش‌نمایش"
 
 #. Create the "Options" frame.
-#: ../src/gtkpounce.c:763
+#: ../src/gtkpounce.c:757
 msgid "Options"
 msgstr "گزینه‌ها"
 
-#: ../src/gtkpounce.c:771
+#: ../src/gtkpounce.c:765
 msgid "P_ounce only when my status is not available"
-msgstr "کمین تنها وقتی که وضعیت من «موجود نیست» است."
-
-#: ../src/gtkpounce.c:776
+msgstr "کمین تنها وقتی که وضعیت شما «در دسترس نیست» است."
+
+#: ../src/gtkpounce.c:770
 msgid "_Recurring"
 msgstr "_تکراری"
 
-#: ../src/gtkpounce.c:1090
+#: ../src/gtkpounce.c:1074
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "آیا مطمئنید می‌خواهید کمین %2$s در %1$s را حذف کنید؟"
-
-#: ../src/gtkpounce.c:1238
+msgstr "کمین آیا مطمئنید می‌خواهید %s برای %s را حذف کنید؟"
+
+#: ../src/gtkpounce.c:1222
 msgid "Pounce Target"
 msgstr "هدف حمله"
 
-#: ../src/gtkpounce.c:1273
+#: ../src/gtkpounce.c:1257
 msgid "Recurring"
 msgstr "تکرار"
 
-#: ../src/gtkpounce.c:1320
+#: ../src/gtkpounce.c:1304
 msgid "Buddy Pounces"
-msgstr "کمین‌های رفقا"
-
-#: ../src/gtkpounce.c:1447
+msgstr "کمینِ رفیق"
+
+#: ../src/gtkpounce.c:1431
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "‏%s شروع به تایپ برای شما کرده است (%s)"
 
-#: ../src/gtkpounce.c:1449
+#: ../src/gtkpounce.c:1433
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "‏%s وارد سیستم شده است (%s)"
 
-#: ../src/gtkpounce.c:1451
+#: ../src/gtkpounce.c:1435
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "‏%s دیگر بی‌کار نیست (%s)"
 
-#: ../src/gtkpounce.c:1453
+#: ../src/gtkpounce.c:1437
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "‏%s دیگر نرفته است (%s)"
-
-#: ../src/gtkpounce.c:1455
+msgstr "‏%s از جایی که رفته بود است (%s)"
+
+#: ../src/gtkpounce.c:1439
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "‏%s دیگر برای شما تایپ نمی‌کند (%s)"
 
-#: ../src/gtkpounce.c:1457
+#: ../src/gtkpounce.c:1441
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "‏%s از سیستم خارج شده است (%s)"
 
-#: ../src/gtkpounce.c:1459
+#: ../src/gtkpounce.c:1443
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "‏%s بی‌کار شده است (%s)"
 
-#: ../src/gtkpounce.c:1461
+#: ../src/gtkpounce.c:1445
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "‏%s رفته است. (%s)"
-
-#: ../src/gtkpounce.c:1463
+msgstr "‏%s جایی رفته است. (%s)"
+
+#: ../src/gtkpounce.c:1447
 #, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr 
-"‏%s برای شما پیغام فرستاده است. (%s)"
-
-#: ../src/gtkpounce.c:1464
+msgstr "‏%s برای شما پیغامی فرستاده است. (%s)"
+
+#: ../src/gtkpounce.c:1448
 msgid "Unknown pounce event. Please report this!"
 msgstr "رویداد کمین نامعلوم. لطفاً این را گزارش کنید!"
 
 #: ../src/gtkprefs.c:512
 msgid "Smiley theme failed to unpack."
-msgstr "بار شدن تم صورتک‌ها شکست خورد."
+msgstr "درآوردن تم صورتک‌ها از بسته شکست خورد."
 
 #: ../src/gtkprefs.c:638
 msgid ""
@@ -4468,16 +4529,16 @@
 msgid "Icon"
 msgstr "شمایل"
 
-#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:286
+#: ../src/protocols/jabber/buddy.c:926 ../src/protocols/jabber/chat.c:767
 msgid "Description"
 msgstr "شرح"
 
 #: ../src/gtkprefs.c:821
 msgid "_Hide new IM conversations"
-msgstr "_مخفی کردن گفتگوهای پیغام فوری جدید"
-
-#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
+msgstr "_مخفی کردن گفتگوهای پیغام‌های اینترنتی جدید"
+
+#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1779
 msgid "When away"
 msgstr "وقتی نیستید"
 
@@ -4487,7 +4548,7 @@
 
 #: ../src/gtkprefs.c:830
 msgid "Show _formatting on incoming messages"
-msgstr "نمایش _قالب‌بندی در پیغام‌های وارده"
+msgstr "نمایش _قالب‌بندیِ پیغام‌های دریافتی"
 
 #: ../src/gtkprefs.c:833
 msgid "Show buddy _icons"
@@ -4503,19 +4564,19 @@
 
 #: ../src/gtkprefs.c:845
 msgid "Highlight _misspelled words"
-msgstr "پر رنگ کردن کلمه‌های _غلط"
+msgstr "_پر رنگ کردن کلمه‌های غلط"
 
 #: ../src/gtkprefs.c:849
 msgid "Use smooth-scrolling"
-msgstr ""
+msgstr "استفاده از لغزش نرم"
 
 #: ../src/gtkprefs.c:865
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr ""
-"پیغام‌های متنی ارسالی شما، هنگامی که از قراردادهای پشتیبانی کننده از قالب‌بندی "
-"استفاده می‌کنید، به این شکل نمایش داده خواهند شد. :)"
+"پیغام‌های متنی ارسالی شما، هنگامی که از قراردادهایی استفاده می‌کنید که از قالب‌بندی "
+"پشتیبانی می‌کنند، به این شکل نمایش داده خواهند شد. :)"
 
 #. All the tab options!
 #: ../src/gtkprefs.c:887
@@ -4524,11 +4585,11 @@
 
 #: ../src/gtkprefs.c:889
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "نمایش پیغام‌های فوری و گپ‌ها در پنجره‌های _زبانه‌دار"
+msgstr "نمایش پیغام‌های اینترنتی و گپ‌ها در پنجره‌های _زبانه‌دار"
 
 #: ../src/gtkprefs.c:903
 msgid "Show close b_utton on tabs"
-msgstr "نماش د_کمه‌ی بستن در زبانه‌ها"
+msgstr "نمایش د_کمهٔ بستن در زبانه‌ها"
 
 #: ../src/gtkprefs.c:909
 msgid "_Placement:"
@@ -4542,13 +4603,14 @@
 msgid "Bottom"
 msgstr "پایین"
 
+# In the next two messages, "Left" and "Right" should be translated in reverse for RTL locals, to work properly.
 #: ../src/gtkprefs.c:913
 msgid "Left"
-msgstr "چپ"
+msgstr "راست"
 
 #: ../src/gtkprefs.c:914
 msgid "Right"
-msgstr "راست"
+msgstr "چپ"
 
 #: ../src/gtkprefs.c:916
 msgid "Left Vertical"
@@ -4562,116 +4624,120 @@
 msgid "N_ew conversations:"
 msgstr "گفتگوهای _جدید:"
 
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:805
-#: ../src/protocols/oscar/oscar.c:6107
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:3632
 msgid "IP Address"
 msgstr "نشانی IP"
 
 #: ../src/gtkprefs.c:975
 msgid "ST_UN server:"
-msgstr "_کارگزار ST_UN:"
-
-#: ../src/gtkprefs.c:977
+msgstr "_کارگزار STUN:"
+
+#: ../src/gtkprefs.c:987
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">مثال: stunserver.org</span>"
+
+#: ../src/gtkprefs.c:991
 msgid "_Autodetect IP address"
 msgstr "تشخیص _خودکار نشانی IP"
 
-#: ../src/gtkprefs.c:986
+#: ../src/gtkprefs.c:1000
 msgid "Public _IP:"
 msgstr "IP _عمومی:"
 
-#: ../src/gtkprefs.c:1014
+#: ../src/gtkprefs.c:1029
 msgid "Ports"
 msgstr "درگاه‌ها"
 
-#: ../src/gtkprefs.c:1017
+#: ../src/gtkprefs.c:1032
 msgid "_Manually specify range of ports to listen on"
-msgstr "مشخص کردن _دستی محدوده‌ی درگاه‌هایی که پاییده می‌شود"
-
-#: ../src/gtkprefs.c:1020
+msgstr "محدودهٔ درگاه‌هایی که پاییده می‌شود به صورت _دستی مشخص شوند"
+
+#: ../src/gtkprefs.c:1035
 msgid "_Start port:"
 msgstr "درگاه _شروع:"
 
-#: ../src/gtkprefs.c:1027
+#: ../src/gtkprefs.c:1042
 msgid "_End port:"
 msgstr "درگاه _پایان:"
 
-#: ../src/gtkprefs.c:1035
+#: ../src/gtkprefs.c:1050
 msgid "Proxy Server"
 msgstr "کارگزار پیشکار"
 
-#: ../src/gtkprefs.c:1039
+#: ../src/gtkprefs.c:1054
 msgid "No proxy"
 msgstr "بدون پیشکار"
 
-#: ../src/gtkprefs.c:1095
+#: ../src/gtkprefs.c:1110
 msgid "_User:"
 msgstr "_کاربر:"
 
-#: ../src/gtkprefs.c:1157
+#: ../src/gtkprefs.c:1172
 msgid "Epiphany"
 msgstr "اپیفانی"
 
-#: ../src/gtkprefs.c:1158
+#: ../src/gtkprefs.c:1173
 msgid "Firebird"
 msgstr "فایربرد"
 
-#: ../src/gtkprefs.c:1159
+#: ../src/gtkprefs.c:1174
 msgid "Firefox"
 msgstr "فایرفاکس"
 
-#: ../src/gtkprefs.c:1160
+#: ../src/gtkprefs.c:1175
 msgid "Galeon"
 msgstr "گالیون"
 
-#: ../src/gtkprefs.c:1161
+#: ../src/gtkprefs.c:1176
 msgid "GNOME Default"
 msgstr "پیش‌فرض گنوم"
 
-#: ../src/gtkprefs.c:1162
+#: ../src/gtkprefs.c:1177
 msgid "Konqueror"
 msgstr "کانکرر"
 
-#: ../src/gtkprefs.c:1163
+#: ../src/gtkprefs.c:1178
 msgid "Mozilla"
 msgstr "موزیلا"
 
-#: ../src/gtkprefs.c:1164
+#: ../src/gtkprefs.c:1179
 msgid "Netscape"
 msgstr "نت‌اسکیپ"
 
-#: ../src/gtkprefs.c:1165
+#: ../src/gtkprefs.c:1180
 msgid "Opera"
 msgstr "اُپرا"
 
-#: ../src/gtkprefs.c:1174
+#: ../src/gtkprefs.c:1189
 msgid "Manual"
 msgstr "دستی"
 
-#: ../src/gtkprefs.c:1227
+#: ../src/gtkprefs.c:1242
 msgid "Browser Selection"
 msgstr "انتخاب مرورگر"
 
-#: ../src/gtkprefs.c:1231
+#: ../src/gtkprefs.c:1246
 msgid "_Browser:"
 msgstr "_مرورگر:"
 
-#: ../src/gtkprefs.c:1239
+#: ../src/gtkprefs.c:1254
 msgid "_Open link in:"
 msgstr "_باز کردن پیوند در:"
 
-#: ../src/gtkprefs.c:1241
+#: ../src/gtkprefs.c:1256
 msgid "Browser default"
-msgstr "مرورگر پیش‌فرض"
-
-#: ../src/gtkprefs.c:1242
+msgstr "پیش‌فرض مرورگر"
+
+#: ../src/gtkprefs.c:1257
 msgid "Existing window"
-msgstr "پنجره‌ی موجود"
-
-#: ../src/gtkprefs.c:1244
+msgstr "پنجرهٔ موجود"
+
+#: ../src/gtkprefs.c:1259
 msgid "New tab"
-msgstr "زبانه‌ی جدید"
-
-#: ../src/gtkprefs.c:1258
+msgstr "زبانهٔ جدید"
+
+#: ../src/gtkprefs.c:1273
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4680,83 +4746,83 @@
 "_دستی:\n"
 "(%s برای نشانی اینترنتی)"
 
-#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
+#: ../src/gtkprefs.c:1309 ../src/gtkprefs.c:1890
 msgid "Logging"
-msgstr "ثبت"
-
-#: ../src/gtkprefs.c:1297
+msgstr "ثبت وقایع"
+
+#: ../src/gtkprefs.c:1312
 msgid "Log _format:"
 msgstr "_قالب تاریخچه:"
 
-#: ../src/gtkprefs.c:1302
+#: ../src/gtkprefs.c:1317
 msgid "Log all _instant messages"
-msgstr "ثبت همه‌ی پیغام‌های _فوری"
-
-#: ../src/gtkprefs.c:1304
+msgstr "_ثبت همهٔ پیغام‌های اینترنتی"
+
+#: ../src/gtkprefs.c:1319
 msgid "Log all c_hats"
-msgstr "ثبت همه‌ی _گپ‌ها"
-
-#: ../src/gtkprefs.c:1306
+msgstr "ثبت همهٔ _گپ‌ها"
+
+#: ../src/gtkprefs.c:1321
 msgid "Log all _status changes to system log"
-msgstr "ثبت همه‌ی تغییرات _وضعیت در تاریخچه‌ی وقایع سیستم"
-
-#: ../src/gtkprefs.c:1454
+msgstr "ثبت همهٔ تغییرات _وضعیت در تاریخچهٔ وقایع سیستم"
+
+#: ../src/gtkprefs.c:1469
 msgid "Sound Selection"
 msgstr "انتخاب صدا"
 
-#: ../src/gtkprefs.c:1462
+#: ../src/gtkprefs.c:1477
 msgid "Quietest"
-msgstr "ساکت‌ترین"
-
-#: ../src/gtkprefs.c:1464
+msgstr "بی‌سرو‌صداترین"
+
+#: ../src/gtkprefs.c:1479
 msgid "Quieter"
-msgstr "ساکت‌تر"
-
-#: ../src/gtkprefs.c:1466
+msgstr "بی‌سروصداتر"
+
+#: ../src/gtkprefs.c:1481
 msgid "Quiet"
-msgstr "ساکت"
-
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:666
+msgstr "بی‌سروصدا"
+
+#: ../src/gtkprefs.c:1483 ../src/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "عادی"
 
-#: ../src/gtkprefs.c:1470
+#: ../src/gtkprefs.c:1485
 msgid "Loud"
 msgstr "بلند"
 
-#: ../src/gtkprefs.c:1472
+#: ../src/gtkprefs.c:1487
 msgid "Louder"
 msgstr "بلندتر"
 
-#: ../src/gtkprefs.c:1474
+#: ../src/gtkprefs.c:1489
 msgid "Loudest"
 msgstr "بلندترین"
 
-#: ../src/gtkprefs.c:1537
+#: ../src/gtkprefs.c:1552
 msgid "Sound Method"
 msgstr "روش صوتی"
 
-#: ../src/gtkprefs.c:1538
+#: ../src/gtkprefs.c:1553
 msgid "_Method:"
 msgstr "_روش:"
 
-#: ../src/gtkprefs.c:1540
+#: ../src/gtkprefs.c:1555
 msgid "Console beep"
 msgstr "بوق پیشانه"
 
-#: ../src/gtkprefs.c:1542
+#: ../src/gtkprefs.c:1557
 msgid "Automatic"
 msgstr "خودکار"
 
-#: ../src/gtkprefs.c:1547
+#: ../src/gtkprefs.c:1562
 msgid "Command"
 msgstr "فرمان"
 
-#: ../src/gtkprefs.c:1548
+#: ../src/gtkprefs.c:1563
 msgid "No sounds"
 msgstr "بدون صدا"
 
-#: ../src/gtkprefs.c:1556
+#: ../src/gtkprefs.c:1571
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4765,124 +4831,124 @@
 "ف_رمانی صوتی:\n"
 "(%s برای نام پرونده)"
 
-#: ../src/gtkprefs.c:1582
+#: ../src/gtkprefs.c:1597
 msgid "Sound Options"
 msgstr "گزینه‌های صدا"
 
-#: ../src/gtkprefs.c:1583
+#: ../src/gtkprefs.c:1598
 msgid "Sounds when conversation has _focus"
 msgstr "وقتی که گفتگو _تمرکز می‌گیرد به صدا درمی‌آید"
 
-#: ../src/gtkprefs.c:1585
+#: ../src/gtkprefs.c:1600
 msgid "_Sounds while away"
 msgstr "هنگام رفتن _به صدا درمی‌آید"
 
-#: ../src/gtkprefs.c:1592
+#: ../src/gtkprefs.c:1607
 msgid "Volume:"
 msgstr "بلندی صدا:"
 
-#: ../src/gtkprefs.c:1620
+#: ../src/gtkprefs.c:1635
 msgid "Sound Events"
 msgstr "رویدادهای صوتی"
 
-#: ../src/gtkprefs.c:1671
+#: ../src/gtkprefs.c:1686
 msgid "Play"
 msgstr "پخش"
 
-#: ../src/gtkprefs.c:1678
+#: ../src/gtkprefs.c:1693
 msgid "Event"
 msgstr "رویداد"
 
-#: ../src/gtkprefs.c:1697
+#: ../src/gtkprefs.c:1712
 msgid "Test"
 msgstr "آزمایش"
 
-#: ../src/gtkprefs.c:1701
+#: ../src/gtkprefs.c:1716
 msgid "Reset"
 msgstr "بازگرداندن تنظیمات قبلی"
 
-#: ../src/gtkprefs.c:1705
+#: ../src/gtkprefs.c:1720
 msgid "Choose..."
 msgstr "انتخاب..."
 
-#: ../src/gtkprefs.c:1747
+#: ../src/gtkprefs.c:1762
 msgid "_Report idle time:"
-msgstr "زمان بی‌کاری _گزارش شود:"
-
-#: ../src/gtkprefs.c:1750
+msgstr "گزارش _زمان بی‌کاری:"
+
+#: ../src/gtkprefs.c:1765
 msgid "From last sent message"
-msgstr "از آخرین پیغام ارسال شده"
-
-#: ../src/gtkprefs.c:1752
+msgstr "از آخرین پیغام فرستاده شده"
+
+#: ../src/gtkprefs.c:1767
 msgid "Based on keyboard or mouse use"
 msgstr "بر مبنای استفاده از صفحه‌کلید یا موشی"
 
-#: ../src/gtkprefs.c:1761
+#: ../src/gtkprefs.c:1776
 msgid "_Auto-reply:"
 msgstr "_پاسخ خودکار:"
 
-#: ../src/gtkprefs.c:1765
+#: ../src/gtkprefs.c:1780
 msgid "When both away and idle"
 msgstr "وقتی نیستید و بی‌کارید"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1771
+#: ../src/gtkprefs.c:1786
 msgid "Auto-away"
 msgstr "رفتن خودکار"
 
-#: ../src/gtkprefs.c:1773
+#: ../src/gtkprefs.c:1788
 msgid "Change status when _idle"
-msgstr "تغییر وضعیت هنگام _بی‌کار شدن"
-
-#: ../src/gtkprefs.c:1777
+msgstr "تغییر وضعیت _هنگام بی‌کار شدن"
+
+#: ../src/gtkprefs.c:1792
 msgid "_Minutes before changing status:"
 msgstr "_تعداد دقایق تا تغییر وضعیت:"
 
-#: ../src/gtkprefs.c:1785
+#: ../src/gtkprefs.c:1800
 msgid "Change _status to:"
 msgstr "تغییر _وضعیت به:"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1806
+#: ../src/gtkprefs.c:1821
 msgid "Status at startup"
 msgstr "وضعیت هنگام راه‌اندازی"
 
-#: ../src/gtkprefs.c:1808
+#: ../src/gtkprefs.c:1823
 msgid "Use status from last _exit at startup"
 msgstr "موقع راه‌اندازی از وضعیت هنگام آخرین _خروج استفاده شود"
 
-#: ../src/gtkprefs.c:1814
+#: ../src/gtkprefs.c:1829
 msgid "Status to a_pply at startup:"
 msgstr "وضعیت مورد ا_ستفاده هنگام راه‌اندازی:"
 
-#: ../src/gtkprefs.c:1865
+#: ../src/gtkprefs.c:1880
 msgid "Smiley Themes"
 msgstr "تم صورتک‌ها"
 
-#: ../src/gtkprefs.c:1866
+#: ../src/gtkprefs.c:1881
 msgid "Sounds"
 msgstr "صداها"
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1847
+#: ../src/gtkprefs.c:1882 ../src/protocols/silc/silc.c:1850
 msgid "Network"
 msgstr "شبکه"
 
-#: ../src/gtkprefs.c:1872
+#: ../src/gtkprefs.c:1887
 msgid "Browser"
 msgstr "مرورگر"
 
-#: ../src/gtkprefs.c:1876
+#: ../src/gtkprefs.c:1891
 msgid "Away / Idle"
 msgstr "رفته / بی‌کار"
 
 #: ../src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
-msgstr "همه‌ی کاربران اجازه‌ی تماس با من را داشته باشند"
+msgstr "همهٔ کاربران اجازهٔ تماس با شما را داشته باشند"
 
 #: ../src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr ""
-"فقط کاربرانی که در فهرست رفقای من هستند اجازه‌ی تماس با من را داشته باشند"
+"فقط کاربرانی که در فهرست رفقایتان هستند اجازهٔ تماس با شما را داشته باشند"
 
 #: ../src/gtkprivacy.c:81
 msgid "Allow only the users below"
@@ -4890,7 +4956,7 @@
 
 #: ../src/gtkprivacy.c:82
 msgid "Block all users"
-msgstr "قطع رابطه با همه‌ی کاربران"
+msgstr "قطع رابطه با همهٔ کاربران"
 
 #: ../src/gtkprivacy.c:83
 msgid "Block only the users below"
@@ -4915,7 +4981,7 @@
 
 #: ../src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
-msgstr "کاربری را که به او اجازه‌ی تماس می‌دهید وارد کنید."
+msgstr "کاربری را که به او اجازهٔ تماس می‌دهید وارد کنید."
 
 #: ../src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
@@ -4955,52 +5021,69 @@
 #: ../src/gtkprivacy.c:610
 #, c-format
 msgid "Block %s?"
-msgstr "رابطه با %s قطع شود؟"
+msgstr "با %s قطع رابطه شود؟"
 
 #: ../src/gtkprivacy.c:612
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "آیا مطمئنید می‌خواهید رابطه‌تان را با %s قطع کنید؟"
 
-#: ../src/gtkrequest.c:285 ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
+#. *
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#.
+#: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
+#: ../src/protocols/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1919 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
+#: ../src/request.h:1335
 msgid "Yes"
 msgstr "بله"
 
-#: ../src/gtkrequest.c:286 ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
+#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:115
+#: ../src/protocols/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1920 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
+#: ../src/request.h:1335
 msgid "No"
 msgstr "نه"
 
-#: ../src/gtkrequest.c:289
+#: ../src/gtkrequest.c:271
 msgid "Apply"
 msgstr "اِعمال"
 
-#: ../src/gtkrequest.c:290 ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:336
+#: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
+#: ../src/protocols/silc/util.c:350
 msgid "Close"
 msgstr "بستن"
 
-#: ../src/gtkrequest.c:1851
+#: ../src/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "این پرونده از قبل وجود دارد"
 
-#: ../src/gtkrequest.c:1852
+#: ../src/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "آیا می‌خواهید روی آن بنویسید؟"
 
-#: ../src/gtkrequest.c:1896 ../src/gtkrequest.c:1937
+#: ../src/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "رونویسی"
+
+#: ../src/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "انتخاب نام جدید"
+
+#: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
 msgid "Save File..."
-msgstr "ذخیره‌ی پرونده..."
-
-#: ../src/gtkrequest.c:1897 ../src/gtkrequest.c:1938
+msgstr "ذخیرهٔ پرونده..."
+
+#: ../src/gtkrequest.c:1513 ../src/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "باز کردن پرونده..."
 
+#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "انتخاب پوشه..."
+
 #: ../src/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_اضافه شود"
@@ -5019,8 +5102,8 @@
 msgid "_Add Chat"
 msgstr "_اضافه کردن گپ"
 
-#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
+#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:283
+#: ../src/protocols/jabber/buddy.c:920 ../src/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "عنوان"
 
@@ -5028,27 +5111,26 @@
 msgid "Type"
 msgstr "نوع"
 
-#. Available status messages are plain text
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:919
 #: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
-#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
-#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1591
+#: ../src/protocols/gg/gg.c:1601 ../src/protocols/gg/gg.c:1607
+#: ../src/protocols/gg/gg.c:1616 ../src/protocols/gg/gg.c:1621
 #: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1185
 #: ../src/protocols/jabber/jabber.c:1195 ../src/protocols/jabber/jabber.c:1205
 #: ../src/protocols/jabber/jabber.c:1215 ../src/protocols/jabber/jabber.c:1225
-#: ../src/protocols/jabber/jabber.c:1237 ../src/protocols/novell/novell.c:2868
-#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7723
-#: ../src/protocols/oscar/oscar.c:7737 ../src/protocols/oscar/oscar.c:7742
-#: ../src/protocols/oscar/oscar.c:7951 ../src/protocols/oscar/oscar.c:7963
-#: ../src/protocols/sametime/sametime.c:3274
-#: ../src/protocols/sametime/sametime.c:3280
-#: ../src/protocols/sametime/sametime.c:3286
-#: ../src/protocols/sametime/sametime.c:3365
+#: ../src/protocols/jabber/jabber.c:1237 ../src/protocols/novell/novell.c:2866
+#: ../src/protocols/novell/novell.c:2972 ../src/protocols/novell/novell.c:2978
+#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:5363
+#: ../src/protocols/oscar/oscar.c:5378 ../src/protocols/oscar/oscar.c:5383
+#: ../src/protocols/oscar/oscar.c:5591 ../src/protocols/oscar/oscar.c:5603
+#: ../src/protocols/sametime/sametime.c:3266
+#: ../src/protocols/sametime/sametime.c:3272
+#: ../src/protocols/sametime/sametime.c:3278
+#: ../src/protocols/sametime/sametime.c:3357
 #: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3279 ../src/protocols/yahoo/yahoo.c:3285
-#: ../src/protocols/zephyr/zephyr.c:2261
+#: ../src/protocols/yahoo/yahoo.c:3282 ../src/protocols/yahoo/yahoo.c:3288
+#: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "پیغام"
 
@@ -5057,126 +5139,100 @@
 msgstr "وضعیت‌های ذخیره شده"
 
 #. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1179
 msgid "_Use"
 msgstr "_استفاده"
 
 #: ../src/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
+msgstr "این عنوان از قبل استفاده می‌شود. باید یک عنوان یکتا انتخاب کنید."
 
 #: ../src/gtksavedstatuses.c:879
 msgid "Different"
 msgstr "اختلاف"
 
-#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
-#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1156
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
-#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:785
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:794
-#: ../src/protocols/yahoo/yahoo.c:2881
+#: ../src/gtksavedstatuses.c:908 ../src/gtksavedstatuses.c:1055
+#: ../src/protocols/gg/gg.c:1024 ../src/protocols/gg/gg.c:1574
+#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:629
+#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:662
+#: ../src/protocols/jabber/jabber.c:1156 ../src/protocols/msn/msn.c:548
+#: ../src/protocols/novell/novell.c:2865 ../src/protocols/novell/novell.c:2869
+#: ../src/protocols/oscar/oscar.c:775 ../src/protocols/oscar/oscar.c:781
+#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2878
 msgid "Status"
 msgstr "وضعیت"
 
-#: ../src/gtksavedstatuses.c:1073
+#: ../src/gtksavedstatuses.c:1072
 msgid "_Title:"
 msgstr "_عنوان:"
 
-#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
+#: ../src/gtksavedstatuses.c:1091 ../src/gtksavedstatuses.c:1412
 msgid "_Status:"
 msgstr "_وضعیت:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1124
+#: ../src/gtksavedstatuses.c:1123
 msgid "Use a _different status for some accounts"
-msgstr ""
+msgstr "استفاده از وضعیت _متفاوت برای بعضی از حساب‌ها"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1188
+#: ../src/gtksavedstatuses.c:1187
 msgid "Sa_ve & Use"
-msgstr "ذ_خیره و استفاده"
-
-#: ../src/gtksavedstatuses.c:1394
+msgstr "_ذخیره و استفاده"
+
+#: ../src/gtksavedstatuses.c:1393
 #, c-format
 msgid "Status for %s"
 msgstr "وضعیت %s"
 
-#: ../src/gtksound.c:61
+#: ../src/gtksound.c:59
 msgid "Buddy logs in"
-msgstr "رفیقتان وارد سیستم شد"
+msgstr "رفیقتان وارد سیستم می‌شود"
+
+#: ../src/gtksound.c:60
+msgid "Buddy logs out"
+msgstr "رفیقتان از سیستم خارج می‌شود"
+
+#: ../src/gtksound.c:61
+msgid "Message received"
+msgstr "پیغام دریافت می‌شود"
 
 #: ../src/gtksound.c:62
-msgid "Buddy logs out"
-msgstr "رفیقتان از سیستم خارج شد"
-
-#: ../src/gtksound.c:63
-msgid "Message received"
-msgstr "پیغام دریافت شد"
-
-#: ../src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "پیغام دریافت شده گفتگو را آغاز می‌کند"
 
-#: ../src/gtksound.c:65
+#: ../src/gtksound.c:63
 msgid "Message sent"
-msgstr "پیغام فرستاده شد"
+msgstr "پیغام فرستاده می‌شود"
+
+#: ../src/gtksound.c:64
+msgid "Person enters chat"
+msgstr "شخصی وارد گپ می‌شود"
+
+#: ../src/gtksound.c:65
+msgid "Person leaves chat"
+msgstr "شخصی گپ را ترک می‌کند"
 
 #: ../src/gtksound.c:66
-msgid "Person enters chat"
-msgstr "شخصی وارد گپ شد"
-
-#: ../src/gtksound.c:67
-msgid "Person leaves chat"
-msgstr "شخصی گپ را ترک کرد"
-
-#: ../src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "شما در گپ حرف می‌زنید"
 
-#: ../src/gtksound.c:69
+#: ../src/gtksound.c:67
 msgid "Others talk in chat"
 msgstr "دیگران در گپ حرف می‌زنند"
 
-#: ../src/gtksound.c:72
-msgid "Someone says your name in chat"
+#: ../src/gtksound.c:70
+msgid "Someone says your screen name in chat"
 msgstr "کسی نام شما را در گپ می‌گوید"
 
-#: ../src/gtksound.c:488
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "نمی‌توان صدا را بخش کرد چون پرونده‌ی انتخاب شده (%s) وجود ندارد."
-
-#: ../src/gtksound.c:504
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-"نمی‌توان صدا را پخش کرد چون روش صوتی «فرمان» انتخاب شده اما فرمانی تنظیم نشده "
-"است."
-
-#: ../src/gtksound.c:516
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
-"نمی‌توان صدا را پخش کرد چون نمی‌توان فرمان صوتی پیکربندی شده را راه‌اندازی کرد: "
-"%s"
-
-#: ../src/gtkstatusbox.c:366
-msgid "Typing"
-msgstr "‏در حال تایپ کردن"
-
 #. connect to the server
 #: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:983 ../src/protocols/msn/session.c:349
+#: ../src/protocols/jabber/jabber.c:983 ../src/protocols/msn/session.c:344
 #: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1874
-#: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1503 ../src/protocols/yahoo/yahoo.c:2571
-#: ../src/protocols/zephyr/zephyr.c:1547
+#: ../src/protocols/novell/novell.c:2181 ../src/protocols/oscar/oscar.c:1250
+#: ../src/protocols/sametime/sametime.c:3685
+#: ../src/protocols/simple/simple.c:1609 ../src/protocols/yahoo/yahoo.c:2570
+#: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "در حال اتصال"
 
@@ -5207,7 +5263,7 @@
 #: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "هنگام بار کردن %s خطای زیر رخ داد: %s"
+msgstr "خطای زیر هنگام بار کردن %s رخ داد: %s"
 
 #: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
 msgid "Failed to load image"
@@ -5216,32 +5272,32 @@
 #: ../src/gtkutils.c:1408
 #, c-format
 msgid "Cannot send folder %s."
-msgstr "نمی‌توان پوشه‌ی %s را فرستاد."
+msgstr "نمی‌توان پوشهٔ %s را فرستاد."
 
 #: ../src/gtkutils.c:1410
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr ""
-"یم نمی‌تواند شاخه جابه‌جا کند. لازم است پرونده‌های داخل شاخه را یکی یکی بفرستید."
+"گیم نمی‌تواند شاخه‌ها را منتقل کند. لازم است پرونده‌های داخل شاخه را یکی یکی بفرستید."
 
 #: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
 msgid "You have dragged an image"
-msgstr "چیزی که کشیده‌اید تصویر است"
+msgstr "یک تصویر را برداشته‌اید"
 
 #: ../src/gtkutils.c:1439
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
-msgstr ""
+msgstr "می‌توانید این تصویر را به صورت پرونده ارسال کنید، یا آن را در داخل پیغام کار بگذارید . و یا از آن عنوان شمایل این کاربر استفاده کنید."
 
 #: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
 msgid "Set as buddy icon"
-msgstr "تنظیم به عنوان شمایل رفقا"
+msgstr "تنظیم به عنوان شمایل رفیق"
 
 #: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
 msgid "Send image file"
-msgstr "فرستادن پرونده ی تصویری"
+msgstr "فرستادن پروندهٔ تصویر"
 
 #: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
 msgid "Insert in message"
@@ -5249,19 +5305,19 @@
 
 #: ../src/gtkutils.c:1448
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "آیا مایلید آن را به عنوان شمایل رفقای این کاربر تنظیم کنید؟"
+msgstr "آیا مایلید این تصویر را شمایل این کاربر قرار دهید؟"
 
 #: ../src/gtkutils.c:1453
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
-msgstr ""
+msgstr "می‌توانید این تصویر را به صورت پرونده ارسال کنید، یا آن را در داخل پیغام کار بگذارید . و یا از آن عنوان شمایل این کاربر استفاده کنید."
 
 #: ../src/gtkutils.c:1455
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr ""
+msgstr "می‌توانید این تصویر را داخل پیغام کار بگذارید یا از آن به عنوان شمایل این کاربر استفاده کنید."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
@@ -5276,40 +5332,41 @@
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
-msgstr ""
-
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
-#.
-#: ../src/gtkwhiteboard.c:344 ../src/protocols/yahoo/yahoo_doodle.c:96
-msgid "Sent Doodle request."
-msgstr ""
-
-#: ../src/log.c:165
+msgstr "شما یک راه‌انداز رومیزی را برداشته‌اید. به احتمال زیاد منظورتان ارسال چیزی است که این راه‌انداز به آن اشاره می‌کند."
+
+#: ../src/gtkwhiteboard.c:756 ../src/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "ذخیرهٔ پرونده"
+
+#: ../src/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "انتخاب رنگ"
+
+#: ../src/log.c:180
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">تاریخچه‌نویس تابع خواندن ندارد</font></b>"
 
-#: ../src/log.c:547
+#: ../src/log.c:561
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:558
+#: ../src/log.c:572
 msgid "Plain text"
 msgstr "متن ساده"
 
-#: ../src/log.c:569
+#: ../src/log.c:583
 msgid "Old Gaim"
 msgstr "گِیم قدیمی"
 
-#: ../src/log.c:664
+#: ../src/log.c:678
 msgid "Logging of this conversation failed."
 msgstr "ثبت این گفتگو شکست خورد."
 
-#: ../src/log.c:965
+#: ../src/log.c:1028
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1033
+#: ../src/log.c:1102
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5318,7 +5375,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;پاسخ "
 "خودکار&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1035
+#: ../src/log.c:1104
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5327,22 +5384,23 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;پاسخ "
 "خودکار&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1092 ../src/log.c:1214
+#: ../src/log.c:1162 ../src/log.c:1294
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>مسیر ثبت پیدا نمی‌شود!</b></font>"
 
-#: ../src/log.c:1104 ../src/log.c:1226
+#: ../src/log.c:1174 ../src/log.c:1308
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>خواندن پرونده ممکن نیست: %s</b></font>"
 
-#: ../src/log.c:1157
+#: ../src/log.c:1236
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <پاسخ خودکار>: %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
-#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5063
+#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1645
+#: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:321
+#: ../src/protocols/oscar/oscar.c:2702
 msgid "Unknown error"
 msgstr "خطای نامعلوم"
 
@@ -5358,7 +5416,7 @@
 
 #: ../src/plugin.c:458
 msgid "Plugin does not implement all required functions"
-msgstr "متصل شونده همه‌ی کاربردهای لازم را پیاده‌سازی نمی‌کند"
+msgstr "متصل شونده همهٔ توابع لازم را پیاده‌سازی نمی‌کند"
 
 #: ../src/plugin.c:523
 #, c-format
@@ -5366,44 +5424,43 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"متصل شونده‌ی مورد نیاز %s پیدا نشد. لطفاً این متصل شونده را نصب کنید و  دوباره "
+"متصل شوندهٔ مورد نیاز %s پیدا نشد. لطفاً این متصل شونده را نصب کنید و  دوباره "
 "امتحان کنید."
 
 #: ../src/plugin.c:528
 msgid "Gaim encountered errors loading the plugin."
-msgstr "گیم هنگام بار کردن متصل شونده با خطاهایی مواجه شد."
+msgstr "گیم هنگام بار کردن متصل شونده با خطایی مواجه شد."
 
 #: ../src/plugin.c:551
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "نمی‌توان متصل شونده‌ی مورد نیاز %s را بار کرد."
+msgstr "نمی‌توان متصل شوندهٔ مورد نیاز %s را بار کرد."
 
 #: ../src/plugin.c:555
 msgid "Gaim was unable to load your plugin."
-msgstr "گیم نتوانست متصل شونده‌ی شما را بار کند."
+msgstr "گیم نتوانست متصل شوندهٔ شما را بار کند."
 
 #: ../src/plugin.c:657
 #, c-format
 msgid "The dependent plugin %s failed to unload."
-msgstr "خارج کردن متصل شونده‌ی مورد نیاز %s شکست خورد."
+msgstr "حذف متصل شوندهٔ وابستهٔ %s از حافظه شکست خورد."
 
 #: ../src/plugin.c:662
 msgid "Gaim encountered errors unloading the plugin."
-msgstr "گیم هنگام خارج کردن متصل شونده با خطاهایی مواجه شد."
+msgstr "گیم هنگام حذف متصل شونده از حافظه با خطایی مواجه شد."
 
 #. Send a message about the connection error
 #: ../src/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
-msgstr "پاییدن اتصالات پیغام‌های فوری وارده ممکن نیست\n"
+msgstr "گوش ایستادن برای اتصالات پیغام‌های اینترنتی دریافتی ممکن نیست\n"
 
 #: ../src/protocols/bonjour/bonjour.c:146
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
-"برقرار اتصال با کارگزار محلی mDNS ممکن نیست. آیا در حال اجراست؟"
+msgstr "برقرار اتصال با کارگزار محلی mDNS ممکن نیست. آیا در حال اجراست؟"
 
 #: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3251
+#: ../src/protocols/sametime/sametime.c:3243
 #, c-format
 msgid ""
 "\n"
@@ -5434,7 +5491,7 @@
 #: ../src/protocols/bonjour/bonjour.c:433
 #: ../src/protocols/bonjour/bonjour.c:435
 msgid "Bonjour Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد Bonjour"
+msgstr "متصل شوندهٔ قرارداد Bonjour"
 
 #: ../src/protocols/bonjour/bonjour.c:471
 #: ../src/protocols/bonjour/bonjour.c:479
@@ -5443,39 +5500,44 @@
 msgstr "کاربر گیم"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:931
+#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
 msgid "Hostname"
 msgstr "نام میزبان"
 
 #. Creating the options for the protocol
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:1956 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1855
+#: ../src/protocols/msn/msn.c:2049 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/oscar/oscar.c:6467
+#: ../src/protocols/sametime/sametime.c:5635 ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/toc/toc.c:2344
 msgid "Port"
 msgstr "درگاه"
 
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
-#: ../src/protocols/gg/gg.c:971
+#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:622
+#: ../src/protocols/jabber/jabber.c:774
 msgid "First name"
 msgstr "نام"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
+#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:617
+#: ../src/protocols/jabber/jabber.c:779
 msgid "Last name"
 msgstr "نام خانوادگی"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:695 ../src/protocols/silc/silc.c:935
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1030
-msgid "Email"
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:764 ../src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/silc.c:939
+msgid "E-mail"
 msgstr "پست الکترونیکی"
 
+#: ../src/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr "Bonjour"
+
 #: ../src/protocols/bonjour/jabber.c:357
 #, c-format
 msgid "%s has closed the conversation."
-msgstr "‏%s گفتگو را بسته است."
+msgstr "‏%s گفتگو را بست."
 
 #: ../src/protocols/bonjour/jabber.c:439
 msgid "Cannot open socket"
@@ -5491,317 +5553,321 @@
 
 #: ../src/protocols/bonjour/jabber.c:465
 msgid "Cannot listen on socket"
-msgstr "پاییدن روی سوکت ممکن نیست"
+msgstr "گوش ایستادن روی سوکت ممکن نیست"
 
 #: ../src/protocols/bonjour/jabber.c:559
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "نمی‌توان پیغام را فرستاد، شروع کردن گفتگو ممکن نیست."
-
-#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
-#: ../src/protocols/gg/gg.c:137
-#, fuzzy
+msgstr "نمی‌توان پیغام را فرستاد. گفتگو شروع نمی‌شود."
+
+#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2346
+msgid "Invalid proxy settings"
+msgstr "تنظیمات پیشکار نامعتبر"
+
+#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2346
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"یا نام میزبان یا شمارهٔ درگاه مشخص شده برای نوع پیشکار داده شده نامعتبر است."
+
+#: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:180
 msgid "Token Error"
-msgstr "خطای نشانه"
-
-#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
-#: ../src/protocols/gg/gg.c:138
-#, fuzzy
+msgstr "خطای توکن"
+
+#: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
-msgstr "نمی‌توان نشانه را گرفت.\n"
-
-#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
+msgstr "نمی‌توان توکن را گرفت.\n"
+
+#: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
-msgstr "ذخیره‌ی فهرست رفقا..."
-
-#: ../src/protocols/gg/gg.c:227
+msgstr "ذخیرهٔ فهرست رفقا..."
+
+#: ../src/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "فهرست رفقایتان خالی است، چیزی در پرونده نوشته نشد."
 
-#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
+#: ../src/protocols/gg/gg.c:276 ../src/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "نمی‌توان پرونده را باز کرد"
 
-#: ../src/protocols/gg/gg.c:246
+#: ../src/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "فهرست رفقا با موفقیت ذخیره شد!"
 
-#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
+#: ../src/protocols/gg/gg.c:307 ../src/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "بار کردن فهرست رفقا ممکن نیست"
 
-#: ../src/protocols/gg/gg.c:281
+#: ../src/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
-msgstr "در حال بار کردن فهرست رفقا..."
-
-#: ../src/protocols/gg/gg.c:282
+msgstr "بار کردن فهرست رفقا..."
+
+#: ../src/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "فهرست رفقا با موفقیت بار شد!"
 
-#: ../src/protocols/gg/gg.c:293
+#: ../src/protocols/gg/gg.c:336
 msgid "Save buddylist..."
-msgstr "ذخیره‌ی فهرست رفقا..."
-
-#: ../src/protocols/gg/gg.c:337
+msgstr "ذخیره کردن فهرست رفقا..."
+
+#: ../src/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "فیلدهای ثبت نام را پر کنید."
 
-#: ../src/protocols/gg/gg.c:342
+#: ../src/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "گذرواژه‌ها مطابقت ندارند."
 
-#: ../src/protocols/gg/gg.c:351
+#: ../src/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "نمی‌توان حساب جدیدی ثبت کرد. خطایی رخ داد.\n"
-
-#: ../src/protocols/gg/gg.c:364
+msgstr "نمی‌توان حساب جدید را ثبت کرد. خطایی رخ داد.\n"
+
+#: ../src/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "حساب Gadu-Gadu جدید ثبت شد"
 
-#: ../src/protocols/gg/gg.c:365
+#: ../src/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
-msgstr "ثبت موفقیت‌آمیز انجام شد!"
-
-#: ../src/protocols/gg/gg.c:425 ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "پست الکترونیکی"
-
-#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1310
+msgstr "ثبت نام موفقیت‌آمیز انجام شد!"
+
+#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:764
+#: ../src/protocols/jabber/jabber.c:753 ../src/protocols/jabber/jabber.c:1310
 msgid "Password"
 msgstr "گذرواژه"
 
-#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:769
 msgid "Password (retype)"
-msgstr "گذرواژه (دوباره تایپ شود)"
-
-#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
-#, fuzzy
+msgstr "گذرواژه (تایپ مجدد)"
+
+#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:774
 msgid "Enter current token"
-msgstr "نشانه‌ی فعلی را وارد کنید."
-
-#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
-#, fuzzy
+msgstr "توکن فعلی را وارد کنید"
+
+#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:780
 msgid "Current token"
-msgstr "در حال حاضر روی"
-
-#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+msgstr "توکن فعلی"
+
+#: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "ثبت حساب Gadu-Gadu جدید"
 
-#: ../src/protocols/gg/gg.c:452
+#: ../src/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "لطفاً فیلدهای زیر را پر کنید"
 
-#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1610
-msgid "Unable to initiate a new search"
-msgstr "نمی‌توان جستجوی جدید آغاز کرد"
-
-#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1611
-msgid "You have a pending search. Please wait for it to finish."
-msgstr "شما یک جستجوی ناتمام دارید. لطفاً صبر کنید تمام شود."
-
-#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
-#: ../src/protocols/gg/gg.c:2003 ../src/protocols/jabber/buddy.c:252
-#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
-#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1035
+#. General
+#: ../src/protocols/gg/gg.c:627 ../src/protocols/gg/gg.c:1038
+#: ../src/protocols/gg/gg.c:1104 ../src/protocols/gg/gg.c:2175
+#: ../src/protocols/jabber/buddy.c:271 ../src/protocols/jabber/buddy.c:803
+#: ../src/protocols/jabber/buddy.c:1522 ../src/protocols/jabber/buddy.c:1704
+#: ../src/protocols/jabber/jabber.c:769 ../src/protocols/msn/msn.c:1368
+#: ../src/protocols/msn/msn.c:1530 ../src/protocols/silc/buddy.c:1528
+#: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
+#: ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/yahoo/yahoo_profile.c:1041
 msgid "Nickname"
 msgstr "لقب"
 
-#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
-#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6153
-#: ../src/protocols/oscar/oscar.c:6161
+#: ../src/protocols/gg/gg.c:632 ../src/protocols/gg/gg.c:1043
+#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:789
+#: ../src/protocols/oscar/oscar.c:3688 ../src/protocols/oscar/oscar.c:3696
 msgid "City"
 msgstr "شهر"
 
-#: ../src/protocols/gg/gg.c:577
+#: ../src/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "سال تولد"
 
-#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1538
-#: ../src/protocols/oscar/oscar.c:6127
-#: ../src/protocols/yahoo/yahoo_profile.c:1060
+#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1532
+#: ../src/protocols/oscar/oscar.c:3652
+#: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
 msgstr "جنسیت"
 
-#: ../src/protocols/gg/gg.c:581
+#: ../src/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "مرد یا زن"
 
-#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6127
+#: ../src/protocols/gg/gg.c:642 ../src/protocols/oscar/oscar.c:3652
 msgid "Male"
 msgstr "مرد"
 
-#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6127
+#: ../src/protocols/gg/gg.c:643 ../src/protocols/oscar/oscar.c:3652
 msgid "Female"
 msgstr "زن"
 
-#: ../src/protocols/gg/gg.c:587
+#: ../src/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "فقط برخط"
 
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
+#: ../src/protocols/gg/gg.c:651 ../src/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "پیدا کردن رفقا"
 
-#: ../src/protocols/gg/gg.c:593
+#: ../src/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
-msgstr "لطفاً معیار جستجویتان را در زیر وارد کنید"
-
-#: ../src/protocols/gg/gg.c:630
+msgstr "لطفاً شرایط جستجو را در زیر وارد کنید"
+
+#: ../src/protocols/gg/gg.c:690
 msgid "Fill in the fields."
-msgstr "فیلدهای را پر کنید."
-
-#: ../src/protocols/gg/gg.c:642
+msgstr "فیلدها را پر کنید."
+
+#: ../src/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:656
+msgstr "گذرواژهٔ فعلی شما با چیزی که واردکردید فرق دارد."
+
+#: ../src/protocols/gg/gg.c:716
 msgid "Unable to change password. Error occured.\n"
-msgstr "تغییر گذرواژه‌ی ممکن نیست. خطایی رخ داد.\n"
-
-#: ../src/protocols/gg/gg.c:665
+msgstr "تغییر گذرواژه ممکن نیست. خطایی رخ داد.\n"
+
+#: ../src/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
-msgstr "تغییر گذرواژه‌ی برای حساب Gadu-Gadu"
-
-#: ../src/protocols/gg/gg.c:666
+msgstr "تغییر گذرواژهٔ حساب Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "گذرواژه با موفقیت تغییر کرد!"
 
-#: ../src/protocols/gg/gg.c:699
+#: ../src/protocols/gg/gg.c:759
 msgid "Current password"
-msgstr "گذرواژه‌ی فعلی"
-
-#: ../src/protocols/gg/gg.c:724
+msgstr "گذرواژهٔ فعلی"
+
+#: ../src/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "لطفاً گذرواژه‌ی فعلی و گذرواژه جدید این UIN را وارد کنید:"
-
-#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
+msgstr "لطفاً گذرواژهٔ فعلی و گذرواژهٔ جدیدتان را وارد کنید."
+
+#: ../src/protocols/gg/gg.c:788 ../src/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
-msgstr "تغییر گذرواژه‌ی Gadu-Gadu"
-
-#. TODO: s/screenname/alias/
-#: ../src/protocols/gg/gg.c:804
+msgstr "تغییر گذرواژهٔ Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "انتخاب گپ برای رفیق: %s"
-
-#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
+msgstr "یک گپ برای رفیق انتخاب کنید: %s"
+
+#: ../src/protocols/gg/gg.c:866 ../src/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "اضافه کردن به گپ..."
 
-#: ../src/protocols/gg/gg.c:950
-msgid "No matching users found"
-msgstr "کاربری مطابقت نمی‌کند"
-
-#: ../src/protocols/gg/gg.c:951
-msgid "There are no users matching your search criteria."
-msgstr "کاربری مطابق با معیارهای جستجوی شما پیدا نشد."
-
-#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
-#: ../src/protocols/oscar/oscar.c:6264
+#: ../src/protocols/gg/gg.c:1029 ../src/protocols/gg/gg.c:1098
+#: ../src/protocols/oscar/oscar.c:3624
+msgid "UIN"
+msgstr "UIN"
+
+#: ../src/protocols/gg/gg.c:1033 ../src/protocols/gg/gg.c:1101
+#: ../src/protocols/jabber/buddy.c:1518 ../src/protocols/jabber/buddy.c:1694
+#: ../src/protocols/oscar/oscar.c:3635 ../src/protocols/silc/ops.c:1024
+msgid "First Name"
+msgstr "نام"
+
+#: ../src/protocols/gg/gg.c:1052 ../src/protocols/gg/gg.c:1110
+msgid "Birth Year"
+msgstr "سال تولد"
+
+#: ../src/protocols/gg/gg.c:1092 ../src/protocols/gg/gg.c:1161
+#: ../src/protocols/oscar/oscar.c:3799
 msgid "Unable to display the search results."
 msgstr "نمی‌توان نتایج جستجو را نمایش داد."
 
-#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6099
-msgid "UIN"
-msgstr "UIN"
-
-#: ../src/protocols/gg/gg.c:980
-msgid "Birth year"
-msgstr "سال تولد"
-
-#: ../src/protocols/gg/gg.c:1020
+#: ../src/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
-msgstr "دفترچه راهنمای کاربران عمومی Gadu-Gadu"
-
-#: ../src/protocols/gg/gg.c:1021
+msgstr "دفترچهٔ راهنمای عمومی کاربران Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "نتایج جستجو"
 
-#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+#: ../src/protocols/gg/gg.c:1197
+msgid "No matching users found"
+msgstr "کاربری با این مشخصات پیدا نشد"
+
+#: ../src/protocols/gg/gg.c:1198
+msgid "There are no users matching your search criteria."
+msgstr "هیچ کاربری مطابق با معیارهای جستجوی شما پیدا نشد."
+
+#: ../src/protocols/gg/gg.c:1292 ../src/protocols/gg/gg.c:1439
 msgid "Unable to read socket"
 msgstr "خواندن سوکت ممکن نیست"
 
-#: ../src/protocols/gg/gg.c:1201
+#: ../src/protocols/gg/gg.c:1375
 msgid "Buddy list downloaded"
-msgstr "فهرست رفقا بارگیری شد"
-
-#: ../src/protocols/gg/gg.c:1202
+msgstr "فهرست رفقا بارگیری شد:"
+
+#: ../src/protocols/gg/gg.c:1376
 msgid "Your buddy list was downloaded from the server."
-msgstr "فهرست رفقایتان از کارگزار بارگیری شد."
-
-#: ../src/protocols/gg/gg.c:1209
+msgstr "فهرست رفقای شما از کارگزار بارگیری شد."
+
+#: ../src/protocols/gg/gg.c:1383
 msgid "Buddy list uploaded"
 msgstr "فهرست رفقا بارگذاری شد"
 
-#: ../src/protocols/gg/gg.c:1210
+#: ../src/protocols/gg/gg.c:1384
 msgid "Your buddy list was stored on the server."
-msgstr "فهرست رفقایتان در کارگزار ذخیره شد."
-
-#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
+msgstr "فهرست رفقای شما در کارگزار ذخیره نشده است."
+
+#: ../src/protocols/gg/gg.c:1485 ../src/protocols/gg/gg.c:1709
 msgid "Connection failed."
 msgstr "اتصال شکست خورد."
 
-#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:564
 msgid "Blocked"
-msgstr "قطع رابطه شد"
-
-#: ../src/protocols/gg/gg.c:1468
+msgstr "رابطه قطع شد"
+
+#: ../src/protocols/gg/gg.c:1638
 msgid "Add to chat"
 msgstr "اضافه کردن به گپ"
 
-#: ../src/protocols/gg/gg.c:1477
+#: ../src/protocols/gg/gg.c:1647
 msgid "Unblock"
 msgstr "برقراری رابطه"
 
-#: ../src/protocols/gg/gg.c:1481
+#: ../src/protocols/gg/gg.c:1651
 msgid "Block"
 msgstr "قطع رابطه"
 
-#: ../src/protocols/gg/gg.c:1498
+#: ../src/protocols/gg/gg.c:1668
 msgid "Chat _name:"
 msgstr "_نام گپ:"
 
-#: ../src/protocols/gg/gg.c:1724
+#: ../src/protocols/gg/gg.c:1896
 msgid "Chat error"
 msgstr "خطای گپ"
 
-#: ../src/protocols/gg/gg.c:1725
+#: ../src/protocols/gg/gg.c:1897
 msgid "This chat name is already in use"
-msgstr "این نام گپ از قبل استفاده می‌شود"
-
-#: ../src/protocols/gg/gg.c:1808
+msgstr "این نام گپ از قبل وجود دارد"
+
+#: ../src/protocols/gg/gg.c:1980
 msgid "Not connected to the server."
 msgstr "به کارگزار متصل نیست."
 
-#: ../src/protocols/gg/gg.c:1831
+#: ../src/protocols/gg/gg.c:2003
 msgid "Find buddies..."
 msgstr "پیدا کردن رفقا..."
 
-#: ../src/protocols/gg/gg.c:1837
+#: ../src/protocols/gg/gg.c:2009
 msgid "Change password..."
 msgstr "تغییر گذرواژه..."
 
-#: ../src/protocols/gg/gg.c:1843
+#: ../src/protocols/gg/gg.c:2015
 msgid "Upload buddylist to Server"
-msgstr "بارگیری فهرست رفقا روی کارگزار"
-
-#: ../src/protocols/gg/gg.c:1847
+msgstr "بارگذاری فهرست رفقا در کارگزار"
+
+#: ../src/protocols/gg/gg.c:2019
 msgid "Download buddylist from Server"
 msgstr "بارگیری فهرست رفقا از کارگزار"
 
-#: ../src/protocols/gg/gg.c:1851
+#: ../src/protocols/gg/gg.c:2023
 msgid "Delete buddylist from Server"
 msgstr "حذف فهرست رفقا از کارگزار"
 
-#: ../src/protocols/gg/gg.c:1855
+#: ../src/protocols/gg/gg.c:2027
 msgid "Save buddylist to file..."
-msgstr "ذخیره‌ی فهرست رفقا در پرونده..."
-
-#: ../src/protocols/gg/gg.c:1859
+msgstr "ذخیرهٔ فهرست رفقا در پرونده..."
+
+#: ../src/protocols/gg/gg.c:2031
 msgid "Load buddylist from file..."
 msgstr "بار کردن فهرست رفقا از پرونده..."
 
@@ -5816,32 +5882,32 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1955
+#: ../src/protocols/gg/gg.c:2127
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد Gadu-Gadu"
+msgstr "متصل شوندهٔ قرارداد Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1956
+#: ../src/protocols/gg/gg.c:2128
 msgid "Polish popular IM"
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:2004
+msgstr "پیغام اینترنتی مشهور لهستانی"
+
+#: ../src/protocols/gg/gg.c:2176
 msgid "Gadu-Gadu User"
 msgstr "کاربر Gadu-Gadu"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1582
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1585
 #, c-format
 msgid "Unknown command: %s"
 msgstr "فرمان نامعلوم: %s"
 
-#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1290
+#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:590
+#: ../src/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "موضوع فعلی: %s"
 
-#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1294
+#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:594
+#: ../src/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "موضوعی تنظیم نشده است"
 
@@ -5854,7 +5920,7 @@
 
 #: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
 msgid "Gaim could not open a listening port."
-msgstr "گیم نمی‌تواند درگاهی را که در حال پاییدن است باز کند"
+msgstr "گیم نمی‌تواند درگاهی را که در حال پایش شدن است باز کند."
 
 #: ../src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
@@ -5894,26 +5960,26 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "لقب‌های IRC نمی‌توانند حاوی فاصله باشند"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
-#: ../src/protocols/jabber/jabber.c:890
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:554
+#: ../src/protocols/jabber/jabber.c:893
 msgid "SSL support unavailable"
 msgstr "پشتیبانی SSL وجود ندارد"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:456
-#: ../src/protocols/simple/simple.c:1427
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:452
+#: ../src/protocols/simple/simple.c:1521
 msgid "Couldn't create socket"
 msgstr "ایجاد سوکت ممکن نیست"
 
-#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1803 ../src/protocols/oscar/oscar.c:1870
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:426
+#: ../src/protocols/oscar/oscar.c:1246
 msgid "Couldn't connect to host"
 msgstr "نمی‌توان به میزبان متصل شد"
 
-#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:453
 msgid "Connection Failed"
 msgstr "اتصال شکست خورد"
 
-#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:456
 msgid "SSL Handshake Failed"
 msgstr "دست دادن SSL شکست خورد"
 
@@ -5921,13 +5987,13 @@
 msgid "Read error"
 msgstr "خطای خواندن"
 
-#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1421
 #: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "کاربران"
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
-#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3354
+#: ../src/protocols/silc/chat.c:1424 ../src/protocols/silc/ops.c:1380
 #: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "موضوع"
@@ -5942,19 +6008,20 @@
 #. *< version
 #: ../src/protocols/irc/irc.c:877
 msgid "IRC Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد IRC"
+msgstr "متصل شوندهٔ قرارداد IRC"
 
 #. *  summary
 #: ../src/protocols/irc/irc.c:878
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "یک متصل‌شونده‌ی قرارداد IRC که کمتر حال آدم را به هم می‌زند"
+msgstr "یک متصل‌شوندهٔ قرارداد IRC که کمتر حال آدم را به هم می‌زند"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/jabber/jabber.c:1908
-#: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1662
+#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/jabber/jabber.c:1908 ../src/protocols/msn/msn.c:2044
+#: ../src/protocols/napster/napster.c:719 ../src/protocols/oscar/oscar.c:6464
+#: ../src/protocols/sametime/sametime.c:5630 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1769
+#: ../src/protocols/toc/toc.c:2340
 msgid "Server"
 msgstr "کارگزار"
 
@@ -5962,15 +6029,16 @@
 msgid "Encodings"
 msgstr "کدگذاری‌ها"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
+#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
-#: ../src/protocols/silc/silc.c:929
+#: ../src/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "نام کاربر"
 
-#: ../src/protocols/irc/irc.c:909
+#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "نام واقعی"
 
@@ -5982,168 +6050,167 @@
 msgid "Use SSL"
 msgstr "از SSL استفاده شود"
 
-#: ../src/protocols/irc/msgs.c:103
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "حالت بد"
 
-#: ../src/protocols/irc/msgs.c:114
+#: ../src/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
-msgstr "شما از %s محروم شده‌اید"
-
-#: ../src/protocols/irc/msgs.c:115
+msgstr "شما از ورود به %s منع شده‌اید."
+
+#: ../src/protocols/irc/msgs.c:119
 msgid "Banned"
-msgstr "محروم شده"
-
-#: ../src/protocols/irc/msgs.c:132
+msgstr "ورود ممنوع"
+
+#: ../src/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "نمی‌توان %s را محروم کرد: فهرست محروم شده‌ها پر شده است"
-
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/irc/msgs.c:244
+msgstr "نمی‌توان ورود به %s را ممنوع کرد: فهرست جاهای ممنوع پر شده است"
+
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6100
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:3625
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "لقب"
 
-#: ../src/protocols/irc/msgs.c:214
+#: ../src/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
-msgstr " <i>(گرداننده‌ی  irc)</i>"
-
-#: ../src/protocols/irc/msgs.c:215
+msgstr " <i>(گردانندهٔ irc)</i>"
+
+#: ../src/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr "<i>(شناسایی شده)</i>"
 
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/irc/msgs.c:223 ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/irc/msgs.c:230 ../src/protocols/irc/msgs.c:241
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1040
-msgid "Realname"
-msgstr "نام واقعی"
-
-#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
+msgstr "<b>%s:</b> ‎%s<br>"
+
+#: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "در حال حاضر روی"
 
-#: ../src/protocols/irc/msgs.c:242
+#: ../src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
-msgstr "<b>بی‌کار به مدت:</b> %s<br>"
-
-#: ../src/protocols/irc/msgs.c:244
-msgid "Online since"
-msgstr "برخط از"
+msgstr "<b>مدت بی‌کاری:</b> %s<br>"
 
 #: ../src/protocols/irc/msgs.c:248
+msgid "Online since"
+msgstr "برخط از"
+
+#: ../src/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
-msgstr "<br><b>صفت مناسب:</b> معرکه<br>"
-
-#: ../src/protocols/irc/msgs.c:316
+msgstr "<br><b>اوضاع و احوال:</b> معرکه<br>"
+
+#: ../src/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s موضوع را تغییر داد به: %s"
-
-#: ../src/protocols/irc/msgs.c:321
+msgstr "‏%s موضوع را تغییر داد به: %s"
+
+#: ../src/protocols/irc/msgs.c:331
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "‏%s موضوع  را پاک کرد.."
+
+#: ../src/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "موضوع %s این است: %s"
 
-#: ../src/protocols/irc/msgs.c:338
+#: ../src/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "پیغام نامعلوم «%s»"
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "پیغام نامعلوم"
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "گیم پیغامی فرستاد که کارگزار IRC نفهمید."
 
-#: ../src/protocols/irc/msgs.c:362
+#: ../src/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "کاربران در ‌‌‌‌%s: %s"
 
-#: ../src/protocols/irc/msgs.c:490
+#: ../src/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "زمان پاسخ"
 
-#: ../src/protocols/irc/msgs.c:491
+#: ../src/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "زمان محلی کارگزار IRC:"
 
-#: ../src/protocols/irc/msgs.c:502
+#: ../src/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "چنین کانالی وجود ندارد"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "چنین کانالی وجود ندارد"
 
-#: ../src/protocols/irc/msgs.c:516
+#: ../src/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "کاربر وارد سیستم نشده است"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../src/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "چنین لقب یا کانالی وجود ندارد"
 
-#: ../src/protocols/irc/msgs.c:541
+#: ../src/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "نمی‌توان ارسال کرد"
 
-#: ../src/protocols/irc/msgs.c:597
+#: ../src/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "پیوستن به %s دعوت لازم دارد."
 
-#: ../src/protocols/irc/msgs.c:598
+#: ../src/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "فقط با دعوت"
 
-#: ../src/protocols/irc/msgs.c:699
+#: ../src/protocols/irc/msgs.c:718
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "‏%s شما را از کانال بیرون انداخت: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:704 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:723 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "بیرون انداخته شده توسط %s (%s)"
-
-#: ../src/protocols/irc/msgs.c:727
+msgstr "توسط %s (%s) بیرون انداخته شد"
+
+#: ../src/protocols/irc/msgs.c:746
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "حالت (%s %s) توسط %s"
 
-#: ../src/protocols/irc/msgs.c:812 ../src/protocols/irc/msgs.c:813
+#: ../src/protocols/irc/msgs.c:831 ../src/protocols/irc/msgs.c:832
 msgid "Invalid nickname"
 msgstr "لقب نامعتبر"
 
-#: ../src/protocols/irc/msgs.c:814
+#: ../src/protocols/irc/msgs.c:833
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"لقبی که انتخاب کردید توسط کارگزار رد شد. این نام احتمالاً حاوی "
+"لقبی که انتخاب کرده‌اید توسط کارگزار رد شد. این نام احتمالاً حاوی "
 "نویسه‌های نامعتبر است."
 
-#: ../src/protocols/irc/msgs.c:818
+#: ../src/protocols/irc/msgs.c:837
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6151,42 +6218,42 @@
 "نام حسابی که انتخاب کرده‌اید توسط کارگزار رد شد. این نام احتمالاً حاوی "
 "نویسه‌های نامعتبر است."
 
-#: ../src/protocols/irc/msgs.c:858
+#: ../src/protocols/irc/msgs.c:876
 msgid "Cannot change nick"
 msgstr "نمی‌توان لقب را عوض کرد"
 
-#: ../src/protocols/irc/msgs.c:858
+#: ../src/protocols/irc/msgs.c:876
 msgid "Could not change nick"
 msgstr "عوض کردن لقب ممکن نیست"
 
-#: ../src/protocols/irc/msgs.c:879
+#: ../src/protocols/irc/msgs.c:897
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "شما کانال %s%s را ترک کردید"
 
-#: ../src/protocols/irc/msgs.c:921
+#: ../src/protocols/irc/msgs.c:939
 msgid "Error: invalid PONG from server"
 msgstr "خطا: PONG نامعتبر از کارگزار"
 
-#: ../src/protocols/irc/msgs.c:923
+#: ../src/protocols/irc/msgs.c:941
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "پاسخ PING ‐‐ تأخیر: %Ilu ثانیه"
 
-#: ../src/protocols/irc/msgs.c:998
+#: ../src/protocols/irc/msgs.c:1022
 #, c-format
 msgid "Cannot join %s:"
 msgstr "نمی‌توان به %s پیوست:"
 
-#: ../src/protocols/irc/msgs.c:999 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1023 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "نمی‌توان به کانال پیوست"
 
-#: ../src/protocols/irc/msgs.c:1033
+#: ../src/protocols/irc/msgs.c:1057
 msgid "Nick or channel is temporarily unavailable."
-msgstr "لقب یا کانال موقتاً موجود نیست."
-
-#: ../src/protocols/irc/msgs.c:1045
+msgstr "کانال یا لقب موقتاً موجود نیست."
+
+#: ../src/protocols/irc/msgs.c:1069
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
@@ -6205,7 +6272,7 @@
 
 #: ../src/protocols/irc/parse.c:116
 msgid "chanserv: Send a command to chanserv"
-msgstr "‏chanserv: ارسال فرمان به کارگزار کانال."
+msgstr "‏chanserv: ارسال فرمان به chanserv"
 
 #: ../src/protocols/irc/parse.c:117
 msgid ""
@@ -6239,7 +6306,7 @@
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 "‏j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]‎: وارد شدن به یک یا چند "
-"کانال، با امکان ارائه‌ی کلید کانال برای هر کدام درصورت لزوم."
+"کانال، با امکان ارائهٔ کلید کانال برای هر کدام در صورت لزوم."
 
 #: ../src/protocols/irc/parse.c:121
 msgid ""
@@ -6247,7 +6314,7 @@
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 "‏join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]‎: وارد شدن به یک یا چند "
-"کانال، با امکان ارائه‌ی کلید کانال برای هر کدام درصورت لزوم."
+"کانال، با امکان ارائهٔ کلید کانال برای هر کدام در صورت لزوم."
 
 #: ../src/protocols/irc/parse.c:122
 msgid ""
@@ -6263,15 +6330,15 @@
 "may disconnect you upon doing this.</i>"
 msgstr ""
 "‏list: نمایش فهرستی از اتاق‌های گپ در شبکه. <i>اخطار، ممکن است بعضی از "
-"کارگزارها به خاطر انجام این کار شما را  قطع کنند.</i>"
+"کارگزارها به خاطر انجام این کار ارتباط شما را  قطع کنند.</i>"
 
 #: ../src/protocols/irc/parse.c:124
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "‏me &lt;action to perform&gt;‎: انجام کنش."
+msgstr "‏me &lt;action to perform&gt;‎: انجام یک کنش."
 
 #: ../src/protocols/irc/parse.c:125
 msgid "memoserv: Send a command to memoserv"
-msgstr "memoserv: ارسال فرمان به کارگزار یادداشت"
+msgstr "‏memoserv‎: ارسال فرمان به memoserv"
 
 #: ../src/protocols/irc/parse.c:126
 msgid ""
@@ -6298,7 +6365,7 @@
 
 #: ../src/protocols/irc/parse.c:130
 msgid "nickserv: Send a command to nickserv"
-msgstr "‏nickserv‎: ارسال فرمان به کارگزار لقب"
+msgstr "nickserv‎: ارسال فرمان به nickserv"
 
 #: ../src/protocols/irc/parse.c:131
 msgid ""
@@ -6318,7 +6385,7 @@
 
 #: ../src/protocols/irc/parse.c:133
 msgid "operserv: Send a command to operserv"
-msgstr "‏operserv‎: ارسال فرمان به کارگزار متصدی"
+msgstr "‏operserv‎: ارسال فرمان به operserv"
 
 #: ../src/protocols/irc/parse.c:134
 msgid ""
@@ -6390,7 +6457,7 @@
 
 #: ../src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "‏whois [server] &lt;nick&gt;‎: گرفتن اطلاعات درباره‌ی کاربر"
+msgstr "‏whois [server] &lt;nick&gt;‎: گرفتن اطلاعات دربارهٔ کاربر."
 
 #: ../src/protocols/irc/parse.c:439
 #, c-format
@@ -6406,11 +6473,10 @@
 msgstr "پاسخ CTCP PING"
 
 #: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
-#: ../src/protocols/oscar/oscar.c:1710 ../src/protocols/toc/toc.c:190
-#: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
-#: ../src/protocols/toc/toc.c:780
+#: ../src/protocols/toc/toc.c:190 ../src/protocols/toc/toc.c:688
+#: ../src/protocols/toc/toc.c:704 ../src/protocols/toc/toc.c:780
 msgid "Disconnected."
-msgstr "قطع شد."
+msgstr "ارتباط قطع شد."
 
 #: ../src/protocols/jabber/auth.c:51
 msgid ""
@@ -6463,201 +6529,237 @@
 
 #: ../src/protocols/jabber/auth.c:632
 msgid "Invalid challenge from server"
-msgstr ""
+msgstr "تقاضای نامعتبر از سوی کارگزار"
 
 #: ../src/protocols/jabber/auth.c:719
 msgid "SASL error"
 msgstr "خطای SASL"
 
-#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/jabber/buddy.c:268 ../src/protocols/jabber/buddy.c:772
 #: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "نام و نام خانوادگی"
 
-#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/jabber/buddy.c:269 ../src/protocols/jabber/buddy.c:785
 #: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "نام خانوادگی"
 
-#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
+#: ../src/protocols/jabber/buddy.c:270 ../src/protocols/jabber/buddy.c:789
 msgid "Given Name"
 msgstr "اسم کوچک"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
+#: ../src/protocols/jabber/buddy.c:272 ../src/protocols/jabber/jabber.c:809
 msgid "URL"
 msgstr "نشانی اینترنتی"
 
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
+#: ../src/protocols/jabber/buddy.c:273 ../src/protocols/jabber/buddy.c:841
 msgid "Street Address"
 msgstr "نشانی خیابان"
 
-#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
+#: ../src/protocols/jabber/buddy.c:274 ../src/protocols/jabber/buddy.c:837
 msgid "Extended Address"
-msgstr "ادامه‌ی نشانی"
-
-#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
+msgstr "ادامهٔ نشانی"
+
+#: ../src/protocols/jabber/buddy.c:275 ../src/protocols/jabber/buddy.c:845
 msgid "Locality"
 msgstr "محله"
 
-#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
+#: ../src/protocols/jabber/buddy.c:276 ../src/protocols/jabber/buddy.c:849
 msgid "Region"
 msgstr "منطقه"
 
-#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
+#: ../src/protocols/jabber/buddy.c:277 ../src/protocols/jabber/buddy.c:853
 msgid "Postal Code"
-msgstr "کد پستی"
-
-#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
-#: ../src/protocols/silc/silc.c:939
+msgstr "کُد پستی"
+
+#: ../src/protocols/jabber/buddy.c:278 ../src/protocols/jabber/buddy.c:858
+#: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "کشور"
 
-#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
-#: ../src/protocols/jabber/buddy.c:768
+#: ../src/protocols/jabber/buddy.c:279 ../src/protocols/jabber/buddy.c:869
+#: ../src/protocols/jabber/buddy.c:876
 msgid "Telephone"
 msgstr "تلفن"
 
-#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
+#: ../src/protocols/jabber/buddy.c:280 ../src/protocols/jabber/buddy.c:887
+#: ../src/protocols/jabber/buddy.c:895 ../src/protocols/jabber/buddy.c:1524
+#: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:526
+#: ../src/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "پست الکترونیکی"
+
+#: ../src/protocols/jabber/buddy.c:281 ../src/protocols/jabber/buddy.c:910
 msgid "Organization Name"
 msgstr "نام سازمان"
 
-#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
+#: ../src/protocols/jabber/buddy.c:282 ../src/protocols/jabber/buddy.c:914
 msgid "Organization Unit"
 msgstr "واحد سازمان"
 
-#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
+#: ../src/protocols/jabber/buddy.c:284 ../src/protocols/jabber/buddy.c:923
 msgid "Role"
 msgstr "نقش"
 
-#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6133
+#: ../src/protocols/jabber/buddy.c:285 ../src/protocols/jabber/buddy.c:806
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3668
 msgid "Birthday"
 msgstr "روز تولد"
 
-#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:588 ../src/protocols/jabber/buddy.c:589
 msgid "Edit Jabber vCard"
-msgstr "ویرایش کارت مجازی Jabber"
-
-#: ../src/protocols/jabber/buddy.c:569
+msgstr "ویرایش کارت مجازی Jabber‏"
+
+#: ../src/protocols/jabber/buddy.c:590
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
-msgstr "همه‌ی موارد زیر اختیاری هستند. فقط اطلاعاتی را که مایلید وارد کنید."
-
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1911
+msgstr "همهٔ موارد زیر اختیاری هستند. فقط اطلاعاتی را که مایلید وارد کنید."
+
+#: ../src/protocols/jabber/buddy.c:646 ../src/protocols/jabber/buddy.c:677
+msgid "Client:"
+msgstr "کارگیر:"
+
+#: ../src/protocols/jabber/buddy.c:650 ../src/protocols/jabber/buddy.c:681
+msgid "Operating System"
+msgstr "سیستم عامل"
+
+#: ../src/protocols/jabber/buddy.c:660 ../src/protocols/jabber/jabber.c:1911
 msgid "Resource"
 msgstr "منابع"
 
-#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
+#: ../src/protocols/jabber/buddy.c:793 ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "نام وسط"
 
-#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:6152 ../src/protocols/oscar/oscar.c:6160
+#: ../src/protocols/jabber/buddy.c:826 ../src/protocols/jabber/jabber.c:784
+#: ../src/protocols/oscar/oscar.c:3687 ../src/protocols/oscar/oscar.c:3695
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "نشانی"
 
-#: ../src/protocols/jabber/buddy.c:725
+#: ../src/protocols/jabber/buddy.c:833
 msgid "P.O. Box"
 msgstr "صندوق پستی"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Photo"
 msgstr "عکس"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Logo"
 msgstr "نشان"
 
-#: ../src/protocols/jabber/buddy.c:1042
+#: ../src/protocols/jabber/buddy.c:1304
 msgid "Un-hide From"
 msgstr "نامخفی شدن از"
 
-#: ../src/protocols/jabber/buddy.c:1046
+#: ../src/protocols/jabber/buddy.c:1308
 msgid "Temporarily Hide From"
 msgstr "مخفی شدن موقت از"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1054
+#: ../src/protocols/jabber/buddy.c:1316
 msgid "Cancel Presence Notification"
 msgstr "انصراف از اعلان حضور"
 
-#: ../src/protocols/jabber/buddy.c:1061
+#: ../src/protocols/jabber/buddy.c:1323
 msgid "(Re-)Request authorization"
 msgstr "درخواست (مجدد) تأیید هویت"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1070
+#: ../src/protocols/jabber/buddy.c:1332
 msgid "Unsubscribe"
 msgstr "قطع اشتراک"
 
-#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1168
+#: ../src/protocols/jabber/buddy.c:1359 ../src/protocols/jabber/chat.c:675
+#: ../src/protocols/jabber/chat.c:686 ../src/protocols/jabber/jabber.c:1168
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "خطا"
 
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1193
+#: ../src/protocols/jabber/buddy.c:1365 ../src/protocols/jabber/jabber.c:1193
 msgid "Chatty"
 msgstr "پرچونه"
 
-#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1369 ../src/status.c:159
 msgid "Extended Away"
-msgstr "رفته‌ی بیشتر"
-
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1223
-#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/oscar/oscar.c:7980
-#: ../src/protocols/sametime/sametime.c:3285
+msgstr "رفتهٔ بیشتر"
+
+#: ../src/protocols/jabber/buddy.c:1371 ../src/protocols/jabber/jabber.c:1223
+#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5620
+#: ../src/protocols/sametime/sametime.c:3277
 msgid "Do Not Disturb"
 msgstr "مزاحم نشوید"
 
-#: ../src/protocols/jabber/buddy.c:1289
-msgid "The following are the results of your search"
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:1388
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6110 ../src/protocols/silc/ops.c:1024
-msgid "First Name"
-msgstr "نام"
-
-#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6111
+#: ../src/protocols/jabber/buddy.c:1516
+msgid "JID"
+msgstr "JID"
+
+#: ../src/protocols/jabber/buddy.c:1520 ../src/protocols/jabber/buddy.c:1699
+#: ../src/protocols/oscar/oscar.c:3636
 msgid "Last Name"
 msgstr "نام خانوادگی"
 
-#: ../src/protocols/jabber/buddy.c:1407
+#: ../src/protocols/jabber/buddy.c:1552
+msgid "The following are the results of your search"
+msgstr "نتایج جستجوی شما در زیر آمده است"
+
+#. current comment from Jabber User Directory users.jabber.org
+#: ../src/protocols/jabber/buddy.c:1627
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr "با استفاده از معیارهای جستجو که در فیلدهای مرتبط وارد می‌کنید، اطلاعات تماس کسی را که در جستجویش هستید پیدا کنید. تذکر: تک‌تک فیلدها از علائم عام جستجو (%) پشتیبانی می‌کنند"
+
+#: ../src/protocols/jabber/buddy.c:1647
+msgid "Directory Query Failed"
+msgstr "پرس‌وجو از دفترچهٔ راهنمای کاربران شکست خورد"
+
+#: ../src/protocols/jabber/buddy.c:1648
+msgid "Could not query the directory server."
+msgstr "پرس‌وجوی از کارگزار دفترچهٔ راهنمای کاربران ممکن نیست."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../src/protocols/jabber/buddy.c:1682
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "راهنمایی‌های کارگزار: %s"
+
+#: ../src/protocols/jabber/buddy.c:1689
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr "برای جستجو به دنبال کاربران Jabber یکی یا چند تا از فیلدهای زیر را پر کنید."
+
+#: ../src/protocols/jabber/buddy.c:1709 ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/oscar/oscar.c:3638 ../src/protocols/oscar/oscar.c:3645
 msgid "E-Mail Address"
 msgstr "نشانی پست الکترونیکی"
 
-#: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
+#: ../src/protocols/jabber/buddy.c:1718 ../src/protocols/jabber/buddy.c:1719
 msgid "Search for Jabber users"
 msgstr "جستجو به دنبال کاربران Jabber"
 
-#: ../src/protocols/jabber/buddy.c:1431
+#: ../src/protocols/jabber/buddy.c:1733
 msgid "Invalid Directory"
-msgstr "دفترچه راهنمای کاربران نامعتبر است"
-
-#: ../src/protocols/jabber/buddy.c:1448
+msgstr "دفترچهٔ راهنمای کاربران نامعتبر"
+
+#: ../src/protocols/jabber/buddy.c:1750
 msgid "Enter a User Directory"
-msgstr "یک دفترچه راهنمای کاربران وارد کنید"
-
-#: ../src/protocols/jabber/buddy.c:1449
+msgstr "یک دفترچهٔ راهنمای کاربران وارد کنید"
+
+#: ../src/protocols/jabber/buddy.c:1751
 msgid "Select a user directory to search"
-msgstr "یک دفترچه راهنمای کاربران برای جستجو انتخاب کنید"
-
-#: ../src/protocols/jabber/buddy.c:1452
+msgstr "یک دفترچه‌ٔ راهنمای کاربران را برای جستجو انتخاب کنید"
+
+#: ../src/protocols/jabber/buddy.c:1754
 msgid "Search Directory"
-msgstr "جستجوی دفترچه راهنمای کاربران"
-
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7475
+msgstr "جستجوی دفترچهٔ راهنما"
+
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5105
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_اتاق:"
@@ -6691,54 +6793,54 @@
 #: ../src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "‏%s دست‌گیره‌ی اتاق معتبری نیست"
+msgstr "‏%s دست‌گیرهٔ اتاق معتبری نیست"
 
 #: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
-msgstr "دست‌گیره‌ی اتاق نامعتبر"
+msgstr "دست‌گیرهٔ اتاق نامعتبر"
 
 #: ../src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "خطای پیکربندی"
 
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:547
 msgid "Unable to configure"
 msgstr "پیکربندی ممکن نیست"
 
+#: ../src/protocols/jabber/chat.c:419
+msgid "Room Configuration Error"
+msgstr "خطای پیکربندی اتاق"
+
 #: ../src/protocols/jabber/chat.c:420
-msgid "Room Configuration Error"
-msgstr "خطای پیکربندی اتاق"
-
-#: ../src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "این اتاق قابلیت پیکربندی شدن ندارد"
 
-#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:469 ../src/protocols/jabber/chat.c:538
 msgid "Registration error"
 msgstr "خطای ثبت"
 
-#: ../src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:626
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "تغییر لقب در اتاق‌های گپ غیر MUC پشتیبانی نمی‌شود"
 
-#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/jabber/chat.c:676 ../src/protocols/jabber/chat.c:687
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "خطا هنگام بازیابی فهرست اتاق‌ها"
 
-#: ../src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:735
 msgid "Invalid Server"
 msgstr "کارگزار نامعتبر"
 
-#: ../src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:773
 msgid "Enter a Conference Server"
 msgstr "کارگزار کنفرانس را وارد کنید"
 
-#: ../src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:774
 msgid "Select a conference server to query"
 msgstr "کارگزار کنفرانسی برای پرس‌وجو انتخاب کنید"
 
-#: ../src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:777
 msgid "Find Rooms"
 msgstr "پیدا کردن اتاق‌ها"
 
@@ -6746,63 +6848,67 @@
 msgid "Error initializing session"
 msgstr "خطا هنگام راه‌اندازی نشست"
 
-#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
-#: ../src/protocols/jabber/jabber.c:303
+#: ../src/protocols/jabber/jabber.c:232 ../src/protocols/jabber/jabber.c:281
+#: ../src/protocols/jabber/jabber.c:309
 msgid "Write error"
 msgstr "خطای نوشتن"
 
-#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
+#: ../src/protocols/jabber/jabber.c:361 ../src/protocols/jabber/jabber.c:394
 msgid "Read Error"
 msgstr "خطای خواندن"
 
-#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
+#: ../src/protocols/jabber/jabber.c:479 ../src/protocols/jabber/jabber.c:903
 msgid "Unable to create socket"
 msgstr "ایجاد سوکت ممکن نیست"
 
-#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:524 ../src/protocols/jabber/jabber.c:861
 msgid "Invalid Jabber ID"
-msgstr "شناسه‌ی Jabber نامعتبر"
-
-#: ../src/protocols/jabber/jabber.c:590
+msgstr "شناسهٔ Jabber نامعتبر"
+
+#: ../src/protocols/jabber/jabber.c:594
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "ثبت نام موفقیت‌آمیز %s@%s"
-
-#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
+msgstr "ثبت نام %s@%s موفقیت‌آمیز بود"
+
+#: ../src/protocols/jabber/jabber.c:596 ../src/protocols/jabber/jabber.c:597
 msgid "Registration Successful"
 msgstr "ثبت نام موفقیت‌آمیز"
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1459
+#: ../src/protocols/jabber/jabber.c:603 ../src/protocols/jabber/jabber.c:1459
 msgid "Unknown Error"
 msgstr "خطای نامعلوم"
 
-#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
+#: ../src/protocols/jabber/jabber.c:605 ../src/protocols/jabber/jabber.c:606
 msgid "Registration Failed"
 msgstr "ثبت نام شکست خورد"
 
-#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
+#: ../src/protocols/jabber/jabber.c:717 ../src/protocols/jabber/jabber.c:718
 msgid "Already Registered"
 msgstr "قبلاً ثبت نام شده است"
 
-#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6154
-#: ../src/protocols/oscar/oscar.c:6162
+#: ../src/protocols/jabber/jabber.c:794 ../src/protocols/oscar/oscar.c:3689
+#: ../src/protocols/oscar/oscar.c:3697
 msgid "State"
 msgstr "استان"
 
-#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/util.c:514
+#: ../src/protocols/jabber/jabber.c:799
+msgid "Postal code"
+msgstr "کد پستی"
+
+#: ../src/protocols/jabber/jabber.c:804 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:528
 msgid "Phone"
 msgstr "تلفن"
 
-#: ../src/protocols/jabber/jabber.c:810
+#: ../src/protocols/jabber/jabber.c:814
 msgid "Date"
 msgstr "تاریخ"
 
-#: ../src/protocols/jabber/jabber.c:818
+#: ../src/protocols/jabber/jabber.c:822
 msgid "Please fill out the information below to register your new account."
-msgstr "لطفاً برای ثبت حساب جدیدتان اطلاعات را در زیر پر کنید."
-
-#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
+msgstr "لطفاً برای ثبت حساب جدیدتان اطلاعات لازم را در فرم زیر پر کنید."
+
+#: ../src/protocols/jabber/jabber.c:825 ../src/protocols/jabber/jabber.c:826
 msgid "Register New Jabber Account"
 msgstr "ثبت حساب Jabber جدید"
 
@@ -6810,17 +6916,17 @@
 msgid "Initializing Stream"
 msgstr "راه‌اندازی جریان"
 
-#: ../src/protocols/jabber/jabber.c:993 ../src/protocols/msn/session.c:355
+#: ../src/protocols/jabber/jabber.c:992 ../src/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "تأیید هویت"
 
-#: ../src/protocols/jabber/jabber.c:1002
+#: ../src/protocols/jabber/jabber.c:1001
 msgid "Re-initializing Stream"
 msgstr "راه‌اندازی مجدد جریان"
 
 #: ../src/protocols/jabber/jabber.c:1072 ../src/protocols/jabber/jabber.c:1437
 #: ../src/protocols/jabber/jabber.c:1478 ../src/protocols/jabber/jabber.c:1512
-#: ../src/protocols/oscar/oscar.c:792 ../src/protocols/oscar/oscar.c:7770
+#: ../src/protocols/oscar/oscar.c:782 ../src/protocols/oscar/oscar.c:5411
 msgid "Not Authorized"
 msgstr "اجازه ندارد"
 
@@ -6830,7 +6936,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1116
 msgid "From (To pending)"
-msgstr ""
+msgstr "فرستنده (گیرندهٔ مشروط)"
 
 #: ../src/protocols/jabber/jabber.c:1121
 msgid "To"
@@ -6838,7 +6944,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1123
 msgid "None (To pending)"
-msgstr ""
+msgstr "هیچ‌کدام (گیرندهٔ مشروط)"
 
 #: ../src/protocols/jabber/jabber.c:1127
 msgid "Subscription"
@@ -6856,7 +6962,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1254
 msgid "Your password has been changed."
-msgstr "گذرواژه‌ی شما تغییر کرد."
+msgstr "گذرواژهٔ شما تغییر کرد."
 
 #: ../src/protocols/jabber/jabber.c:1258 ../src/protocols/jabber/jabber.c:1259
 msgid "Error changing password"
@@ -6868,27 +6974,27 @@
 
 #: ../src/protocols/jabber/jabber.c:1320 ../src/protocols/jabber/jabber.c:1321
 msgid "Change Jabber Password"
-msgstr "تغییر گذرواژه‌ی Jabber"
+msgstr "تغییر گذرواژهٔ Jabber"
 
 #: ../src/protocols/jabber/jabber.c:1321
 msgid "Please enter your new password"
 msgstr "لطفاً گذرواژه جدیدتان را وارد کنید"
 
-#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:8404
-#: ../src/protocols/silc/silc.c:1019
+#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:6181
+#: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "تنظیم اطلاعات کاربر..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1336 ../src/protocols/oscar/oscar.c:8415
-#: ../src/protocols/silc/silc.c:1015
+#: ../src/protocols/jabber/jabber.c:1336 ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "تغییر گذرواژه..."
 
 #. }
 #: ../src/protocols/jabber/jabber.c:1341
 msgid "Search for Users..."
-msgstr "جستجو به دنبال کاربر..."
+msgstr "جستجو به دنبال کاربران..."
 
 #: ../src/protocols/jabber/jabber.c:1417
 msgid "Bad Request"
@@ -6920,7 +7026,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1431
 msgid "Malformed Jabber ID"
-msgstr "شناسه‌ی Jabber معیوب"
+msgstr "شناسهٔ Jabber معیوب"
 
 #: ../src/protocols/jabber/jabber.c:1433
 msgid "Not Acceptable"
@@ -6976,7 +7082,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid authzid"
-msgstr "شناسه‌ی تأیید هویت نامعتبر"
+msgstr "شناسهٔ تأیید هویت نامعتبر"
 
 #: ../src/protocols/jabber/jabber.c:1472
 msgid "Invalid Authorization Mechanism"
@@ -7008,7 +7114,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1494 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
-msgstr "انتضای مدت اتصال"
+msgstr "انقضای مدت اتصال"
 
 #: ../src/protocols/jabber/jabber.c:1496
 msgid "Host Gone"
@@ -7024,7 +7130,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1504
 msgid "Invalid ID"
-msgstr "شناسه‌ی نامعتبر"
+msgstr "شناسهٔ نامعتبر"
 
 #: ../src/protocols/jabber/jabber.c:1506
 msgid "Invalid Namespace"
@@ -7076,7 +7182,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1532
 msgid "Unsupported Version"
-msgstr "نسخه‌ی پشتبیانی نشده"
+msgstr "نسخهٔ پشتیبانی نشده"
 
 #: ../src/protocols/jabber/jabber.c:1534
 msgid "XML Not Well Formed"
@@ -7089,17 +7195,17 @@
 #: ../src/protocols/jabber/jabber.c:1603
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "نمی‌توان کاربر %s را محروم کرد"
+msgstr "نمی‌توان ورود کاربر %s را ممنوع کرد"
 
 #: ../src/protocols/jabber/jabber.c:1623
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "رابطه‌ی نامعلوم: «%s»"
+msgstr "رابطهٔ نامعلوم: «%s»"
 
 #: ../src/protocols/jabber/jabber.c:1628
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "نمی‌توان کاربر %s را به عنوان «%s» مرتبط کرد"
+msgstr "نمی‌توان کاربر را دعوت کرد (%s)."
 
 #: ../src/protocols/jabber/jabber.c:1647
 #, c-format
@@ -7145,14 +7251,16 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: تنظیم نوع رابطه‌ی کاربر با اتاق."
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: تنظیم نوع "
+"رابطهٔ کاربر با اتاق."
 
 #: ../src/protocols/jabber/jabber.c:1780
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: تنظیم نقش کاربر در اتاق."
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: تنظیم نقش "
+"کاربر در اتاق."
 
 #: ../src/protocols/jabber/jabber.c:1786
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -7183,7 +7291,7 @@
 #. *  description
 #: ../src/protocols/jabber/jabber.c:1886 ../src/protocols/jabber/jabber.c:1888
 msgid "Jabber Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد Jabber"
+msgstr "متصل شوندهٔ قرارداد Jabber"
 
 #: ../src/protocols/jabber/jabber.c:1914
 msgid "Use TLS if available"
@@ -7201,73 +7309,73 @@
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "اجازه دادن تأیید هویت متنی ساده در جریان‌های رمزنگاری نشده"
 
-#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/simple/simple.c:1668
+#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/simple/simple.c:1775
 msgid "Connect port"
 msgstr "درگاه اتصال"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1936 ../src/protocols/silc/silc.c:1851
+#: ../src/protocols/jabber/jabber.c:1936 ../src/protocols/silc/silc.c:1854
 msgid "Connect server"
 msgstr "اتصال کارگزار"
 
-#: ../src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "پیغام از %s"
 
-#: ../src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "‏%s موضوع را تنظیم کرد به: %s"
 
-#: ../src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "موضوع: %s"
 
-#: ../src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "ارسال پیغام به %s شکست خورد: %s"
 
-#: ../src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "خطای پیغام Jabber"
 
-#: ../src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:319
 #, c-format
 msgid " (Code %s)"
 msgstr " (کد %s)"
 
-#: ../src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:279 ../src/protocols/jabber/parser.c:288
 msgid "XML Parse error"
-msgstr "خطای تجزیه‌ی XML"
-
-#: ../src/protocols/jabber/presence.c:305
+msgstr "خطای تجزیهٔ XML"
+
+#: ../src/protocols/jabber/presence.c:308
 msgid "Unknown Error in presence"
 msgstr "خطای نامعلوم در حضور"
 
-#: ../src/protocols/jabber/presence.c:310 ../src/protocols/msn/userlist.c:104
+#: ../src/protocols/jabber/presence.c:313 ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "کاربر %s می‌خواهد %s را به فهرست رفقایش اضافه کند."
 
-#: ../src/protocols/jabber/presence.c:319 ../src/protocols/oscar/oscar.c:4740
-#: ../src/protocols/oscar/oscar.c:7405
+#: ../src/protocols/jabber/presence.c:322 ../src/protocols/oscar/oscar.c:2382
+#: ../src/protocols/oscar/oscar.c:5036
 msgid "_Authorize"
 msgstr "_اجازه داده شود"
 
-#: ../src/protocols/jabber/presence.c:320 ../src/protocols/oscar/oscar.c:4742
-#: ../src/protocols/oscar/oscar.c:7406
+#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:2384
+#: ../src/protocols/oscar/oscar.c:5037
 msgid "_Deny"
 msgstr "_رد شود"
 
-#: ../src/protocols/jabber/presence.c:376
-#: ../src/protocols/jabber/presence.c:377
+#: ../src/protocols/jabber/presence.c:380
+#: ../src/protocols/jabber/presence.c:381
 msgid "Create New Room"
 msgstr "ایجاد اتاق جدید"
 
-#: ../src/protocols/jabber/presence.c:378
+#: ../src/protocols/jabber/presence.c:382
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -7275,30 +7383,30 @@
 "شما در حال ایجاد یک اتاق جدید هستید. آیا مایلید آن را پیکربندی کنید یا "
 "تنظیمات پیش‌فرض را می‌پذیرید؟"
 
-#: ../src/protocols/jabber/presence.c:380
+#: ../src/protocols/jabber/presence.c:385
 msgid "_Configure Room"
-msgstr "پ_یکربندی اتاق"
-
-#: ../src/protocols/jabber/presence.c:382
+msgstr "_پیکربندی اتاق"
+
+#: ../src/protocols/jabber/presence.c:387
 msgid "_Accept Defaults"
 msgstr "_پذیرش پیش‌فرض‌ها"
 
-#: ../src/protocols/jabber/presence.c:419
+#: ../src/protocols/jabber/presence.c:425
 #, c-format
 msgid "Error in chat %s"
 msgstr "خطا در گپ %s"
 
-#: ../src/protocols/jabber/presence.c:422
+#: ../src/protocols/jabber/presence.c:428
 #, c-format
 msgid "Error joining chat %s"
 msgstr "خطا هنگام پیوستن به گپ %s"
 
-#: ../src/protocols/jabber/si.c:726
+#: ../src/protocols/jabber/si.c:728
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "فرستادن پرونده به %s ممکن نیست، کاربر از انتقال پرونده پشتیبانی نمی‌کند"
 
-#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
+#: ../src/protocols/jabber/si.c:729 ../src/protocols/jabber/si.c:730
 msgid "File Send Failed"
 msgstr "فرستادن پرونده شکست خورد"
 
@@ -7355,7 +7463,7 @@
 
 #: ../src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
-msgstr "نام دوستانه‌ی نامعتبر"
+msgstr "نام دوستانهٔ نامعتبر"
 
 #: ../src/protocols/msn/error.c:61
 msgid "List Full"
@@ -7369,13 +7477,13 @@
 msgid "Not on list"
 msgstr "در فهرست نیست"
 
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:705
 msgid "User is offline"
 msgstr "کاربر برون‌خط است"
 
 #: ../src/protocols/msn/error.c:73
 msgid "Already in the mode"
-msgstr "از قبل در این حالت است"
+msgstr "از قبل در همین حالت است"
 
 #: ../src/protocols/msn/error.c:76
 msgid "Already in opposite list"
@@ -7403,7 +7511,7 @@
 
 #: ../src/protocols/msn/error.c:95
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "سعی شد کاربر به گروهی اضافه شود که وجود ندارد"
+msgstr "سعی شد اطلاعات تماس به گروهی اضافه شود که وجود ندارد"
 
 #: ../src/protocols/msn/error.c:99
 msgid "Switchboard failed"
@@ -7421,7 +7529,7 @@
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:148
 msgid "Not logged in"
 msgstr "وارد سیستم نشده است"
 
@@ -7500,7 +7608,7 @@
 
 #: ../src/protocols/msn/error.c:177
 msgid "Bad friend file"
-msgstr "پرونده‌ی دوست بد"
+msgstr "پروندهٔ دوست بد"
 
 #: ../src/protocols/msn/error.c:180
 msgid "Not expected"
@@ -7514,7 +7622,7 @@
 msgid "Server too busy"
 msgstr "کارگزار خیلی مشغول است"
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2864
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1331
 #: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "تأیید هویت شکست خورد"
@@ -7555,7 +7663,7 @@
 
 #: ../src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
-msgstr "نام دوستانه‌ی MSN جدید شما خیلی بلند است."
+msgstr "نام دوستانهٔ MSN جدید شما خیلی بلند است."
 
 #: ../src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
@@ -7567,15 +7675,15 @@
 
 #: ../src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
-msgstr "شماره‌ی تلفن منزل‌تان را تنظیم کنید."
+msgstr "شمارهٔ تلفن منزل‌تان را تنظیم کنید."
 
 #: ../src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
-msgstr "شماره‌ی تلفن محل کارتان را تنظیم کنید."
+msgstr "شمارهٔ تلفن محل کارتان را تنظیم کنید."
 
 #: ../src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
-msgstr "شماره‌ی تلفن همراه‌تان را تنظیم کنید."
+msgstr "شمارهٔ تلفن همراه‌تان را تنظیم کنید."
 
 #: ../src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
@@ -7609,9 +7717,9 @@
 msgid "Page"
 msgstr "پی‌جویی"
 
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
-#: ../src/protocols/yahoo/yahoo.c:2881 ../src/protocols/yahoo/yahoo.c:2887
+#: ../src/protocols/msn/msn.c:548 ../src/protocols/msn/msn.c:555
+#: ../src/protocols/msn/msn.c:564 ../src/protocols/sametime/sametime.c:3239
+#: ../src/protocols/yahoo/yahoo.c:2878 ../src/protocols/yahoo/yahoo.c:2884
 #, c-format
 msgid ""
 "\n"
@@ -7620,174 +7728,326 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:555
 msgid "Has you"
 msgstr "شما را دارد"
 
-#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2710 ../src/protocols/yahoo/yahoo.c:3289
+#: ../src/protocols/msn/msn.c:585 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2707 ../src/protocols/yahoo/yahoo.c:3292
 msgid "Be Right Back"
 msgstr "الان برمی‌گردم"
 
-#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
+#: ../src/protocols/msn/msn.c:589 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2849 ../src/protocols/novell/novell.c:2983
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2712 ../src/protocols/yahoo/yahoo.c:3292
+#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3295
 msgid "Busy"
 msgstr "مشغول"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2720
-#: ../src/protocols/yahoo/yahoo.c:3304
+#: ../src/protocols/msn/msn.c:593 ../src/protocols/yahoo/yahoo.c:2717
+#: ../src/protocols/yahoo/yahoo.c:3307
 msgid "On the Phone"
 msgstr "پای تلفن"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2724
-#: ../src/protocols/yahoo/yahoo.c:3310
+#: ../src/protocols/msn/msn.c:597 ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3313
 msgid "Out to Lunch"
 msgstr "بیرون برای ناهار"
 
-#: ../src/protocols/msn/msn.c:623
+#: ../src/protocols/msn/msn.c:621
 msgid "Set Friendly Name..."
 msgstr "تنظیم نام دوستانه..."
 
-#: ../src/protocols/msn/msn.c:628
+#: ../src/protocols/msn/msn.c:626
 msgid "Set Home Phone Number..."
-msgstr "تنظیم شماره‌ی تلفن منزل..."
-
-#: ../src/protocols/msn/msn.c:632
+msgstr "تنظیم شمارهٔ تلفن منزل..."
+
+#: ../src/protocols/msn/msn.c:630
 msgid "Set Work Phone Number..."
-msgstr "تنظیم شماره‌ی تلفن محل کار..."
-
-#: ../src/protocols/msn/msn.c:636
+msgstr "تنظیم شمارهٔ تلفن محل کار..."
+
+#: ../src/protocols/msn/msn.c:634
 msgid "Set Mobile Phone Number..."
-msgstr "تنظیم شماره‌ی تلفن همراه..."
-
-#: ../src/protocols/msn/msn.c:642
+msgstr "تنظیم شمارهٔ تلفن همراه..."
+
+#: ../src/protocols/msn/msn.c:640
 msgid "Enable/Disable Mobile Devices..."
 msgstr "به کار انداختن/از کار انداختن دستگاه‌های همراه..."
 
-#: ../src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:645
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "اجازه دادن/ندادن پی‌جویی روی دستگاه‌های همراه..."
 
-#: ../src/protocols/msn/msn.c:657
+#: ../src/protocols/msn/msn.c:655
 msgid "Open Hotmail Inbox"
-msgstr "صندوق نامه‌ی هات‌مِیل باز شود"
-
-#: ../src/protocols/msn/msn.c:681
+msgstr "صندوق نامهٔ هات‌مِیل باز شود"
+
+#: ../src/protocols/msn/msn.c:679
 msgid "Send to Mobile"
-msgstr "فرستادن به همراه"
-
-#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
+msgstr "فرستادن به تلفن همراه"
+
+#: ../src/protocols/msn/msn.c:689 ../src/protocols/novell/novell.c:3439
 msgid "Initiate _Chat"
 msgstr "راه‌اندازی _گپ"
 
-#: ../src/protocols/msn/msn.c:729
+#: ../src/protocols/msn/msn.c:727
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 msgstr ""
-"پشتیبانی SSL برای MSN لازم است. لطفاً یک کتابخانه‌ی SSL پشتیبانی شده نصبکنید. "
+"پشتیبانی SSL برای MSN لازم است. لطفاً یک کتابخانهٔ SSL پشتیبانی شده نصب کنید. "
 "برای اطلاعات پیشتر به http://gaim.sf.net/faq-ssl.php مراجعه کنید."
 
-#: ../src/protocols/msn/msn.c:757
+#: ../src/protocols/msn/msn.c:755
 msgid "Failed to connect to server."
 msgstr "اتصال به کارگزار شکست خورد."
 
-#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
+#: ../src/protocols/msn/msn.c:1361 ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>اسم مستعار:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1725
-#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1056
+#: ../src/protocols/msn/msn.c:1368 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/util.c:1061
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>‏%s:</b>"
 
-#: ../src/protocols/msn/msn.c:1456
+#: ../src/protocols/msn/msn.c:1458
 msgid "MSN Profile"
-msgstr "مجموعه تنظیمات MSN"
-
-#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1712
+msgstr "شرح حال MSN"
+
+#: ../src/protocols/msn/msn.c:1463 ../src/protocols/msn/msn.c:1789
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
-msgstr "خطا هنگام بازیابی مجموعه تنظیمات"
-
-#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6139
-#: ../src/protocols/yahoo/yahoo_profile.c:1050
+msgstr "خطا هنگام بازیابی شرح حال"
+
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:3674
+#: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "سن"
 
-#: ../src/protocols/msn/msn.c:1547 ../src/protocols/yahoo/yahoo_profile.c:1055
-msgid "Marital Status"
-msgstr "وضعیت تأهل"
-
-#: ../src/protocols/msn/msn.c:1554 ../src/protocols/novell/novell.c:1480
-#: ../src/protocols/yahoo/yahoo_profile.c:1045
-msgid "Location"
-msgstr "مکان"
-
-#: ../src/protocols/msn/msn.c:1562 ../src/protocols/yahoo/yahoo_profile.c:1065
+#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "شغل"
 
-#: ../src/protocols/msn/msn.c:1579 ../src/protocols/msn/msn.c:1585
-#: ../src/protocols/msn/msn.c:1592 ../src/protocols/msn/msn.c:1600
-#: ../src/protocols/msn/msn.c:1607
-msgid "A Little About Me"
-msgstr "کمی درباره‌ی من"
-
-#: ../src/protocols/msn/msn.c:1616 ../src/protocols/msn/msn.c:1622
-#: ../src/protocols/msn/msn.c:1629 ../src/protocols/msn/msn.c:1636
-msgid "Favorite Things"
-msgstr "چیزهای مورد علاقه"
-
-#: ../src/protocols/msn/msn.c:1645 ../src/protocols/msn/msn.c:1651
-#: ../src/protocols/msn/msn.c:1658
+#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1478
+#: ../src/protocols/yahoo/yahoo_profile.c:1051
+msgid "Location"
+msgstr "مکان"
+
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1718
+#: ../src/protocols/msn/msn.c:1724 ../src/protocols/msn/msn.c:1731
 msgid "Hobbies and Interests"
 msgstr "سرگرمی‌ها و علایق"
 
-#: ../src/protocols/msn/msn.c:1667 ../src/protocols/msn/msn.c:1673
-#: ../src/protocols/yahoo/yahoo_profile.c:1107
+#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1652
+#: ../src/protocols/msn/msn.c:1658 ../src/protocols/msn/msn.c:1665
+#: ../src/protocols/msn/msn.c:1673 ../src/protocols/msn/msn.c:1680
+msgid "A Little About Me"
+msgstr "کمی دربارهٔ خودتان"
+
+#: ../src/protocols/msn/msn.c:1551
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>عمومی</b><br>%s"
+
+#. Social
+#: ../src/protocols/msn/msn.c:1560 ../src/protocols/yahoo/yahoo_profile.c:1061
+msgid "Marital Status"
+msgstr "وضعیت تأهل"
+
+#: ../src/protocols/msn/msn.c:1561
+msgid "Interests"
+msgstr "علایق"
+
+#: ../src/protocols/msn/msn.c:1562
+msgid "Pets"
+msgstr "حیوانات خانگی"
+
+#: ../src/protocols/msn/msn.c:1563
+msgid "Hometown"
+msgstr "زادگاه"
+
+#: ../src/protocols/msn/msn.c:1564
+msgid "Places Lived"
+msgstr "شهرهای دیگری که در آنها زندگی کرده‌اید"
+
+#: ../src/protocols/msn/msn.c:1565
+msgid "Fashion"
+msgstr "مُد"
+
+#: ../src/protocols/msn/msn.c:1566
+msgid "Humor"
+msgstr "خُلق"
+
+#: ../src/protocols/msn/msn.c:1567
+msgid "Music"
+msgstr "موسیقی"
+
+#: ../src/protocols/msn/msn.c:1568 ../src/protocols/msn/msn.c:1740
+#: ../src/protocols/msn/msn.c:1746 ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
 msgstr "نقل قول محبوب"
 
-#: ../src/protocols/msn/msn.c:1681
+#: ../src/protocols/msn/msn.c:1572
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>روابط اجتماعی</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1581
+msgid "Significant Other"
+msgstr "مطالب مهم دیگر"
+
+#: ../src/protocols/msn/msn.c:1582
+msgid "Home Phone"
+msgstr "تلفن خانه"
+
+#: ../src/protocols/msn/msn.c:1583
+msgid "Home Phone 2"
+msgstr "تلفن خانه ۲"
+
+#: ../src/protocols/msn/msn.c:1584 ../src/protocols/oscar/oscar.c:3686
+msgid "Home Address"
+msgstr "نشانی خانه"
+
+#: ../src/protocols/msn/msn.c:1585
+msgid "Personal Mobile"
+msgstr "همراه شخصی"
+
+#: ../src/protocols/msn/msn.c:1586
+msgid "Home Fax"
+msgstr "نمابر خانه"
+
+#: ../src/protocols/msn/msn.c:1587
+msgid "Personal E-Mail"
+msgstr "پست الکترونیکی شخصی"
+
+#: ../src/protocols/msn/msn.c:1588
+msgid "Personal IM"
+msgstr "پیغام اینترنتی شخصی"
+
+#: ../src/protocols/msn/msn.c:1590
+msgid "Anniversary"
+msgstr "سالگرد ازدواج"
+
+#: ../src/protocols/msn/msn.c:1591 ../src/protocols/msn/msn.c:1615
+msgid "Notes"
+msgstr "یادداشت‌ها"
+
+#: ../src/protocols/msn/msn.c:1595
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>شخصی</b><br> %s"
+
+#: ../src/protocols/msn/msn.c:1602 ../src/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "عنوان شغلی"
+
+#: ../src/protocols/msn/msn.c:1603 ../src/protocols/oscar/oscar.c:3703
+msgid "Company"
+msgstr "شرکت"
+
+#: ../src/protocols/msn/msn.c:1604 ../src/protocols/novell/novell.c:1480
+msgid "Department"
+msgstr "بخش"
+
+#: ../src/protocols/msn/msn.c:1605
+msgid "Profession"
+msgstr "حرفه"
+
+#: ../src/protocols/msn/msn.c:1606
+msgid "Work Phone"
+msgstr "تلفن محل کار"
+
+#: ../src/protocols/msn/msn.c:1607
+msgid "Work Phone 2"
+msgstr "تلفن محل کار ۲"
+
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3694
+msgid "Work Address"
+msgstr "نشانی محل کار"
+
+#: ../src/protocols/msn/msn.c:1609
+msgid "Work Mobile"
+msgstr "تلفن همراه کاری"
+
+#: ../src/protocols/msn/msn.c:1610
+msgid "Work Pager"
+msgstr "پی‌جوی محل کار"
+
+#: ../src/protocols/msn/msn.c:1611
+msgid "Work Fax"
+msgstr "نمابر محل کار"
+
+#: ../src/protocols/msn/msn.c:1612
+msgid "Work E-Mail"
+msgstr "پست الکترونیکی کاری"
+
+#: ../src/protocols/msn/msn.c:1613
+msgid "Work IM"
+msgstr "پیغام اینترنتی کاری"
+
+#: ../src/protocols/msn/msn.c:1614
+msgid "Start Date"
+msgstr "تاریخ شروع"
+
+#: ../src/protocols/msn/msn.c:1619
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>کاری</b><br> %s"
+
+#: ../src/protocols/msn/msn.c:1630
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>اطلاعات تماس</b>%s%s"
+
+#: ../src/protocols/msn/msn.c:1689 ../src/protocols/msn/msn.c:1695
+#: ../src/protocols/msn/msn.c:1702 ../src/protocols/msn/msn.c:1709
+msgid "Favorite Things"
+msgstr "چیزهای مورد علاقه"
+
+#: ../src/protocols/msn/msn.c:1754
 msgid "Last Updated"
 msgstr "آخرین به‌هنگام‌سازی"
 
-#: ../src/protocols/msn/msn.c:1692 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1766 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
-msgstr "صفحه‌ی آغازه"
-
-#: ../src/protocols/msn/msn.c:1714
+msgstr "صفحهٔ آغازه"
+
+#: ../src/protocols/msn/msn.c:1791
 msgid "The user has not created a public profile."
-msgstr "کاربر مجموعه تنظیمات عمومی ایجاد نکرده است."
-
-#: ../src/protocols/msn/msn.c:1715
+msgstr "کاربر شرح حال عمومی ایجاد نکرده است."
+
+#: ../src/protocols/msn/msn.c:1792
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
 "‏MSN گزارش کرد که نمی‌تواند مجموعه تنظیمات کاربر را پیدا کند. این بدین معنا "
-"است که یا کاربر وجود ندارد یا این که کاربر وجود دارد اما مجموعه تنظیمات "
+"است که یا کاربر وجود ندارد یا این که کاربر وجود دارد اما شرح حال "
 "عمومی‌ای ایجاد نکرده است."
 
-#: ../src/protocols/msn/msn.c:1719
+#: ../src/protocols/msn/msn.c:1796
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr ""
-"گیم نتوانست هیچ اطلاعاتی در مجموعه تنظیمات کاربر پیدا کند. به احتمال زیاد "
+"گیم نتوانست اطلاعاتی در شرح حال کاربر پیدا کند. به احتمال زیاد "
 "این کاربر وجود ندارد."
 
-#: ../src/protocols/msn/msn.c:1725 ../src/protocols/yahoo/yahoo_profile.c:1202
+#. put a link to the actual profile URL
+#: ../src/protocols/msn/msn.c:1801
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../src/protocols/msn/msn.c:1801 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
-msgstr "نشانی اینترنتی مجموعه تنظیمات"
+msgstr "نشانی اینترنتی شرح حال"
 
 #. *< type
 #. *< ui_requirement
@@ -7799,25 +8059,21 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:1930 ../src/protocols/msn/msn.c:1932
+#: ../src/protocols/msn/msn.c:2023 ../src/protocols/msn/msn.c:2025
 msgid "MSN Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد MSN"
-
-#: ../src/protocols/msn/msn.c:1951
-msgid "Login server"
-msgstr "کارگزار ورود به سیستم"
-
-#: ../src/protocols/msn/msn.c:1960
+msgstr "متصل شوندهٔ قرارداد MSN"
+
+#: ../src/protocols/msn/msn.c:2053
 msgid "Use HTTP Method"
 msgstr "استفاده از روش HTTP"
 
-#: ../src/protocols/msn/msn.c:1965
+#: ../src/protocols/msn/msn.c:2058
 msgid "Show custom smileys"
 msgstr "نمایش صورتک‌های سفارشی"
 
-#: ../src/protocols/msn/msn.c:1973
+#: ../src/protocols/msn/msn.c:2066
 msgid "nudge: nudge a user to get their attention"
-msgstr ""
+msgstr "nudge: به کاربران سقلمه می‌زند تا حواسشان را جمع کنند"
 
 #: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
 #: ../src/protocols/yahoo/yahoochat.c:1345
@@ -7831,7 +8087,7 @@
 msgstr "‏%s گروه معتبری نیست."
 
 #: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "خطای نامعلوم."
 
@@ -7853,7 +8109,7 @@
 #: ../src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "نمی‌توان به کاربر در %s اجازه داد (%s)"
+msgstr "نمی‌توان به کاربر اجازهٔ ورود به %s را داد (%s)"
 
 #: ../src/protocols/msn/notification.c:514
 #, c-format
@@ -7869,15 +8125,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "سرویس موقتاً موجود نیست."
 
-#: ../src/protocols/msn/notification.c:821
+#: ../src/protocols/msn/notification.c:820
 msgid "Unable to rename group"
 msgstr "تغییر نام گروه ممکن نیست"
 
-#: ../src/protocols/msn/notification.c:876
+#: ../src/protocols/msn/notification.c:875
 msgid "Unable to delete group"
 msgstr "حذف گروه ممکن نیست"
 
-#: ../src/protocols/msn/notification.c:1309
+#: ../src/protocols/msn/notification.c:1308
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7894,11 +8150,11 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"تا %Id دقیقه‌ی دیگر کارگزار MSN برای تعمیر و نگهداری خاموش خواهد شد. در آن "
+"تا %Id دقیقهٔ دیگر کارگزار MSN برای تعمیر و نگهداری خاموش خواهد شد. در آن "
 "زمان شما به طور خودکار از سیستم خارج خواهید شد. لطفاً گفتگوهای خود را تمام "
 "کنید.\n"
 "\n"
-"پس از پایان فرآیند تعمیر و نگهداری، خواهید توانست وارد سیستم شوید."
+"پس از پایان فرایند تعمیر و نگهداری، خواهید توانست وارد سیستم شوید."
 
 #: ../src/protocols/msn/servconn.c:135
 msgid "Writing error"
@@ -7917,64 +8173,64 @@
 "خطای اتصال از کارگزار %s:\n"
 "‏%s"
 
-#: ../src/protocols/msn/session.c:304
+#: ../src/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "قرارداد ما توسط این کارگزار پشتیبانی نمی‌شود."
 
-#: ../src/protocols/msn/session.c:308
+#: ../src/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
-msgstr "خطا هنگام تجزیه‌ی HTTP."
+msgstr "خطا هنگام تجزیهٔ HTTP."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:5816 ../src/protocols/yahoo/yahoo.c:193
+#: ../src/protocols/msn/session.c:307 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:3417 ../src/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "شما از جای دیگری وارد سیستم شده‌اید."
 
-#: ../src/protocols/msn/session.c:315
+#: ../src/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "کارگزارهای MSN موقتاً قابل دسترسی نیستند. لطفاً پس از کمی صبر دوباره امتحان "
 "کنید."
 
-#: ../src/protocols/msn/session.c:320
+#: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "کارگزارهای MSN موقتاً خاموش خواهند شد."
 
-#: ../src/protocols/msn/session.c:324
+#: ../src/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "تأیید هویت ممکن نیست: %s"
 
-#: ../src/protocols/msn/session.c:329
+#: ../src/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "فهرست رفقای MSN شما موقتاً قابل دسترسی نیست. لطفاً پس از کمی صبر دوباره امتحان "
 "کنید."
 
-#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
+#: ../src/protocols/msn/session.c:345 ../src/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "در حال دست دادن"
 
-#: ../src/protocols/msn/session.c:351
+#: ../src/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "در حال انتقال"
 
-#: ../src/protocols/msn/session.c:353
+#: ../src/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "در حال آغاز تأیید هویت"
 
-#: ../src/protocols/msn/session.c:354
+#: ../src/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "در حال گرفتن کوکی"
 
-#: ../src/protocols/msn/session.c:356
+#: ../src/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "در حال فرستادن کوکی"
 
-#: ../src/protocols/msn/session.c:357
+#: ../src/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "در حال بازیابی فهرست رفقا"
 
@@ -7990,69 +8246,69 @@
 msgid "Out To Lunch"
 msgstr "بیرون برای ناهار"
 
-#: ../src/protocols/msn/switchboard.c:408
+#: ../src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "ممکن است پیغام فرستاده نشده باشد چون مدت منقضی شد:"
-
-#: ../src/protocols/msn/switchboard.c:416
+msgstr "ممکن است پیغام فرستاده نشده باشد چون مدت انتظار منقضی شد:"
+
+#: ../src/protocols/msn/switchboard.c:409
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "نمی‌توان پیغام را فرستاد، ارسال پیغام در حین نامرئی بودن مجاز نیست:"
 
-#: ../src/protocols/msn/switchboard.c:420
+#: ../src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent because the user is offline:"
 msgstr "نمی‌توان پیغام را فرستاد چون کاربر برون‌خط است:"
 
-#: ../src/protocols/msn/switchboard.c:424
+#: ../src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "نمی‌توان پیغام را فرستاد چون خطای اتصال اتفاق افتاد:"
-
-#: ../src/protocols/msn/switchboard.c:428
+msgstr "نمی‌توان پیغام را فرستاد چون اتصال دچار خطا شد:"
+
+#: ../src/protocols/msn/switchboard.c:421
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "نمی‌توان پیغام را فرستاد چون خیلی سریع ارسال می‌شود:"
-
-#: ../src/protocols/msn/switchboard.c:432
+msgstr "نمی‌توان پیغام را فرستاد چون سرعت ارسال پیغام‌ها خیلی زیاد است:"
+
+#: ../src/protocols/msn/switchboard.c:425
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
-msgstr ""
-
-#: ../src/protocols/msn/switchboard.c:440
+msgstr "نمی‌توان پیغام را فرستاد چون در جعبه تقسیم خطایی رخ داد:"
+
+#: ../src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "ممکن است پیغام فرستاده نشده باشد چون خطایی نامعلوم رخ داد:"
 
-#: ../src/protocols/msn/switchboard.c:961
-#, fuzzy, c-format
+#: ../src/protocols/msn/switchboard.c:953
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "‏%s می‌خواهد پرونده‌ای برای شما بفرستد"
+msgstr "‏%s برای شما سقلمه‌ای فرستاد"
 
 #: ../src/protocols/msn/userlist.c:96
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "کاربر %s ‏(%s) می‌خواهد %s را به فهرست رفقایش اضافه کند."
 
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:913
 msgid "Authorize"
 msgstr "اجازه داده شود"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:915
 msgid "Deny"
 msgstr "رد شود"
 
 #: ../src/protocols/msn/userlist.c:286
 #, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "‏%s شما را به فهرست رفقایش اضافه کرده است."
-
-#: ../src/protocols/msn/userlist.c:350
+msgstr "‏%s شما را به فهرست رفقایش اضافه کرد."
+
+#: ../src/protocols/msn/userlist.c:355
 #, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "‏%s شما را از فهرست رفقایش حذف کرده است."
-
-#: ../src/protocols/msn/userlist.c:678
+msgstr "‏%s شما را از فهرست رفقایش حذف کرد."
+
+#: ../src/protocols/msn/userlist.c:677
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "نمی‌توان «%s» را اضافه کرد."
 
-#: ../src/protocols/msn/userlist.c:680
+#: ../src/protocols/msn/userlist.c:679
 msgid "The screen name specified is invalid."
 msgstr "نام کاربری مشخص شده نامعتبر است."
 
@@ -8079,7 +8335,7 @@
 #: ../src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr "نمی‌توان «%s» را به فهرست پر اهمیت نَپستر شما اضافه کرد"
+msgstr "نمی‌توان «%s» را به فهرست جاهای مهم نَپستر شما اضافه کرد"
 
 #. MSG_CLIENT_WHOIS
 #: ../src/protocols/napster/napster.c:420
@@ -8096,8 +8352,8 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../src/protocols/napster/napster.c:507
 #: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
-#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
+#: ../src/protocols/yahoo/yahoo.c:2237 ../src/protocols/yahoo/yahoo.c:2264
+#: ../src/protocols/yahoo/yahoo.c:2347 ../src/protocols/yahoo/yahoo.c:2362
 #: ../src/protocols/yahoo/yahoo_filexfer.c:74
 #: ../src/protocols/yahoo/yahoo_filexfer.c:137
 #: ../src/protocols/yahoo/ycht.c:540
@@ -8121,11 +8377,11 @@
 #: ../src/protocols/napster/napster.c:699
 #: ../src/protocols/napster/napster.c:701
 msgid "NAPSTER Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد نَپستر"
+msgstr "متصل شوندهٔ قرارداد نَپستر"
 
 #: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
-msgstr "پارامترهای مورد نیاز به درون رد نشدند"
+msgstr "پارامترهای مورد نیاز داده نشدند"
 
 #: ../src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
@@ -8149,7 +8405,7 @@
 
 #: ../src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
-msgstr "پرونده‌ای با این نام از قبل وجود دارد"
+msgstr "پوشه‌ای با این نام از قبل وجود دارد"
 
 #: ../src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
@@ -8161,7 +8417,7 @@
 
 #: ../src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
-msgstr "گذرواژه‌ی نامعتبر"
+msgstr "گذرواژهٔ نامعتبر"
 
 #: ../src/protocols/novell/nmuser.c:1901
 msgid "User not found"
@@ -8173,7 +8429,7 @@
 
 #: ../src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
-msgstr "دسترسی کارگزار به دفترچه راهنمای کاربران ممکن نشد"
+msgstr "کارگزار نتوانست به شاخه دسترسی پیدا کند"
 
 #: ../src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
@@ -8197,7 +8453,7 @@
 
 #: ../src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
-msgstr "نام کاربر یا گذرواژه‌ی نامعتبر"
+msgstr "نام کاربر یا گذرواژهٔ نامعتبر"
 
 #: ../src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
@@ -8224,11 +8480,11 @@
 
 #: ../src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
-msgstr "در حین به‌هنگام‌سازی دفترچه راهنمای کاربران خطایی رخ داد"
+msgstr "در حین به‌هنگام‌سازی شاخه خطایی رخ داد"
 
 #: ../src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
-msgstr "نسخه‌ی قرارداد ناسازگار است"
+msgstr "نسخهٔ قرارداد ناسازگار است"
 
 #: ../src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
@@ -8239,7 +8495,7 @@
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-"این نسخه‌ی اولووشن اجازه نمی‌دهد بیش از ده کاربر در یک زمان وارد سیستم شوند"
+"این نسخهٔ اولووشن اجازه نمی‌دهد بیش از ده کاربر در یک زمان وارد سیستم شوند"
 
 #: ../src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
@@ -8263,7 +8519,7 @@
 #: ../src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "نمی‌توان %s را به فهرست رفقایتان اضافه کرد (%s)."
+msgstr "نمی‌توان %s را به فهرست رفقای شما اضافه کرد (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
 #: ../src/protocols/novell/novell.c:422
@@ -8271,7 +8527,7 @@
 msgid "Unable to send message (%s)."
 msgstr "نمی‌توان پیغام فرستاد (%s)."
 
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
+#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "نمی‌توان کاربر را دعوت کرد (%s)."
@@ -8292,7 +8548,7 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"نمی‌توان در فهرست کارگزار کاربر %s را به پوشه %s جابه‌جا کرد. خطا هنگام ایجاد "
+"نمی‌توان در فهرست کارگزار کاربر %s را به پوشهٔ %s منتقل کرد. خطا هنگام ایجاد "
 "پوشه (%s)."
 
 #: ../src/protocols/novell/novell.c:632
@@ -8301,7 +8557,7 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"نمی‌توان %s را به فهرست رفقایتان اضافه کرد. خطا هنگام ایجاد پوشه در فهرست "
+"نمی‌توان %s را به فهرست رفقای شما اضافه کرد. خطا هنگام ایجاد پوشه در فهرست "
 "کارگزار (%s)."
 
 #: ../src/protocols/novell/novell.c:705
@@ -8329,44 +8585,35 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "نمی‌توان %s را از فهرست حریم خصوصی حذف کرد (%s)."
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "نمی‌توان تنظیمات حریم خصوصی در کارگزار را تغییر داد (%s)."
 
-#: ../src/protocols/novell/novell.c:1014
+#: ../src/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "نمی‌توان کنفرانس را ایجاد کرد (%s)."
 
-#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
+#: ../src/protocols/novell/novell.c:1121 ../src/protocols/novell/novell.c:1691
 msgid "Error communicating with server. Closing connection."
 msgstr "خطا هنگام برقراری ارتباط با کارگزار. اتصال بسته می‌شود."
 
-#: ../src/protocols/novell/novell.c:1478
+#: ../src/protocols/novell/novell.c:1476
 msgid "Telephone Number"
-msgstr "شماره‌ی تلفن"
+msgstr "شمارهٔ تلفن"
 
 #: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "بخش"
-
-#: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "عنوان شخصی"
 
-#: ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr ""
 
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6113
-#: ../src/protocols/oscar/oscar.c:6120
-msgid "Email Address"
-msgstr "نشانی پست الکترونیکی"
-
-#: ../src/protocols/novell/novell.c:1506
+#: ../src/protocols/novell/novell.c:1504
 msgid "User ID"
-msgstr "شناسه‌ی کاربر"
+msgstr "شناسهٔ کاربر"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
@@ -8375,41 +8622,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1520
+#: ../src/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "نام و نام خانوادگی"
 
-#: ../src/protocols/novell/novell.c:1644
+#: ../src/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "کنفرانس GroupWise %Id"
 
-#: ../src/protocols/novell/novell.c:1669
+#: ../src/protocols/novell/novell.c:1667
 msgid "Unable to make SSL connection to server."
 msgstr "ایجاد اتصال SSL به کارگزار ممکن نیست."
 
-#: ../src/protocols/novell/novell.c:1726
+#: ../src/protocols/novell/novell.c:1724
 msgid "Authenticating..."
 msgstr "تأیید هویت..."
 
-#: ../src/protocols/novell/novell.c:1738
+#: ../src/protocols/novell/novell.c:1736
 msgid "Unable to connect to server."
 msgstr "اتصال به کارگزار ممکن نیست."
 
-#: ../src/protocols/novell/novell.c:1741
+#: ../src/protocols/novell/novell.c:1739
 msgid "Waiting for response..."
 msgstr "در حال انتظار برای پاسخ..."
 
-#: ../src/protocols/novell/novell.c:1876
+#: ../src/protocols/novell/novell.c:1874
 #, c-format
 msgid "%s has been invited to this conversation."
-msgstr "‏%s به این گفتگو دعوت شده است."
-
-#: ../src/protocols/novell/novell.c:1904
+msgstr "‏%s به این گفتگو دعوت شد."
+
+#: ../src/protocols/novell/novell.c:1902
 msgid "Invitation to Conversation"
 msgstr "دعوت به گفتگو"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../src/protocols/novell/novell.c:1903
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8420,26 +8667,26 @@
 "\n"
 "زمان ارسال: %s"
 
-#: ../src/protocols/novell/novell.c:1907
+#: ../src/protocols/novell/novell.c:1905
 msgid "Would you like to join the conversation?"
 msgstr "آیا مایلید به این گفتگو بپیوندید؟"
 
-#: ../src/protocols/novell/novell.c:2014
+#: ../src/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "شما از سیستم خارج شدید چون در ایستگاه کاری دیگری وارد سیستم شده‌اید."
 
-#: ../src/protocols/novell/novell.c:2070
+#: ../src/protocols/novell/novell.c:2068
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
-"به نظر می‌رسد %s برون‌خط است و پیغامی را که الان فرستاده‌اید دریافت نکرده است."
+"به نظر می‌رسد %s برون‌خط است و پیغامی را که الان فرستادید دریافت نکرده است."
 
 #. TODO: Would be nice to prompt if not set!
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2168
+#: ../src/protocols/novell/novell.c:2166
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8447,11 +8694,11 @@
 "نمی‌توان به کارگزار متصل شد. لطفاً نشانی کارگزاری را که مایلید به آن متصل شوید "
 "وارد کنید."
 
-#: ../src/protocols/novell/novell.c:2190
+#: ../src/protocols/novell/novell.c:2188
 msgid "Error. SSL support is not installed."
 msgstr "خطا. پشتیبانی SSL نصب نشده است."
 
-#: ../src/protocols/novell/novell.c:2499
+#: ../src/protocols/novell/novell.c:2497
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "این کنفرانس بسته شده است. دیگر نمی‌توان پیغامی فرستاد."
 
@@ -8465,115 +8712,166 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
+#: ../src/protocols/novell/novell.c:3541 ../src/protocols/novell/novell.c:3543
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد پیغام‌رسان GroupWise ناول"
-
-#: ../src/protocols/novell/novell.c:3564
+msgstr "متصل شوندهٔ قرارداد پیغام‌رسان GroupWise ناوِل"
+
+#: ../src/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "نشانی کارگزار"
 
-#: ../src/protocols/novell/novell.c:3568
+#: ../src/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "درگاه کارگزار"
 
-#: ../src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/flap_connection.c:222
+msgid "Server closed the connection."
+msgstr "کارگزار اتصال را قطع کرد."
+
+#: ../src/protocols/oscar/flap_connection.c:224
+msgid "Lost connection with server for an unknown reason."
+msgstr "اتصال به کارگزار به دلیل نامعلومی قطع شد."
+
+#: ../src/protocols/oscar/flap_connection.c:226
+msgid "Received invalid data on connection with server."
+msgstr "داده‌های نامعتبری از اتصال کارگزار دریافت شد.."
+
+#: ../src/protocols/oscar/flap_connection.c:228
+msgid "Could not establish a connection with the server."
+msgstr "برقراری اتصال با کارگزار ممکن نیست."
+
+#: ../src/protocols/oscar/odc.c:41
+msgid "The remote user has closed the connection."
+msgstr "‏کاربر دوردست اتصال را قطع کرده است."
+
+#: ../src/protocols/oscar/odc.c:45
+msgid "The remote user has declined your request."
+msgstr "کاربر دوردست درخواست شما را رد کرده است."
+
+#: ../src/protocols/oscar/odc.c:49
+msgid "Lost connection with the remote user for an unknown reason."
+msgstr "اتصال شما به کاربر دوردست به دلیل نامعلومی قطع شد."
+
+#: ../src/protocols/oscar/odc.c:53
+msgid "Received invalid data on connection with remote user."
+msgstr "داده‌های نامعتبری از اتصال با کاربر دوردست دریافت شد."
+
+#: ../src/protocols/oscar/odc.c:57
+msgid "Could not establish a connection with the remote user."
+msgstr "برقراری اتصال با کاربر دوردست ممکن نیست."
+
+#: ../src/protocols/oscar/odc.c:567
+msgid "Direct IM established"
+msgstr "ارتباط پیغام اینترنتی مستقیم برقرار شد"
+
+#: ../src/protocols/oscar/oscar.c:144
 msgid "Invalid error"
 msgstr "خطای نامعتبر"
 
-#: ../src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:145
 msgid "Invalid SNAC"
 msgstr "SNAC نامعتبر"
 
-#: ../src/protocols/oscar/oscar.c:205
+#: ../src/protocols/oscar/oscar.c:146
 msgid "Rate to host"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:206
+#: ../src/protocols/oscar/oscar.c:147
 msgid "Rate to client"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:149
 msgid "Service unavailable"
 msgstr "سرویس موجود نیست"
 
-#: ../src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:150
 msgid "Service not defined"
 msgstr "سرویس تعریف نشده است"
 
-#: ../src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:151
 msgid "Obsolete SNAC"
 msgstr "‏SNAC مهجور"
 
-#: ../src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:152
 msgid "Not supported by host"
 msgstr "میزبان پشتیبانی نمی‌کند"
 
-#: ../src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:153
 msgid "Not supported by client"
 msgstr "کارگیر پشتیبانی نمی‌کند"
 
-#: ../src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:154
 msgid "Refused by client"
 msgstr "کارگیر رد کرد"
 
-#: ../src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:155
 msgid "Reply too big"
 msgstr "پاسخ خیلی بزرگ است"
 
-#: ../src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:156
 msgid "Responses lost"
-msgstr "پاسه گم شد"
-
-#: ../src/protocols/oscar/oscar.c:216
+msgstr "پاسخ‌ها گم شدند"
+
+#: ../src/protocols/oscar/oscar.c:157
 msgid "Request denied"
 msgstr "درخواست رد شد"
 
-#: ../src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:158
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:159
 msgid "Insufficient rights"
 msgstr "حقوق ناکافی"
 
-#: ../src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:160
 msgid "In local permit/deny"
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:220
+msgstr "در فهرست اجازه/منع محلی"
+
+#: ../src/protocols/oscar/oscar.c:161
 msgid "Too evil (sender)"
-msgstr "خیلی بدجنس است (فرستنده)"
-
-#: ../src/protocols/oscar/oscar.c:221
+msgstr "خیلی بد است (فرستنده)"
+
+#: ../src/protocols/oscar/oscar.c:162
 msgid "Too evil (receiver)"
-msgstr "خیلی بدجنس است (گیرنده)"
-
-#: ../src/protocols/oscar/oscar.c:222
+msgstr "خیلی بد است (گیرنده)"
+
+#: ../src/protocols/oscar/oscar.c:163
 msgid "User temporarily unavailable"
 msgstr "کاربر موقتاً در دسترس نیست"
 
-#: ../src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:164
 msgid "No match"
 msgstr "مطابقت ندارد"
 
-#: ../src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:165
 msgid "List overflow"
-msgstr "پر شدن فهرست"
-
-#: ../src/protocols/oscar/oscar.c:225
+msgstr "فهرست پر شده است"
+
+#: ../src/protocols/oscar/oscar.c:166
 msgid "Request ambiguous"
 msgstr "درخواست مبهم"
 
-#: ../src/protocols/oscar/oscar.c:226
+#: ../src/protocols/oscar/oscar.c:167
 msgid "Queue full"
 msgstr "صف پر است"
 
-#: ../src/protocols/oscar/oscar.c:227
+#: ../src/protocols/oscar/oscar.c:168
 msgid "Not while on AOL"
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
+msgstr "در AOL امکان ندارد"
+
+#: ../src/protocols/oscar/oscar.c:346
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+"(در دریافت پیغام خطایی رخ داد. کسی که مشغول گفتگو با او هستید از یک کُدگذاری متفاوت به نسبت کُدگذاری مورد انتظار استفاده می‌کند. اگر می‌دانید "
+"کُدگذاری مورد استفادهٔ او چیست می‌توانید آن را در قسمت گزینه‌های حساب پیش‌رفتهٔ حساب AIM/ICQ خود وارد کنید."
+""
+
+#: ../src/protocols/oscar/oscar.c:449
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -8581,183 +8879,141 @@
 "(در دریافت این پیغام خطایی وجود داشت. به احتمال زیاد رفیقی که دارید با او "
 "صحبت می‌کند کارگیر پر اشکالی دارد.)"
 
-#: ../src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:628
 msgid "Voice"
 msgstr "صدای انسان"
 
-#: ../src/protocols/oscar/oscar.c:641
+#: ../src/protocols/oscar/oscar.c:631
 msgid "AIM Direct IM"
-msgstr "پیغام فوری مستقیم AIM"
-
-#: ../src/protocols/oscar/oscar.c:644 ../src/protocols/silc/silc.c:693
-#: ../src/protocols/silc/util.c:510
+msgstr "پیغام اینترنتی مستقیم AIM"
+
+#: ../src/protocols/oscar/oscar.c:634 ../src/protocols/silc/silc.c:697
+#: ../src/protocols/silc/util.c:524
 msgid "Chat"
 msgstr "گپ"
 
-#: ../src/protocols/oscar/oscar.c:647 ../src/protocols/oscar/oscar.c:8095
+#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5790
 msgid "Get File"
 msgstr "گرفتن پرونده"
 
-#: ../src/protocols/oscar/oscar.c:654
+#: ../src/protocols/oscar/oscar.c:644
 msgid "Games"
 msgstr "بازی‌ها"
 
-#: ../src/protocols/oscar/oscar.c:657
+#: ../src/protocols/oscar/oscar.c:647
 msgid "Add-Ins"
 msgstr "افزودنی‌ها"
 
-#: ../src/protocols/oscar/oscar.c:660
+#: ../src/protocols/oscar/oscar.c:650
 msgid "Send Buddy List"
 msgstr "فرستادن فهرست رفقا"
 
-#: ../src/protocols/oscar/oscar.c:663
+#: ../src/protocols/oscar/oscar.c:653
 msgid "ICQ Direct Connect"
 msgstr "اتصال مستقیم ICQ"
 
-#: ../src/protocols/oscar/oscar.c:666
+#: ../src/protocols/oscar/oscar.c:656
 msgid "AP User"
 msgstr "کاربر AP"
 
-#: ../src/protocols/oscar/oscar.c:669
+#: ../src/protocols/oscar/oscar.c:659
 msgid "ICQ RTF"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:672
+#: ../src/protocols/oscar/oscar.c:662
 msgid "Nihilist"
 msgstr "پوچ‌گرا"
 
-#: ../src/protocols/oscar/oscar.c:675
+#: ../src/protocols/oscar/oscar.c:665
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:678
+#: ../src/protocols/oscar/oscar.c:668
 msgid "Old ICQ UTF8"
-msgstr "یوتی‌اف هشت ICQ قدیمی"
-
-#: ../src/protocols/oscar/oscar.c:681
+msgstr "‏UTF-8 ‏ICQ قدیمی"
+
+#: ../src/protocols/oscar/oscar.c:671
 msgid "Trillian Encryption"
 msgstr "رمزنگاری Trillian"
 
-#: ../src/protocols/oscar/oscar.c:684
+#: ../src/protocols/oscar/oscar.c:674
 msgid "ICQ UTF8"
-msgstr "یوتی‌اف هشت ICQ"
+msgstr "‏UTF-8 ‏ICQ"
+
+#: ../src/protocols/oscar/oscar.c:677
+msgid "Hiptop"
+msgstr ""
+
+#: ../src/protocols/oscar/oscar.c:680
+msgid "Security Enabled"
+msgstr "امنیت به کار انداخته شد"
+
+#: ../src/protocols/oscar/oscar.c:683
+msgid "Video Chat"
+msgstr "گپ ویدیویی"
 
 #: ../src/protocols/oscar/oscar.c:687
-msgid "Hiptop"
+msgid "iChat AV"
 msgstr ""
 
 #: ../src/protocols/oscar/oscar.c:690
-msgid "Security Enabled"
-msgstr "امنیت به کار انداخته شد"
+msgid "Live Video"
+msgstr "ویدیوی زنده"
 
 #: ../src/protocols/oscar/oscar.c:693
-msgid "Video Chat"
-msgstr "گپ ویدیویی"
-
-#: ../src/protocols/oscar/oscar.c:697
-msgid "iChat AV"
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:700
-msgid "Live Video"
-msgstr "ویدیوی زنده"
-
-#: ../src/protocols/oscar/oscar.c:703
 msgid "Camera"
 msgstr "دوربین"
 
-#: ../src/protocols/oscar/oscar.c:721 ../src/protocols/oscar/oscar.c:7957
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5597
 msgid "Free For Chat"
 msgstr "آزاد برای گپ"
 
-#: ../src/protocols/oscar/oscar.c:725 ../src/protocols/oscar/oscar.c:7985
+#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5625
 msgid "Not Available"
-msgstr "موجود نیست"
-
-#: ../src/protocols/oscar/oscar.c:727 ../src/protocols/oscar/oscar.c:7975
+msgstr "در دسترس نیست"
+
+#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5615
 msgid "Occupied"
 msgstr "مشغول"
 
-#: ../src/protocols/oscar/oscar.c:731
+#: ../src/protocols/oscar/oscar.c:721
 msgid "Web Aware"
-msgstr "مطلع وب"
-
-#: ../src/protocols/oscar/oscar.c:735
+msgstr ""
+
+#: ../src/protocols/oscar/oscar.c:725
 msgid "Online"
 msgstr "برخط"
 
-#: ../src/protocols/oscar/oscar.c:812 ../src/protocols/oscar/oscar.c:5188
+#: ../src/protocols/oscar/oscar.c:802 ../src/protocols/oscar/oscar.c:2825
 msgid "Warning Level"
 msgstr "سطح اخطار"
 
-#: ../src/protocols/oscar/oscar.c:821
+#: ../src/protocols/oscar/oscar.c:811
 msgid "Buddy Comment"
-msgstr "توضیح درباره‌ی رفیق"
-
-#: ../src/protocols/oscar/oscar.c:970
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "پیغام فوری مستقیم با %s بسته شد"
-
-#: ../src/protocols/oscar/oscar.c:972
-#, c-format
-msgid "Direct IM with %s failed"
-msgstr "پیغام فوری مستقیم با %s شکست خورد"
-
-#: ../src/protocols/oscar/oscar.c:980
-msgid "Direct Connect failed"
-msgstr "اتصال مستقیم شکست خورد"
-
-#: ../src/protocols/oscar/oscar.c:1060 ../src/protocols/oscar/oscar.c:1189
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "پیغام فوری مستقیم با %s برقرار شد"
-
-#: ../src/protocols/oscar/oscar.c:1141
-#, c-format
-msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "در حال تلاش برای اتصال به %s در %s:%hu برای پیغام فوری مستقیم."
-
-#: ../src/protocols/oscar/oscar.c:1544
-#, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "درخواست از %s برای اتصال به ما در %s:%hu برای پیغام فوری مستقیم."
-
-#: ../src/protocols/oscar/oscar.c:1549 ../src/protocols/oscar/oscar.c:1596
-msgid "Unable to open Direct IM"
-msgstr "باز کردن پیغام فوری مستقیم ممکن نیست"
-
-#: ../src/protocols/oscar/oscar.c:1632
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:1636
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"چون این کار نشانی IP شما را آشکار می‌سازد، ممکن است خطری برای حریم خصوصی شما "
-"به حساب آید. آیا مایلید ادامه دهید؟"
-
-#: ../src/protocols/oscar/oscar.c:1640 ../src/protocols/oscar/oscar.c:4499
-msgid "_Connect"
-msgstr "_اتصال"
-
-#: ../src/protocols/oscar/oscar.c:1718
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "اتصال شما با اتاق گپ %s قطع شده است."
-
-#: ../src/protocols/oscar/oscar.c:1741
-msgid "Chat is currently unavailable"
-msgstr "گپ در حال حاضر قابل دسترسی نیست"
-
-#: ../src/protocols/oscar/oscar.c:1813
+msgstr "توضیح دربارهٔ رفیق"
+
+#: ../src/protocols/oscar/oscar.c:966
+msgid "Could not connect to authentication server"
+msgstr "نمی‌توان به کارگزار تأیید هویت متصل شد."
+
+#: ../src/protocols/oscar/oscar.c:968
+msgid "Could not connect to BOS server"
+msgstr "نمی‌توان به کارگزار BOS متصل شد"
+
+#: ../src/protocols/oscar/oscar.c:998
 msgid "Screen name sent"
 msgstr "نام کاربری فرستاده شد"
 
-#: ../src/protocols/oscar/oscar.c:1829
+#: ../src/protocols/oscar/oscar.c:1003
+msgid "Connection established, cookie sent"
+msgstr "اتصال برقرار شد، کوکی فرستاده شد"
+
+#. TODO: Don't call this with ssi
+#: ../src/protocols/oscar/oscar.c:1034
+msgid "Finalizing connection"
+msgstr "در حال تکمیل کردن اتصال"
+
+#: ../src/protocols/oscar/oscar.c:1219
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8768,75 +9024,20 @@
 "است. نام کاربری باید یا با حرف شروع شود و شامل حروف، ارقام، و فاصله باشد یا "
 "فقط از ارقام تشکیل شده باشد."
 
-#: ../src/protocols/oscar/oscar.c:1857
-msgid "Unable to login to AIM"
-msgstr "نمی‌توان وارد سیستم AIM شد"
-
-#: ../src/protocols/oscar/oscar.c:1960 ../src/protocols/oscar/oscar.c:2951
-msgid "Could Not Connect"
-msgstr "نمی‌توان متصل شد"
-
-#: ../src/protocols/oscar/oscar.c:1971
-msgid "Connection established, cookie sent"
-msgstr "اتصال برقرار شد، کوکی فرستاده شد"
-
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. *
-#. * Above, we checked if we had previously attempted a connection
-#. * redirect to prevent a conflict with the joscar library
-#.
-#. Let the user not to lose hope quite yet
-#: ../src/protocols/oscar/oscar.c:2130
-msgid "Attempting connection redirect..."
-msgstr "در حال تلاش برای تغییر مسیر اتصال..."
-
-#. proxyip timed out
-#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
-#. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
-#: ../src/protocols/oscar/oscar.c:2176
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:2274
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
-msgid "Unable to establish file descriptor."
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:2279
-msgid "Unable to create new connection."
-msgstr "نمی‌توان اتصال جدید ایجاد کرد."
-
-#: ../src/protocols/oscar/oscar.c:2516 ../src/protocols/oscar/oscar.c:2525
-#: ../src/protocols/oscar/oscar.c:2539 ../src/protocols/oscar/oscar.c:2549
-msgid "Unable to log into file transfer proxy."
-msgstr "ورود به سیستم پیشکار انتقال پرونده ممکن نیست."
-
-#: ../src/protocols/oscar/oscar.c:2603
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:2841 ../src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:1308 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
-msgstr "لقب یا گذرواژه‌ی نادرست."
-
-#: ../src/protocols/oscar/oscar.c:2846
+msgstr "لقب یا گذرواژهٔ نادرست."
+
+#: ../src/protocols/oscar/oscar.c:1313
 msgid "Your account is currently suspended."
 msgstr "حساب شما در حال حاضر به حالت تعلیق در آمده است."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2850
+#: ../src/protocols/oscar/oscar.c:1317
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "پیغام‌رسان فوری AOL موقتاً قابل دسترسی نیست."
-
-#: ../src/protocols/oscar/oscar.c:2855
+msgstr "پیغام‌رسان اینترنتی AOL موقتاً قابل دسترسی نیست."
+
+#: ../src/protocols/oscar/oscar.c:1322
 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."
@@ -8845,81 +9046,71 @@
 "کنید و بعد دوباره امتحان کنید. اگر الان به تلاشتان ادامه دهید شاید مجبور "
 "شوید بیشتر منتظر بمانید."
 
-#: ../src/protocols/oscar/oscar.c:2860
+#: ../src/protocols/oscar/oscar.c:1327
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "نسخه‌ی کارگیری که استفاده می‌کنید خیلی قدیمی است. لطفاً در %s ارتقا دهید"
-
-#: ../src/protocols/oscar/oscar.c:2888
-msgid "Internal Error"
-msgstr "خطای داخلی"
-
-#: ../src/protocols/oscar/oscar.c:2958
+msgstr "نسخهٔ کارگیری که استفاده می‌کنید خیلی قدیمی است. لطفاً در %s ارتقا دهید"
+
+#: ../src/protocols/oscar/oscar.c:1363
+msgid "Could Not Connect"
+msgstr "نمی‌توان متصل شد"
+
+#: ../src/protocols/oscar/oscar.c:1368
 msgid "Received authorization"
 msgstr "اجازه دریافت شد"
 
-#: ../src/protocols/oscar/oscar.c:2982
+#: ../src/protocols/oscar/oscar.c:1391
 msgid "The SecurID key entered is invalid."
 msgstr "کلید SecurID وارد شده نامعتبر است."
 
-#: ../src/protocols/oscar/oscar.c:2996
+#: ../src/protocols/oscar/oscar.c:1405
 msgid "Enter SecurID"
 msgstr "‏SecurID را وارد کنید"
 
-#: ../src/protocols/oscar/oscar.c:2997
+#: ../src/protocols/oscar/oscar.c:1406
 msgid "Enter the 6 digit number from the digital display."
 msgstr "عدد ۶ رقمی را از نمایش دیجیتالی وارد کنید."
 
-#: ../src/protocols/oscar/oscar.c:3037 ../src/protocols/oscar/oscar.c:3067
-#: ../src/protocols/oscar/oscar.c:3158
+#: ../src/protocols/oscar/oscar.c:1446 ../src/protocols/oscar/oscar.c:1480
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"ممکن است به زودی ارتباط شما قطع شود. شاید مایل باشید تا زمان تعمیر، از TOC "
+"ممکن است به‌زودی ارتباط شما قطع شود. شاید مایل باشید تا زمان تعمیر، از TOC "
 "استفاده کنید. برای به‌هنگام‌سازی %s را ببینید."
 
-#: ../src/protocols/oscar/oscar.c:3040 ../src/protocols/oscar/oscar.c:3070
+#: ../src/protocols/oscar/oscar.c:1449 ../src/protocols/oscar/oscar.c:1483
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3161
+#: ../src/protocols/oscar/oscar.c:1569
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"ممکن است به زودی ارتباط شما قطع شود. برای دیدن به‌هنگام‌سازی‌ها %s را ببینید."
+
+#: ../src/protocols/oscar/oscar.c:1572
 msgid "Gaim was unable to get a valid login hash."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:3182
+#: ../src/protocols/oscar/oscar.c:1598
 msgid "Password sent"
 msgstr "گذرواژه فرستاده شد"
 
-#: ../src/protocols/oscar/oscar.c:4490
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "‏%s درخواست کرده است به طور مستقیم به %s متصل شود"
-
-#: ../src/protocols/oscar/oscar.c:4493
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"این کار نیازمند اتصال مستقیم بین دو رایانه است و برای تصاویر پیغام فوری "
-"ضروری است. از آن جا که به این ترتیب این نشانی IP شما آشکار خواهد شد، ممکن "
-"است این کار خطری برای حریم خصوصی شما تلقی شود."
-
-#: ../src/protocols/oscar/oscar.c:4532
+#: ../src/protocols/oscar/oscar.c:2157
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "لطفاً به من اجازه دهید بتوانم شما را به فهرست رفقایم اضافه کنم."
-
-#: ../src/protocols/oscar/oscar.c:4540
+msgstr "لطفاً به من اجازه دهید شما را به فهرست رفقایم اضافه کنم."
+
+#: ../src/protocols/oscar/oscar.c:2166
 msgid "Authorization Request Message:"
 msgstr "پیغام درخواست اجازه:"
 
-#: ../src/protocols/oscar/oscar.c:4541
+#: ../src/protocols/oscar/oscar.c:2167
 msgid "Please authorize me!"
 msgstr "اگر می‌شود به من اجازه دهید!"
 
-#: ../src/protocols/oscar/oscar.c:4571
+#: ../src/protocols/oscar/oscar.c:2201
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8928,38 +9119,38 @@
 "برای اضافه کردن کاربر %s به فهرست رفقا، لازم است از او اجازه گرفت. آیا "
 "می‌خواهید برای او یک درخواست اجازه بفرستید؟"
 
-#: ../src/protocols/oscar/oscar.c:4576
+#: ../src/protocols/oscar/oscar.c:2206
 msgid "Request Authorization"
 msgstr "درخواست اجازه"
 
-#: ../src/protocols/oscar/oscar.c:4578
+#: ../src/protocols/oscar/oscar.c:2208
 msgid "_Request Authorization"
 msgstr "_درخواست اجازه"
 
-#: ../src/protocols/oscar/oscar.c:4616 ../src/protocols/oscar/oscar.c:4622
-#: ../src/protocols/oscar/oscar.c:4726 ../src/protocols/oscar/oscar.c:4750
-#: ../src/protocols/oscar/oscar.c:7391 ../src/protocols/oscar/oscar.c:7443
+#: ../src/protocols/oscar/oscar.c:2252 ../src/protocols/oscar/oscar.c:2260
+#: ../src/protocols/oscar/oscar.c:2368 ../src/protocols/oscar/oscar.c:2392
+#: ../src/protocols/oscar/oscar.c:5022 ../src/protocols/oscar/oscar.c:5074
 msgid "No reason given."
 msgstr "دلیلی ارائه نشد."
 
-#: ../src/protocols/oscar/oscar.c:4621
+#: ../src/protocols/oscar/oscar.c:2259
 msgid "Authorization Denied Message:"
 msgstr "پیغام رد اجازه:"
 
-#: ../src/protocols/oscar/oscar.c:4728
+#: ../src/protocols/oscar/oscar.c:2370
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"کاربر %Iu به این دلیل می‌خواهد %s را به فهرست رفقایش اضافه کند:\n"
-"‏%s"
-
-#: ../src/protocols/oscar/oscar.c:4738 ../src/protocols/oscar/oscar.c:7403
+"کاربر %Iu به دلیل زیر می‌خواهد %s را به فهرست رفقایش اضافه کند:\n"
+"%s"
+
+#: ../src/protocols/oscar/oscar.c:2380 ../src/protocols/oscar/oscar.c:5034
 msgid "Authorization Request"
 msgstr "درخواست اجازه"
 
-#: ../src/protocols/oscar/oscar.c:4750
+#: ../src/protocols/oscar/oscar.c:2392
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8970,18 +9161,18 @@
 "کرده است:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4751
+#: ../src/protocols/oscar/oscar.c:2393
 msgid "ICQ authorization denied."
-msgstr "اجازه‌ی ICQ رد شد."
+msgstr "درخواست اجازهٔ ICQ رد شد."
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4758
+#: ../src/protocols/oscar/oscar.c:2400
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
-"کاربر %Iu با درخواست شما برای اضافه کردن وی به فهرست رفقایتان موافق است."
-
-#: ../src/protocols/oscar/oscar.c:4766
+"کاربر %Iu با درخواست شما برای اضافه کردن وی به فهرست رفقایتان موافقت کرد."
+
+#: ../src/protocols/oscar/oscar.c:2408
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8989,12 +9180,12 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"شما پیغام ویژه‌ای دریافت کرده‌اید\n"
+"شما یک پیغام ویژه دریافت کرده‌اید\n"
 "\n"
 "فرستنده: %s ‏[%s]\n"
-"‏%s"
-
-#: ../src/protocols/oscar/oscar.c:4774
+"%s"
+
+#: ../src/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9007,7 +9198,7 @@
 "فرستنده: %s ‏[%s]\n"
 "‏%s"
 
-#: ../src/protocols/oscar/oscar.c:4782
+#: ../src/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9015,37 +9206,37 @@
 "Message is:\n"
 "%s"
 msgstr ""
-"شما یک پست الکترونیکی ICQ از %s دریافت کرده‌اید [%s]\n"
+"شما یک نامهٔ الکترونیکی ICQ از %s دریافت کرده‌اید [%s]\n"
 "\n"
 "پیغام این است:\n"
-"‏%s"
-
-#: ../src/protocols/oscar/oscar.c:4803
+"%s"
+
+#: ../src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "کاربر %Iu ‏ICQ برای شما یک رفیق فرستاده است: %s ‏(%s)"
 
-#: ../src/protocols/oscar/oscar.c:4809
+#: ../src/protocols/oscar/oscar.c:2451
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "آیا می‌خواهید این رفیق را به فهرست رفقا‌یتان اضافه کنید؟"
 
-#: ../src/protocols/oscar/oscar.c:4813
+#: ../src/protocols/oscar/oscar.c:2455
 msgid "_Decline"
 msgstr "_رد"
 
-#: ../src/protocols/oscar/oscar.c:4897
+#: ../src/protocols/oscar/oscar.c:2539
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "‏%Ihu پیغام از %s را دریافت نکردید چون نامعتبر بودند."
 
-#: ../src/protocols/oscar/oscar.c:4906
+#: ../src/protocols/oscar/oscar.c:2548
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "%Ihu پیغام از %s را دریافت نکردید چون خیلی بلند بودند."
 
-#: ../src/protocols/oscar/oscar.c:4915
+#: ../src/protocols/oscar/oscar.c:2557
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9053,187 +9244,174 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "%Ihu پیغام از %s را دریافت نکردید چون خارج از محدوده بودند."
 
-#: ../src/protocols/oscar/oscar.c:4924
+#: ../src/protocols/oscar/oscar.c:2566
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "%Ihu پیغام از %s را دریافت نکردید چون او خیلی بدجنس بود."
 
-#: ../src/protocols/oscar/oscar.c:4933
+#: ../src/protocols/oscar/oscar.c:2575
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "%Ihu پیغام از %s را دریافت نکردید چون شما خیلی بدجنسید."
 
-#: ../src/protocols/oscar/oscar.c:4942
+#: ../src/protocols/oscar/oscar.c:2584
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "شما به دلیل نامعلومی %Ihu پیغام از %s را دریافت نکردید."
 
-#: ../src/protocols/oscar/oscar.c:5001
+#: ../src/protocols/oscar/oscar.c:2640
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>وضعیت:</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:5062
+#: ../src/protocols/oscar/oscar.c:2701
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:5099
+#: ../src/protocols/oscar/oscar.c:2737
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "نمی‌توان پیغام فرستاد: %s"
 
-#: ../src/protocols/oscar/oscar.c:5099 ../src/protocols/oscar/oscar.c:5104
-#: ../src/protocols/oscar/oscar.c:5162 ../src/protocols/oscar/oscar.c:5166
+#: ../src/protocols/oscar/oscar.c:2737 ../src/protocols/oscar/oscar.c:2742
+#: ../src/protocols/oscar/oscar.c:2800 ../src/protocols/oscar/oscar.c:2804
 msgid "Unknown reason."
 msgstr "دلیل نامعلوم."
 
-#: ../src/protocols/oscar/oscar.c:5102
-#: ../src/protocols/sametime/sametime.c:2373
+#: ../src/protocols/oscar/oscar.c:2740
+#: ../src/protocols/sametime/sametime.c:2367
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "نمی‌توان به %s پیغام فرستاد:"
 
-#: ../src/protocols/oscar/oscar.c:5162
+#: ../src/protocols/oscar/oscar.c:2800
 #, c-format
 msgid "User information not available: %s"
 msgstr "اطلاعات کاربر موجود نیست: %s"
 
-#: ../src/protocols/oscar/oscar.c:5165
+#: ../src/protocols/oscar/oscar.c:2803
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "اطلاعات کاربر %s موجود نیست:"
 
-#: ../src/protocols/oscar/oscar.c:5192
+#: ../src/protocols/oscar/oscar.c:2829
 msgid "Online Since"
 msgstr "برخط از"
 
-#: ../src/protocols/oscar/oscar.c:5197
-#: ../src/protocols/yahoo/yahoo_profile.c:1153
+#: ../src/protocols/oscar/oscar.c:2834
+#: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "عضو از"
 
-#: ../src/protocols/oscar/oscar.c:5202
+#: ../src/protocols/oscar/oscar.c:2839
 msgid "Capabilities"
 msgstr "قابلیت‌ها"
 
-#: ../src/protocols/oscar/oscar.c:5220
+#: ../src/protocols/oscar/oscar.c:2857
 msgid "Available Message"
 msgstr "پیغام حاضر"
 
-#: ../src/protocols/oscar/oscar.c:5337
+#: ../src/protocols/oscar/oscar.c:2946
 msgid "Your AIM connection may be lost."
 msgstr "ممکن است اتصال AIM شما از دست رفته باشد."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5523
+#: ../src/protocols/oscar/oscar.c:3127
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 "[نمی‌توان پیغامی از این کاربر را نمایش داد چون حاوی نویسه‌های نامعتبر است.]"
 
-#: ../src/protocols/oscar/oscar.c:5744
+#: ../src/protocols/oscar/oscar.c:3346
 msgid "Rate limiting error."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5745
+#: ../src/protocols/oscar/oscar.c:3347
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:5818
+#: ../src/protocols/oscar/oscar.c:3419
 msgid "You have been signed off for an unknown reason."
 msgstr "شما به دلیل نامعلومی از سیستم خارج شدید."
 
-#: ../src/protocols/oscar/oscar.c:5831 ../src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:3432 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "اتصال شما با اتاق گپ %s قطع شده است."
 
-#. XXX - Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:5860
-msgid "Finalizing connection"
-msgstr "در حال تکمیل کردن اتصال"
-
-#: ../src/protocols/oscar/oscar.c:6125 ../src/protocols/silc/util.c:542
+#: ../src/protocols/oscar/oscar.c:3650 ../src/protocols/silc/util.c:556
 msgid "Mobile Phone"
 msgstr "تلفن همراه"
 
-#: ../src/protocols/oscar/oscar.c:6142
+#: ../src/protocols/oscar/oscar.c:3677
 msgid "Personal Web Page"
-msgstr "صفحه‌ی وب شخصی"
-
-#: ../src/protocols/oscar/oscar.c:6146
+msgstr "صفحهٔ وب شخصی"
+
+#: ../src/protocols/oscar/oscar.c:3681
 msgid "Additional Information"
 msgstr "اطلاعات اضافی"
 
-#: ../src/protocols/oscar/oscar.c:6151
-msgid "Home Address"
-msgstr "نشانی خانه"
-
-#: ../src/protocols/oscar/oscar.c:6155 ../src/protocols/oscar/oscar.c:6163
+#: ../src/protocols/oscar/oscar.c:3690 ../src/protocols/oscar/oscar.c:3698
 msgid "Zip Code"
-msgstr "کد پستی"
-
-#: ../src/protocols/oscar/oscar.c:6159
-msgid "Work Address"
-msgstr "نشانی محل کار"
-
-#: ../src/protocols/oscar/oscar.c:6167
+msgstr "کُد پستی"
+
+#: ../src/protocols/oscar/oscar.c:3702
 msgid "Work Information"
 msgstr "اطلاعات محل کار"
 
-#: ../src/protocols/oscar/oscar.c:6168
-msgid "Company"
-msgstr "شرکت"
-
-#: ../src/protocols/oscar/oscar.c:6169
+#: ../src/protocols/oscar/oscar.c:3704
 msgid "Division"
 msgstr "شاخه"
 
-#: ../src/protocols/oscar/oscar.c:6170
+#: ../src/protocols/oscar/oscar.c:3705
 msgid "Position"
-msgstr "جایگاه"
-
-#: ../src/protocols/oscar/oscar.c:6172
+msgstr "عنوان شغلی"
+
+#: ../src/protocols/oscar/oscar.c:3707
 msgid "Web Page"
-msgstr "صفحه‌ی وب"
-
-#: ../src/protocols/oscar/oscar.c:6230
+msgstr "صفحهٔ وب"
+
+#: ../src/protocols/oscar/oscar.c:3765
 msgid "Pop-Up Message"
 msgstr "پیغام واشو"
 
-#: ../src/protocols/oscar/oscar.c:6270
+#: ../src/protocols/oscar/oscar.c:3805
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "نام‌های کاربری زیر به %s مرتبط است"
 
-#: ../src/protocols/oscar/oscar.c:6301
+#: ../src/protocols/oscar/oscar.c:3810
+msgid "Screen name"
+msgstr "نام کاربری"
+
+#: ../src/protocols/oscar/oscar.c:3836
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "نتیجه‌ای برای نشانی پست الکترونیکی %s پیدا نشد"
 
-#: ../src/protocols/oscar/oscar.c:6322
+#: ../src/protocols/oscar/oscar.c:3857
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
-msgstr "شما باید یک نامه‌ی الکترونیکی برای تأیید %s دریافت کنید."
-
-#: ../src/protocols/oscar/oscar.c:6324
+msgstr "شما باید یک نامهٔ الکترونیکی برای تأیید %s دریافت کنید."
+
+#: ../src/protocols/oscar/oscar.c:3859
 msgid "Account Confirmation Requested"
 msgstr "تأیید حساب درخواست شد"
 
-#: ../src/protocols/oscar/oscar.c:6355
+#: ../src/protocols/oscar/oscar.c:3890
 msgid "Error Changing Account Info"
 msgstr "خطا هنگام تغییر اطلاعات حساب"
 
-#: ../src/protocols/oscar/oscar.c:6358
+#: ../src/protocols/oscar/oscar.c:3893
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9242,12 +9420,13 @@
 "خطای 0x%04x: قالب‌بندی نام کاربری ممکن نیست چون نام کاربری درخواست شده با نام "
 "اصلی فرق می‌کند."
 
-#: ../src/protocols/oscar/oscar.c:6361
+#: ../src/protocols/oscar/oscar.c:3896
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "خطای 0x%04x: قالب‌بندی نام کاربری ممکن نیست چون نامعتبر است."
-
-#: ../src/protocols/oscar/oscar.c:6364
+msgstr ""
+"خطای 0x%04x: قالب‌بندی نام کاربری ممکن نیست چون نام نامعتبر است."
+
+#: ../src/protocols/oscar/oscar.c:3899
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9256,7 +9435,7 @@
 "خطای 0x%04x: قالب‌بندی نام کاربری ممکن نیست چون نام کاربری درخواست شده طولانی "
 "است."
 
-#: ../src/protocols/oscar/oscar.c:6367
+#: ../src/protocols/oscar/oscar.c:3902
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9265,7 +9444,7 @@
 "خطای 0x%04x: تغییر نشانی پست الکترونیکی ممکن نیست چون یک درخواست معلق دیگر "
 "برای این نام کاربری از قبل موجود است."
 
-#: ../src/protocols/oscar/oscar.c:6370
+#: ../src/protocols/oscar/oscar.c:3905
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9274,7 +9453,7 @@
 "خطای 0x%04x: تغییر نشانی پست الکترونیکی ممکن نیست چون نشانی داده شده با "
 "تعداد زیادی نام کاربری مرتبط است."
 
-#: ../src/protocols/oscar/oscar.c:6373
+#: ../src/protocols/oscar/oscar.c:3908
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9283,12 +9462,12 @@
 "خطای 0x%04x: تغییر نشانی پست الکترونیکی ممکن نیست چون نشانی داده شده نامعتبر "
 "است."
 
-#: ../src/protocols/oscar/oscar.c:6376
+#: ../src/protocols/oscar/oscar.c:3911
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "خطای 0x%04x: خطای نامعلوم."
 
-#: ../src/protocols/oscar/oscar.c:6386
+#: ../src/protocols/oscar/oscar.c:3921
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9297,37 +9476,37 @@
 "نام کاربری شما در حال حاضر به این صورت قالب‌بندی شده است:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:6387 ../src/protocols/oscar/oscar.c:6394
+#: ../src/protocols/oscar/oscar.c:3922 ../src/protocols/oscar/oscar.c:3929
 msgid "Account Info"
 msgstr "اطلاعات حساب"
 
-#: ../src/protocols/oscar/oscar.c:6392
+#: ../src/protocols/oscar/oscar.c:3927
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "نشانی پست الکترونیکی %s، %s است"
 
-#: ../src/protocols/oscar/oscar.c:6464
+#: ../src/protocols/oscar/oscar.c:4102
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"تصویر پیغام فوری‌تان فرستاده نشد. برای ارسال تصاویر پیغام فوری باید به صورت "
+"تصویر پیغام اینترنتی‌تان فرستاده نشد. برای ارسال تصاویر پیغام اینترنتی باید به صورت "
 "مستقیم متصل باشید."
 
-#: ../src/protocols/oscar/oscar.c:6704
+#: ../src/protocols/oscar/oscar.c:4342
 msgid "Unable to set AIM profile."
 msgstr "نمی‌توان مجموعه تنظیمات AIM را تنظیم کرد."
 
-#: ../src/protocols/oscar/oscar.c:6705
+#: ../src/protocols/oscar/oscar.c:4343
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-"احتمالاً شما قبل از این که رویه‌ی ورود به سیستم کامل شود درخواست تنظیم مجموعه "
-"تنظیمات‌تان را کرده‌اید. مجموعه تنظیمات شما تنظیم نشده باقی مانده است؛ هنگامی "
+"احتمالاً شما قبل از این که رویهٔ ورود به سیستم کامل شود درخواست تنظیم "
+"شرح حالتان را کرده‌اید. مجموعه تنظیمات شما تنظیم نشده باقی مانده است؛ هنگامی "
 "که کاملاً متصل شدید دوباره برای تنظیم آن تلاش کنید."
 
-#: ../src/protocols/oscar/oscar.c:6719
+#: ../src/protocols/oscar/oscar.c:4357
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9337,13 +9516,13 @@
 "truncated it for you."
 msgstr[0] ""
 "طول مجموعه تنظیمات از حداکثر طول مجاز %Id بایت بیشتر شده است. گیم انتهای آن "
-"را برایتان برید."
-
-#: ../src/protocols/oscar/oscar.c:6724
+"را برایتان قیچی کرد."
+
+#: ../src/protocols/oscar/oscar.c:4362
 msgid "Profile too long."
 msgstr "مجموعه تنظیمات خیلی طولانی است."
 
-#: ../src/protocols/oscar/oscar.c:6766
+#: ../src/protocols/oscar/oscar.c:4405
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9353,13 +9532,13 @@
 "truncated it for you."
 msgstr[0] ""
 "طول پیغام شما از حداکثر طول مجاز %Id بایت بیشتر شد. گیم ته پیغام را برایتان "
-"برید."
-
-#: ../src/protocols/oscar/oscar.c:6771
+"قیچی کرد."
+
+#: ../src/protocols/oscar/oscar.c:4410
 msgid "Away message too long."
 msgstr "پیغام رفتن خیلی طولانی است."
 
-#: ../src/protocols/oscar/oscar.c:6840
+#: ../src/protocols/oscar/oscar.c:4479
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9370,31 +9549,31 @@
 "با یک حرف شروع شود و شامل حروف، ارقام، و فاصله باشند، یا فقط از ارقام تشکیل "
 "شده باشد."
 
-#: ../src/protocols/oscar/oscar.c:6842 ../src/protocols/oscar/oscar.c:7249
-#: ../src/protocols/oscar/oscar.c:7263
+#: ../src/protocols/oscar/oscar.c:4481 ../src/protocols/oscar/oscar.c:4880
+#: ../src/protocols/oscar/oscar.c:4894
 msgid "Unable To Add"
 msgstr "نمی‌توان اضافه کرد"
 
-#: ../src/protocols/oscar/oscar.c:6949
+#: ../src/protocols/oscar/oscar.c:4585
 msgid "Unable To Retrieve Buddy List"
 msgstr "نمی‌توان فهرست رفقا را بازیابی کرد"
 
-#: ../src/protocols/oscar/oscar.c:6950
+#: ../src/protocols/oscar/oscar.c:4586
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
 "گیم موقتاً نتوانست فهرست رفقایتان را از کارگزارهای AIM بازیابی کند. فهرست "
-"رفقایتان گم نشده است، و احتمالاً در چند ساعت آینده قابل دسترسی خواهد شد."
-
-#: ../src/protocols/oscar/oscar.c:7147 ../src/protocols/oscar/oscar.c:7148
-#: ../src/protocols/oscar/oscar.c:7153 ../src/protocols/oscar/oscar.c:7307
-#: ../src/protocols/oscar/oscar.c:7308 ../src/protocols/oscar/oscar.c:7313
+"رفقایتان از دست نرفته است، و احتمالاً در چند ساعت آینده قابل دسترسی خواهد شد."
+
+#: ../src/protocols/oscar/oscar.c:4778 ../src/protocols/oscar/oscar.c:4779
+#: ../src/protocols/oscar/oscar.c:4784 ../src/protocols/oscar/oscar.c:4938
+#: ../src/protocols/oscar/oscar.c:4939 ../src/protocols/oscar/oscar.c:4944
 msgid "Orphans"
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:7247
+msgstr "یتیمان"
+
+#: ../src/protocols/oscar/oscar.c:4878
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9403,11 +9582,11 @@
 "نمی‌توان رفیق %s را به فهرست رفقایتان اضافه کرد چون رفقای خیلی زیادی در فهرست "
 "رفقایتان دارید. لطفاً یکی را حذف کرده و دوباره امتحان کنید."
 
-#: ../src/protocols/oscar/oscar.c:7247 ../src/protocols/oscar/oscar.c:7261
+#: ../src/protocols/oscar/oscar.c:4878 ../src/protocols/oscar/oscar.c:4892
 msgid "(no name)"
 msgstr "(بدون نام)"
 
-#: ../src/protocols/oscar/oscar.c:7261
+#: ../src/protocols/oscar/oscar.c:4892
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9417,7 +9596,7 @@
 "به دلیل نامعلومی نمی‌توان رفیق %s را اضافه کرد. معمول‌ترین علت این است که "
 "حداکثر تعداد رفقای مجاز را در فهرست رفقایتان داشته باشید."
 
-#: ../src/protocols/oscar/oscar.c:7344
+#: ../src/protocols/oscar/oscar.c:4975
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9426,11 +9605,11 @@
 "کاربر %s به شما اجازه داده که او را به فهرست رفقایتان اضافه کنید. آیا "
 "می‌خواهید این کار را بکنید؟"
 
-#: ../src/protocols/oscar/oscar.c:7350
+#: ../src/protocols/oscar/oscar.c:4981
 msgid "Authorization Given"
 msgstr "اجازه داده شد"
 
-#: ../src/protocols/oscar/oscar.c:7394
+#: ../src/protocols/oscar/oscar.c:5025
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9440,18 +9619,18 @@
 "‏%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7439
+#: ../src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "کاربر %s با درخواست شما برای اضافه کردنش به فهرست رفقایتان موافقت کرده است."
 
-#: ../src/protocols/oscar/oscar.c:7440
+#: ../src/protocols/oscar/oscar.c:5071
 msgid "Authorization Granted"
 msgstr "اجازه داده شد"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7443
+#: ../src/protocols/oscar/oscar.c:5074
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9462,156 +9641,182 @@
 "کرده است:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7444
+#: ../src/protocols/oscar/oscar.c:5075
 msgid "Authorization Denied"
 msgstr "اجازه داده نشد"
 
-#: ../src/protocols/oscar/oscar.c:7481 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:5111 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_تبادل:"
 
-#: ../src/protocols/oscar/oscar.c:7517
+#: ../src/protocols/oscar/oscar.c:5151
 msgid "Invalid chat name specified."
 msgstr "نام گپ مشخص شده نامعتبر است."
 
-#: ../src/protocols/oscar/oscar.c:7587
+#: ../src/protocols/oscar/oscar.c:5221
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"تصویر پیغام فوری شما فرستاده نشد. نمی‌توان در گپ‌های AIM تصاویر پیغام فوری "
+"تصویر پیغام اینترنتی شما فرستاده نشد. نمی‌توان در گپ‌های AIM تصاویر پیغام اینترنتی "
 "فرستاد."
 
-#: ../src/protocols/oscar/oscar.c:7742
+#: ../src/protocols/oscar/oscar.c:5383
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(در حال بازیابی)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8048
+#: ../src/protocols/oscar/oscar.c:5688
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "توضیح رفیق برای %s"
 
-#: ../src/protocols/oscar/oscar.c:8049
+#: ../src/protocols/oscar/oscar.c:5689
 msgid "Buddy Comment:"
 msgstr "توضیح رفیق:"
 
-#: ../src/protocols/oscar/oscar.c:8068
+#: ../src/protocols/oscar/oscar.c:5735
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "شما برقراری اتصال مستقیم پیغام اینترنتی با %s را انتخاب کردید."
+
+#: ../src/protocols/oscar/oscar.c:5739
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"چون این کار نشانی IP شما را آشکار می‌سازد، ممکن است تهدیدی برای حریم خصوصی شما "
+"به حساب آید. آیا مایلید ادامه دهید؟"
+
+#: ../src/protocols/oscar/oscar.c:5743 ../src/protocols/oscar/peer.c:941
+msgid "_Connect"
+msgstr "_اتصال"
+
+#: ../src/protocols/oscar/oscar.c:5761
 msgid "Edit Buddy Comment"
 msgstr "ویرایش توضیح رفیق"
 
-#: ../src/protocols/oscar/oscar.c:8075
+#: ../src/protocols/oscar/oscar.c:5769
 msgid "Get Status Msg"
 msgstr "گرفتن پیغام وضعیت"
 
-#: ../src/protocols/oscar/oscar.c:8088
+#: ../src/protocols/oscar/oscar.c:5782
 msgid "Direct IM"
-msgstr "پیغام فوری مستقیم"
-
-#: ../src/protocols/oscar/oscar.c:8107
+msgstr "پیغام اینترنتی مستقیم"
+
+#: ../src/protocols/oscar/oscar.c:5804
 msgid "Re-request Authorization"
-msgstr "درخواست مجدد اجازه"
-
-#: ../src/protocols/oscar/oscar.c:8164
+msgstr "درخواست مجدد اعطای اجازه"
+
+#: ../src/protocols/oscar/oscar.c:5861
 msgid "Require authorization"
 msgstr "اجازه لازم دارد"
 
-#: ../src/protocols/oscar/oscar.c:8167
+#: ../src/protocols/oscar/oscar.c:5864
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:8172
+#: ../src/protocols/oscar/oscar.c:5869
 msgid "ICQ Privacy Options"
 msgstr "گزینه‌های حریم خصوصی ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8189
+#: ../src/protocols/oscar/oscar.c:5886
 msgid "The new formatting is invalid."
 msgstr "قالب‌بندی جدید نامعتبر است."
 
-#: ../src/protocols/oscar/oscar.c:8190
+#: ../src/protocols/oscar/oscar.c:5887
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "قالب‌بندی نام کاربری فقط می‌تواند در تغییر بزرگی و کوچکی حروف و فاصله‌ها باشد."
 
-#: ../src/protocols/oscar/oscar.c:8197
+#: ../src/protocols/oscar/oscar.c:5894
 msgid "New screen name formatting:"
 msgstr "قالب‌بندی نام کاربری جدید:"
 
-#: ../src/protocols/oscar/oscar.c:8249
+#: ../src/protocols/oscar/oscar.c:5950
 msgid "Change Address To:"
 msgstr "تغییر نشانی به:"
 
-#: ../src/protocols/oscar/oscar.c:8294
+#: ../src/protocols/oscar/oscar.c:5995
 msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>شما در انتظار اجازه نیستید</i>"
-
-#: ../src/protocols/oscar/oscar.c:8297
+msgstr "<i>شما در انتظار اجازهٔ کسی نیستید</i>"
+
+#: ../src/protocols/oscar/oscar.c:5998
 msgid "You are awaiting authorization from the following buddies"
-msgstr "شما در انتظار اجازه‌ی رفقای زیر هستید"
-
-#: ../src/protocols/oscar/oscar.c:8298
+msgstr "شما در انتظار اجازهٔ رفقای زیر هستید"
+
+#: ../src/protocols/oscar/oscar.c:5999
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 "برای درخواست مجدد اجازه از رفقای زیر روی آن‌ها کلیک راست کرده و «درخواست مجدد "
-"اجازه» را انتخاب کنید."
-
-#: ../src/protocols/oscar/oscar.c:8315
+"اعطای اجازه» را انتخاب کنید."
+
+#: ../src/protocols/oscar/oscar.c:6016
 msgid "Find Buddy by E-Mail"
 msgstr "پیدا کردن رفیق از روی پست الکترونیکی"
 
-#: ../src/protocols/oscar/oscar.c:8316
+#: ../src/protocols/oscar/oscar.c:6017
 msgid "Search for a buddy by e-mail address"
 msgstr "جستجو به دنبال رفیق از روی نشانی پست الکترونیکی"
 
-#: ../src/protocols/oscar/oscar.c:8317
+#: ../src/protocols/oscar/oscar.c:6018
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "نشانی پست الکترونیکی رفیقی را که به دنبالش می‌گردید وارد کنید."
-
-#: ../src/protocols/oscar/oscar.c:8410
+msgstr "نشانی پست الکترونیکی رفیقی را که دنبالش می‌گردید وارد کنید."
+
+#: ../src/protocols/oscar/oscar.c:6187
 msgid "Set User Info (URL)..."
 msgstr "تنظیم اطلاعات کاربر (نشانی اینترنتی)..."
 
-#: ../src/protocols/oscar/oscar.c:8421
+#: ../src/protocols/oscar/oscar.c:6198
 msgid "Change Password (URL)"
 msgstr "تغییر گذرواژه (نشانی اینترنتی)"
 
-#: ../src/protocols/oscar/oscar.c:8425
+#: ../src/protocols/oscar/oscar.c:6202
 msgid "Configure IM Forwarding (URL)"
-msgstr "پیکربندی ارجاع پیغام فوری (نشانی اینترنتی)"
+msgstr "پیکربندی ارجاع پیغام اینترنتی (نشانی اینترنتی)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8435
+#: ../src/protocols/oscar/oscar.c:6212
 msgid "Set Privacy Options..."
 msgstr "تنظیم گزینه‌های حریم خصوصی..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8442
+#: ../src/protocols/oscar/oscar.c:6219
 msgid "Format Screen Name..."
 msgstr "قالب‌بندی نام کاربری..."
 
-#: ../src/protocols/oscar/oscar.c:8446
+#: ../src/protocols/oscar/oscar.c:6223
 msgid "Confirm Account"
 msgstr "تأیید حساب"
 
-#: ../src/protocols/oscar/oscar.c:8450
-msgid "Display Currently Registered Address"
-msgstr "نمایش نشانی ثبت شده‌ی فعلی"
-
-#: ../src/protocols/oscar/oscar.c:8454
-msgid "Change Currently Registered Address..."
-msgstr "تغییر نشانی ثبت شده‌ی فعلی..."
-
-#: ../src/protocols/oscar/oscar.c:8461
+#: ../src/protocols/oscar/oscar.c:6227
+msgid "Display Currently Registered E-Mail Address"
+msgstr "نمایش نشانی پست الکترونیک ثبت شدهٔ فعلی"
+
+#: ../src/protocols/oscar/oscar.c:6231
+msgid "Change Currently Registered E-Mail Address..."
+msgstr "تغییر نشانی پست الکترونیک ثبت شدهٔ فعلی..."
+
+#: ../src/protocols/oscar/oscar.c:6238
 msgid "Show Buddies Awaiting Authorization"
 msgstr "نمایش رفقای در انتظار اجازه"
 
-#: ../src/protocols/oscar/oscar.c:8467
-msgid "Search for Buddy by E-Mail..."
+#: ../src/protocols/oscar/oscar.c:6244
+msgid "Search for Buddy by E-Mail Address..."
 msgstr "جستجو به دنبال رفیق از روی پست الکترونیکی..."
 
-#: ../src/protocols/oscar/oscar.c:8472
+#: ../src/protocols/oscar/oscar.c:6249
 msgid "Search for Buddy by Information"
 msgstr "جستجو به دنبال رفیق از روی اطلاعات"
 
+#: ../src/protocols/oscar/oscar.c:6315
+msgid "Use recent buddies group"
+msgstr "استفاده از آخرین گروه رفقا"
+
+#: ../src/protocols/oscar/oscar.c:6318
+msgid "Show how long you have been idle"
+msgstr "نمایش این که چه مدت بی‌کار بوده‌اید"
+"شما را قادر می‌سازد به طور دستی زمانی را که بی‌کار بوده‌اید پیکربندی کنید."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9622,160 +9827,177 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8650 ../src/protocols/oscar/oscar.c:8652
+#: ../src/protocols/oscar/oscar.c:6443 ../src/protocols/oscar/oscar.c:6445
 msgid "AIM/ICQ Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد AIM/ICQ"
-
-#: ../src/protocols/oscar/oscar.c:8671
-msgid "Auth host"
-msgstr "میزبان تأیید هویت"
-
-#: ../src/protocols/oscar/oscar.c:8674
-msgid "Auth port"
-msgstr "درگاه تأیید هویت"
-
-#: ../src/protocols/oscar/oscar.c:8677 ../src/protocols/zephyr/zephyr.c:2900
+msgstr "متصل شوندهٔ قرارداد AIM/ICQ"
+
+#: ../src/protocols/oscar/oscar.c:6470 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
-msgstr "کدگذاری"
-
-#: ../src/protocols/oscar/oscar.c:8681
-msgid ""
-"Use AIM/ICQ proxy server\n"
-"(slower, but usually works)"
-msgstr ""
-"استفاده از کارگزار پیشکار AIM/ICQ\n"
-"(کندتر است، اما معمولاً کار می‌کند)"
+msgstr "کُدگذاری"
+
+#: ../src/protocols/oscar/oscar.c:6474
+msgid ""
+"Always use AIM/ICQ proxy server\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"استفادهٔ دائم از کارگزار پیشکار AIM/ICQ\n"
+"(کندتر است، اما نشانی IP شما را آشکار نمی‌کند)"
+
+#: ../src/protocols/oscar/peer.c:613
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "درخواست از %s برای اتصال به ما در %s:%hu برای پیغام اینترنتی مستقیم."
+
+#: ../src/protocols/oscar/peer.c:662 ../src/protocols/oscar/peer.c:693
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "در حال تلاش برای اتصال به %s:%hu."
+
+#: ../src/protocols/oscar/peer.c:753
+msgid "Attempting to connect via proxy server."
+msgstr "در حال تلاش برای اتصال از طریق کارگزار پیشکار."
+
+#: ../src/protocols/oscar/peer.c:931
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "‏%s درخواست کرده به طور مستقیم به %s متصل شود"
+
+#: ../src/protocols/oscar/peer.c:935
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+"این کار نیازمند اتصال مستقیم بین دو رایانه است و برای تصاویر پیغام اینترنتی "
+"ضروری است. از آن جا که به این ترتیب این نشانی IP شما آشکار خواهد شد، ممکن "
+"است این کار تهدیدی برای حریم خصوصی شما تلقی شود."
 
 #: ../src/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
-msgstr "اتصال بسته شد (درحال نوشتن)"
-
-#: ../src/protocols/sametime/sametime.c:1267
+msgstr "اتصال بسته شد (در حال نوشتن)"
+
+#: ../src/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>عنوان گروه:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1268
+#: ../src/protocols/sametime/sametime.c:1262
 #, fuzzy, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>کاربر:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1270
+#: ../src/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "Info for Group %s"
 msgstr "اطلاعات گروه %s"
 
-#: ../src/protocols/sametime/sametime.c:1272
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
-msgstr "اطلاعات محل کار"
-
-#: ../src/protocols/sametime/sametime.c:1304
+msgstr "اطلاعات دفترچهٔ نشانی نوتز"
+
+#: ../src/protocols/sametime/sametime.c:1298
 msgid "Invite Group to Conference..."
 msgstr "دعوت گروه به کنفرانس..."
 
-#: ../src/protocols/sametime/sametime.c:1314
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1308
 msgid "Get Notes Address Book Info"
-msgstr "اضافه کردن به دفترچه نشانی"
-
-#: ../src/protocols/sametime/sametime.c:1467
+msgstr "گرفتن اطلاعات دفترچهٔ نشانی نوتز"
+
+#: ../src/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
 msgstr "در حال فرستادن دست دادن"
 
-#: ../src/protocols/sametime/sametime.c:1472
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "در حال انتظار برای آغاز انتقال"
-
-#: ../src/protocols/sametime/sametime.c:1477
+msgstr "در انتظار برای اعلام دست دادن"
+
+#: ../src/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:1482
+msgstr "دست دادن اعلام شد، در حال ورود به سیستم"
+
+#: ../src/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:1487
+msgstr "در انتظار برای اعلام ورود به سیستم"
+
+#: ../src/protocols/sametime/sametime.c:1481
 msgid "Login Redirected"
 msgstr "ورود به سیستم تغییر مسیر داده شد"
 
-#: ../src/protocols/sametime/sametime.c:1493
+#: ../src/protocols/sametime/sametime.c:1487
 msgid "Forcing Login"
-msgstr "در حال اجبار ورود به سیستم"
-
-#: ../src/protocols/sametime/sametime.c:1497
+msgstr "اجبار ورود به سیستم"
+
+#: ../src/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:1502
+msgstr "ورود به سیستم تأیید شد"
+
+#: ../src/protocols/sametime/sametime.c:1496
 msgid "Starting Services"
-msgstr "سرویس‌های آغاز می‌شوند"
-
-#: ../src/protocols/sametime/sametime.c:1507
+msgstr "در حال آغاز سرویس"
+
+#: ../src/protocols/sametime/sametime.c:1501
 msgid "Connected"
-msgstr "متصل"
-
-#: ../src/protocols/sametime/sametime.c:1605
+msgstr "متصل شد"
+
+#: ../src/protocols/sametime/sametime.c:1599
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "یک مدیر Sametime اعلان زیر را در کارگزار %s منتشر کرده است"
 
-#: ../src/protocols/sametime/sametime.c:1610
+#: ../src/protocols/sametime/sametime.c:1604
 msgid "Sametime Administrator Announcement"
 msgstr "اعلان مدیر Sametime"
 
-#: ../src/protocols/sametime/sametime.c:1662
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1656
 msgid "Connection reset"
-msgstr "اتصال بسته شد"
-
-#: ../src/protocols/sametime/sametime.c:1669
+msgstr "اتصال از نو آغاز شد"
+
+#: ../src/protocols/sametime/sametime.c:1663
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "خطا هنگام خواندن از سوکت: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1698
-#: ../src/protocols/sametime/sametime.c:3696
+#: ../src/protocols/sametime/sametime.c:1692
+#: ../src/protocols/sametime/sametime.c:3688
 msgid "Unable to connect to host"
 msgstr "اتصال به میزبان ممکن نیست"
 
-#: ../src/protocols/sametime/sametime.c:1736
+#: ../src/protocols/sametime/sametime.c:1730
 #, c-format
 msgid "Announcement from %s"
 msgstr "اعلان از %s"
 
-#: ../src/protocols/sametime/sametime.c:1910
+#: ../src/protocols/sametime/sametime.c:1904
 msgid "Conference Closed"
 msgstr "کنفرانس بسته شد"
 
-#: ../src/protocols/sametime/sametime.c:2367
+#: ../src/protocols/sametime/sametime.c:2361
 msgid "Unable to send message: "
 msgstr "نمی‌توان پیغام فرستاد: "
 
-#: ../src/protocols/sametime/sametime.c:2926
+#: ../src/protocols/sametime/sametime.c:2918
 msgid "Place Closed"
-msgstr "مکان بسته شد"
-
-#: ../src/protocols/sametime/sametime.c:3217
+msgstr "محل بسته شد"
+
+#: ../src/protocols/sametime/sametime.c:3209
 msgid "Microphone"
 msgstr "میکروفون"
 
-#: ../src/protocols/sametime/sametime.c:3218
+#: ../src/protocols/sametime/sametime.c:3210
 msgid "Speakers"
 msgstr "بلندگوها"
 
-#: ../src/protocols/sametime/sametime.c:3219
+#: ../src/protocols/sametime/sametime.c:3211
 msgid "Video Camera"
 msgstr "دوربین ویدیویی"
 
-#: ../src/protocols/sametime/sametime.c:3223
+#: ../src/protocols/sametime/sametime.c:3215
 msgid "File Transfer"
 msgstr "انتقال پرونده"
 
-#: ../src/protocols/sametime/sametime.c:3257
+#: ../src/protocols/sametime/sametime.c:3249
 #, c-format
 msgid ""
 "\n"
@@ -9784,7 +10006,7 @@
 "\n"
 "<b>پشتیبانی‌ها:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:3262
+#: ../src/protocols/sametime/sametime.c:3254
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -9792,325 +10014,327 @@
 "\n"
 "<b>کاربر خارجی</b>"
 
-#: ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3360
 msgid "Create conference with user"
 msgstr "ایجاد کنفرانس با کاربر"
 
-#: ../src/protocols/sametime/sametime.c:3369
+#: ../src/protocols/sametime/sametime.c:3361
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
-msgstr ""
-# "لطفاً برای کنفرانس جدید موضوعی وارد کنید، و برای %s پیغام دعوت بفرستید"
-
-#: ../src/protocols/sametime/sametime.c:3373
+msgstr "لطفاً موضوعی برای کنفرانس جدید و متن دعوت‌نامه‌ای که برای %s فرستاده می‌شود وارد کنید"
+
+#: ../src/protocols/sametime/sametime.c:3365
 msgid "New Conference"
 msgstr "کنفرانس جدید"
 
-#: ../src/protocols/sametime/sametime.c:3375
+#: ../src/protocols/sametime/sametime.c:3367
 msgid "Create"
 msgstr "ایجاد"
 
-#: ../src/protocols/sametime/sametime.c:3439
+#: ../src/protocols/sametime/sametime.c:3431
 msgid "Available Conferences"
 msgstr "کنفرانس‌های موجود"
 
-#: ../src/protocols/sametime/sametime.c:3445
+#: ../src/protocols/sametime/sametime.c:3437
 msgid "Create New Conference..."
 msgstr "ایجاد کنفرانس جدید..."
 
-#: ../src/protocols/sametime/sametime.c:3452
+#: ../src/protocols/sametime/sametime.c:3444
 msgid "Invite user to a conference"
 msgstr "دعوت کاربر به کنفرانس"
 
-#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3445
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:3458
+"از فهرست زیر یک کنفرانس انتخاب کنید تا دعوت‌نامه‌ای برای کاربر %s فرستاده شود. اگر می‌خواهید "
+"کنفرانس جدیدی ایجاد کرده و این کاربر را به آن دعوت کنید، «ایجاد کنفرانس جدید» را انتخاب کنید."
+
+#: ../src/protocols/sametime/sametime.c:3450
 msgid "Invite to Conference"
 msgstr "دعوت به کنفرانس"
 
-#: ../src/protocols/sametime/sametime.c:3460
+#: ../src/protocols/sametime/sametime.c:3452
 msgid "Invite"
 msgstr "دعوت"
 
-#: ../src/protocols/sametime/sametime.c:3548
+#: ../src/protocols/sametime/sametime.c:3540
 msgid "Invite to Conference..."
 msgstr "دعوت به کنفرانس..."
 
-#: ../src/protocols/sametime/sametime.c:3553
+#: ../src/protocols/sametime/sametime.c:3545
 msgid "Send TEST Announcement"
 msgstr "ارسال اعلان آزمایشی"
 
-#: ../src/protocols/sametime/sametime.c:3600
+#: ../src/protocols/sametime/sametime.c:3592
 msgid "No Sametime Community Server specified"
 msgstr "کارگزار اجتماع Sametime مشخص نشده است"
 
-#: ../src/protocols/sametime/sametime.c:3622
+#: ../src/protocols/sametime/sametime.c:3614
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"میزبان یا نشانیIP برای حساب Meanwhile ‏%s پیکربندی نشده است. "
-"لطفاً برای ادامه‌ی ورود به سیستم یکی از آنها را وارد کنید."
-
-#: ../src/protocols/sametime/sametime.c:3627
+"میزبان یا نشانیIP برای حساب %s در Meanwhile پیکربندی نشده است. لطفاً برای ادامهٔ "
+"ورود به سیستم یک نشانی IP را وارد کنید."
+
+#: ../src/protocols/sametime/sametime.c:3619
 msgid "Meanwhile Connection Setup"
-msgstr "برپاسازی اتصال Meanwhile"
-
-#: ../src/protocols/sametime/sametime.c:3628
+msgstr "اتصال دوردست شکست خورد"
+
+#: ../src/protocols/sametime/sametime.c:3620
 msgid "No Sametime Community Server Specified"
 msgstr "کارگزار اجتماع Sametime مشخص نشده است"
 
-#: ../src/protocols/sametime/sametime.c:4085
+#: ../src/protocols/sametime/sametime.c:4077
 msgid "<b>External User</b><br>"
 msgstr "<b>کاربر خارجی</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4088
+#: ../src/protocols/sametime/sametime.c:4080
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
-msgstr "<b>شناسه‌ی کاربر:</b> %s<br>"
-
-#: ../src/protocols/sametime/sametime.c:4094
+msgstr "<b>شناسهٔ کاربر:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4086
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>نام و نام خانوادگی:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4100
+#: ../src/protocols/sametime/sametime.c:4092
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>آخرین کارگیر معلوم:</b> "
 
-#: ../src/protocols/sametime/sametime.c:4108
+#: ../src/protocols/sametime/sametime.c:4100
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "نامعلوم (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4115
+#: ../src/protocols/sametime/sametime.c:4107
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
-msgstr "<b>پشتیبانی‌ها:</b> %s<br>"
-
-#: ../src/protocols/sametime/sametime.c:4121
+msgstr "<b>پشتیبانی‌ها:</b> ‎%s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4113
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>وضعیت:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4264
-#: ../src/protocols/sametime/sametime.c:5427
+#: ../src/protocols/sametime/sametime.c:4256
+#: ../src/protocols/sametime/sametime.c:5419
 msgid "User Name"
 msgstr "نام کاربر"
 
-#: ../src/protocols/sametime/sametime.c:4267
-#: ../src/protocols/sametime/sametime.c:5430
+#: ../src/protocols/sametime/sametime.c:4259
+#: ../src/protocols/sametime/sametime.c:5422
 msgid "Sametime ID"
-msgstr "شناسه‌ی Sametime"
-
-#: ../src/protocols/sametime/sametime.c:4291
+msgstr "شناسهٔ Sametime"
+
+#: ../src/protocols/sametime/sametime.c:4283
 msgid "An ambiguous user ID was entered"
-msgstr "یک شناسه‌ی کاربری مبهم وارد شد."
-
-#: ../src/protocols/sametime/sametime.c:4292
+msgstr "یک شناسهٔ کاربری مبهم وارد شد."
+
+#: ../src/protocols/sametime/sametime.c:4284
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"شناسه‌ی «%s» ممکن است به هر کدام از کاربران زیر اشاره کند. لطفاً کاربر درست را از فهرست"
-" زیر انتخاب کنید تا به فهرست رفقایتان اضافه شود."
-
-#: ../src/protocols/sametime/sametime.c:4297
+"شناسهٔ «%s» ممکن است به هریک از کاربران زیر مربوط باشد.کاربر درست را از فهرست انتخاب کنید تا "
+"به فهرست رفقایتان اضافه شود."
+
+#: ../src/protocols/sametime/sametime.c:4289
 msgid "Select User"
 msgstr "انتخاب کاربر"
 
-#: ../src/protocols/sametime/sametime.c:4367
+#: ../src/protocols/sametime/sametime.c:4359
 msgid "Unable to add user: user not found"
-msgstr "اضافه کردن کاربر ممکن نیست: کاربر پیدا نشد"
-
-#: ../src/protocols/sametime/sametime.c:4369
+msgstr "نمی‌توان کاربر را  اضافه کرد: کاربر پیدا نشد"
+
+#: ../src/protocols/sametime/sametime.c:4361
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"شناسه‌ی «%s» با هیچ یک از کاربران اجتماع Sametime شما مطابقت نداشت. "
-"این مدخل از فهرست رفقایتان حذف شد."
-
-#: ../src/protocols/sametime/sametime.c:4374
+"شناسهٔ «%s» با هیچ یک از کاربران اجتماع Sametime شما مطابقت نداشت. این مدخل "
+"از فهرست رفقایتان حذف شد."
+
+#: ../src/protocols/sametime/sametime.c:4366
 msgid "Unable to add user"
-msgstr "نمی‌توان کاربر اضافه کرد"
-
-#: ../src/protocols/sametime/sametime.c:4946
+msgstr "نمی‌توان کاربر را اضافه کرد"
+
+#: ../src/protocols/sametime/sametime.c:4938
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
-"خطا هنگام خواندن پرونده‌ی %s: \n"
+"خطا هنگام خواندن پروندهٔ %s: \n"
 "‏%s\n"
 
+#: ../src/protocols/sametime/sametime.c:5069
+msgid "Remotely Stored Buddy List"
+msgstr "فهرست رفقای ذخیره‌ شده در دوردست"
+
+#: ../src/protocols/sametime/sametime.c:5074
+msgid "Buddy List Storage Mode"
+msgstr "حالت ذخیرهٔ فهرست رفقا"
+
 #: ../src/protocols/sametime/sametime.c:5077
-msgid "Remotely Stored Buddy List"
-msgstr "فهرست رفقای ذخیره شده در کارگزار دوردست"
-
-#: ../src/protocols/sametime/sametime.c:5082
-msgid "Buddy List Storage Mode"
-msgstr "حالت ذخیره‌ی فهرست رفقا"
-
-#: ../src/protocols/sametime/sametime.c:5085
 msgid "Local Buddy List Only"
 msgstr "فقط فهرست رفقای محلی"
 
-#: ../src/protocols/sametime/sametime.c:5087
+#: ../src/protocols/sametime/sametime.c:5079
 msgid "Merge List from Server"
-msgstr "ادغام فهرست کارگزار"
-
-#: ../src/protocols/sametime/sametime.c:5089
+msgstr "ادغام با فهرست کارگزار"
+
+#: ../src/protocols/sametime/sametime.c:5081
 msgid "Merge and Save List to Server"
-msgstr "ادغام و ذخیره‌ی فهرست در کارگزار"
-
-#: ../src/protocols/sametime/sametime.c:5091
+msgstr "ادغام و ذخیرهٔ فهرست رفقا در کارگزار"
+
+#: ../src/protocols/sametime/sametime.c:5083
 msgid "Synchronize List with Server"
 msgstr "همگام‌سازی فهرست با کارگزار"
 
-#: ../src/protocols/sametime/sametime.c:5140
+#: ../src/protocols/sametime/sametime.c:5132
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "وارد کردن فهرست Sametime حساب %s"
 
-#: ../src/protocols/sametime/sametime.c:5179
+#: ../src/protocols/sametime/sametime.c:5171
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "صادر کردن فهرست Sametime حساب %s"
-
-#: ../src/protocols/sametime/sametime.c:5232
+msgstr "صدور فهرست Sametime حساب %s"
+
+#: ../src/protocols/sametime/sametime.c:5224
 msgid "Unable to add group: group exists"
-msgstr "اضافه کردن گروه ممکن نیست: گروه وجود ندارد"
-
-#: ../src/protocols/sametime/sametime.c:5233
+msgstr "نمی‌توان گروه را اضافه کرد: گروه وجود دارد"
+
+#: ../src/protocols/sametime/sametime.c:5225
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "گروهی به نام «%s» از قبل در فهرست رفقایتان وجود دارد."
 
-#: ../src/protocols/sametime/sametime.c:5236
-#: ../src/protocols/sametime/sametime.c:5365
+#: ../src/protocols/sametime/sametime.c:5228
+#: ../src/protocols/sametime/sametime.c:5357
 msgid "Unable to add group"
 msgstr "اضافه کردن گروه ممکن نیست"
 
-#: ../src/protocols/sametime/sametime.c:5295
+#: ../src/protocols/sametime/sametime.c:5287
 msgid "Possible Matches"
 msgstr "مطابقت‌های احتمالی"
 
-#: ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5303
 msgid "Notes Address Book group results"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5312
+msgstr "نتایج گروه دفترچهٔ نشانی نوتز"
+
+#: ../src/protocols/sametime/sametime.c:5304
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5317
-#, fuzzy
+"شناسهٔ «%s» ممکن است به هریک از این گروه‌های دفترچهٔ نشانی نوتز برگردد. لطفاً گروه درست را "
+"از فهرست زیر انتخاب کنید تا به فهرست رفقایتان اضافه شود."
+
+#: ../src/protocols/sametime/sametime.c:5309
 msgid "Select Notes Address Book"
-msgstr "اضافه کردن به دفترچه نشانی"
-
-#: ../src/protocols/sametime/sametime.c:5359
+msgstr "انتخاب دفترچهٔ نشانی نوتز"
+
+#: ../src/protocols/sametime/sametime.c:5351
 msgid "Unable to add group: group not found"
-msgstr "اضافه کردن گروه ممکن نیست: گروه پیدا نشد"
-
-#: ../src/protocols/sametime/sametime.c:5361
+msgstr "نمی‌توان گروه را اضافه کرد: گروه پیدا نشد"
+
+#: ../src/protocols/sametime/sametime.c:5353
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5402
-#, fuzzy
+msgstr "شناسهٔ «%s» با هیچ یک از گروه‌های دفترچهٔ نشانی نوتز که در اجتماع Sametime شما وجود دارد مطابقت نمی‌کند."
+
+#: ../src/protocols/sametime/sametime.c:5394
 msgid "Notes Address Book Group"
-msgstr "اضافه کردن به دفترچه نشانی"
-
-#: ../src/protocols/sametime/sametime.c:5403
+msgstr "گروه در دفترچهٔ نشانی نوتز"
+
+#: ../src/protocols/sametime/sametime.c:5395
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5451
+msgstr "نام گروه در دفترچهٔ نشانی نوتز را در فیلد زیر وارد کنید تا گروه و اعضای آن به فهرست رفقایتان اضافه شود."
+
+#: ../src/protocols/sametime/sametime.c:5443
 #, c-format
 msgid "Search results for '%s'"
-msgstr "نتایج جستجوی «%s»"
-
-#: ../src/protocols/sametime/sametime.c:5452
+msgstr "نتایج جستجو به دنبال %s"
+
+#: ../src/protocols/sametime/sametime.c:5444
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:5484
+"شناسهٔ «%s» ممکن است به هر کدام از کاربران زیر برگردد. می‌توانید با استفاده از دکمه‌های زیر این کاربران را "
+"به فهرست رفقایتان اضافه کرده یا برای آنها پیغام بفرستید."
+
+#: ../src/protocols/sametime/sametime.c:5476
 msgid "No matches"
 msgstr "مطابقت ندارد"
 
-#: ../src/protocols/sametime/sametime.c:5485
+#: ../src/protocols/sametime/sametime.c:5477
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr "شناسه‌ی «%s» با هیچ یک از کاربران اجتماع Sametime شما مطابقت ندارد."
-
-#: ../src/protocols/sametime/sametime.c:5489
-
+msgstr "شناسهٔ «%s» با هیچ یک از کاربران اجتماع Sametime شما مطابقت ندارد."
+
+#: ../src/protocols/sametime/sametime.c:5481
 msgid "No Matches"
 msgstr "مطابقت ندارد"
 
-#: ../src/protocols/sametime/sametime.c:5526
+#: ../src/protocols/sametime/sametime.c:5518
 msgid "Search for a user"
 msgstr "جستجو به دنبال کاربر"
 
-#: ../src/protocols/sametime/sametime.c:5527
+#: ../src/protocols/sametime/sametime.c:5519
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
-"نام یا قسمتی از شناسه را برای جستجوی کاربران مطابق در اجتماع Sametime خود در فیلد زیر وارد کنید."
-
-#: ../src/protocols/sametime/sametime.c:5530
+"نام یا قسمتی از شناسه را برای جستجوی کاربران مطابق در اجتماع Sametime خود در "
+"فیلد زیر وارد کنید."
+
+#: ../src/protocols/sametime/sametime.c:5522
 msgid "User Search"
-msgstr "جستجو کاربر"
+msgstr "جستجوی کاربر"
+
+#: ../src/protocols/sametime/sametime.c:5534
+msgid "Import Sametime List..."
+msgstr "وارد کردن فهرست Sametime..."
+
+#: ../src/protocols/sametime/sametime.c:5538
+msgid "Export Sametime List..."
+msgstr "صادر کردن فهرست Sametime..."
 
 #: ../src/protocols/sametime/sametime.c:5542
-msgid "Import Sametime List..."
-msgstr "وارد کردن فهرست Sametime..."
+msgid "Add Notes Address Book Group..."
+msgstr "اضافه کردن گروه به دفترچهٔ نشانی..."
 
 #: ../src/protocols/sametime/sametime.c:5546
-msgid "Export Sametime List..."
-msgstr "صادر کردن فهرست Sametime..."
-
-#: ../src/protocols/sametime/sametime.c:5550
-#, fuzzy
-msgid "Add Notes Address Book Group..."
-msgstr "اضافه کردن به دفترچه نشانی"
-
-#: ../src/protocols/sametime/sametime.c:5554
 msgid "User Search..."
-msgstr "جستجو کاربر..."
-
-#: ../src/protocols/sametime/sametime.c:5651
+msgstr "جستجوی کاربر..."
+
+#: ../src/protocols/sametime/sametime.c:5643
 msgid "Force login (ignore server redirects)"
 msgstr "اجبار به ورود به سیستم (تغییر مسیرهای کارگزار نادیده گرفته شود)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5661
+#: ../src/protocols/sametime/sametime.c:5653
 msgid "Hide client identity"
 msgstr "مخفی کردن هویت کارگیر"
 
@@ -10187,15 +10411,15 @@
 #: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
 #: ../src/protocols/silc/buddy.c:464
 msgid "IM With Password"
-msgstr "پیغام فوری با گذرواژه"
+msgstr "پیغام اینترنتی با گذرواژه"
 
 #: ../src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
-msgstr "نمی‌توان کلید پیغام فوری را تنظیم کرد"
+msgstr "نمی‌توان کلید پیغام اینترنتی را تنظیم کرد"
 
 #: ../src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
-msgstr "تنظیم گذرواژه‌ی پیغام فوری"
+msgstr "تنظیم گذرواژهٔ پیغام اینترنتی"
 
 #: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
 #: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
@@ -10212,7 +10436,7 @@
 msgstr "نمایش کلید عمومی"
 
 #: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:236
+#: ../src/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "نمی‌توان کلید عمومی را بار کرد"
 
@@ -10225,7 +10449,7 @@
 #: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
 #: ../src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
-msgstr "تمی‌توان اطلاعات کاربر را گرفت"
+msgstr "نمی‌توان اطلاعات کاربر را گرفت"
 
 #: ../src/protocols/silc/buddy.c:734
 #, c-format
@@ -10238,7 +10462,7 @@
 "You can use the Get Public Key command to get the public key."
 msgstr ""
 "شما نمی‌توانید اعلان‌های رفیق را دریافت کنید مگر این که کلید عمومی او را وارد "
-"کنید. برای گرفتن کلید عمومی می‌توانید از فرمان «Get Public Key» استفاده کنید."
+"کنید. برای گرفتن کلید عمومی می‌توانید از فرمان گرفتن کلید عمومی استفاده کنید."
 
 #. Open file selector to select the public key.
 #: ../src/protocols/silc/buddy.c:1064
@@ -10271,7 +10495,7 @@
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
-"بیش از یک کاربر با یک کلید عمومی پیدا شد. کاربر درست را از فهرست انتخاب کنید "
+"بیش از یک کاربر با این کلید عمومی پیدا شد. کاربر درست را از فهرست انتخاب کنید "
 "تا به فهرست رفقایتان اضافه شود."
 
 #: ../src/protocols/silc/buddy.c:1179
@@ -10302,58 +10526,57 @@
 msgid "Robot"
 msgstr "روبات"
 
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:668
-#: ../src/protocols/silc/util.c:473
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/util.c:487
 msgid "Happy"
 msgstr "خوشحال"
 
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:670
-#: ../src/protocols/silc/util.c:475
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/util.c:489
 msgid "Sad"
 msgstr "غمگین"
 
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:672
-#: ../src/protocols/silc/util.c:477
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/util.c:491
 msgid "Angry"
 msgstr "عصبانی"
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:479
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/util.c:493
 msgid "Jealous"
 msgstr "حسود"
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:481
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/util.c:495
 msgid "Ashamed"
 msgstr "خجالت زده"
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:483
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/util.c:497
 msgid "Invincible"
 msgstr "سرسخت"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:485
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:499
 msgid "In Love"
 msgstr "عاشق"
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:487
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/util.c:501
 msgid "Sleepy"
 msgstr "خواب‌آلود"
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:489
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/util.c:503
 msgid "Bored"
 msgstr "بی‌حوصله"
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:686
-#: ../src/protocols/silc/util.c:491
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/util.c:505
 msgid "Excited"
 msgstr "هیجان‌زده"
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:493
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
+#: ../src/protocols/silc/util.c:507
 msgid "Anxious"
 msgstr "نگران"
 
@@ -10378,9 +10601,9 @@
 msgstr "دستگاه"
 
 #: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:736 ../src/protocols/silc/silc.c:738
+#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
 msgid "Timezone"
-msgstr "منطقه‌ی زمانی "
+msgstr "منطقهٔ زمانی "
 
 #: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
 msgid "Geolocation"
@@ -10388,15 +10611,15 @@
 
 #: ../src/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
-msgstr "برگرداندن کلید پیغام فوری به مقدار اولیه"
+msgstr "برگرداندن کلید پیغام اینترنتی به مقدار اولیه"
 
 #: ../src/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
-msgstr "پیغام فوری با تبادل کلید"
+msgstr "پیغام اینترنتی با تبادل کلید"
 
 #: ../src/protocols/silc/buddy.c:1640
 msgid "IM with Password"
-msgstr "پیغام فوری با گذرواژه"
+msgstr "پیغام اینترنتی با گذرواژه"
 
 #: ../src/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
@@ -10406,9 +10629,9 @@
 msgid "Kill User"
 msgstr "کشتن کاربر"
 
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
-msgstr ""
+msgstr "رسم روی تخته‌سفید"
 
 #: ../src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
@@ -10419,7 +10642,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "کانال %s در شبکه وجود ندارد"
 
-#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
+#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "اطلاعات کانال"
 
@@ -10447,48 +10670,49 @@
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>کلید رمز کانال:</b> %s"
 
-#: ../src/protocols/silc/chat.c:141
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../src/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>‏HMAC کانال:</b> %s"
 
-#: ../src/protocols/silc/chat.c:146
+#: ../src/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>موضوع کانال:</b><br> %s"
 
-#: ../src/protocols/silc/chat.c:151
+#: ../src/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>حالت‌های کانال:</b> "
 
-#: ../src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>اثر انگشت کلید مؤسس:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:165
+#: ../src/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: ../src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "اضافه کردن کلید عمومی کانال"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:290
+#: ../src/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "باز کردن کلید عمومی..."
 
-#: ../src/protocols/silc/chat.c:399
+#: ../src/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
-msgstr "گذرواژه‌ی کانال"
-
-#: ../src/protocols/silc/chat.c:406
+msgstr "گذرواژهٔ کانال"
+
+#: ../src/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "فهرست کلیدهای عمومی کانال"
 
-#: ../src/protocols/silc/chat.c:411
+#: ../src/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -10496,135 +10720,135 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"تأیید هویت کانال برای ایمن نگه داشتن کانال از دسترسی تأیید هویت نشده استفاده "
+"تأیید هویت کانال برای ممانعت از دسترسی بی‌اجازه به کانال استفاده "
 "می‌شود. تأیید هویت می‌تواند بر اساس گذرواژه یا امضای دیجیتالی باشد. اگر "
-"گذرواژه تنظیم شده باشد، دادن آن برای پیوستن به کانال الزامی است. اگر کلید "
-"عمومی کانال تنظیم شده باشند فقط کاربرانی که کلیدهای عمومی‌شان در فهرست آمده "
+"گذرواژه تنظیم شود، دادن آن برای پیوستن به کانال الزامی است. اگر کلید "
+"عمومی کانال تنظیم شود فقط کاربرانی که کلیدهای عمومی‌شان در فهرست آمده "
 "باشد می‌توانند به کانال بپیوندند."
 
-#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
-#: ../src/protocols/silc/chat.c:905
+#: ../src/protocols/silc/chat.c:421 ../src/protocols/silc/chat.c:422
+#: ../src/protocols/silc/chat.c:459 ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "تأیید هویت کانال"
 
-#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "اضافه / حذف کردن"
 
-#: ../src/protocols/silc/chat.c:577
+#: ../src/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "نام گروه"
 
-#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:944
+#: ../src/protocols/silc/chat.c:582 ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "گذرواژه"
 
-#: ../src/protocols/silc/chat.c:592
+#: ../src/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "لطفاً گذرواژه و نام گروه خصوصی کانال %s را وارد کنید."
 
-#: ../src/protocols/silc/chat.c:594
+#: ../src/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "اضافه کردن گروه خصوصی کانال"
 
-#: ../src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "محدودیت کاربران"
 
-#: ../src/protocols/silc/chat.c:722
+#: ../src/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "تنظیم محدودیت کاربران کانال. برای برگرداندن محدودیت کاربران به حالت پیش‌فرض "
 "روی صفر تنظیم کنید."
 
-#: ../src/protocols/silc/chat.c:877
+#: ../src/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "گرفتن اطلاعات"
 
-#: ../src/protocols/silc/chat.c:885
+#: ../src/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "فهرست دعوت"
 
-#: ../src/protocols/silc/chat.c:890
+#: ../src/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "فهرست منع"
 
-#: ../src/protocols/silc/chat.c:898
+#: ../src/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "اضافه کردن گروه خصوصی"
 
-#: ../src/protocols/silc/chat.c:911
+#: ../src/protocols/silc/chat.c:912
 msgid "Reset Permanent"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:916
+msgstr "برداشتن فهرست همیشگی"
+
+#: ../src/protocols/silc/chat.c:917
 msgid "Set Permanent"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:924
+msgstr "تنظیم فهرست همیشگی"
+
+#: ../src/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "تنظیم محدودیت کاربران"
 
-#: ../src/protocols/silc/chat.c:930
+#: ../src/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:935
+msgstr "برداشتن محدودیت موضوع"
+
+#: ../src/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:942
+msgstr "تنظیم محدودیت موضوع"
+
+#: ../src/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:947
+msgstr "برداشتن کانال خصوصی"
+
+#: ../src/protocols/silc/chat.c:948
 msgid "Set Private Channel"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:954
+msgstr "تنظیم کانال خصوصی"
+
+#: ../src/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:959
+msgstr "برداشتن کانال سری"
+
+#: ../src/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:1033
+msgstr "تنظیم کانال سری"
+
+#: ../src/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
-msgstr ""
-
-#: ../src/protocols/silc/chat.c:1037
+msgstr "شما مؤسس کانال <I>%s</I> هستید"
+
+#: ../src/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "مؤسس کانال در <I>%s</I>، ‏<I>%s</I> است"
 
-#: ../src/protocols/silc/chat.c:1096
+#: ../src/protocols/silc/chat.c:1097
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "پیش از آن که به گروه خصوصی بپیوندید باید به کانال %s بپیوندید"
 
-#: ../src/protocols/silc/chat.c:1098
+#: ../src/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "پیوستن به گروه خصوصی"
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../src/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "نمی‌توان به گروه خصوصی پیوست"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
 msgid "Call Command"
-msgstr "فراخواندن فرمان"
-
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+msgstr "فراخوانی فرمان"
+
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "نمی‌توان فرمان را فراخوانی کرد"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1153
+#: ../src/protocols/silc/chat.c:1295 ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "فرمان نامعلوم"
 
@@ -10634,7 +10858,7 @@
 #: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
 #: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
-msgstr "انتقال پرونده‌ی امن"
+msgstr "انتقال پروندهٔ امن"
 
 #: ../src/protocols/silc/ft.c:90 ../src/protocols/silc/ft.c:93
 #: ../src/protocols/silc/ft.c:97 ../src/protocols/silc/ft.c:101
@@ -10698,7 +10922,7 @@
 #: ../src/protocols/silc/ops.c:684
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr "‏<I>%s</I> همه‌ی حالت‌های <I>%s</I> را حذف کرد"
+msgstr "‏<I>%s</I> همهٔ حالت‌های <I>%s</I> را حذف کرد"
 
 #: ../src/protocols/silc/ops.c:713
 #, c-format
@@ -10729,15 +10953,11 @@
 msgid "Birth Day"
 msgstr "روز تولد"
 
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "عنوان شغل"
-
 #: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
-msgstr "نقش شغل"
-
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:937
+msgstr "نقش شغلی"
+
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr "سازمان"
 
@@ -10745,10 +10965,6 @@
 msgid "Unit"
 msgstr "واحد"
 
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "پست الکترونیکی"
-
 #: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "یادداشت"
@@ -10757,6 +10973,11 @@
 msgid "Join Chat"
 msgstr "پیوستن به گپ"
 
+#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1046
+msgid "Real Name"
+msgstr "نام واقعی"
+
 #: ../src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "متن وضعیت"
@@ -10773,7 +10994,7 @@
 msgid "_More..."
 msgstr "_بیشتر..."
 
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1003
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr "جدا شدن از کارگزار"
 
@@ -10896,7 +11117,7 @@
 msgstr "قطع شده از طرف کارگزار"
 
 #: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:195
+#: ../src/protocols/silc/silc.c:199
 msgid "Resuming session"
 msgstr "ازسرگیری نشست"
 
@@ -10927,7 +11148,7 @@
 
 #: ../src/protocols/silc/ops.c:1947
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "شکست: کارگزار دوردست کلید رمز پیشنهاد شده را پشتیبانی نمی‌کند"
+msgstr "شکست: کارگزار از رمزگشای پیشنهاد شده پشتیبانی نمی‌کند"
 
 #: ../src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
@@ -10959,7 +11180,7 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
-"کلید عمومی %s دریافت شد. نسخه‌ی محلی شما با این کلید مطابقت ندارد. آیا با این "
+"کلید عمومی %s دریافت شد. نسخهٔ محلی شما با این کلید مطابقت ندارد. آیا با این "
 "وجود مایلید این کلید عمومی را قبول کنید؟"
 
 #: ../src/protocols/silc/pk.c:108
@@ -10988,50 +11209,53 @@
 msgid "Unsupported public key type"
 msgstr "نوع کلید عمومی پشتیبانی نشده"
 
-#: ../src/protocols/silc/silc.c:155
+#: ../src/protocols/silc/silc.c:158
 msgid "Connection failed"
 msgstr "اتصال شکست خورد"
 
-#: ../src/protocols/silc/silc.c:187
+#: ../src/protocols/silc/silc.c:191
 msgid "Cannot initialize SILC Client connection"
 msgstr "نمی‌توان اتصال کارگیر SILC را راه‌اندازی کرد"
 
-#: ../src/protocols/silc/silc.c:198
+#: ../src/protocols/silc/silc.c:202
 msgid "Performing key exchange"
 msgstr "در حال اجرای تبادل کلید"
 
-#: ../src/protocols/silc/silc.c:283
+#: ../src/protocols/silc/silc.c:287
 msgid "Out of memory"
 msgstr "حافظه تمام شد"
 
-#: ../src/protocols/silc/silc.c:324
+#: ../src/protocols/silc/silc.c:328
 msgid "Cannot initialize SILC protocol"
 msgstr "نمی‌توان قرارداد SILC را راه‌اندازی کرد"
 
-#: ../src/protocols/silc/silc.c:331
-#, fuzzy
+#: ../src/protocols/silc/silc.c:335
 msgid "Cannot find/access ~/.silc directory"
-msgstr "نمی‌توان شاخه را فرستاد."
+msgstr "نمی‌توان شاخهٔ ~/.silc را پیدا کرد یا دسترسی به آن ممکن نیست"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:336
+#: ../src/protocols/silc/silc.c:340
 msgid "Connecting to SILC Server"
 msgstr "در حال اتصال به کارگزار SILC"
 
-#: ../src/protocols/silc/silc.c:345
+#: ../src/protocols/silc/silc.c:349
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "نمی‌توان زوج کلید SILC را بار کرد: %s"
 
-#: ../src/protocols/silc/silc.c:365
+#: ../src/protocols/silc/silc.c:369
 msgid "Unable to create connection"
-msgstr "برقرار اتصال ممکن نیست"
-
-#: ../src/protocols/silc/silc.c:664
+msgstr "نمی‌توان اتصال ایجاد کرد"
+
+#: ../src/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "حالت فعلی شما"
 
-#: ../src/protocols/silc/silc.c:691
+#: ../src/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "عاشق"
+
+#: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11039,43 +11263,43 @@
 "\n"
 "روش‌های تماس مرجح شما"
 
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/util.c:518
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:532
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:520
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:534
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
-msgstr "کنفرانس ویدیویی"
-
-#: ../src/protocols/silc/silc.c:708
+#: ../src/protocols/silc/silc.c:707
+msgid "Video conferencing"
+msgstr "کنفرانس ویدئویی"
+
+#: ../src/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "وضعیت فعلی شما"
 
-#: ../src/protocols/silc/silc.c:715
+#: ../src/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr "سرویس‌های برخط"
 
-#: ../src/protocols/silc/silc.c:718
+#: ../src/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr "دیگران بتوانند ببینند از چه سرویس‌هایی استفاده می‌کنید"
 
-#: ../src/protocols/silc/silc.c:724
+#: ../src/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr "دیگران بتوانند ببینند شما از چه کامپیوتری استفاده می‌کنید"
 
-#: ../src/protocols/silc/silc.c:731
+#: ../src/protocols/silc/silc.c:735
 msgid "Your VCard File"
-msgstr "پرونده‌ی کارت مجازی شما"
-
-#: ../src/protocols/silc/silc.c:743 ../src/protocols/silc/silc.c:744
+msgstr "پروندهٔ کارت مجازی شما"
+
+#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr "ویژگی‌های وضعیت برخط کاربر"
 
-#: ../src/protocols/silc/silc.c:745
+#: ../src/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -11084,167 +11308,163 @@
 "شما می‌توانید به دیگران اجازه دهید اطلاعات وضعیت برخط شما و اطلاعات شخصی شما "
 "را ببینند. لطفاً اطلاعاتی را که دوست دارید دیگران در مورد شما ببینند پر کنید."
 
-#: ../src/protocols/silc/silc.c:785 ../src/protocols/silc/silc.c:791
-#: ../src/protocols/silc/silc.c:1431
+#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
+#: ../src/protocols/silc/silc.c:1434
 msgid "Message of the Day"
 msgstr "پیغام روز"
 
-#: ../src/protocols/silc/silc.c:785
+#: ../src/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr "پیغام روزی موجود نیست"
 
-#: ../src/protocols/silc/silc.c:786 ../src/protocols/silc/silc.c:1426
+#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1429
 msgid "There is no Message of the Day associated with this connection"
 msgstr "هیچ پیغام روزی با این اتصال مرتبط نیست"
 
-#: ../src/protocols/silc/silc.c:837 ../src/protocols/silc/silc.c:881
-#: ../src/protocols/silc/silc.c:952 ../src/protocols/silc/silc.c:953
+#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
+#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
 msgid "Create New SILC Key Pair"
-msgstr "ایجاد زوج کلید جدید SILC..."
-
-#: ../src/protocols/silc/silc.c:837
+msgstr "ایجاد زوج کلید جدید SILC"
+
+#: ../src/protocols/silc/silc.c:841
 msgid "Passphrases do not match"
-msgstr "گذرواژه‌ها مطابقت ندارند."
-
-#: ../src/protocols/silc/silc.c:881
+msgstr "گذرواژه‌ها مطابقت ندارند"
+
+#: ../src/protocols/silc/silc.c:885
 msgid "Key Pair Generation failed"
 msgstr "تولید زوج کلید شکست خورد"
 
-#: ../src/protocols/silc/silc.c:920
+#: ../src/protocols/silc/silc.c:924
 msgid "Key length"
 msgstr "طول کلید"
 
-#: ../src/protocols/silc/silc.c:922
+#: ../src/protocols/silc/silc.c:926
 msgid "Public key file"
-msgstr "پرونده‌ی کلید عمومی"
-
-#: ../src/protocols/silc/silc.c:924
+msgstr "پروندهٔ کلید عمومی"
+
+#: ../src/protocols/silc/silc.c:928
 msgid "Private key file"
-msgstr "پرونده‌ی کلید خصوصی"
-
-#: ../src/protocols/silc/silc.c:933
-msgid "Real Name"
-msgstr "نام واقعی"
-
-#: ../src/protocols/silc/silc.c:947
-msgid "Re-type Passphrase"
-msgstr "تایپ مجدد گذرواژه"
-
-#: ../src/protocols/silc/silc.c:954
+msgstr "پروندهٔ کلید خصوصی"
+
+#: ../src/protocols/silc/silc.c:951
+msgid "Passphrase (retype)"
+msgstr "گذرواژه (تایپ مجدد)"
+
+#: ../src/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
 msgstr "تولید زوج کلید"
 
-#: ../src/protocols/silc/silc.c:998
+#: ../src/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr "وضعیت برخط"
 
-#: ../src/protocols/silc/silc.c:1007
+#: ../src/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr "نمایش پیغام روز"
 
-#: ../src/protocols/silc/silc.c:1011
+#: ../src/protocols/silc/silc.c:1015
 msgid "Create SILC Key Pair..."
-msgstr "ایجاد زوج کلید SILC..."
-
-#: ../src/protocols/silc/silc.c:1110
+msgstr "ایجاد زوج کلید SILC"
+
+#: ../src/protocols/silc/silc.c:1114
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "کاربر <I>%s</I> درشبکه حاضر نیست"
 
-#: ../src/protocols/silc/silc.c:1302
+#: ../src/protocols/silc/silc.c:1305
 msgid "Topic too long"
 msgstr "موضوع خیلی بلند است"
 
-#: ../src/protocols/silc/silc.c:1383
+#: ../src/protocols/silc/silc.c:1386
 msgid "You must specify a nick"
 msgstr "باید یک لقب مشخص کنید"
 
-#: ../src/protocols/silc/silc.c:1485
+#: ../src/protocols/silc/silc.c:1488
 #, c-format
 msgid "channel %s not found"
 msgstr "کانال %s پیدا نشد"
 
-#: ../src/protocols/silc/silc.c:1490
+#: ../src/protocols/silc/silc.c:1493
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "حالت‌های کانال برای %s: ‏%s"
 
-#: ../src/protocols/silc/silc.c:1492
+#: ../src/protocols/silc/silc.c:1495
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr "هیچ حالت کانال روی %s تنظیم نشده است"
-
-#: ../src/protocols/silc/silc.c:1505
+msgstr "هیچ حالت کانالی روی %s تنظیم نشده است"
+
+#: ../src/protocols/silc/silc.c:1508
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "تنظیم cmodes برای %s شکست خورد"
 
-#: ../src/protocols/silc/silc.c:1535
+#: ../src/protocols/silc/silc.c:1538
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "فرمان نامعلوم: %s، (ممکن است اشکال گیم باشد)"
 
-#: ../src/protocols/silc/silc.c:1598
+#: ../src/protocols/silc/silc.c:1601
 msgid "part [channel]:  Leave the chat"
 msgstr "‏part [channel]‎: ترک گپ"
 
-#: ../src/protocols/silc/silc.c:1602
+#: ../src/protocols/silc/silc.c:1605
 msgid "leave [channel]:  Leave the chat"
 msgstr "‏leave [channel]‎: ترک گپ"
 
-#: ../src/protocols/silc/silc.c:1606
+#: ../src/protocols/silc/silc.c:1609
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "‏topic [&lt;new topic&gt;]‎: نمایش یا تغییر موضوع"
 
-#: ../src/protocols/silc/silc.c:1611
+#: ../src/protocols/silc/silc.c:1614
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "‏join &lt;channel&gt; [&lt;password&gt;]‎: پیوستن به گپ در این شبکه"
-
-#: ../src/protocols/silc/silc.c:1615
+msgstr "‏join &lt;channel&gt; [&lt;password&gt;]‎: پیوستن به یک گپ در این شبکه"
+
+#: ../src/protocols/silc/silc.c:1618
 msgid "list:  List channels on this network"
 msgstr "list: فهرست کردن کانال‌های این شبکه"
 
-#: ../src/protocols/silc/silc.c:1619
+#: ../src/protocols/silc/silc.c:1622
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "‏whois &lt;nick&gt;‎: نمایش اطلاعات لقب"
 
-#: ../src/protocols/silc/silc.c:1623 ../src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/silc/silc.c:1626 ../src/protocols/zephyr/zephyr.c:2622
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "‏msg &lt;nick&gt; &lt;message&gt;‎: فرستادن پیغام خصوصی به کاربر"
 
-#: ../src/protocols/silc/silc.c:1627
+#: ../src/protocols/silc/silc.c:1630
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "‏query &lt;nick&gt; [&lt;message&gt;]‎: فرستادن پیغام خصوصی به کاربر"
 
-#: ../src/protocols/silc/silc.c:1631
+#: ../src/protocols/silc/silc.c:1634
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: نمایش پیغام روز کارگزار"
 
-#: ../src/protocols/silc/silc.c:1635
+#: ../src/protocols/silc/silc.c:1638
 msgid "detach:  Detach this session"
 msgstr "detach: جدا کردن این نشست"
 
-#: ../src/protocols/silc/silc.c:1639
+#: ../src/protocols/silc/silc.c:1642
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "‏quit [message]‎: قطع از کارگزار، با پیغامی اختیاری"
 
-#: ../src/protocols/silc/silc.c:1643
+#: ../src/protocols/silc/silc.c:1646
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr ""
-
-#: ../src/protocols/silc/silc.c:1649
+msgstr "‏call &lt;command&gt;:  فراخوانی فرمان‌های slic"
+
+#: ../src/protocols/silc/silc.c:1652
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "‏kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]‎: کشتن با لقب"
 
-#: ../src/protocols/silc/silc.c:1653
+#: ../src/protocols/silc/silc.c:1656
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "‏nick &lt;newnick&gt;‎: تغییر لقب شما"
 
-#: ../src/protocols/silc/silc.c:1657
+#: ../src/protocols/silc/silc.c:1660
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "‏whowas &lt;nick&gt;‎: نمایش اطلاعات صاحب لقب"
 
-#: ../src/protocols/silc/silc.c:1661
+#: ../src/protocols/silc/silc.c:1664
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11252,7 +11472,7 @@
 "‏cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]‎: تغییر یا نمایش حالت‌های "
 "کانال"
 
-#: ../src/protocols/silc/silc.c:1665
+#: ../src/protocols/silc/silc.c:1668
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11260,50 +11480,50 @@
 "‏cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;‎: تغییر حالت‌های لقب روی "
 "کانال"
 
-#: ../src/protocols/silc/silc.c:1669
+#: ../src/protocols/silc/silc.c:1672
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "‏umode &lt;usermodes&gt;‎: تنظیم حالت‌های شما روی شبکه"
 
-#: ../src/protocols/silc/silc.c:1673
+#: ../src/protocols/silc/silc.c:1676
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "‏oper &lt;nick&gt; [-pubkey]‎: گرفتن مزایای متصدی کارگزار"
 
-#: ../src/protocols/silc/silc.c:1677
+#: ../src/protocols/silc/silc.c:1680
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: ../src/protocols/silc/silc.c:1681
+#: ../src/protocols/silc/silc.c:1684
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "‏kick &lt;channel&gt; &lt;nick&gt; [comment]‎: بیرون انداختن کارگیر از کانال"
 
-#: ../src/protocols/silc/silc.c:1685
+#: ../src/protocols/silc/silc.c:1688
 msgid "info [server]:  View server administrative details"
 msgstr "‏info [server]‎: نمایش جزئیات مدیریتی کارگزار"
 
-#: ../src/protocols/silc/silc.c:1689
+#: ../src/protocols/silc/silc.c:1692
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "‏ban [&lt;channel&gt; +|-&lt;nick&gt;]‎: محروم کردن کارگیر از کانال"
 
-#: ../src/protocols/silc/silc.c:1693
+#: ../src/protocols/silc/silc.c:1696
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "‏getkey &lt;nick|server&gt;‎: بازیابی کلید عمومی کارگزار یا کارگیر"
 
-#: ../src/protocols/silc/silc.c:1697
+#: ../src/protocols/silc/silc.c:1700
 msgid "stats:  View server and network statistics"
 msgstr "‏stats: نمایش آمار کارگزار و شبکه"
 
-#: ../src/protocols/silc/silc.c:1701
+#: ../src/protocols/silc/silc.c:1704
 msgid "ping:  Send PING to the connected server"
 msgstr "‏ping: ارسال  PING به کارگزار متصل"
 
-#: ../src/protocols/silc/silc.c:1706
+#: ../src/protocols/silc/silc.c:1709
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "‏users &lt;channel&gt;‎: فهرست کردن کاربران کانال"
 
-#: ../src/protocols/silc/silc.c:1710
+#: ../src/protocols/silc/silc.c:1713
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11320,112 +11540,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1819
+#: ../src/protocols/silc/silc.c:1822
 msgid "SILC Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد SILC"
+msgstr "متصل شوندهٔ قرارداد SILC"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1821
+#: ../src/protocols/silc/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "قرارداد کنفرانس زنده‌ی اینترنتی امن (SILC)"
-
-#: ../src/protocols/silc/silc.c:1858
+msgstr "قرارداد کنفرانس زندهٔ اینترنتی امن (SILC)"
+
+#: ../src/protocols/silc/silc.c:1861
 msgid "Public Key file"
-msgstr "پرونده‌ی کلید عمومی"
-
-#: ../src/protocols/silc/silc.c:1862
+msgstr "پروندهٔ کلید عمومی"
+
+#: ../src/protocols/silc/silc.c:1865
 msgid "Private Key file"
-msgstr "پرونده‌ی کلید خصوصی"
-
-#: ../src/protocols/silc/silc.c:1872
+msgstr "پروندهٔ کلید خصوصی"
+
+#: ../src/protocols/silc/silc.c:1875
 msgid "Cipher"
 msgstr "کلید رمز"
 
-#: ../src/protocols/silc/silc.c:1882
+#: ../src/protocols/silc/silc.c:1885
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1885
-msgid "Public key authentication"
-msgstr "تأیید هویت کلید عمومی"
-
 #: ../src/protocols/silc/silc.c:1888
+msgid "Public key authentication"
+msgstr "تأیید هویت کلید عمومی"
+
+#: ../src/protocols/silc/silc.c:1891
 msgid "Reject watching by other users"
 msgstr "رد نظارت کاربران دیگر"
 
-#: ../src/protocols/silc/silc.c:1891
+#: ../src/protocols/silc/silc.c:1894
 msgid "Block invites"
 msgstr "مسدود کردن دعوت‌ها"
 
-#: ../src/protocols/silc/silc.c:1894
+#: ../src/protocols/silc/silc.c:1897
 msgid "Block IMs without Key Exchange"
-msgstr "مسدود کردن پیغام‌های فوری بدون تبادل کلید"
-
-#: ../src/protocols/silc/silc.c:1897
+msgstr "مسدود کردن پیغام‌های اینترنتی بدون تبادل کلید"
+
+#: ../src/protocols/silc/silc.c:1900
 msgid "Reject online status attribute requests"
 msgstr "رد درخواست‌های مشخصه‌های وضعیت برخط"
 
-#: ../src/protocols/silc/silc.c:1900
+#: ../src/protocols/silc/silc.c:1903
 msgid "Block messages to whiteboard"
-msgstr ""
-
-#: ../src/protocols/silc/silc.c:1903
-#, fuzzy
-msgid "Automatically open whiteboard"
-msgstr "باز کردن به طور _خودکار"
+msgstr "مسدود کردن مسیر پیغام‌های تخته‌سفید"
 
 #: ../src/protocols/silc/silc.c:1906
+msgid "Automatically open whiteboard"
+msgstr "باز کردن تخته‌سفید به طور _خودکار"
+
+#: ../src/protocols/silc/silc.c:1909
 msgid "Digitally sign and verify all messages"
-msgstr "امضای دیجیتالی و تأیید همه‌ی پیغام‌ها"
-
-#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
+msgstr "امضای دیجیتالی و تأیید همهٔ پیغام‌های اینترنتی"
+
+#: ../src/protocols/silc/util.c:207 ../src/protocols/silc/util.c:233
 msgid "Creating SILC key pair..."
 msgstr "در حال ایجاد زوج کلید SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../src/protocols/silc/util.c:314
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "نام واقعی: \t%s\n"
 
-#: ../src/protocols/silc/util.c:316
+#: ../src/protocols/silc/util.c:330
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "نام کاربر: \t%s\n"
 
-#: ../src/protocols/silc/util.c:318
-#, c-format
-msgid "EMail: \t\t%s\n"
+#: ../src/protocols/silc/util.c:332
+#, c-format
+msgid "E-Mail: \t\t%s\n"
 msgstr "پست الکترونیکی: \t\t%s\n"
 
-#: ../src/protocols/silc/util.c:320
+#: ../src/protocols/silc/util.c:334
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "نام میزبان: \t%s\n"
 
-#: ../src/protocols/silc/util.c:322
+#: ../src/protocols/silc/util.c:336
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "سازمان: \t%s\n"
 
-#: ../src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:338
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "کشور: \t%s\n"
 
-#: ../src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:339
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "الگوریتم: \t%s\n"
 
-#: ../src/protocols/silc/util.c:326
-#, c-format
-msgid "Key length: \t%d bits\n"
+#: ../src/protocols/silc/util.c:340
+#, c-format
+msgid "Key Length: \t%d bits\n"
 msgstr "طول کلید : \t%Id بیت \n"
 
-#: ../src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:342
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11436,75 +11655,78 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:329
+#: ../src/protocols/silc/util.c:343
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
 
-#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
+#: ../src/protocols/silc/util.c:347 ../src/protocols/silc/util.c:348
 msgid "Public Key Information"
 msgstr "اطلاعات کلید عمومی"
 
-#: ../src/protocols/silc/util.c:516
+#: ../src/protocols/silc/util.c:530
 msgid "Paging"
 msgstr "در حال پی‌جویی"
 
-#: ../src/protocols/silc/util.c:540
+#: ../src/protocols/silc/util.c:536
+msgid "Video Conferencing"
+msgstr "کنفرانس ویدیویی"
+
+#: ../src/protocols/silc/util.c:554
 msgid "Computer"
 msgstr "کامپیوتر"
 
-#: ../src/protocols/silc/util.c:544
+#: ../src/protocols/silc/util.c:558
 msgid "PDA"
 msgstr "پی‌دی‌اِی"
 
-#: ../src/protocols/silc/util.c:546
+#: ../src/protocols/silc/util.c:560
 msgid "Terminal"
 msgstr "پایانه"
 
 #: ../src/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
+msgstr "‏%s پیغامی به تخته‌سفید فرستاد. آیا می‌خواهید تخته‌سفید را باز کنید؟"
 
 #: ../src/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
-msgstr ""
+msgstr "‏%s پیغامی به تخته‌سفید در کانال %s فرستاد. آیا می‌خواهید تخته‌سفید را باز کنید؟"
 
 #: ../src/protocols/silc/wb.c:302
 msgid "Whiteboard"
-msgstr ""
+msgstr "تخته‌سفید"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:415
+#: ../src/protocols/simple/simple.c:411
 msgid "Could not write"
 msgstr "نمی‌توان نوشت"
 
-#: ../src/protocols/simple/simple.c:430 ../src/protocols/simple/simple.c:1331
+#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1425
 msgid "Could not connect"
 msgstr "متصل نشد"
 
-#: ../src/protocols/simple/simple.c:924
+#: ../src/protocols/simple/simple.c:997
 msgid "Wrong Password"
-msgstr "گذرواژه‌ی نادرست"
-
-#: ../src/protocols/simple/simple.c:1362 ../src/protocols/simple/simple.c:1401
-#: ../src/protocols/simple/simple.c:1413 ../src/protocols/simple/simple.c:1460
+msgstr "گذرواژه اشتباه"
+
+#: ../src/protocols/simple/simple.c:1456 ../src/protocols/simple/simple.c:1495
+#: ../src/protocols/simple/simple.c:1507 ../src/protocols/simple/simple.c:1565
 msgid "Could not create listen socket"
 msgstr "ایجاد سوکت پایش ممکن نیست"
 
-#: ../src/protocols/simple/simple.c:1383
-#, fuzzy
+#: ../src/protocols/simple/simple.c:1477
 msgid "Couldn't resolve host"
-msgstr "نمی‌توان به میزبان متصل شد"
-
-#: ../src/protocols/simple/simple.c:1481
+msgstr "تحویل نام میزبان ممکن نیست"
+
+#: ../src/protocols/simple/simple.c:1587
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "نام‌های کاربری SIP نمی‌توانند حاوی فاصله یا نماد @ باشند"
+msgstr "لقب‌های SIP نمی‌توانند حاوی فاصله یا نماد @ باشند"
 
 #. *< type
 #. *< ui_requirement
@@ -11514,40 +11736,38 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1642
+#: ../src/protocols/simple/simple.c:1749
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد SIP/SIMPLE"
+msgstr "متصل شوندهٔ قرارداد SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1643
+#: ../src/protocols/simple/simple.c:1750
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد SIP/SIMPLE"
-
-#: ../src/protocols/simple/simple.c:1665
+msgstr "متصل شوندهٔ قرارداد SIP/SIMPLE"
+
+#: ../src/protocols/simple/simple.c:1772
 msgid "Publish status (note: everyone may watch you)"
-msgstr ""
-
-#: ../src/protocols/simple/simple.c:1671
+msgstr "انتشار وضعیت (تذکر: ممکن است همه ببینند)"
+
+#: ../src/protocols/simple/simple.c:1778
 msgid "Use UDP"
-msgstr "از UDP استفاده شود"
-
-#: ../src/protocols/simple/simple.c:1673
+msgstr "استفاده از UDP"
+
+#: ../src/protocols/simple/simple.c:1780
 msgid "Use proxy"
-msgstr "از پیشکار استفاده شود"
-
-#: ../src/protocols/simple/simple.c:1675
+msgstr "استفاده از پیشکار"
+
+#: ../src/protocols/simple/simple.c:1782
 msgid "Proxy"
 msgstr "پیشکار"
 
-#: ../src/protocols/simple/simple.c:1677
-#, fuzzy
+#: ../src/protocols/simple/simple.c:1784
 msgid "Auth User"
 msgstr "تأیید هویت کاربر"
 
-#: ../src/protocols/simple/simple.c:1679
-#, fuzzy
+#: ../src/protocols/simple/simple.c:1786
 msgid "Auth Domain"
-msgstr "دامنه‌ی تأیید هویت"
+msgstr "تأیید هویت دامنه"
 
 #: ../src/protocols/toc/toc.c:139
 #, c-format
@@ -11567,12 +11787,12 @@
 #: ../src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
-msgstr "نوشتن پرونده‌ی %s ممکن نیست."
+msgstr "نوشتن پروندهٔ %s ممکن نیست."
 
 #: ../src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
-msgstr "خواندن پرونده‌ی %s ممکن نیست."
+msgstr "خواندن پروندهٔ %s ممکن نیست."
 
 #: ../src/protocols/toc/toc.c:488
 #, c-format
@@ -11591,7 +11811,7 @@
 
 #: ../src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "یک پیغام جا افتاد، شما از محدوده‌ی سرعت کارگزار فراتر رفته‌اید."
+msgstr "یک پیغام جا افتاد، شما از محدودهٔ سرعت کارگزار فراتر رفته‌اید."
 
 #: ../src/protocols/toc/toc.c:500
 #, c-format
@@ -11606,12 +11826,12 @@
 #: ../src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
-msgstr "یک پیغام فوری از %s را دریافت نکردید چون خیلی بزرگ بود."
+msgstr "یک پیغام اینترنتی از %s را دریافت نکردید چون خیلی بزرگ بود."
 
 #: ../src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "یک پیغام فوری از %s را دریافت نکردید چون خیلی سریع بود."
+msgstr "یک پیغام اینترنتی از %s را دریافت نکردید چون خیلی سریع بود."
 
 #: ../src/protocols/toc/toc.c:512
 msgid "Failure."
@@ -11627,7 +11847,7 @@
 
 #: ../src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
-msgstr "سرویس دفترچه‌ی راهنمای کاربران به طور موقت قابل دسترسی نیست."
+msgstr "سرویس دفترچهٔ راهنمای کاربران به طور موقت قابل دسترسی نیست."
 
 #: ../src/protocols/toc/toc.c:524
 msgid "E-mail lookup restricted."
@@ -11643,7 +11863,7 @@
 
 #: ../src/protocols/toc/toc.c:533
 msgid "User has no directory information."
-msgstr "کاربر اطلاعاتی در دفترچه راهنمای کاربران ندارد."
+msgstr "کاربر اطلاعاتی در دفترچهٔ راهنمای کاربران ندارد."
 
 #: ../src/protocols/toc/toc.c:537
 msgid "Country not supported."
@@ -11667,7 +11887,7 @@
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
-"شما به دفعات خیلی زیادی متناوباً وارد سیستم شده و از آن خارج شده‌اید. ده دقیقه "
+"شما دفعات خیلی زیادی متناوباً وارد سیستم شده و از آن خارج شده‌اید. ده دقیقه "
 "صبر کرده و بعد دوباره امتحان کنید. اگر به تلاش ادامه دهید، باید حتی بیش از "
 "این صبر کنید."
 
@@ -11695,7 +11915,7 @@
 
 #: ../src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
+msgstr "مکث TOC به پایان رسید.حالا می‌توانید دوباره پیغام بفرستید."
 
 #: ../src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
@@ -11711,21 +11931,17 @@
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 msgstr ""
-"وقتی این اتفاق می‌افتد TOC همه‌ی پیغام‌هایی را که به آن فرستاده می‌شود نادیده "
-"می‌گیرد، و اگر پیغامی ارسال کنید ممکن است شما را بیرون بیاندازد. گیم جلوی رد "
-"شدن هرچیزی را خواهد گرفت. این مشکل موقتی است، لطفاً صبر کنید."
+"وقتی این اتفاق می‌افتد TOC همهٔ پیغام‌هایی را که به آن فرستاده می‌شود نادیده "
+"می‌گیرد، و اگر پیغامی ارسال کنید ممکن است شما را بیرون بیندازد. گیم جلوی رد "
+"شدن هر چیزی را خواهد گرفت. این مشکل موقتی است، لطفاً صبر کنید."
 
 #: ../src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
-msgstr "گرفتن اطلاعات دفترچه‌ی راهنمای کاربران"
-
-#: ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "تنظیم اطلاعات کاربر"
+msgstr "گرفتن اطلاعات دفترچهٔ راهنمای کاربران"
 
 #: ../src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
-msgstr "تنظیم اطلاعات دفترچه‌ی راهنمای کاربران"
+msgstr "تنظیم اطلاعات دفترچهٔ راهنمای کاربران"
 
 #: ../src/protocols/toc/toc.c:1694
 msgid "Change Password"
@@ -11747,7 +11963,7 @@
 
 #: ../src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
-msgstr "نمی‌توان سرصفحه‌ی پرونده را نوشت. پرونده انتقال نخواهد یافت."
+msgstr "نمی‌توان سرصفحهٔ پرونده را نوشت. پرونده انتقال نخواهد یافت."
 
 #: ../src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
@@ -11776,58 +11992,50 @@
 #. *  description
 #: ../src/protocols/toc/toc.c:2319 ../src/protocols/toc/toc.c:2321
 msgid "TOC Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد TOC"
-
-#: ../src/protocols/toc/toc.c:2340
-msgid "TOC host"
-msgstr "میزبان TOC"
-
-#: ../src/protocols/toc/toc.c:2344
-msgid "TOC port"
-msgstr "درگاه TOC"
-
-#: ../src/protocols/yahoo/yahoo.c:712
+msgstr "متصل شوندهٔ قرارداد TOC"
+
+#: ../src/protocols/yahoo/yahoo.c:710
 msgid "Your Yahoo! message did not get sent."
-msgstr "پیغام‌های Yahoo! شما فرستاده نشد."
-
-#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3562
+msgstr "پیغام‌های Yahoo!‎ شما فرستاده نشد."
+
+#: ../src/protocols/yahoo/yahoo.c:764 ../src/protocols/yahoo/yahoo.c:3564
 msgid "Buzz!!"
 msgstr "اوهوی!!"
 
-#: ../src/protocols/yahoo/yahoo.c:810
+#: ../src/protocols/yahoo/yahoo.c:809
 #, c-format
 msgid "Yahoo! system message for %s:"
-msgstr "پیغام سیستم Yahoo! برای %s:"
+msgstr "پیغام سیستم Yahoo!‎ برای %s:"
 
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:906
+#: ../src/protocols/yahoo/yahoo.c:905
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "کاربر %s می‌خواهد %s را به فهرست رفقایش %s%s اضافه کند"
 
-#: ../src/protocols/yahoo/yahoo.c:912
+#: ../src/protocols/yahoo/yahoo.c:911
 msgid "Message (optional) :"
 msgstr "پیغام (اختیاری) :"
 
-#: ../src/protocols/yahoo/yahoo.c:954
+#: ../src/protocols/yahoo/yahoo.c:953
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:957
+msgstr "‏%s (مثل دفعهٔ قبل) درخواست شما را برای اضافه کردنشان به فهرستتان رد کرد."
+
+#: ../src/protocols/yahoo/yahoo.c:956
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:960
+msgstr "‏%s به این دلیل (مثل دفعهٔ قبل) درخواست شما را برای اضافه کردنشان به فهرستتان رد کرد: %s."
+
+#: ../src/protocols/yahoo/yahoo.c:959
 msgid "Add buddy rejected"
 msgstr "اضافه کردن رفیق رد شد"
 
-#: ../src/protocols/yahoo/yahoo.c:1703
+#: ../src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11835,14 +12043,14 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 "کارگزار یاهو استفاده از روش تأیید هویت ناشناخته‌ای را درخواست کرده است. این "
-"نسخه‌ی گیم به احتمال زیاد نخواهد توانست با موفقیت وارد سیستم یاهو شود. برای "
+"نسخهٔ گیم به احتمال زیاد نخواهد توانست با موفقیت وارد سیستم یاهو شود. برای "
 "ارتقا %s را ببینید."
 
-#: ../src/protocols/yahoo/yahoo.c:1706
+#: ../src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
-msgstr "تأیید هویت Yahoo! شکست خورد"
-
-#: ../src/protocols/yahoo/yahoo.c:1772
+msgstr "تأیید هویت Yahoo!‎ شکست خورد"
+
+#: ../src/protocols/yahoo/yahoo.c:1771
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11851,160 +12059,160 @@
 "شما سعی کردید %s را نادیده بگیرید، اما این کاربر در فهرست رفقای شما هست. با "
 "کلیک روی «بله» رفیقتان را حذف کرده و او را نادیده بگیرید."
 
-#: ../src/protocols/yahoo/yahoo.c:1775
+#: ../src/protocols/yahoo/yahoo.c:1774
 msgid "Ignore buddy?"
 msgstr "رفیقتان نادیده گرفته شود؟"
 
-#: ../src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1808
 msgid "Invalid username."
 msgstr "نام کاربری نامعتبر."
 
-#: ../src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1819
 msgid "Normal authentication failed!"
 msgstr "تأیید هویت عادی شکست خورد!"
 
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
 "attempt to log in using Web Messenger authentication, which will result in "
 "reduced functionality and features."
 msgstr ""
-"روش تأیید هویت عادی شکست خورد. دلیل این مسئله یا غلط بودن گذرواژه‌ی شما و یا "
-"تغییر شِمای تأیید هویت یاهو است. گِیم تلاش خواهد کرد با استفاده از تأیید هویت "
-"به روش وب مسنجر وارد سیستم شود، که باعث کم شدن برخی امکانات و کارکردها خواهد "
-"شد."
-
-#: ../src/protocols/yahoo/yahoo.c:1829
+"روش تأیید هویت عادی شکست خورد. دلیل این مسئله یا غلط بودن گذرواژهٔ شما و یا "
+"تغییر شِمای تأیید هویت Yahoo!‎ است. گِیم تلاش خواهد کرد با استفاده از تأیید "
+"هویت به روش وب مسنجر وارد سیستم شود، که باعث کم شدن برخی امکانات و کارکردها "
+"خواهد شد."
+
+#: ../src/protocols/yahoo/yahoo.c:1828
 msgid "Incorrect password."
-msgstr "گذرواژه‌ی نادرست"
-
-#: ../src/protocols/yahoo/yahoo.c:1832
+msgstr "گذرواژهٔ نادرست"
+
+#: ../src/protocols/yahoo/yahoo.c:1831
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "حساب شما قفل شده است، لطفاً از وب‌گاه Yahoo! وارد سیستم شوید."
-
-#: ../src/protocols/yahoo/yahoo.c:1835
+msgstr "حساب شما قفل شده است، لطفاً از وب‌گاه Yahoo!‎ وارد سیستم شوید."
+
+#: ../src/protocols/yahoo/yahoo.c:1834
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"شماره خطای نامعلوم %Id. ورود به سیستم در وب‌گاه Yahoo! ممکن است آن را درست "
+"خطای نامعلوم با شمارهٔ %d. ورود به وب‌گاه Yahoo!‎ ممکن است این مشکل را برطرف "
 "کند."
 
-#: ../src/protocols/yahoo/yahoo.c:1889
-#, c-format
+#: ../src/protocols/yahoo/yahoo.c:1888
+#, c-formSIP/SIMPLEat
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "اضافه کردن رفیق %s به گروه %s به فهرست کارگزار‌ با حساب %s ممکن نیست."
-
-#: ../src/protocols/yahoo/yahoo.c:1892
+msgstr "اضافه کردن رفیق %s به گروه %s به فهرست کارگزار با حساب %s ممکن نیست."
+
+#: ../src/protocols/yahoo/yahoo.c:1891
 msgid "Could not add buddy to server list"
 msgstr "نمی‌توان رفیق را به فهرست کارگزار اضافه کرد"
 
-#: ../src/protocols/yahoo/yahoo.c:2011
+#: ../src/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
-#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
+#: ../src/protocols/yahoo/yahoo.c:2149 ../src/protocols/yahoo/yahoo.c:2296
+#: ../src/protocols/yahoo/yahoo.c:2311 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "نمی‌توان خواند"
 
-#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
-#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoo.c:2335 ../src/protocols/yahoo/yahoo.c:2492
+#: ../src/protocols/yahoo/yahoo.c:2594 ../src/protocols/yahoo/yahoo.c:2604
 #: ../src/protocols/yahoo/yahoochat.c:1447
 #: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "مشکل اتصال"
 
-#: ../src/protocols/yahoo/yahoo.c:2714 ../src/protocols/yahoo/yahoo.c:3295
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3298
 msgid "Not at Home"
 msgstr "خانه نیستم"
 
-#: ../src/protocols/yahoo/yahoo.c:2716 ../src/protocols/yahoo/yahoo.c:3298
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3301
 msgid "Not at Desk"
 msgstr "پشت میز نیستم"
 
-#: ../src/protocols/yahoo/yahoo.c:2718 ../src/protocols/yahoo/yahoo.c:3301
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3304
 msgid "Not in Office"
 msgstr "در دفتر نیستم"
 
-#: ../src/protocols/yahoo/yahoo.c:2722 ../src/protocols/yahoo/yahoo.c:3307
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3310
 msgid "On Vacation"
 msgstr "در تعطیلات"
 
-#: ../src/protocols/yahoo/yahoo.c:2726 ../src/protocols/yahoo/yahoo.c:3313
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3316
 msgid "Stepped Out"
 msgstr "یک دقیقه بیرون رفته‌ام"
 
-#: ../src/protocols/yahoo/yahoo.c:2819 ../src/protocols/yahoo/yahoo.c:2849
+#: ../src/protocols/yahoo/yahoo.c:2816 ../src/protocols/yahoo/yahoo.c:2846
 msgid "Not on server list"
 msgstr "در فهرست کارگزار نیست"
 
-#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2925
+#: ../src/protocols/yahoo/yahoo.c:2863 ../src/protocols/yahoo/yahoo.c:2922
 msgid "Appear Online"
 msgstr "به نظر برخط"
 
-#: ../src/protocols/yahoo/yahoo.c:2869 ../src/protocols/yahoo/yahoo.c:2946
+#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2943
 msgid "Appear Permanently Offline"
-msgstr "همیشه برون‌خط به نظر برسد"
-
-#: ../src/protocols/yahoo/yahoo.c:2888
+msgstr "همیشه به نظر برون‌خط"
+
+#: ../src/protocols/yahoo/yahoo.c:2885
 msgid "Presence"
 msgstr "حضور"
 
-#: ../src/protocols/yahoo/yahoo.c:2931
+#: ../src/protocols/yahoo/yahoo.c:2928
 msgid "Appear Offline"
 msgstr "به نظر برون‌خط"
 
-#: ../src/protocols/yahoo/yahoo.c:2940
+#: ../src/protocols/yahoo/yahoo.c:2937
 msgid "Don't Appear Permanently Offline"
-msgstr "همیشه برون‌خط به نظر نرسد"
-
-#: ../src/protocols/yahoo/yahoo.c:2988
+msgstr "همیشه به نظر برون‌خط نباشد"
+
+#: ../src/protocols/yahoo/yahoo.c:2985
 msgid "Join in Chat"
 msgstr "پیوستن به گپ"
 
-#: ../src/protocols/yahoo/yahoo.c:2994
+#: ../src/protocols/yahoo/yahoo.c:2991
 msgid "Initiate Conference"
 msgstr "راه‌اندازی کنفرانس"
 
-#: ../src/protocols/yahoo/yahoo.c:3022
+#: ../src/protocols/yahoo/yahoo.c:3019
 msgid "Presence Settings"
 msgstr "تنظیمات حضور"
 
-#: ../src/protocols/yahoo/yahoo.c:3028
+#: ../src/protocols/yahoo/yahoo.c:3025
 msgid "Start Doodling"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3057
 msgid "Active which ID?"
 msgstr "فعال‌سازی کدام شناسه؟"
 
-#: ../src/protocols/yahoo/yahoo.c:3069
+#: ../src/protocols/yahoo/yahoo.c:3066
 msgid "Join who in chat?"
 msgstr "پیوستن به کی در گپ؟"
 
-#: ../src/protocols/yahoo/yahoo.c:3079
+#: ../src/protocols/yahoo/yahoo.c:3076
 msgid "Activate ID..."
 msgstr "فعال‌سازی شناسه..."
 
-#: ../src/protocols/yahoo/yahoo.c:3083
+#: ../src/protocols/yahoo/yahoo.c:3080
 msgid "Join User in Chat..."
 msgstr "پیوستن به کاربر در گپ..."
 
-#: ../src/protocols/yahoo/yahoo.c:3621
+#: ../src/protocols/yahoo/yahoo.c:3623
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "‏join &lt;room&gt;‎: پیوستن به اتاق گپ در شبکه‌ی Yahoo"
-
-#: ../src/protocols/yahoo/yahoo.c:3626
+msgstr "‏join &lt;room&gt;‎: پیوستن به اتاق گپ در شبکهٔ Yahoo"
+
+#: ../src/protocols/yahoo/yahoo.c:3628
 msgid "list: List rooms on the Yahoo network"
-msgstr "list: فهرست کردن اتاق‌ها در شبکه‌ی یاهو"
-
-#: ../src/protocols/yahoo/yahoo.c:3630
+msgstr "list: فهرست کردن اتاق‌های شبکهٔ یاهو"
+
+#: ../src/protocols/yahoo/yahoo.c:3632
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:3634
+#: ../src/protocols/yahoo/yahoo.c:3636
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -12018,57 +12226,70 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
+#: ../src/protocols/yahoo/yahoo.c:3729 ../src/protocols/yahoo/yahoo.c:3731
 msgid "Yahoo Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد Yahoo"
-
-#: ../src/protocols/yahoo/yahoo.c:3746
+msgstr "متصل شوندهٔ قرارداد یاهو"
+
+#: ../src/protocols/yahoo/yahoo.c:3748
 msgid "Yahoo Japan"
-msgstr "‏Yahoo ژاپن"
-
-#: ../src/protocols/yahoo/yahoo.c:3749
-msgid "Pager host"
-msgstr "میزبان پِی‌جو"
-
-#: ../src/protocols/yahoo/yahoo.c:3752
-msgid "Japan Pager host"
-msgstr "میزبان پِی‌جوی ژاپن"
-
-#: ../src/protocols/yahoo/yahoo.c:3755
+msgstr "‏یاهوی ژاپن"
+
+#: ../src/protocols/yahoo/yahoo.c:3751
+msgid "Pager server"
+msgstr "کارگزار پِی‌جو"
+
+#: ../src/protocols/yahoo/yahoo.c:3754
+msgid "Japan Pager server"
+msgstr "کارگزار پِی‌جوی ژاپن"
+
+#: ../src/protocols/yahoo/yahoo.c:3757
 msgid "Pager port"
 msgstr "درگاه پِی‌جو"
 
-#: ../src/protocols/yahoo/yahoo.c:3758
-msgid "File transfer host"
-msgstr "میزبان انتقال پرونده"
-
-#: ../src/protocols/yahoo/yahoo.c:3761
-msgid "Japan file transfer host"
-msgstr "میزبان انتقال پرونده‌ی ژاپن"
-
-#: ../src/protocols/yahoo/yahoo.c:3764
+#: ../src/protocols/yahoo/yahoo.c:3760
+msgid "File transfer server"
+msgstr "کارگزار انتقال پرونده"
+
+#: ../src/protocols/yahoo/yahoo.c:3763
+msgid "Japan file transfer server"
+msgstr "کارگزار انتقال پروندهٔ ژاپن"
+
+#: ../src/protocols/yahoo/yahoo.c:3766
 msgid "File transfer port"
 msgstr "درگاه انتقال پرونده"
 
-#: ../src/protocols/yahoo/yahoo.c:3767
+#: ../src/protocols/yahoo/yahoo.c:3769
 msgid "Chat room locale"
 msgstr "شرایط محلی اتاق گپ"
 
-#: ../src/protocols/yahoo/yahoo.c:3770
+#: ../src/protocols/yahoo/yahoo.c:3772
 msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoo.c:3774
+msgstr "نادیده گرفتن دعوت به کنفرانس‌ها و اتاق‌های گپ"
+
+#: ../src/protocols/yahoo/yahoo.c:3776
 msgid "Chat room list URL"
 msgstr "نشانی اینترنتی فهرست اتاق‌های گپ"
 
-#: ../src/protocols/yahoo/yahoo.c:3777
-msgid "YCHT host"
-msgstr "میزبان YCHT"
-
-#: ../src/protocols/yahoo/yahoo.c:3780
-msgid "YCHT port"
-msgstr "درگاه YCHT"
+#: ../src/protocols/yahoo/yahoo.c:3779
+msgid "Yahoo Chat server"
+msgstr "کارگزار گپ یاهو"
+
+#: ../src/protocols/yahoo/yahoo.c:3782
+msgid "Yahoo Chat port"
+msgstr "درگاه گَپ‏ یاهو"
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr ""
+
+#: ../src/protocols/yahoo/yahoo_filexfer.c:253
+#: ../src/protocols/yahoo/yahoo_filexfer.c:262
+#: ../src/protocols/yahoo/yahoo_filexfer.c:271
+msgid "Unable to establish file descriptor."
+msgstr ""
 
 #. TODO: what to do here - do we really have to disconnect?
 #: ../src/protocols/yahoo/yahoo_packet.c:265
@@ -12082,18 +12303,18 @@
 
 #: ../src/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Japan Profile"
-msgstr "مجموعه تنظیمات Yahoo! ژاپن"
+msgstr "مجموعه تنظیمات Yahoo!‎ ژاپن"
 
 #: ../src/protocols/yahoo/yahoo_profile.c:784
 msgid "Yahoo! Profile"
-msgstr "مجموعه تنظیمات Yahoo!"
+msgstr "مجموعه تنظیمات Yahoo!‎"
 
 #: ../src/protocols/yahoo/yahoo_profile.c:828
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
-"ببخشید، مجموعه تنظیماتی که حاوی مطالب ۱۸ سال به بالا هستند در حال حاضر "
+"ببخشید، شرح حال‌هایی که حاوی مطالب ۱۸ سال به بالا هستند در حال حاضر "
 "پشتیبانی نمی‌شوند."
 
 #: ../src/protocols/yahoo/yahoo_profile.c:830
@@ -12101,77 +12322,77 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr ""
-"اگر مایل به دیدن این مجموعه تنظیمات هستید، باید این پیوند را در مرورگر وب‌تان "
+"اگر مایل به دیدن این شرح حال هستید، باید این پیوند را در مرورگر وب‌تان "
 "بازدید کنید"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1006
+#: ../src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Yahoo! ID"
-msgstr "شناسه‌ی Yahoo!"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1078
-#: ../src/protocols/yahoo/yahoo_profile.c:1082
-#: ../src/protocols/yahoo/yahoo_profile.c:1086
+msgstr "شناسهٔ Yahoo!‎"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1084
+#: ../src/protocols/yahoo/yahoo_profile.c:1088
+#: ../src/protocols/yahoo/yahoo_profile.c:1092
 msgid "Hobbies"
 msgstr "سرگرمی‌ها"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1096
-#: ../src/protocols/yahoo/yahoo_profile.c:1100
+#: ../src/protocols/yahoo/yahoo_profile.c:1102
+#: ../src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Latest News"
 msgstr "آخرین اخبار"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1121
+#: ../src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Home Page"
-msgstr "صفحه‌ی آغازه"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1136
+msgstr "صفحهٔ آغازه"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1142
 msgid "Cool Link 1"
 msgstr "پیوند باحال ۱"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1141
+#: ../src/protocols/yahoo/yahoo_profile.c:1147
 msgid "Cool Link 2"
 msgstr "پیوند باحال ۲"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1145
+#: ../src/protocols/yahoo/yahoo_profile.c:1151
 msgid "Cool Link 3"
 msgstr "پیوند باحال ۳"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1158
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 msgid "Last Update"
 msgstr "آخرین به هنگام‌رسانی"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "اطلاعات کاربر برای %s موجود نیست"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: ../src/protocols/yahoo/yahoo_profile.c:1176
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
-"ببخشید، به نظر می‌رسد این مجموعه تنظیمات به زبانی است که در حال حاضر پشتیبانی "
+"ببخشید، به نظر می‌رسد این شرح حال به زبان یا قالبی است که در حال حاضر پشتیبانی "
 "نمی‌شود."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1186
+#: ../src/protocols/yahoo/yahoo_profile.c:1192
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
-"نمی‌توان مجموعه تنظیمات کاربر را بازیابی کرد. به احتمال زیاد این مشکلی موقت "
-"در سمت کارگزار است. لطفاً کمی‌ دیرتر دوباره تلاش کنید."
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1189
+"نمی‌توان شرح حال کاربر را بازیابی کرد. به احتمال زیاد این مشکلی موقت "
+"از طرف کارگزار است. لطفاً کمی دیرتر دوباره تلاش کنید."
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1195
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
-"نمی‌توان مجموعه تنظیمات کاربر را بازیابی کرد. به احتمال زیاد این بدین معنی "
+"نمی‌توان شرح حال کاربر را بازیابی کرد. به احتمال زیاد این بدین معنی "
 "است که کاربر وجود ندارد؛ هرچند، یاهو بعضی وقت‌ها در پیدا کردن مجموعه تنظیمات "
-"کاربر شکست می‌خورد. اگر می‌دانید کاربر وجود دارد، لطفاً کمی‌ دیرتر دوباره تلاش "
+"کاربر شکست می‌خورد. اگر می‌دانید کاربر وجود دارد، لطفاً کمی دیرتر دوباره تلاش "
 "کنید."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1197
+#: ../src/protocols/yahoo/yahoo_profile.c:1203
 msgid "The user's profile is empty."
 msgstr "مجموعه تنظیمات کاربر خالی است."
 
@@ -12207,7 +12428,7 @@
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
-msgstr ""
+msgstr "خطای نامعلوم. ممکن است لازم باشد از سیستم خارج شده و پنج دقیقه صبر کنید تا بتوانید به یک اتاق گپ بپیوندید"
 
 #: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
@@ -12248,111 +12469,111 @@
 msgid "Connection problem with the YCHT server."
 msgstr "مشکل اتصال با کارگزار YCHT"
 
-#: ../src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:346
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
-"(هنگام تبدیل این پیغام خطایی رخ داد.\t گزینه‌ی «کدگذاری» را در ویرایشگر حساب "
+"(هنگام تبدیل این پیغام خطایی رخ داد.\t گزینهٔ «کُدگذاری» را در ویرایشگر حساب "
 "بررسی کنید)"
 
-#: ../src/protocols/zephyr/zephyr.c:686
+#: ../src/protocols/zephyr/zephyr.c:701
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "نمی‌توان چیزی به گپ %s، %s، %s ارسال کرد"
 
-#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
+#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>کاربر:</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
+#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>مخفی است یا وارد سیستم نشده"
 
-#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
+#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>در %s از %s"
 
-#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
+#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
 msgid "Anyone"
 msgstr "همه"
 
-#: ../src/protocols/zephyr/zephyr.c:2278
+#: ../src/protocols/zephyr/zephyr.c:2298
 msgid "_Class:"
 msgstr "_کلاس:"
 
-#: ../src/protocols/zephyr/zephyr.c:2284
+#: ../src/protocols/zephyr/zephyr.c:2304
 msgid "_Instance:"
 msgstr "_نمونه:"
 
-#: ../src/protocols/zephyr/zephyr.c:2290
+#: ../src/protocols/zephyr/zephyr.c:2310
 msgid "_Recipient:"
 msgstr "_گیرنده:"
 
-#: ../src/protocols/zephyr/zephyr.c:2301
+#: ../src/protocols/zephyr/zephyr.c:2321
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "تلاش برای ثبت نام در %s،%s،%s شکست خورد"
 
-#: ../src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2627
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "‏zlocate &lt;nick&gt;‎: مکان‌یابی کاربر"
 
-#: ../src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2632
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "‏zl &lt;nick&gt;‎: مکان‌یابی کاربر"
 
-#: ../src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2637
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "‏instance &lt;instance&gt;: تنظیم نمونه‌ای که روی این کلاس استفاده می‌شود"
-
-#: ../src/protocols/zephyr/zephyr.c:2622
+msgstr "instance &lt;instance&gt;: تنظیم نمونه‌ای که روی این کلاس استفاده می‌شود"
+
+#: ../src/protocols/zephyr/zephyr.c:2642
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "‏inst &lt;instance&gt;: تنظیم نمونه‌ای که روی این کلاس استفاده می‌شود"
-
-#: ../src/protocols/zephyr/zephyr.c:2627
+msgstr "inst &lt;instance&gt;: تنظیم نمونه‌ای که روی این کلاس استفاده می‌شود"
+
+#: ../src/protocols/zephyr/zephyr.c:2647
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "‏topic &lt;instance&gt; تنظیم نمونه‌ای که روی این کلاس استفاده می‌شود"
-
-#: ../src/protocols/zephyr/zephyr.c:2633
+msgstr "topic &lt;instance&gt;: تنظیم نمونه‌ای که روی این کلاس استفاده می‌شود"
+
+#: ../src/protocols/zephyr/zephyr.c:2653
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: پیوستن به گپ جدید"
 
-#: ../src/protocols/zephyr/zephyr.c:2638
+#: ../src/protocols/zephyr/zephyr.c:2658
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2644
+#: ../src/protocols/zephyr/zephyr.c:2664
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2650
+#: ../src/protocols/zephyr/zephyr.c:2670
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2676
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2661
+#: ../src/protocols/zephyr/zephyr.c:2681
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../src/protocols/zephyr/zephyr.c:2767
+#: ../src/protocols/zephyr/zephyr.c:2787
 msgid "Resubscribe"
 msgstr "اشتراک مجدد"
 
-#: ../src/protocols/zephyr/zephyr.c:2770
+#: ../src/protocols/zephyr/zephyr.c:2790
 msgid "Retrieve subscriptions from server"
 msgstr "بازیابی اشتراک از کارگزار"
 
@@ -12366,92 +12587,98 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2855 ../src/protocols/zephyr/zephyr.c:2857
+#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
 msgid "Zephyr Protocol Plugin"
-msgstr "متصل شونده‌ی قرارداد Zephyr"
-
-#: ../src/protocols/zephyr/zephyr.c:2882
+msgstr "متصل شوندهٔ قرارداد Zephyr"
+
+#: ../src/protocols/zephyr/zephyr.c:2896
+msgid "Use tzc"
+msgstr "از tzc استفاده شود"
+
+#: ../src/protocols/zephyr/zephyr.c:2899
+msgid "tzc command"
+msgstr "فرمان tzc"
+
+#: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
 msgstr "صادر کردن به .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2885
+#: ../src/protocols/zephyr/zephyr.c:2905
 msgid "Export to .zephyr.subs"
 msgstr "صادر کردن به .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2888
+#: ../src/protocols/zephyr/zephyr.c:2908
 msgid "Import from .anyone"
 msgstr "وارد کردن از .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2891
+#: ../src/protocols/zephyr/zephyr.c:2911
 msgid "Import from .zephyr.subs"
 msgstr "وارد کردن از .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2894
+#: ../src/protocols/zephyr/zephyr.c:2914
 msgid "Realm"
-msgstr "قلمرو"
-
-#: ../src/protocols/zephyr/zephyr.c:2897
+msgstr ""
+
+#: ../src/protocols/zephyr/zephyr.c:2917
 msgid "Exposure"
 msgstr ""
 
-#: ../src/proxy.c:1212 ../src/proxy.c:1268 ../src/proxy.c:1317
-#: ../src/proxy.c:1344
+#: ../src/proxy.c:1217 ../src/proxy.c:1273 ../src/proxy.c:1321
+#: ../src/proxy.c:1348
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "خطای اتصال پیشکار %Id"
 
 #. Forbidden
-#: ../src/proxy.c:1333
+#: ../src/proxy.c:1337
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr ""
 "دسترسی مُجاز نیست: کارگزار پیشکار تونل زدن از درگاه %Id را ممنوع کرده است."
 
-#: ../src/proxy.c:2333
-msgid "Invalid proxy settings"
-msgstr "تنظیمات پیشکار نامعتبر"
-
-#: ../src/proxy.c:2333
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"یا نام میزبان یا شماره‌ی درگاه مشخص شده برای نوع پیشکار داده شده نامعتبر است."
-
-#: ../src/savedstatuses.c:514
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: ../src/request.h:1354
+msgid "_Accept"
+msgstr "_پذیرش"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../src/savedstatuses.c:45
+msgid "I'm not here right now"
+msgstr "فعلاً نیستم"
+
+#: ../src/savedstatuses.c:524
 msgid "saved statuses"
 msgstr "وضعیت‌های ذخیره شده"
 
-#: ../src/savedstatuses.c:767
-msgid "I'm not here right now"
-msgstr ""
-
-#: ../src/server.c:225
+#: ../src/server.c:227
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "‏%s به عنوان %s شناخته می‌شود.\n"
 
-#: ../src/server.c:675
+#: ../src/server.c:681
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr ""
-"‏%s، %s را به اتاق گپ %s دعوت کرد:\n"
+msgstr "%s، %s را به اتاق گپ %s دعوت کرد:\n"
 "‏%s"
 
-#: ../src/server.c:680
+#: ../src/server.c:686
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s، %s را به اتاق گپ %s دعوت کرد:\n"
 
-#: ../src/server.c:684
+#: ../src/server.c:690
 msgid "Accept chat invitation?"
 msgstr "دعوت گپ را قبول می‌کنید؟"
 
 #: ../src/status.c:153
 msgid "Unset"
-msgstr "تنظیم نشده"
+msgstr "صفر کردن"
 
 #: ../src/status.c:156
 msgid "Unavailable"
@@ -12461,108 +12688,1323 @@
 msgid "Mobile"
 msgstr "همراه"
 
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "‏%s وارد سیستم شد"
-
-#: ../src/status.c:627
-#, c-format
-msgid "%s came back"
-msgstr "‏%s برگشت"
-
-#: ../src/status.c:634
-#, c-format
-msgid "%s signed off"
-msgstr "%s خارج شد"
-
-#: ../src/status.c:638
-#, c-format
-msgid "%s went away"
-msgstr "‏%s رفت"
-
-#: ../src/status.c:1284
+#: ../src/status.c:622
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s وضعیت را از %s به %s تغییر داد"
+
+#: ../src/status.c:632
+#, c-format
+msgid "%s is now %s"
+msgstr "‏%s در حال حاضر %s است"
+
+#: ../src/status.c:637
+#, c-format
+msgid "%s is no longer %s"
+msgstr "%s دیگر %s نیست."
+
+#: ../src/status.c:1311
 #, c-format
 msgid "%s became idle"
 msgstr "%s بی‌کار شد"
 
-#: ../src/status.c:1297
+#: ../src/status.c:1328
 #, c-format
 msgid "%s became unidle"
 msgstr "%s دیگر بی‌کار نیست"
 
-#: ../src/status.c:1359
+#: ../src/status.c:1394
 #, c-format
 msgid "+++ %s became idle"
-msgstr "+++ ‏%s بی‌کار شد"
-
-#: ../src/status.c:1361
+msgstr "+++ %s بی‌کار شد"
+
+#: ../src/status.c:1396
 #, c-format
 msgid "+++ %s became unidle"
-msgstr "+++ ‏%s دیگر بی‌کار نیست"
-
-#: ../src/util.c:670
+msgstr "+++ %s دیگر بی‌کار نیست"
+
+#: ../src/util.c:679
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2460
+#: ../src/util.c:2453
 #, c-format
 msgid "Error Reading %s"
 msgstr "خطا هنگام خواندن %s"
 
-#: ../src/util.c:2461
+#: ../src/util.c:2454
 #, 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~ تغییر یافت."
-
-#: ../src/util.c:2954
+"در خواندن %s شما خطایی پیش آمد و بار نشد. نام پروندهٔ قدیمی "
+"به %s~ تغییر کرد."
+
+#: ../src/util.c:2903
 msgid "Calculating..."
 msgstr "در حال محاسبه"
 
-#: ../src/util.c:2957
+#: ../src/util.c:2906
 msgid "Unknown."
 msgstr "نامعلوم."
 
-#: ../src/util.c:2983
+#: ../src/util.c:2932
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%Id ثانیه"
 
-#: ../src/util.c:2995
+#: ../src/util.c:2944
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%Id روز"
 
-#: ../src/util.c:3003
+#: ../src/util.c:2952
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] "%s، %Id ساعت"
-
-#: ../src/util.c:3009
+msgstr[0] "%s و %Id ساعت"
+
+#: ../src/util.c:2958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%Id ساعت"
 
-#: ../src/util.c:3017
+#: ../src/util.c:2966
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "%s، %Id دقیقه"
-
-#: ../src/util.c:3023
+msgstr[0] "%s و %Id دقیقه"
+
+#: ../src/util.c:2972
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%Id دقیقه"
 
-#: ../src/util.c:3498
+#: ../src/util.c:3439
 msgid "g003: Error opening connection.\n"
 msgstr "‏g003: خطای آغاز کردن اتصال.\n"
+
+#~ msgid "%s logged out."
+#~ msgstr "%s از سیستم خارج شد."
+
+#~ msgid "Screen Name:"
+#~ msgstr "نام کاربری:"
+
+#, fuzzy
+#~ msgid "Background color name"
+#~ msgstr "رنگ پس‌زمینه"
+
+#, fuzzy
+#~ msgid "Background color as a string"
+#~ msgstr "رنگ پس‌زمینه"
+
+#, fuzzy
+#~ msgid "Background color as a GdkColor"
+#~ msgstr "رنگ پس‌زمینه"
+
+#, fuzzy
+#~ msgid "Background set"
+#~ msgstr "رنگ پس‌زمینه"
+
+#~ msgid "Whether this tag affects the background color"
+#~ msgstr "این که این برچسب روی رنگ پس‌زمینه تأثیر می‌گذارد یا نه"
+
+#, fuzzy
+#~ msgid "Active item"
+#~ msgstr "فعال"
+
+#, fuzzy
+#~ msgid "The item which is currently active"
+#~ msgstr "گپ در حال حاضر قابل دسترسی نیست"
+
+#, fuzzy
+#~ msgid "Appears as list"
+#~ msgstr "به نظر برون‌خط"
+
+#~ msgid "me is using Gaim v%s."
+#~ msgstr "‏me از گیم نسخهٔ %s استفاده می‌کند."
+
+#~ msgid "Error launching <b>%s</b>: %s"
+#~ msgstr "خطا هنگام راه‌اندازی <b>%s</b>: %s"
+
+#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
+#~ msgstr "نمی‌توان صدا را بخش کرد چون پروندهٔ انتخاب شده (%s) وجود ندارد."
+
+#~ msgid ""
+#~ "Unable to play sound because the 'Command' sound method has been chosen, "
+#~ "but no command has been set."
+#~ msgstr ""
+#~ "نمی‌توان صدا را پخش کرد چون روش صوتی «فرمان» انتخاب شده اما فرمانی تنظیم "
+#~ "نشده است."
+
+#~ msgid ""
+#~ "Unable to play sound because the configured sound command could not be "
+#~ "launched: %s"
+#~ msgstr ""
+#~ "نمی‌توان صدا را پخش کرد چون نمی‌توان فرمان صوتی پیکربندی شده را راه‌اندازی "
+#~ "کرد: %s"
+
+#~ msgid "Email"
+#~ msgstr "پست الکترونیکی"
+
+#, fuzzy
+#~ msgid "Unable to initiate a new search"
+#~ msgstr "نمی‌توان در شبکه نوشت"
+
+#, fuzzy
+#~ msgid "You have a pending search. Please wait for it to finish."
+#~ msgstr "شما پیغام‌های را با سرعت خیلی زیادی به %s ارسال می‌کنید."
+
+#~ msgid "Realname"
+#~ msgstr "نام واقعی"
+
+#~ msgid "Email Address"
+#~ msgstr "نشانی پست الکترونیکی"
+
+#~ msgid "Direct IM with %s closed"
+#~ msgstr "پیغام اینترنتی مستقیم با %s بسته شد"
+
+#~ msgid "Direct IM with %s failed"
+#~ msgstr "پیغام اینترنتی مستقیم با %s شکست خورد"
+
+#~ msgid "Unable to open Direct IM"
+#~ msgstr "باز کردن پیغام اینترنتی مستقیم ممکن نیست"
+
+#, fuzzy
+#~ msgid "You have lost your connection to chat room %s."
+#~ msgstr "اتصال شما با اتاق گپ %s قطع شده است."
+
+#~ msgid "Chat is currently unavailable"
+#~ msgstr "گپ در حال حاضر قابل دسترسی نیست"
+
+#~ msgid "Unable to login to AIM"
+#~ msgstr "نمی‌توان وارد سیستم AIM شد"
+
+#~ msgid "Unable to create new connection."
+#~ msgstr "نمی‌توان اتصال جدید ایجاد کرد."
+
+#, fuzzy
+#~ msgid "Unable to log into file transfer proxy."
+#~ msgstr "نوشتن پروندهٔ %s ممکن نیست."
+
+#~ msgid "Internal Error"
+#~ msgstr "خطای داخلی"
+
+#~ msgid "Auth host"
+#~ msgstr "میزبان تأیید هویت"
+
+#~ msgid "Auth port"
+#~ msgstr "درگاه تأیید هویت"
+
+#~ msgid "EMail"
+#~ msgstr "پست الکترونیکی"
+
+#, fuzzy
+#~ msgid "Re-type Passphrase"
+#~ msgstr "گذرواژه"
+
+#~ msgid "TOC host"
+#~ msgstr "میزبان TOC"
+
+#~ msgid "TOC port"
+#~ msgstr "درگاه TOC"
+
+#~ msgid "Pager host"
+#~ msgstr "میزبان پِی‌جو"
+
+#, fuzzy
+#~ msgid "YCHT host"
+#~ msgstr "میزبان YCHT"
+
+#, fuzzy
+#~ msgid "YCHT port"
+#~ msgstr "درگاه YCHT"
+
+#~ msgid "%s signed on"
+#~ msgstr "‏%s وارد سیستم شد"
+
+#~ msgid "%s came back"
+#~ msgstr "‏%s برگشت"
+
+#~ msgid "%s signed off"
+#~ msgstr "%s خارج شد"
+
+#~ msgid "%s went away"
+#~ msgstr "‏%s رفت"
+
+#~ msgid "Error Message Suppression"
+#~ msgstr "پنهان کردن پیغام‌های خطا"
+
+#~ msgid "Hide Disconnect Errors"
+#~ msgstr "مخفی کردن خطاهای قطع اتصال"
+
+#~ msgid "Hide Login Errors"
+#~ msgstr "مخفی کردن خطاهای ورود به سیستم"
+
+#~ msgid "Restore Away State On Reconnect"
+#~ msgstr "ازسرگیری وضعیت رفته هنگام اتصال مجدد"
+
+#~ msgid "When you are kicked offline, this reconnects you."
+#~ msgstr ""
+#~ "هنگامی که ناخواسته برون‌خط شوید، این گزینه سبب وصل شدن مجدد شما خواهد شد."
+
+#~ msgid "Auto-login"
+#~ msgstr "ورود خودکار به سیستم"
+
+#~ msgid "Join A Chat..."
+#~ msgstr "پیوستن به گپ..."
+
+#~ msgid "Back"
+#~ msgstr "عقب"
+
+#~ msgid "Signoff"
+#~ msgstr "خروج از سیستم"
+
+#~ msgid "_Hide new messages until tray icon is clicked"
+#~ msgstr "_مخفی کردن پیغام‌های جدید تا زمانی که روی شمایل سینی کلیک شود"
+
+#~ msgid "Gaim - Signed off"
+#~ msgstr "گیم ـ از سیستم خارج شد"
+
+#~ msgid "Gaim - Away"
+#~ msgstr "گیم ـ رفته"
+
+#~ msgid "Not connected to AIM"
+#~ msgstr "به AIM متصل نشده است"
+
+#~ msgid "No screenname given."
+#~ msgstr "نام کاربری داده نشده است."
+
+#~ msgid "No roomname given."
+#~ msgstr "نام اتاقی داده نشده است."
+
+#~ msgid "Invalid AIM URI"
+#~ msgstr "نشانی AIM نامعتبر"
+
+#~ msgid ""
+#~ "Failed to assign %s to a socket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "تخصیص %s به سوکت شکست خورد:\n"
+#~ "%s"
+
+#~ msgid "Remote Control"
+#~ msgstr "کنترل از راه دور"
+
+#~ msgid "Provides remote control for gaim applications."
+#~ msgstr "برنامه‌های گیم را به کنترل از راه دور مجهز می‌کند."
+
+#~ msgid ""
+#~ "Gives Gaim the ability to be remote-controlled through third-party "
+#~ "applications or through the gaim-remote tool."
+#~ msgstr ""
+#~ "این قابلیت را به گیم می‌دهد که توسط برنامه‌های طرف سوم یا از طریق ابزار "
+#~ "gaim-remote از راه دور کنترل شود."
+
+#~ msgid "Docked _Buddy List is always on top"
+#~ msgstr "فهرست رفقای _جدا شده همیشه رو باشد"
+
+#~ msgid "Away!"
+#~ msgstr "رفته!"
+
+#~ msgid "Edit This Message"
+#~ msgstr "ویرایش این پیغام"
+
+#~ msgid "I'm Back!"
+#~ msgstr "من برگشتم!"
+
+#~ msgid "Are you sure you want to remove the away message \"%s\"?"
+#~ msgstr "آیا مطمئنید می‌خواهید پیغام رفتن «%s» را حذف کنید؟"
+
+#~ msgid "Remove Away Message"
+#~ msgstr "حذف پیغام رفتن"
+
+#~ msgid "Set All Away"
+#~ msgstr "تنظیم همه به رفته"
+
+#~ msgid "You cannot save an away message with a blank title"
+#~ msgstr "نمی‌شود پیغام رفتن را با عنوان خالی ذخیره کرد"
+
+#~ msgid ""
+#~ "Please give the message a title, or choose \"Use\" to use without saving."
+#~ msgstr ""
+#~ "لطفاً به پیغام عنوانی بدهید، یا برای استفاده بدون ذخیره کردن «استفاده» را "
+#~ "انتخاب کنید."
+
+#~ msgid "You cannot create an empty away message"
+#~ msgstr "نمی‌شود پیغام رفتن خالی ایجاد کرد"
+
+#~ msgid "New away message"
+#~ msgstr "پیغام رفتن جدید"
+
+#~ msgid "Away title: "
+#~ msgstr "عنوان رفته:"
+
+#~ msgid "_Save"
+#~ msgstr "_ذخیره"
+
+#~ msgid "Buddy List Error"
+#~ msgstr "خطای فهرست رفقا"
+
+#~ msgid "(+%d more)"
+#~ msgstr "(+%Id بیشتر)"
+
+#~ msgid " left the room (%s)."
+#~ msgstr " از اتاق خارج شد (%s)."
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "اندازهٔ پیکان بازکننده"
+
+#~ msgid ""
+#~ "Usage: %s command [OPTIONS] [URI]\n"
+#~ "\n"
+#~ "    COMMANDS:\n"
+#~ "       uri                      Handle AIM: URI\n"
+#~ "       away                     Popup the away dialog with the default "
+#~ "message\n"
+#~ "       back                     Remove the away dialog\n"
+#~ "       quit                     Close running copy of Gaim\n"
+#~ "\n"
+#~ "    OPTIONS:\n"
+#~ "       -h, --help [command]     Show help for command\n"
+#~ msgstr ""
+#~ "Usage: %s command [OPTIONS] [URI]\n"
+#~ "\n"
+#~ "    COMMANDS:\n"
+#~ "       uri                      Handle AIM: URI\n"
+#~ "       away                     Popup the away dialog with the default "
+#~ "message\n"
+#~ "       back                     Remove the away dialog\n"
+#~ "       quit                     Close running copy of Gaim\n"
+#~ "\n"
+#~ "    OPTIONS:\n"
+#~ "       -h, --help [command]     Show help for command\n"
+
+#~ msgid ""
+#~ "Gaim not running (on session 0)\n"
+#~ "Is the \"Remote Control\" plugin loaded?\n"
+#~ msgstr ""
+#~ "Gaim not running (on session 0)\n"
+#~ "Is the \"Remote Control\" plugin loaded?\n"
+
+# "گیم در حال اجرا نیست (در نشست ۰)\n"
+# "آیا متصل شوندهٔ «کنترل دوردست» بار شده است؟\n"
+#~ msgid ""
+#~ "\n"
+#~ "Using AIM: URIs:\n"
+#~ "Sending an IM to a screen name:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
+#~ "world'\n"
+#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
+#~ "Please note the quoting used above - if you run this from a shell the "
+#~ "'&'\n"
+#~ "needs to be escaped, or the command will stop at that point.\n"
+#~ "Also,the following will just open a conversation window to a screen "
+#~ "name,\n"
+#~ "with no message:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
+#~ "\n"
+#~ "Joining a chat:\n"
+#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
+#~ "...joins the 'PenguinLounge' chat room.\n"
+#~ "\n"
+#~ "Adding a buddy to your buddy list:\n"
+#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
+#~ "...prompts you to add 'Penguin' to your buddy list.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Using AIM: URIs:\n"
+#~ "Sending an IM to a screen name:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
+#~ "world'\n"
+#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
+#~ "Please note the quoting used above - if you run this from a shell the "
+#~ "'&'\n"
+#~ "needs to be escaped, or the command will stop at that point.\n"
+#~ "Also,the following will just open a conversation window to a screen "
+#~ "name,\n"
+#~ "with no message:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
+#~ "\n"
+#~ "Joining a chat:\n"
+#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
+#~ "...joins the 'PenguinLounge' chat room.\n"
+#~ "\n"
+#~ "Adding a buddy to your buddy list:\n"
+#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
+#~ "...prompts you to add 'Penguin' to your buddy list.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Close running copy of Gaim\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Close running copy of Gaim\n"
+
+# "بستن نسخهٔ در حال اجرای گیم\n"
+#~ msgid ""
+#~ "\n"
+#~ "Mark all accounts as \"away\" with the default message.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Mark all accounts as \"away\" with the default message.\n"
+
+# "علامت زدن همهٔ حساب‌ها با «رفته» با پیغام پیش‌فرض.\n"
+#~ msgid ""
+#~ "\n"
+#~ "Set all accounts as not away.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Set all accounts as not away.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Do you wish to add him or her to your buddy list?"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "آیا مایلید او را به فهرست رفقایتان اضافه کنید؟"
+
+#~ msgid "Information"
+#~ msgstr "اطلاعات"
+
+#~ msgid "Alias Contact..."
+#~ msgstr "اسم مستعار گذاشتن روی آشنا..."
+
+#~ msgid "/Buddies/_Signoff"
+#~ msgstr "/رفقا/_خروج از سیستم"
+
+#~ msgid "/Tools/_Away"
+#~ msgstr "ابزارها/_رفتن"
+
+#~ msgid "/Tools/Account Ac_tions"
+#~ msgstr "/‌ابزارها/کنش‌های _حساب‌ها"
+
+#~ msgid "/Tools/Pl_ugin Actions"
+#~ msgstr "/ابزارها/کنش‌های _متصل شونده‌ها"
+
+#~ msgid "/Tools/A_ccounts"
+#~ msgstr "/ابزارها/ح_ساب‌ها"
+
+#~ msgid "Rename Group"
+#~ msgstr "تغییر نام گروه"
+
+#~ msgid "New group name"
+#~ msgstr "نام گروه جدید"
+
+#~ msgid "Please enter a new name for the selected group."
+#~ msgstr "لطفاً برای گروه انتخاب شده نام جدیدی وارد کنید."
+
+#~ msgid "%d%%"
+#~ msgstr "٪%Id"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Account:</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>حساب:</b>"
+
+#~ msgid "Warned (%d%%) "
+#~ msgstr "اخطار گرفته (%Id%%)"
+
+#~ msgid "Offline "
+#~ msgstr "برون‌خط"
+
+#~ msgid "/Tools/Away"
+#~ msgstr "/ابزارها/رفته"
+
+#~ msgid "/Tools/Account Actions"
+#~ msgstr "/ابزارها/کنش‌های حساب‌ها"
+
+#~ msgid "Send a message to the selected buddy"
+#~ msgstr "فرستادن پیغام به رفیق انتخاب شده"
+
+#~ msgid "Get information on the selected buddy"
+#~ msgstr "گرفتن اطلاعات دربارهٔ رفیق انتخاب شده"
+
+#~ msgid "_Chat"
+#~ msgstr "_گپ"
+
+#~ msgid "Join a chat room"
+#~ msgstr "پیوستن به اتاق گپ"
+
+#~ msgid "_Away"
+#~ msgstr "_رفته"
+
+#~ msgid "Set an away message"
+#~ msgstr "تنظیم پیغام رفتن"
+
+#~ msgid "Done."
+#~ msgstr "انجام شد."
+
+#~ msgid "Signon: "
+#~ msgstr "ورود به سیستم:"
+
+#~ msgid "Signon"
+#~ msgstr "ورود به سیستم"
+
+#~ msgid "Cancel All"
+#~ msgstr "انصراف از همه"
+
+#~ msgid "_Reconnect"
+#~ msgstr "اتصال م_جدد"
+
+#~ msgid "Reason Unknown."
+#~ msgstr "دلیل نامعلوم است."
+
+#~ msgid "Reconnect _All"
+#~ msgstr "اتصال مجدد _همه"
+
+#~ msgid "Time"
+#~ msgstr "زمان"
+
+#~ msgid "Get Away Msg"
+#~ msgstr "گرفتن پیغام رفتن"
+
+#~ msgid "/Conversation/_Warn..."
+#~ msgstr "/گفتگو/ا_خطار..."
+
+#~ msgid "/Conversation/Warn..."
+#~ msgstr "/گفتگو/اخطار..."
+
+#~ msgid "Warn"
+#~ msgstr "اخطار"
+
+#~ msgid "Warn the user"
+#~ msgstr "اخطار دادن به کاربر"
+
+#~ msgid "Block the user"
+#~ msgstr "قطع رابطه با کاربر"
+
+#~ msgid "Send a file to the user"
+#~ msgstr "فرستادن پرونده برای کاربر"
+
+#~ msgid "Add the user to your buddy list"
+#~ msgstr "اضافه کردن کاربر به فهرست رفقایتان"
+
+#~ msgid "Remove the user from your buddy list"
+#~ msgstr "حذف کاربر از فهرست رفقا‌یتان"
+
+#~ msgid "Invite a user"
+#~ msgstr "دعوت کردن کاربر"
+
+#~ msgid "Add the chat to your buddy list"
+#~ msgstr "اضافه کردن گپ به فهرست رفقا"
+
+#~ msgid "<main>/Conversation/Close"
+#~ msgstr "<main>/گفتگو/بستن"
+
+#~ msgid "former lead developer"
+#~ msgstr "برنامه‌ساز ارشد قبلی"
+
+#~ msgid "former maintainer"
+#~ msgstr "نگهدارندهٔ قبلی"
+
+#~ msgid "Azerbaijani"
+#~ msgstr "آذربایجانی"
+
+#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
+#~ msgstr "ولادیمیرا جیرجینووا و ولادیمیر (کالادان) پتکوف"
+
+#~ msgid "Estonian"
+#~ msgstr "استونیایی"
+
+#~ msgid "Burmese"
+#~ msgstr "برمه‌ای"
+
+#~ msgid "Norwegian (Nynorsk)"
+#~ msgstr "نروژی"
+
+#~ msgid "Punjabi"
+#~ msgstr "پنجابی"
+
+#~ msgid "Albanian"
+#~ msgstr "آلبانیایی"
+
+#~ msgid "Ukrainian"
+#~ msgstr "اوکراینی"
+
+#~ msgid "Xhosa"
+#~ msgstr "خوسا"
+
+#~ msgid "Chinese"
+#~ msgstr "چینی"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">گیم نسخهٔ %s</span>"
+
+#~ msgid ""
+#~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "all at once.  It is written using Gtk+ and is licensed under the GPL."
+#~ "<BR><BR>"
+#~ msgstr ""
+#~ "گیم یک کارگیر پیمانه‌ای پیغام‌رسان است که قابلیت کار همزمان با AIM‏، MSN‏، "
+#~ "Yahoo!‎‏، ICQ‏، IRC‏، SILC‏، GroupWise، ناول، Napster‏، Zephyr و Gadu-Fadu را "
+#~ "دارد. این برنامه با استفاده از GTK+ نوشته شده و تحت مجوز GPL منتشر شده "
+#~ "است.<BR><BR>"
+
+#~ msgid "Active Developers"
+#~ msgstr "برنامه‌سازان فعال"
+
+#~ msgid "_Screen name"
+#~ msgstr "_نام کاربری"
+
+#~ msgid "Warn User"
+#~ msgstr "اخطار به کاربر"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+#~ "\n"
+#~ "This will increase %s's warning level and he or she will be subject to "
+#~ "harsher rate limiting.\n"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">به %s اخطار داده شود؟</span>\n"
+#~ "\n"
+#~ "این کار سبب بالا رفتن سطح اخطار %s شده و باعث می‌شود او مورد محدودیت‌های "
+#~ "وابسته به ارزیابی بیشتری قرار بگیرد.\n"
+
+#~ msgid "Warn _anonymously?"
+#~ msgstr "اخطار به صورت _ناشناس؟"
+
+#~ msgid "<b>Anonymous warnings are less severe.</b>"
+#~ msgstr "<b>اخطارهای ناشناس کمتر جدی هستند.</b>"
+
+#~ msgid "_Keep the dialog open"
+#~ msgstr "_محاوره باز نگه داشته شود"
+
+#~ msgid "Show transfer details"
+#~ msgstr "نمایش جزئیات انتقال"
+
+#~ msgid "<span weight=\"bold\">From:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">فرستنده:</span> %s\n"
+
+#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">موضوع:</span> %s\n"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">نامه دارید!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+
+#~ msgid "A_way"
+#~ msgstr "_رفته"
+
+#~ msgid "_Idle"
+#~ msgstr "_بی‌کار"
+
+#~ msgid "Retur_n from idle"
+#~ msgstr "با_زگشت از بی‌کاری"
+
+#~ msgid "Pounce Action"
+#~ msgstr "کنشِ حمله"
+
+#~ msgid "Bro_wse..."
+#~ msgstr "م_رور..."
+
+#~ msgid "Sav_e this pounce after activation"
+#~ msgstr "_ذخیرهٔ این کمین بعد از فعال‌سازی"
+
+#~ msgid "Remove Buddy Pounce"
+#~ msgstr "حذف کمینِ رفیق"
+
+#~ msgid "D_isplay remote nicknames if no alias is set"
+#~ msgstr "_نمایش لقب‌های دوردست در صورت تنظیم نبودن اسامی مستعار"
+
+#~ msgid "Display"
+#~ msgstr "نمایش"
+
+#~ msgid "Show _timestamp on messages"
+#~ msgstr "نمایش _مُهرهای زمانی در پیغام‌ها"
+
+#~ msgid "Ignore font _faces"
+#~ msgstr "نادیده گرفتن _شکل قلم‌ها"
+
+#~ msgid "Ignore font si_zes"
+#~ msgstr "نادیده گرفتن _اندازهٔ قلم‌ها"
+
+#~ msgid "Default Formatting"
+#~ msgstr "قالب‌بندی پیش‌فرض"
+
+#~ msgid "_Send default formatting with outgoing messages"
+#~ msgstr "_ارسال قالب‌بندی پیش‌فرض با پیغام‌های ارسالی"
+
+#~ msgid "Enter _sends message"
+#~ msgstr "(کلید) ورود پیغام را می_‌فرستد"
+
+#~ msgid "Window Closing"
+#~ msgstr "بستن پنجره"
+
+#~ msgid "_Escape closes window"
+#~ msgstr "_گریز پنجره را می‌بندد"
+
+#~ msgid "Insertions"
+#~ msgstr "درج‌ها"
+
+#~ msgid "Control-{B/I/U} changes _formatting"
+#~ msgstr "مهار با {ذ/ه‍/ع} _قالب‌بندی را عوض می‌کند"
+
+#~ msgid "Control-(number) _inserts smileys"
+#~ msgstr "مهار با (شماره) صورتک _درج می‌کند"
+
+#~ msgid "_Sorting:"
+#~ msgstr "_مرتب‌سازی:"
+
+#~ msgid "Show _buttons as:"
+#~ msgstr "نمایش _دکمه‌ها به شکل:"
+
+# 48x48/emblems/emblem-pictures.icon.in.h:1
+#~ msgid "Pictures"
+#~ msgstr "تصاویر"
+
+#~ msgid "Text"
+#~ msgstr "متن"
+
+#~ msgid "Pictures and text"
+#~ msgstr "تصاویر و متن"
+
+#~ msgid "_Raise window on events"
+#~ msgstr "بالا آ_وردن پنجره هنگام وقوع رویداد"
+
+#~ msgid "Show _warning levels"
+#~ msgstr "نمایش سطوح ا_خطار"
+
+#~ msgid "Enable \"_slash\" commands"
+#~ msgstr "به کار انداختن _فرمان‌های «slash»"
+
+#~ msgid "Show _aliases in tabs/titles"
+#~ msgstr "نمایش ا_سامی مستعار در زبانه‌ها/عنوان‌ها"
+
+#~ msgid "_Raise IM window on events"
+#~ msgstr "بالا آ_وردن پنجرهٔ پیغام اینترنتی هنگام وقوع رویداد"
+
+#~ msgid "Raise chat _window on events"
+#~ msgstr "بالا آوردن پنجرهٔ _گپ هنگام وقوع رویداد"
+
+#~ msgid "Use _multi-colored screen names in chats"
+#~ msgstr "استفاده از نام‌های کاربری _چندرنگ در گپ‌ها"
+
+#~ msgid "Tab p_lacement:"
+#~ msgstr "تعیین _جای زبانه:"
+
+#~ msgid "New conversation _placement:"
+#~ msgstr "تعیین _جای گفتگوی جدید:"
+
+#~ msgid "System Logs"
+#~ msgstr "تاریخچه‌های سیستم"
+
+#~ msgid "_Enable system log"
+#~ msgstr " _به کار انداختن تاریخچهٔ سیستم"
+
+#~ msgid "Log when buddies _sign on/sign off"
+#~ msgstr "ثبت زمانی که رفقا به سیستم _وارد/از سیستم خارج می‌شوند"
+
+#~ msgid "Log when buddies become _idle/un-idle"
+#~ msgstr "ثبت زمان _بی‌کار شدن/برگشتن از بی‌کاری رفقا"
+
+#~ msgid "Log when buddies go away/come _back"
+#~ msgstr "ثبت زمانی که رفقا می_روند/برمی‌گردند"
+
+#~ msgid "Log your _own signons/idleness/awayness"
+#~ msgstr "ثبت زمان ورود به سیستم/بی‌کار شدن/رفتن خودتان"
+
+#~ msgid "_Queue new messages when away"
+#~ msgstr "به _صف کردن پیغام‌های جدید وقتی نیستید"
+
+#~ msgid "Idle _time reporting:"
+#~ msgstr "گزارش _زمان بی‌کاری:"
+
+#~ msgid "Gaim usage"
+#~ msgstr "استفاده از گیم"
+
+#~ msgid "X usage"
+#~ msgstr "استفاده از X"
+
+#~ msgid "Windows usage"
+#~ msgstr "استفاده از ویندوز"
+
+#~ msgid "Away m_essage:"
+#~ msgstr "_پیغام رفتن:"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>  %s\n"
+#~ "<span weight=\"bold\">URL:</span>  %s\n"
+#~ "<span weight=\"bold\">File name:</span>  %s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">نوشتهٔ:</span>\t‎%s\n"
+#~ "<span weight=\"bold\">نشانی اینترنتی:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">نام پرونده:</span>\t%s"
+
+#~ msgid "Summary"
+#~ msgstr "خلاصه"
+
+#~ msgid "Details"
+#~ msgstr "جزئیات"
+
+#~ msgid "_Edit"
+#~ msgstr "_ویرایش"
+
+#~ msgid "Message Text"
+#~ msgstr "متن پیغام"
+
+#~ msgid "Shortcuts"
+#~ msgstr "میانبرها"
+
+#~ msgid "Away Messages"
+#~ msgstr "پیغام‌های رفتن"
+
+#~ msgid "Please create an account."
+#~ msgstr "لطفاً یک حساب ایجاد کنید."
+
+#~ msgid "Login"
+#~ msgstr "ورود به سیستم"
+
+#~ msgid "<b>_Account:</b>"
+#~ msgstr "<b>_حساب:</b>"
+
+#~ msgid "<b>_Password:</b>"
+#~ msgstr "<b>_گذرواژه:</b>"
+
+#~ msgid "A_ccounts"
+#~ msgstr "ح_ساب‌ها"
+
+#~ msgid "P_references"
+#~ msgstr "ترجی_حات"
+
+#~ msgid "_Sign on"
+#~ msgstr "_ورود به سیستم"
+
+#~ msgid ""
+#~ "Gaim %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -a, --acct          display account editor window\n"
+#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
+#~ "specifies\n"
+#~ "                      name of away message to use)\n"
+#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
+#~ "specifies\n"
+#~ "                      account(s) to use, seperated by commas)\n"
+#~ "  -n, --loginwin      don't automatically login; show login window\n"
+#~ "  -u, --user=NAME     use account NAME\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ msgstr ""
+#~ "Gaim %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -a, --acct          display account editor window\n"
+#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
+#~ "specifies\n"
+#~ "                      name of away message to use)\n"
+#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
+#~ "specifies\n"
+#~ "                      account(s) to use, seperated by commas)\n"
+#~ "  -n, --loginwin      don't automatically login; show login window\n"
+#~ "  -u, --user=NAME     use account NAME\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ "  -h, --help          display this help and exit\n"
+
+# "گیم %s.  برای اطلاعات بیشتر «%s -h» را امتحان کنید.\n"
+#~ msgid "Unable to load preferences"
+#~ msgstr "نمی‌توان ترجیحات را بار کرد"
+
+#~ msgid ""
+#~ "Gaim was not able to load your preferences because they are stored in an "
+#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "using the Preferences window."
+#~ msgstr ""
+#~ "گیم نمی‌تواند ترجیحات شما را بار کند چون در قالب قدیمی‌ای که دیگر استفاده "
+#~ "نمی‌شود ذخیره شده‌اند. لطفاً با استفاده از پنجرهٔ ترجیحات، تنظیمات‌تان را "
+#~ "مجدداً پیکربندی کنید."
+
+#~ msgid "Slightly less boring default"
+#~ msgstr "پیش‌فرضی کمی جالب‌تر"
+
+#~ msgid "Available for friends only"
+#~ msgstr "در دسترس فقط برای دوستان"
+
+#~ msgid "Away for friends only"
+#~ msgstr "رفته فقط برای دوستان"
+
+#~ msgid "Invisible for friends only"
+#~ msgstr "نامرئی فقط برای دوستان"
+
+#~ msgid "Unable to resolve hostname."
+#~ msgstr "تحویل نام میزبان ممکن نیست."
+
+#~ msgid "Error while writing to socket."
+#~ msgstr "خطا هنگام نوشتن در سوکت."
+
+#~ msgid "Authentication failed."
+#~ msgstr "تأیید هویت شکست خورد."
+
+#~ msgid "Unknown Error Code."
+#~ msgstr "کد خطای نامعلوم."
+
+#~ msgid "Reading data"
+#~ msgstr "در حال خواندن داده"
+
+#~ msgid "Reading server key"
+#~ msgstr "در حال خواندن کلید کارگزار"
+
+#~ msgid "Critical error in GG library\n"
+#~ msgstr "خطای بحرانی در کتابخانهٔ GC\n"
+
+#~ msgid "Unable to ping server"
+#~ msgstr "نمی‌توان کارگزار را ping کرد"
+
+#~ msgid "Send as message"
+#~ msgstr "فرستادن به شکل پیغام"
+
+#~ msgid "Looking up GG server"
+#~ msgstr "در حال گشتن به دنبال کارگزار GG"
+
+#~ msgid "Invalid Gadu-Gadu UIN specified"
+#~ msgstr "‏UIN ‏Gadu-Gadu تعریف شده نامعتبر است"
+
+#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
+#~ msgstr ""
+#~ "شما در حال تلاش برای فرستادن پیغام به یک UIN ‏Gadu-Gadu نامعتبر هستید."
+
+#~ msgid "Couldn't get search results"
+#~ msgstr "نمی‌توان نتایج جستجو را گرفت"
+
+#~ msgid "Sex"
+#~ msgstr "جنیست"
+
+#~ msgid "Couldn't Import Buddy List from Server"
+#~ msgstr "نمی‌توان فهرست رفقا را از کارگزار وارد کرد"
+
+#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
+#~ msgstr "فهرست رفقا با موفقیت به کارگزار Gadu-Gadu منتقل شد"
+
+#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
+#~ msgstr "نمی‌توان فهرست رفقا را به کارگزار Gadu-Gadu منتقل کرد"
+
+#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
+#~ msgstr "فهرست رفقا با موفقیت از کارگزار Gadu-Gadu حذف شد"
+
+#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
+#~ msgstr "نمی‌توان فهرست رفقا را از کارگزار Gadu-Gadu حذف کرد"
+
+#~ msgid "Password couldn't be changed"
+#~ msgstr "نمی‌توان گذرواژه را تغییر داد"
+
+#~ msgid "Error communicating with Gadu-Gadu server"
+#~ msgstr "خطا هنگام برقراری ارتباط با کارگزار Gadu-Gadu"
+
+#~ msgid ""
+#~ "Gaim was unable to complete your request due to a problem communicating "
+#~ "with the Gadu-Gadu HTTP server.  Please try again later."
+#~ msgstr ""
+#~ "به دلیل اشکالی در ارتباط با کارگزار HTTP ‏Gadu-Gadu گیم نتوانست درخواست "
+#~ "شما را انجام دهد. لطفاً کمی بعد دوباره امتحان کنید."
+
+#~ msgid "Unable to import Gadu-Gadu buddy list"
+#~ msgstr "وارد کردن فهرست Gadu-Gadu ممکن نیست"
+
+#~ msgid ""
+#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
+#~ "try again later."
+#~ msgstr ""
+#~ "گیم نتوانست به کارگزار فهرست رفقای Gadu-Gadu متصل شود. لطفاً کمی بعد "
+#~ "دوباره امتحان کنید."
+
+#~ msgid ""
+#~ "Gaim was unable to connect to the buddy list server.  Please try again "
+#~ "later."
+#~ msgstr ""
+#~ "گیم نتوانست به کارگزار فهرست رفقا متصل شود. لطفاً کمی بعد دوباره امتحان "
+#~ "کنید."
+
+#~ msgid "Unable to delete Gadu-Gadu buddy list"
+#~ msgstr "نمی‌توان فهرست رفقا Gadu-Gadu را حذف کرد"
+
+#~ msgid "Unable to access directory"
+#~ msgstr "دسترسی به شاخه ممکن نیست"
+
+#~ msgid ""
+#~ "Gaim was unable to search the Directory because it was unable to connect "
+#~ "to the directory server.  Please try again later."
+#~ msgstr ""
+#~ "گیم نتوانست در دفترچهٔ راهنمای کاربران جستجو کند چون نمی‌توانست به کارگزار "
+#~ "دفترچهٔ راهنمای کاربران متصل شود. لطفاً کمی بعد دوباره امتحان کنید."
+
+#~ msgid ""
+#~ "Gaim was unable to change your password due to an error connecting to the "
+#~ "Gadu-Gadu server.  Please try again later."
+#~ msgstr ""
+#~ "به دلیل اشکال در اتصال به کارگزار Gadu-Gadu گیم نتوانست گذرواژهٔ شما را "
+#~ "تغییر دهد. لطفاً کمی بعد دوباره امتحان کنید."
+
+#~ msgid "Import Buddy List from Server"
+#~ msgstr "وارد کردن فهرست رفقا از کارگزار"
+
+#~ msgid "Unable to access user profile."
+#~ msgstr "دسترسی به مجموعه تنظیمات کاربر ممکن نیست."
+
+#~ msgid ""
+#~ "Gaim was unable to access this user's profile due to an error connecting "
+#~ "to the directory server.  Please try again later."
+#~ msgstr ""
+#~ "به علت وجود خطایی در اتصال به کارگزار دفترچهٔ راهنمای کاربران، گیم نتوانست "
+#~ "به مجموعه تنظیمات این کاربر دسترسی پیدا کند. لطفاً کمی دیرتر دوباره تلاش "
+#~ "کنید."
+
+#~ msgid "File Transfer Aborted"
+#~ msgstr "انتقال پرونده قطع شد"
+
+#~ msgid "IRC"
+#~ msgstr "IRC"
+
+#~ msgid "Quit message"
+#~ msgstr "پیغامِ تَرک"
+
+#~ msgid "Buddy Information for %s"
+#~ msgstr "اطلاعات رفیق برای %s"
+
+#~ msgid "Invalid nickname '%s'"
+#~ msgstr "لقب «%s» نامعتبر"
+
+#~ msgid "Jabber ID"
+#~ msgstr "شناسهٔ Jabber‏"
+
+#~ msgid "Jabber Profile"
+#~ msgstr "مجموعه تنظیمات Jabber"
+
+#~ msgid "Roomlist Error"
+#~ msgstr "خطای فهرست اتاق‌ها"
+
+#~ msgid "Logged out"
+#~ msgstr "از سیستم خارج شد"
+
+#~ msgid "The user %s wants to add you to their buddy list."
+#~ msgstr "کاربر %s می‌خواهد شما را به فهرست رفقایش اضافه کند."
+
+#~ msgid "Hidden"
+#~ msgstr "مخفی"
+
+#~ msgid ""
+#~ "You were disconnected from the server, because you logged on from a "
+#~ "different location"
+#~ msgstr "اتصال شما از کارگزار قطع شد، چون از مکان دیگری وارد سیستم شدید"
+
+#~ msgid "User Properties"
+#~ msgstr "ویژگی‌های کاربر"
+
+#~ msgid "Error processing event or response (%s)."
+#~ msgstr "خطای پردازش رویداد یا پاسخ (%s)."
+
+#~ msgid "Transfer of file %s timed out."
+#~ msgstr "مدت انتقال پروندهٔ %s منقضی شد."
+
+#~ msgid ""
+#~ "You have been disconnected because you have signed on with this screen "
+#~ "name at another location."
+#~ msgstr ""
+#~ "اتصال شما قطع شد چون شما با همین نام کاربری در مکان دیگری وارد سیستم شدید."
+
+#~ msgid "Not specified"
+#~ msgstr "مشخص نشده است"
+
+#~ msgid "ICQ Info for %s"
+#~ msgstr "اطلاعات ICQ در مورد %s"
+
+#~ msgid ""
+#~ "Error 0x%04x: Unable to format screen name because the requested screen "
+#~ "name ends in a space."
+#~ msgstr ""
+#~ "خطای 0x%04x: قالب‌بندی نام کاربری ممکن نیست چون نام کاربری درخواست شده با "
+#~ "فاصله تمام می‌شود."
+
+#~ msgid "Unable to set AIM away message."
+#~ msgstr "نمی‌توان پیغام رفتن AIM را تنظیم کرد."
+
+#~ msgid ""
+#~ "You have probably requested to set your away message before the login "
+#~ "procedure completed.  You remain in a \"present\" state; try setting it "
+#~ "again when you are fully connected."
+#~ msgstr ""
+#~ "احتمالاً شما قبل از این که رویهٔ ورود به سیستم کامل شود درخواست تنظیم پیغام "
+#~ "رفتن‌تان را کرده‌اید. شما در وضعیت «حاضر» باقی مانده‌اید؛ هنگامی که کاملاً "
+#~ "متصل شدید دوباره برای تنظیم این پیغام تلاش کنید."
+
+#~ msgid "Away Message"
+#~ msgstr "پیغام رفتن"
+
+#~ msgid "I'm doing work and hoping for a distraction--IM me!"
+#~ msgstr ""
+#~ "من دارم کار می‌کنم و منتظرم کسی پیغامی بفرستد و حواسم را پرت کند... برایم "
+#~ "پیغام بفرستید!"
+
+#~ msgid "Set Available Message..."
+#~ msgstr "تنظیم پیغام حاضر..."
+
+#~ msgid "Failed to leave channel"
+#~ msgstr "ترک کانال شکست خورد"
+
+#~ msgid "Verify all IM message signatures"
+#~ msgstr "تأیید همهٔ امضاهای پیغام‌های اینترنتی"
+
+#~ msgid "Digitally sign all channel messages"
+#~ msgstr "امضای دیجیتالی همهٔ پیغام‌های کانال"
+
+#~ msgid "Verify all channel message signatures"
+#~ msgstr "تأیید همهٔ امضاهای پیغام‌های کانال"
+
+#~ msgid "Basic Profile"
+#~ msgstr "مجموعه تنظیمات پایه"
+
+#~ msgid "Profile Information"
+#~ msgstr "اطلاعات مجموعه تنظیمات"
+
+#~ msgid "AIM"
+#~ msgstr "AIM"
+
+#~ msgid "ICQ UIN"
+#~ msgstr "ICQ UIN"
+
+#~ msgid "MSN"
+#~ msgstr "MSN"
+
+#~ msgid "Yahoo"
+#~ msgstr "Yahoo"
+
+#~ msgid "I'm From"
+#~ msgstr "من اهل"
+
+#~ msgid "Set your Trepia profile data."
+#~ msgstr "داده‌های مجموعه تنظیمات Trepia خود را تنظیم کنید."
+
+#~ msgid "Profile"
+#~ msgstr "مجموعه تنظیمات"
+
+#~ msgid "Set Profile"
+#~ msgstr "تنظیم مجموعه تنظیمات"
+
+#~ msgid "Visit Homepage"
+#~ msgstr "بازدید صفحهٔ آغازه"
+
+#~ msgid "Local Users"
+#~ msgstr "کاربران محلی"
+
+#~ msgid "Trepia Protocol Plugin"
+#~ msgstr "متصل شوندهٔ قرارداد Trepia"
+
+#~ msgid ""
+#~ "You have been logged off as you have logged in on a different machine or "
+#~ "device."
+#~ msgstr ""
+#~ "شما از سیستم خارج شدید چون از دستگاه یا کامپیوتر دیگری وارد سیستم شدید."
+
+#~ msgid "Custom"
+#~ msgstr "سفارشی"
+
+#~ msgid "Please enter your password"
+#~ msgstr "لطفاً گذرواژه‌تان را وارد کنید"
+
+#~ msgid "(%d message)"
+#~ msgid_plural "(%d messages)"
+#~ msgstr[0] "(%Id پیغام)"
+
+#~ msgid "(1 message)"
+#~ msgstr "(۱ پیغام)"
+
+#~ msgid "%s logged in."
+#~ msgstr "‏%s وارد سیستم شد."
+
+#~ msgid ""
+#~ "%s has just been warned by %s.\n"
+#~ "Your new warning level is %d%%"
+#~ msgstr ""
+#~ "‏%2$s به %1$s اخطار داد.\n"
+#~ "سطح اخطار جدید شما ٪%3$Id است"
+
+#~ msgid "an anonymous person"
+#~ msgstr "شخصی ناشناس"
+
+#~ msgid ""
+#~ "%s has invited %s to the chat room %s:\n"
+#~ "<b>%s</b>"
+#~ msgstr ""
+#~ "%s، %s را به اتاق گپ %s دعوت کرد:\n"
+#~ "<b>%s</b>"
+
+#~ msgid "Sorry, I ran out for a bit!"
+#~ msgstr "ببخشید، یه دقیقه رفتم بیرون!"
+
+#~ msgid "_Warn"
+#~ msgstr "ا_خطار"
+
+#~ msgid "%a %b %e %H:%M:%S %Y"
+#~ msgstr "%A %OJd %JB %OJC%OJy، ساعت %OH:%OM:%OS"
+
+#~ msgid "Mail Server"
+#~ msgstr "کارگزار نامه"
+
+#~ msgid "%s (%d new/%d total)"
+#~ msgstr "%s (%Id جدید/%Id در مجموع)"
+
+#~ msgid "Check email every X seconds.\n"
+#~ msgstr "بررسی نامه هر X ثانیه.\n"
+
+#~ msgid "Use last matching buddy"
+#~ msgstr "استفاده از آخرین رفیقی که مطابقت می‌کند"
+
+#~ msgid ""
+#~ "The buddy with the lowest score is the buddy who will have priority in "
+#~ "the contact.\n"
+#~ "The default values (offline = 4,away = 2, and idle = 1)\n"
+#~ "will use what used to be the built-in order active->idle->away->away+idle-"
+#~ ">offline."
+#~ msgstr ""
+#~ "اولویت تماس با رفیقی است که کمترین نمره را داشته باشد.\n"
+#~ "مقادیر پیش‌فرض (برون‌خط = ۴، رفته = ۲ و بی‌کار = ۱) از\n"
+#~ "ترتیب توکار سابق یعنی فعال->بی‌کار->رفته+بی‌کار->برون‌خط بهره می‌برند."
+
+#~ msgid "Show fewer options"
+#~ msgstr "نمایش گزینه‌های کمتر"
+
+#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
+#~ msgstr "کاربر %s (%s%s%s%s%s) می‌خواهد به او اجازه دهید."
+
+#~ msgid "Send message through server"
+#~ msgstr "فرستادن پیغام از طریق کارگزار"
+
+#~ msgid "Connecting..."
+#~ msgstr "در حال اتصال..."
+
+#~ msgid "Nick:"
+#~ msgstr "لقب:"
+
+#~ msgid "Display conversation closed notices"
+#~ msgstr "نمایش اعلان‌های بسته شدن گفتگو"
+
+#~ msgid "Display timeout notices"
+#~ msgstr "نمایش اعلان‌های انتقضای مدت"
+
+#~ msgid "The conversation has become inactive and timed out."
+#~ msgstr "گفتگو غیر فعال شده و مدت آن منقضی شد."
--- a/po/sq.po	Mon Oct 30 21:48:42 2006 +0000
+++ b/po/sq.po	Mon Oct 30 22:45:28 2006 +0000
@@ -1,15 +1,15 @@
 # translation of gaim.po to Albanian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Besnik Bleta <besnik@spymac.com>, 2004, 2005.
+# Besnik Bleta <besnik@programeshqip.org>, 2004, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim_sq\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2005-02-12 17:30+0200\n"
-"Last-Translator: Besnik Bleta <besnik@spymac.com>\n"
+"PO-Revision-Date: 2006-10-29 14:30+0200\n"
+"Last-Translator: Besnik Bleta <besnik@programeshqip>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,9 +43,8 @@
 msgstr "Fshih Gabime Hyrjeje"
 
 #: plugins/autorecon.c:313
-#, fuzzy
 msgid "Hide Reconnecting Dialog"
-msgstr "Fshih Gabime Shkëputje"
+msgstr "Fshih Dialog Rilidhjeje"
 
 #  *< api_version
 #  *< type
@@ -55,11 +54,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/autorecon.c:337
 msgid "Auto-Reconnect"
 msgstr "Vetërilidhu"
@@ -69,10 +64,8 @@
 #  *  summary
 #  *  description
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
+#: plugins/autorecon.c:340
+#: plugins/autorecon.c:342
 msgid "When you are kicked offline, this reconnects you."
 msgstr "Kur jeni përzënë \"offline\", kjo ju rilidh"
 
@@ -99,24 +92,18 @@
 #  Explanation
 #. Explanation
 #: plugins/contact_priority.c:141
-#, fuzzy
 msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
+"The buddy with the lowest score is the buddy who will have priority in the contact.\n"
+"The default values (offline = 4, away = 2, and idle = 1) will use what used to be\n"
 "the built-in order: active, idle, away, away + idle, offline."
 msgstr ""
-"Shoku me pikët më të pakta është shoku që do të ketë përparësi në "
-"kontaktin.\n"
+"Shoku me pikët më të pakta është shoku që do të ketë përparësi në kontaktin.\n"
 "Vlerat parazgjedhje (i palidhur = 4, i larguar = 2, dhe i plogësht = 1)\n"
-"do të përdorin atë çka ishte rend i trupëzuar veprues->joveprues->i larguar-"
-">i larguar+i plogësht->jo i lidhur."
+"do të përdorin atë çka ishte radha e trupëzuar: veprues, joveprues, i larguar, i larguar+, i plogësht, jo i lidhur."
 
 #: plugins/contact_priority.c:144
-#, fuzzy
 msgid "Point values to use for account..."
-msgstr "Pikë për t'i përdorur për Llogarinë..."
+msgstr "Pikë për t'i përdorur për llogarinë..."
 
 #  *< api_version
 #  *< type
@@ -126,11 +113,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/contact_priority.c:195
 msgid "Contact Priority"
 msgstr "Përparësi Kontaktesh"
@@ -139,28 +122,18 @@
 #  *< version
 #  *< summary
 #. *< name
-#. *< version
-#. *< summary
 #: plugins/contact_priority.c:198
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Lejon kontrollimin e vlerave të shoqëruara me gjendje të ndryshme shokësh."
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "Lejon kontrollimin e vlerave të shoqëruara me gjendje të ndryshme shokësh."
 
 #  *< description
 #. *< description
 #: plugins/contact_priority.c:200
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Lejon ndryshim pikësh për gjendje plogështie/largimi/i palidhur shokësh në "
-"llogaritje përparësish kontakti."
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "Lejon ndryshim pikësh për gjendje plogështie/largimi/i palidhur shokësh në llogaritje përparësish kontakti."
 
 #  *  DEFINES, MACROS & DATA TYPES
-#.
 #. *  DEFINES, MACROS & DATA TYPES
-#.
 #: plugins/docklet/docklet-win32.c:44
 msgid "Gaim"
 msgstr "Gaim"
@@ -174,9 +147,8 @@
 msgstr "Gaim - Larguar"
 
 #: plugins/docklet/docklet.c:383
-#, fuzzy
 msgid "Show Buddy List"
-msgstr "Listë Shokësh"
+msgstr "Shfaq Listë Shokësh"
 
 #: plugins/docklet/docklet.c:390
 msgid "New Message..."
@@ -190,56 +162,42 @@
 msgid "Mute Sounds"
 msgstr "Pa Tinguj"
 
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
+#: plugins/docklet/docklet.c:406
+#: src/gtkft.c:691
 #: src/protocols/oscar/oscar.c:8357
 msgid "File Transfers"
 msgstr "Shpërngulje Kartelash"
 
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
+#: plugins/docklet/docklet.c:407
+#: src/gtkaccount.c:2422
 msgid "Accounts"
 msgstr "Llogari"
 
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
+#: plugins/docklet/docklet.c:408
+#: src/gtkprefs.c:1763
 msgid "Preferences"
 msgstr "Parapëlqime"
 
 #. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
 #: plugins/docklet/docklet.c:416
 msgid "Quit"
 msgstr "Lër"
 
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/docklet/docklet.c:556
 msgid "System Tray Icon"
 msgstr "Ikonë Shtylle Sistemi"
 
 #. *< name
-#. *< version
-#. *  summary
 #: plugins/docklet/docklet.c:559
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Shfaq për Gaim-in një ikonë në shtyllë sistemi."
 
 #. *  description
 #: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"Shfaq një ikonë shtylle sistemi (në GNOME, KDE ose Windows për shembull) për "
-"të treguar gjendjen e çastit të Gaim-it, për të mundësuar hyrje të shpejtë "
-"në funksionet e përdorur zakonisht, dhe për të këmbyer shfaqjen e listës së "
-"shokëve me dritare hyrjeje. Lejon gjithashtu të vihen në pritje mesazhe deri "
-"sa të klikohet ikona, e ngjashme me ICQ."
+msgid "Displays a system tray icon (in GNOME, KDE or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list or login window. Also allows messages to be queued until the icon is clicked, similar to ICQ."
+msgstr "Shfaq një ikonë shtylle sistemi (në GNOME, KDE ose Windows për shembull) për të treguar gjendjen e çastit të Gaim-it, për të mundësuar hyrje të shpejtë në funksionet e përdorur zakonisht, dhe për të këmbyer shfaqjen e listës së shokëve me dritare hyrjeje. Lejon gjithashtu të vihen në pritje mesazhe deri sa të klikohet ikona, e ngjashme me ICQ."
 
 #: plugins/extplacement.c:79
 msgid "By conversation count"
@@ -258,11 +216,7 @@
 msgstr "Ndaj dritaret IM dhe Fjalosjeje kur vendosen sipas numrash"
 
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/extplacement.c:132
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
@@ -270,7 +224,6 @@
 #  *< name
 #  *< version
 #. *< name
-#. *< version
 #: plugins/extplacement.c:134
 msgid "Extra conversation placement options."
 msgstr "Mundësi ekstra vendosjeje bashkëbisedimi."
@@ -278,14 +231,9 @@
 #  *< summary
 #  *  description
 #. *< summary
-#. *  description
 #: plugins/extplacement.c:136
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Ngushton numrin e bashkëbisedimeve për dritare, me mundësinë edhe të ndarjes "
-"së IM-ve dhe Fjalosjeve"
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgstr "Ngushton numrin e bashkëbisedimeve për dritare, me mundësinë edhe të ndarjes së IM-ve dhe Fjalosjeve"
 
 #  *< api_version
 #  *< type
@@ -295,11 +243,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Kontroll Gaim Kartelash"
@@ -309,10 +253,8 @@
 #  *  summary
 #  *  description
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: plugins/filectl.c:248
+#: plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Ju lejon të kontrolloni Gaim-in duke dhënë urdhra në një kartelë."
 
@@ -324,11 +266,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Shtojcë Shembulli Gaim "
@@ -337,8 +275,6 @@
 #  *< version
 #  *  summary
 #. *< name
-#. *< version
-#. *  summary
 #: plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Shtojcë shembull që bën gjëra - shihni përshkrimin"
@@ -359,78 +295,69 @@
 
 #: plugins/gaimrc.c:40
 msgid "Cursor Color"
-msgstr ""
+msgstr "Ngjyrë Kursori"
 
 #: plugins/gaimrc.c:41
 msgid "Secondary Cursor Color"
-msgstr ""
+msgstr "Ngjyrë e Dytë Kursori"
 
 #: plugins/gaimrc.c:42
-#, fuzzy
 msgid "Hyperlink Color"
 msgstr "Ngjyrë Tejlidhjeje"
 
 #: plugins/gaimrc.c:53
-#, fuzzy
 msgid "GtkTreeView Expander Size"
-msgstr "Madhësi Zgjeruesi"
+msgstr "Madhësi Zgjeruesi GtkTreeView"
 
 #  Conversations
 #: plugins/gaimrc.c:72
-#, fuzzy
 msgid "Conversation Entry"
-msgstr "bashkëbisedime"
+msgstr "Zë Bashkëbisedimi"
 
 #  Conversations
 #: plugins/gaimrc.c:73
-#, fuzzy
 msgid "Conversation History"
-msgstr "bashkëbisedime"
+msgstr "Histori Bashkëbisedimi"
 
 #: plugins/gaimrc.c:74
-#, fuzzy
 msgid "Log Viewer"
-msgstr "Shërbyes hyrjeje"
+msgstr "Parës Regjistrimi"
 
 #: plugins/gaimrc.c:75
-#, fuzzy
 msgid "Request Dialog"
-msgstr "Kërkesë e dykuptimtë"
+msgstr "Dialog Kërkese"
 
 #  ---------- "Notify For" ----------
 #: plugins/gaimrc.c:76
-#, fuzzy
 msgid "Notify Dialog"
-msgstr "Njoftim Për"
+msgstr "Dialog Njoftimi"
 
 #: plugins/gaimrc.c:209
-#, fuzzy, c-format
+#, c-format
 msgid "Select Color for %s"
-msgstr "Përzgjidhni Ngjyrë Teksti"
+msgstr "Përzgjidhni Ngjyrë për %s"
 
 #: plugins/gaimrc.c:211
-#, fuzzy
 msgid "Select Color"
-msgstr "Përzgjidhni Ngjyrë Teksti"
+msgstr "Përzgjidhni Ngjyrë"
 
 #: plugins/gaimrc.c:246
-#, fuzzy, c-format
+#, c-format
 msgid "Select Font for %s"
-msgstr "Përzgjidhni Gërma"
+msgstr "Përzgjidhni Gërma për %s"
 
 #: plugins/gaimrc.c:284
-#, fuzzy
 msgid "Select Interface Font"
-msgstr "Përzgjidhni Gërma"
+msgstr "Përzgjidhni Gërma Ndërfaqeje"
 
 #: plugins/gaimrc.c:343
-#, fuzzy
 msgid "GTK+ Interface Font"
-msgstr "Mundësi Ndërfaqeje"
+msgstr "Gërma Ndërfaqeje GTK+"
 
 #: plugins/gaimrc.c:362
+#, fuzzy
 msgid "GTK+ Text Shortcut Theme"
-msgstr ""
+msgstr "Temë GTK+ me Shkurtprerje Teksti"
 
 #  *< api_version
 #  *< type
@@ -440,13 +367,13 @@
 #  *< priority
 #  *< id
 #: plugins/gaimrc.c:460
-#, fuzzy
 msgid "Gaim GTK+ Theme Control"
-msgstr "Kontroll Gaim Kartelash"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgstr "Kontroll Teme GTK+ për Gaim-in"
+
+#: plugins/gaimrc.c:462
+#: plugins/gaimrc.c:463
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "Ofron mundësi ndryshimi të rregullimeve të zakonshme gtkrc."
 
 #. Configuration frame
 #: plugins/gestures/gestures.c:243
@@ -459,7 +386,7 @@
 
 #: plugins/gestures/gestures.c:255
 msgid "Right mouse button"
-msgstr "Buton djathtas i miut"
+msgstr "Butoni djathtas i miut"
 
 #  "Visual gesture display" checkbox
 #. "Visual gesture display" checkbox
@@ -475,11 +402,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/gestures/gestures.c:296
 msgid "Mouse Gestures"
 msgstr "Gjeste Miu"
@@ -488,8 +411,6 @@
 #  *< version
 #  *  summary
 #. *< name
-#. *< version
-#. *  summary
 #: plugins/gestures/gestures.c:299
 msgid "Provides support for mouse gestures"
 msgstr "Mundëson mbulim gjestesh miu"
@@ -509,13 +430,14 @@
 "Zvarrisni butonin e mesit të miut për të kryer ca veprime:\n"
 "\n"
 "Zvarriteni poshtë e mandej djathtas për të mbyllur një bashkëbisedim.\n"
-"Zvarriteni sipër e mandej majtas për të kaluar te bashkëbisedimi i "
-"mëparshëm.\n"
+"Zvarriteni sipër e mandej majtas për të kaluar te bashkëbisedimi i mëparshëm.\n"
 "Zvarriteni sipër e mandej djathtas për të kaluar tek bashkëbisedimi pasues."
 
 #: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#: plugins/gevolution/assoc-buddy.c:119
+#: src/gtkroomlist.c:572
+#: src/protocols/jabber/jabber.c:638
+#: src/protocols/msn/msn.c:1539
 msgid "Name"
 msgstr "Emër"
 
@@ -527,19 +449,19 @@
 #. Add the label.
 #: plugins/gevolution/add_buddy_dialog.c:458
 msgid "Select a person from your address book below, or add a new person."
-msgstr ""
-"Përzgjidhni dikë prej librit tuaj të vendndodhjeve më sipër, ose shtoni një "
-"person të ri."
+msgstr "Përzgjidhni dikë prej librit tuaj të vendndodhjeve më sipër, ose shtoni një person të ri."
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
+#: plugins/gevolution/assoc-buddy.c:353
+#: src/protocols/jabber/buddy.c:1357
 #: src/protocols/oscar/oscar.c:8128
 msgid "Search"
 msgstr "Kërko"
 
 #: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
+#: plugins/gevolution/new_person_dialog.c:306
+#: src/gtkblist.c:4082
 #: src/gtkblist.c:4459
 msgid "Group:"
 msgstr "Grup:"
@@ -557,18 +479,13 @@
 
 #. Add the label.
 #: plugins/gevolution/assoc-buddy.c:340
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Përzgjidhni një person prej librit tuaj të vendndodhjeve për të shtuar këtë "
-"shok, ose krijoni një person të ri."
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "Përzgjidhni një person prej librit tuaj të vendndodhjeve për të shtuar këtë shok, ose krijoni një person të ri."
 
 #. Add the expander
 #: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
 msgid "User _details"
-msgstr "Fshih hollësi përdoruesi"
+msgstr "_Hollësi përdoruesi"
 
 #  "Associate Buddy" button
 #. "Associate Buddy" button
@@ -576,33 +493,36 @@
 msgid "_Associate Buddy"
 msgstr "_Shoqëro Shok"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
+#: plugins/gevolution/gevo-util.c:64
+#: plugins/gevolution/gevolution.c:96
+#: src/blist.c:518
+#: src/blist.c:1259
+#: src/blist.c:1480
+#: src/gtkblist.c:3897
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Shokë"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
+#: plugins/gevolution/gevolution.c:262
+#: plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
-msgstr "I pazoti të dërgoj mesazh."
+msgstr "I pazoti të dërgoj e-mail."
 
 #: plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
+msgstr "I ekzekutueshmi për Evolution nuk u gjet në PATH."
 
 #: plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
+msgstr "Shoku i treguar nuk u gjet te Kontaktet e Evolucionit."
 
 #: plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Shto te Libër Vendndodhjesh"
 
 #: plugins/gevolution/gevolution.c:290
-#, fuzzy
 msgid "Send E-Mail"
-msgstr "E-Mail"
+msgstr "Dërgo E-Mail"
 
 #. Configuration frame
 #: plugins/gevolution/gevolution.c:414
@@ -614,7 +534,9 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Përzgjidhni tërë llogaritë tek të cilat mund të vetështohen shokë."
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
+#: plugins/gevolution/gevolution.c:447
+#: plugins/idle.c:111
+#: plugins/idle.c:140
 msgid "Account"
 msgstr "Llogari"
 
@@ -626,11 +548,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/gevolution/gevolution.c:530
 msgid "Evolution Integration"
 msgstr "Integrim me Evolucionin"
@@ -640,13 +558,10 @@
 #  *  summary
 #  *  description
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
+#: plugins/gevolution/gevolution.c:533
+#: plugins/gevolution/gevolution.c:535
 msgid "Provides integration with Evolution."
-msgstr "Mundëson integrim me Eolucionin e Ximian-it."
+msgstr "Mundëson integrim me Eolucionin."
 
 #: plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
@@ -671,8 +586,10 @@
 msgstr "Të dhëna të mundshme:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: plugins/gevolution/new_person_dialog.c:337
+#: src/gtkaccount.c:412
+#: src/gtkaccount.c:434
+#: src/protocols/oscar/oscar.c:613
 msgid "Buddy Icon"
 msgstr "Ikonë Shoku"
 
@@ -690,15 +607,17 @@
 
 #: plugins/history.c:146
 msgid "History Plugin Requires Logging"
-msgstr ""
+msgstr "Shtojca për Historikun Lyp Regjistrim"
 
 #: plugins/history.c:147
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
+"Regjistrimi mund të aktivizohet prej Mjete -> Parapëlqime -> Regjistrim.\n"
+"\n"
+"Aktivizimi i regjistrimit të mesazheve të atypëratyshëm dhe/ose fjalosjeve aktivizon historikun për të njëjtin tip bashkëbisedimi."
 
 #: plugins/history.c:186
 msgid "History"
@@ -710,13 +629,13 @@
 
 #: plugins/history.c:189
 msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
+"When a new conversation is opened this plugin will insert the last conversation into the current conversation.\n"
 "\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
+"The history plugin requires logging be enabled. Logging can be enabled from Tools -> Preferences -> Logging. Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
+"Kur hapet një bashkëbisedim kjo shtojcë do të fusë bashkëbisedimin e fundit te bashkëbisedimi i çastit.\n"
+"\n"
+"Shtojca e historikut lyp që regjistrimi të jetë veprues. Regjistrimi mund të bëhet veprues prej Mjete -> Parapëlqime -> Regjistrim. Aktivizimi i regjistrimit të mesazheve të atypëratyshëm dhe/ose fjalosje do të aktivizojë historikun për të njëjtin tip bashkëbisedimi."
 
 #  *< api_version
 #  *< type
@@ -726,11 +645,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/iconaway.c:101
 msgid "Iconify on Away"
 msgstr "Ikonizim për i Larguar"
@@ -740,10 +655,8 @@
 #  *  summary
 #  *  description
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: plugins/iconaway.c:104
+#: plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Ikonëson listën e shokëve dhe bashkëbisedimin tuaj kur largoheni."
 
@@ -751,11 +664,14 @@
 msgid "Minutes"
 msgstr "Minuta"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#: plugins/idle.c:122
+#: plugins/idle.c:149
+#: plugins/idle.c:215
 msgid "I'dle Mak'er"
 msgstr "Plogështibërësi"
 
-#: plugins/idle.c:123 plugins/idle.c:181
+#: plugins/idle.c:123
+#: plugins/idle.c:181
 msgid "Set Account Idle Time"
 msgstr "Caktoni Kohë Plogështie Llogarie"
 
@@ -763,26 +679,26 @@
 msgid "_Set"
 msgstr "_Caktoni"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: plugins/idle.c:127
+#: plugins/idle.c:154
 msgid "_Cancel"
 msgstr "_Anulo"
 
-#: plugins/idle.c:150 plugins/idle.c:185
-#, fuzzy
+#: plugins/idle.c:150
+#: plugins/idle.c:185
 msgid "Unset Account Idle Time"
-msgstr "Caktoni Kohë Plogështie Llogarie"
+msgstr "Hiq Kohë Plogështie Llogarie"
 
 #: plugins/idle.c:153
-#, fuzzy
 msgid "_Unset"
-msgstr "_Përdor"
+msgstr "_Hiq"
 
 #: plugins/idle.c:190
 msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
+msgstr "Hiq Kohë Plogështie Për Tërë Llogaritë e Plogështa"
+
+#: plugins/idle.c:217
+#: plugins/idle.c:218
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Ju lejon të formësoni dorazi sa gjatë keni qenë i plogësht"
 
@@ -794,11 +710,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Klient Prove IPC"
@@ -807,8 +719,6 @@
 #  *< version
 #  *  summary
 #. *< name
-#. *< version
-#. *  summary
 #: plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Provo mbulim të shtojcës IPC, si një klient."
@@ -816,12 +726,8 @@
 #  *  description
 #. *  description
 #: plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"Provo mbulim të shtojcës IPC, si një klient. Kjo pikas shërbyes shtojce dhe "
-"thërret urdhrat e regjistruar."
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "Provo mbulim të shtojcës IPC, si një klient. Kjo pikas shërbyes shtojce dhe thërret urdhrat e regjistruar."
 
 #  *< api_version
 #  *< type
@@ -831,11 +737,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Shërbyes Prove IPC"
@@ -844,8 +746,6 @@
 #  *< version
 #  *  summary
 #. *< name
-#. *< version
-#. *  summary
 #: plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Provo mbulim të shtojcës IPC, si shërbyes."
@@ -866,8 +766,7 @@
 
 #: plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Shton një kuti të vogël te listë shokësh që shfaqetnëse keni postë të re."
+msgstr "Shton një kuti të vogël te listë shokësh që shfaqetnëse keni postë të re."
 
 #  ---------- "Notify For" ----------
 #. ---------- "Notify For" ----------
@@ -911,9 +810,8 @@
 #  IM Convo trans options
 #. Raise window method button
 #: plugins/notify.c:706
-#, fuzzy
 msgid "R_aise conversation window"
-msgstr "Dritare Bashkëbisedimi IM"
+msgstr "N_gri dritare bashkëbisedimi"
 
 #  ---------- "Notification Removals" ----------
 #. ---------- "Notification Removals" ----------
@@ -952,20 +850,14 @@
 msgstr "Remove gjatë kalimit te një ske_dë bashkëbisedimi"
 
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/notify.c:841
 msgid "Message Notification"
 msgstr "Njoftim Mesazhesh"
 
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: plugins/notify.c:844
+#: plugins/notify.c:846
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Mundëson një larmi rrugësh për t'ju njoftuar mesazhe të palexuar."
 
@@ -977,11 +869,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/perl/perl.c:587
 msgid "Perl Plugin Loader"
 msgstr "Ngarkues Shtojcash Perl"
@@ -990,9 +878,8 @@
 #  *< version
 #  *< summary
 #. *< name
-#. *< version
-#. *< summary
-#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
+#: plugins/perl/perl.c:589
+#: plugins/perl/perl.c:590
 msgid "Provides support for loading perl plugins."
 msgstr "Mundëson suport për ngarkim shtojcash perl"
 
@@ -1005,19 +892,13 @@
 msgstr "Ju lejon të dërgoni input bruto te protokolle me bazë teksti "
 
 #: plugins/raw.c:154
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Ju lejon të fusni të dhëna bruto në protokolle me bazë teksti (Jabber, MSN, "
-"IRC, TOC). Për të dërguar, shtypni 'Enter' te kuti futjesh. Kqyrni dritare "
-"\"debug\"."
+msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "Ju lejon të fusni të dhëna bruto në protokolle me bazë teksti (Jabber, MSN, IRC, TOC). Për të dërguar, shtypni 'Enter' te kuti futjesh. Kqyrni dritare \"debug\"."
 
 #: plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr ""
-"Jeni duke përdorur versionin  %s të Gaim-it.  Versioni i çastit është %s.<hr>"
+msgstr "Jeni duke përdorur versionin  %s të Gaim-it.  Versioni i çastit është %s.<hr>"
 
 #: plugins/relnot.c:69
 #, c-format
@@ -1030,14 +911,11 @@
 
 #: plugins/relnot.c:74
 #, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"Mund të kini versionin %s prej:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-
-#: plugins/relnot.c:78 plugins/relnot.c:79
+msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+msgstr "Mund të kini versionin %s prej:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+
+#: plugins/relnot.c:78
+#: plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "Version i Ri i Mundshëm"
 
@@ -1049,11 +927,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "Njoftim Versioni"
@@ -1062,8 +936,6 @@
 #  *< version
 #  *  summary
 #. *< name
-#. *< version
-#. *  summary
 #: plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "Kontrollon periodikisht për versione të rinj"
@@ -1071,12 +943,8 @@
 #  *  description
 #. *  description
 #: plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Kontrollon periodikisht për versione të rinj dhe njofton përdoruesin me "
-"Shënime Ndryshimi"
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "Kontrollon periodikisht për versione të rinj dhe njofton përdoruesin me Shënime Ndryshimi"
 
 #  *< api_version
 #  *< type
@@ -1086,11 +954,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/signals-test.c:730
 msgid "Signals Test"
 msgstr "Provë Sinjalesh"
@@ -1100,10 +964,8 @@
 #  *  summary
 #  *  description
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: plugins/signals-test.c:733
+#: plugins/signals-test.c:735
 msgid "Test to see that all signals are working properly."
 msgstr "Provo për të parë që tërë sinjalet punojnë në rregull."
 
@@ -1115,11 +977,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "Shtojcë e Thjeshtë"
@@ -1129,20 +987,19 @@
 #  *  summary
 #  *  description
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/simple.c:37 plugins/simple.c:39
+#: plugins/simple.c:37
+#: plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "Provon nëse shumica e gjërave funksionojnë."
 
 #: plugins/spellchk.c:1788
+#, fuzzy
 msgid "Duplicate Correction"
-msgstr ""
+msgstr "Dyfishim Ndreqjeje"
 
 #: plugins/spellchk.c:1789
 msgid "The specified word already exists in the correction list."
-msgstr ""
+msgstr "Fjala e treguar ekziston tashmë te lista e ndreqjeve."
 
 #: plugins/spellchk.c:1948
 msgid "Text Replacements"
@@ -1158,7 +1015,7 @@
 
 #: plugins/spellchk.c:1996
 msgid "Whole words only"
-msgstr ""
+msgstr "Vetëm fjalë të plota"
 
 #: plugins/spellchk.c:2022
 msgid "Add a new text replacement"
@@ -1174,17 +1031,16 @@
 
 #: plugins/spellchk.c:2060
 msgid "Only replace _whole words"
-msgstr ""
+msgstr "Zëvendëso vetëm fjalë të _plota"
 
 #: plugins/spellchk.c:2097
 msgid "Text replacement"
 msgstr "Zëvendësim Teksti"
 
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: plugins/spellchk.c:2099
+#: plugins/spellchk.c:2100
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Zëvendëson tekst në mesazhe që dërgohen, bazuar në rregulla të përcaktuar "
-"nga përdoruesi."
+msgstr "Zëvendëson tekst në mesazhe që dërgohen, bazuar në rregulla të përcaktuar nga përdoruesi."
 
 #  *< api_version
 #  *< type
@@ -1194,11 +1050,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/ssl/ssl-gnutls.c:227
 msgid "GNUTLS"
 msgstr "GNUTLS"
@@ -1208,10 +1060,8 @@
 #  *  summary
 #  *  description
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+#: plugins/ssl/ssl-gnutls.c:230
+#: plugins/ssl/ssl-gnutls.c:232
 msgid "Provides SSL support through GNUTLS."
 msgstr "Mundëson suport SSL përmes GNUTLS."
 
@@ -1223,11 +1073,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/ssl/ssl-nss.c:319
 msgid "NSS"
 msgstr "NSS"
@@ -1237,10 +1083,8 @@
 #  *  summary
 #  *  description
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+#: plugins/ssl/ssl-nss.c:322
+#: plugins/ssl/ssl-nss.c:324
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Mundëson suport SSL përmes Mozilla NSS."
 
@@ -1252,11 +1096,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
@@ -1266,10 +1106,8 @@
 #  *  summary
 #  *  description
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+#: plugins/ssl/ssl.c:97
+#: plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Ofron librari suporti për mbështjellës rreth SSL-je."
 
@@ -1313,11 +1151,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/statenotify.c:120
 msgid "Buddy State Notification"
 msgstr "Njoftim Gjendjeje Shoku"
@@ -1327,22 +1161,17 @@
 #  *  summary
 #  *  description
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Njofton në dritare bashkëbisedimi kur një shok largohet ose kthehet prej "
-"plogështimi ose largimi."
+#: plugins/statenotify.c:123
+#: plugins/statenotify.c:126
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "Njofton në dritare bashkëbisedimi kur një shok largohet ose kthehet prej plogështimi ose largimi."
 
 #: plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
 msgstr "Ngarkues Shtojce Tcl"
 
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: plugins/tcl/tcl.c:365
+#: plugins/tcl/tcl.c:366
 msgid "Provides support for loading Tcl plugins"
 msgstr "Mundëson suport për ngarkim shtojcash Tcl"
 
@@ -1354,20 +1183,16 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: plugins/ticker/ticker.c:75
+#: plugins/ticker/ticker.c:326
+#, fuzzy
 msgid "Buddy Ticker"
-msgstr ""
+msgstr "Paradë Shokësh"
 
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:329
+#: plugins/ticker/ticker.c:331
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Një version rrëshqitjeje vertikale për listë shokësh."
 
@@ -1391,20 +1216,14 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/timestamp.c:279
 msgid "Timestamp"
 msgstr "Vulë kohore"
 
 #. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: plugins/timestamp.c:282
+#: plugins/timestamp.c:284
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Shton te bashkëbisedimet vula kohore në stil iChat çdo N minuta."
 
@@ -1429,15 +1248,13 @@
 msgstr "_Shfaq shtyllë rrëshqitësi në dritare IM"
 
 #: plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
 msgid "Remove IM window transparency on focus"
-msgstr "Tejdukshmëri dritareje _IM"
+msgstr "Hiq tejdukshmëri dritareje IM kur fokusohet "
 
 #: plugins/win32/transparency/win2ktrans.c:558
 #: plugins/win32/transparency/win2ktrans.c:606
-#, fuzzy
 msgid "Always on top"
-msgstr "Kontak Aliasi"
+msgstr "Përherë sipër"
 
 #. Buddy List trans options
 #: plugins/win32/transparency/win2ktrans.c:590
@@ -1449,9 +1266,8 @@
 msgstr "tejdukshmëri dritareje Liste _Shokësh"
 
 #: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
 msgid "Remove Buddy List window transparency on focus"
-msgstr "tejdukshmëri dritareje Liste _Shokësh"
+msgstr "Hiq tejdukshmëri dritareje Liste Shokësh kur fokusohet"
 
 #  *< api_version
 #  *< type
@@ -1461,11 +1277,7 @@
 #  *< priority
 #  *< id
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
 #: plugins/win32/transparency/win2ktrans.c:657
 msgid "Transparency"
 msgstr "Tejdukshmëri"
@@ -1474,8 +1286,6 @@
 #  *< version
 #  *  summary
 #. *< name
-#. *< version
-#. *  summary
 #: plugins/win32/transparency/win2ktrans.c:660
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Tejdukshmëri e Ndryshueshme për listë shokësh dhe bashkëbisedimesh."
@@ -1483,17 +1293,14 @@
 #  *  description
 #. *  description
 #: plugins/win32/transparency/win2ktrans.c:662
-#, fuzzy
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Kjo shtojcë aktivizon ndryshore tejdukshmërie alfa për dritare "
-"bashkëbisedimesh dhe listë shokësh.\n"
+"Kjo shtojcë aktivizon ndryshore tejdukshmërie alfa për dritare bashkëbisedimesh dhe listë shokësh.\n"
 "\n"
-"* Shënim: Kjo shtojcë lyp Win2000 ose WinXP."
+"* Shënim: Kjo shtojcë lyp Win2000 ose më të ri."
 
 #: plugins/win32/winprefs/winprefs.c:385
 msgid "GTK+ Runtime Version"
@@ -1510,7 +1317,8 @@
 msgstr "_Nis Gaim-in në nisje të Windows-it"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: plugins/win32/winprefs/winprefs.c:405
+#: src/gtkblist.c:3173
 msgid "Buddy List"
 msgstr "Listë Shokësh"
 
@@ -1520,18 +1328,17 @@
 
 #. Blist On Top
 #: plugins/win32/winprefs/winprefs.c:410
-#, fuzzy
 msgid "_Keep Buddy List window on top:"
-msgstr "_Mbaj dritare Liste Shokësh përherë sipër"
-
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
+msgstr "_Mbaj dritare Liste Shokësh sipër:"
+
+#: plugins/win32/winprefs/winprefs.c:412
+#: src/gtkprefs.c:1657
 msgid "Never"
 msgstr "Kurrë"
 
 #: plugins/win32/winprefs/winprefs.c:413
-#, fuzzy
 msgid "Always"
-msgstr "Larguar"
+msgstr "Përherë"
 
 #. XXX: Did this ever work?
 #: plugins/win32/winprefs/winprefs.c:415
@@ -1540,15 +1347,15 @@
 
 #  Conversations
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
+#: plugins/win32/winprefs/winprefs.c:419
+#: src/gtkprefs.c:803
 #: src/gtkprefs.c:1727
 msgid "Conversations"
 msgstr "bashkëbisedime"
 
 #: plugins/win32/winprefs/winprefs.c:420
-#, fuzzy
 msgid "_Flash window when messages are received"
-msgstr "_Xixëllo Dritare kur merren mesazhe të rinj"
+msgstr "_Xixëllo dritare kur merren mesazhe"
 
 #: plugins/win32/winprefs/winprefs.c:443
 msgid "WinGaim Options"
@@ -1559,20 +1366,16 @@
 msgstr "Mundësi vetëm për Windows Gaim."
 
 #: plugins/win32/winprefs/winprefs.c:446
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
+msgid "Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."
+msgstr "Ofron mundësi të caktuara për Gaim-in nën Windows Gaim, si ngecje liste shokësh dhe xixëllim bashkëbisedimi."
 
 #: src/account.c:773
-#, fuzzy
 msgid "accounts"
-msgstr "Llogari"
+msgstr "llogari"
 
 #: src/account.c:915
-#, fuzzy
 msgid "Password is required to sign on."
-msgstr "Fjalëkalimi ka skaduar"
+msgstr "Për të nënshkruar lipset fjalëkalim."
 
 #: src/account.c:940
 #, c-format
@@ -1581,77 +1384,129 @@
 
 #  if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/account.c:947
-#, fuzzy
 msgid "Enter Password"
-msgstr "Ndrysho Fjalëkalim"
+msgstr "Jepni Fjalëkalimin"
 
 #: src/account.c:952
-#, fuzzy
 msgid "Save password"
-msgstr "Fjalëkalim i ri"
+msgstr "Ruaj fjalëkalimin"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
-#: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+#: src/account.c:960
+#: src/account.c:1116
+#: src/gtkdialogs.c:507
+#: src/gtkdialogs.c:648
+#: src/gtkdialogs.c:704
+#: src/gtkrequest.c:261
+#: src/protocols/gg/gg.c:434
+#: src/protocols/gg/gg.c:581
+#: src/protocols/gg/gg.c:1498
+#: src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:250
+#: src/protocols/msn/msn.c:265
+#: src/protocols/msn/msn.c:280
+#: src/protocols/msn/msn.c:295
+#: src/protocols/oscar/oscar.c:2894
+#: src/protocols/oscar/oscar.c:4404
+#: src/protocols/oscar/oscar.c:4485
+#: src/protocols/oscar/oscar.c:7857
+#: src/protocols/oscar/oscar.c:7982
+#: src/protocols/oscar/oscar.c:8007
+#: src/protocols/oscar/oscar.c:8059
+#: src/protocols/sametime/sametime.c:4585
+#: src/protocols/silc/buddy.c:465
+#: src/protocols/silc/buddy.c:1137
+#: src/protocols/silc/chat.c:422
+#: src/protocols/silc/chat.c:460
+#: src/protocols/silc/chat.c:723
+#: src/protocols/silc/ops.c:1083
+#: src/protocols/silc/ops.c:1696
+#: src/protocols/silc/silc.c:716
+#: src/protocols/yahoo/yahoo.c:2965
+#: src/protocols/yahoo/yahoo.c:2974
+#: src/request.h:1331
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
-#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
+#: src/account.c:961
+#: src/account.c:1117
+#: src/account.c:1155
+#: src/gtkaccount.c:2124
+#: src/gtkaccount.c:2575
+#: src/gtkblist.c:4497
+#: src/gtkdialogs.c:508
+#: src/gtkdialogs.c:649
+#: src/gtkdialogs.c:705
+#: src/gtkdialogs.c:724
+#: src/gtkdialogs.c:746
+#: src/gtkdialogs.c:766
+#: src/gtkdialogs.c:810
+#: src/gtkdialogs.c:872
+#: src/gtkdialogs.c:914
+#: src/gtkdialogs.c:956
+#: src/gtkimhtmltoolbar.c:419
+#: src/gtkprivacy.c:595
+#: src/gtkprivacy.c:608
+#: src/gtkprivacy.c:633
+#: src/gtkprivacy.c:644
+#: src/gtkrequest.c:262
+#: src/gtksavedstatuses.c:221
+#: src/protocols/gg/gg.c:435
+#: src/protocols/gg/gg.c:582
+#: src/protocols/gg/gg.c:656
+#: src/protocols/gg/gg.c:1499
+#: src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:1358
+#: src/protocols/jabber/buddy.c:1392
+#: src/protocols/jabber/chat.c:780
+#: src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:281
+#: src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:313
+#: src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:2895
+#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4405
+#: src/protocols/oscar/oscar.c:4442
+#: src/protocols/oscar/oscar.c:4486
+#: src/protocols/oscar/oscar.c:7858
+#: src/protocols/oscar/oscar.c:7983
+#: src/protocols/oscar/oscar.c:8008
+#: src/protocols/oscar/oscar.c:8060
+#: src/protocols/oscar/oscar.c:8129
+#: src/protocols/sametime/sametime.c:4586
+#: src/protocols/silc/buddy.c:466
+#: src/protocols/silc/buddy.c:1042
+#: src/protocols/silc/buddy.c:1138
+#: src/protocols/silc/chat.c:595
+#: src/protocols/silc/chat.c:724
+#: src/protocols/silc/ops.c:1697
+#: src/protocols/silc/silc.c:717
+#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:2975
+#: src/request.h:1331
+#: src/request.h:1341
 msgid "Cancel"
 msgstr "Anulo"
 
-#: src/account.c:986 src/connection.c:96
+#: src/account.c:986
+#: src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Mungon shtojcë protokolli për %s"
 
-#: src/account.c:988 src/connection.c:99
+#: src/account.c:988
+#: src/connection.c:99
 msgid "Connection Error"
 msgstr "Gabim Lidhjeje"
 
-#: src/account.c:1052 src/protocols/gg/gg.c:470
+#: src/account.c:1052
+#: src/protocols/gg/gg.c:470
 #: src/protocols/jabber/jabber.c:1115
 msgid "New passwords do not match."
 msgstr "Fjalëkalimi i ri nuk përputhet."
@@ -1679,29 +1534,32 @@
 
 #: src/account.c:1113
 msgid "Please enter your current password and your new password."
-msgstr ""
-"Ju lutem jepni fjalëkalimin tuaj të çastit dhe fjalëkalimin tuaj të ri."
+msgstr "Ju lutem jepni fjalëkalimin tuaj të çastit dhe fjalëkalimin tuaj të ri."
 
 #: src/account.c:1146
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ndrysho të dhëna përdoruesi për %s"
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
+#: src/account.c:1154
+#: src/gtkdebug.c:684
+#: src/gtkrequest.c:268
 #: src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Ruaj"
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
+#: src/account.c:1641
+#: src/gtkft.c:156
+#: src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:1083
+#: src/protocols/jabber/buddy.c:1100
 #: src/protocols/novell/novell.c:2837
 msgid "Unknown"
 msgstr "E panjohur"
 
 #: src/blist.c:545
-#, fuzzy
 msgid "buddy list"
-msgstr "Listë Shokësh"
+msgstr "listë shokësh"
 
 #: src/blist.c:1162
 msgid "Chats"
@@ -1709,18 +1567,10 @@
 
 #: src/blist.c:1863
 #, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
-msgstr[0] ""
-"%d shok prej grupit %s nuk u hoq sepse nuk qe bërë hyrje prej llogarisë së "
-"tij.  Ky shok dhe grupi nuk u hoqën.\n"
-msgstr[1] ""
-"%d shokë prej grupit %s nuk u hoqën sepse nuk qe bërë hyrje prej llogarisë "
-"së tyre.  Këta shokë dhe grupi nuk u hoqën.\n"
+msgid "%d buddy from group %s was not removed because its account was not logged in.  This buddy and the group were not removed.\n"
+msgid_plural "%d buddies from group %s were not removed because their accounts were not logged in.  These buddies and the group were not removed.\n"
+msgstr[0] "%d shok prej grupit %s nuk u hoq sepse nuk qe bërë hyrje prej llogarisë së tij.  Ky shok dhe grupi nuk u hoqën.\n"
+msgstr[1] "%d shokë prej grupit %s nuk u hoqën sepse nuk qe bërë hyrje prej llogarisë së tyre.  Këta shokë dhe grupi nuk u hoqën.\n"
 
 #: src/blist.c:1872
 msgid "Group not removed"
@@ -1731,15 +1581,15 @@
 msgstr "Gabim Regjistrimi"
 
 #: src/conversation.c:205
-#, fuzzy
 msgid "Unable to send message: The message is too large."
-msgstr "I pazoti të dërgoj mesazh. Mesazhi është shumë i madh."
+msgstr "I pazoti të dërgoj mesazh: Mesazhi është shumë i madh."
 
 #  TODO: Improve this! message to who or for what conference?
-#: src/conversation.c:208 src/conversation.c:221
-#, fuzzy, c-format
+#: src/conversation.c:208
+#: src/conversation.c:221
+#, c-format
 msgid "Unable to send message to %s."
-msgstr "I pazoti të dërgoj mesazh te %s:"
+msgstr "I pazoti të dërgoj mesazh te %s."
 
 #: src/conversation.c:209
 msgid "The message is too large."
@@ -1789,7 +1639,8 @@
 msgid " left the room (%s)."
 msgstr " la dhomën (%s)."
 
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+#: src/ft.c:188
+#: src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1827,8 +1678,7 @@
 #: src/ft.c:248
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr ""
-"%s nuk është kartelë e rregullt. Po kundërshtoj, me frikë, ta mbishkruaj.\n"
+msgstr "%s nuk është kartelë e rregullt. Po kundërshtoj, me frikë, ta mbishkruaj.\n"
 
 #: src/ft.c:306
 #, c-format
@@ -1857,9 +1707,9 @@
 "Portë e largët: %d"
 
 #: src/ft.c:382
-#, fuzzy, c-format
+#, c-format
 msgid "%s is offering to send file %s"
-msgstr "Po i ofroj %s dërgimin e %s"
+msgstr "%s po ofron dërgimin e kartelës %s"
 
 #: src/ft.c:422
 #, c-format
@@ -1872,9 +1722,9 @@
 msgstr "Po i ofroj %s dërgimin e %s"
 
 #: src/ft.c:454
-#, fuzzy, c-format
+#, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Të pranoj kërkesë shpërnguljeje kartelash prej %s?"
+msgstr "Po nis shpërnguljen e %s prej %s"
 
 #: src/ft.c:608
 #, c-format
@@ -1905,14 +1755,14 @@
 msgstr "%s anuloi shpërnguljen e kartelës"
 
 #: src/ft.c:1119
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer to %s failed."
-msgstr "Shpërngulje kartele te %s dështoi.\n"
+msgstr "Shpërngulja e kartelës drejt %s dështoi."
 
 #: src/ft.c:1121
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer from %s failed."
-msgstr "Shpërngulje kartele prej %s dështoi.\n"
+msgstr "Shpërngulja e kartelës prej %s dështoi."
 
 #: src/gtkaccount.c:362
 #, c-format
@@ -1930,11 +1780,13 @@
 msgid "Login Options"
 msgstr "Mundësi Futjeje"
 
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: src/gtkaccount.c:747
+#: src/gtkft.c:623
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
+#: src/gtkaccount.c:752
+#: src/gtkblist.c:4051
 msgid "Screen Name:"
 msgstr "Emër në Ekran:"
 
@@ -1942,7 +1794,9 @@
 msgid "Password:"
 msgstr "Fjalëkalim:"
 
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+#: src/gtkaccount.c:830
+#: src/gtkblist.c:4065
+#: src/gtkblist.c:4444
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -1972,33 +1826,40 @@
 
 #  Use Global Proxy Settings
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: src/gtkaccount.c:1128
+#: src/gtkaccount.c:1175
 msgid "Use Global Proxy Settings"
 msgstr "Përdor Rregullime të Përgjithshme \"Proxy\""
 
 #. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: src/gtkaccount.c:1134
+#: src/gtkaccount.c:1182
 msgid "No Proxy"
 msgstr "Pa \"Proxy\""
 
 #  HTTP
 #. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: src/gtkaccount.c:1140
+#: src/gtkaccount.c:1189
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: src/gtkaccount.c:1146
+#: src/gtkaccount.c:1196
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: src/gtkaccount.c:1152
+#: src/gtkaccount.c:1203
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+#: src/gtkaccount.c:1158
+#: src/gtkaccount.c:1210
+#: src/gtkprefs.c:1007
 msgid "Use Environmental Settings"
 msgstr "Përdor Rregullime Mjedisi"
 
@@ -2014,15 +1875,18 @@
 msgid "Proxy Options"
 msgstr "Mundësi \"Proxy\""
 
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+#: src/gtkaccount.c:1287
+#: src/gtkprefs.c:1001
 msgid "Proxy _type:"
 msgstr "_Tip \"proxy\":"
 
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+#: src/gtkaccount.c:1296
+#: src/gtkprefs.c:1022
 msgid "_Host:"
 msgstr "_Strehë:"
 
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+#: src/gtkaccount.c:1300
+#: src/gtkprefs.c:1040
 msgid "_Port:"
 msgstr "_Portë:"
 
@@ -2030,7 +1894,8 @@
 msgid "_Username:"
 msgstr "_Emër përdoruesi:"
 
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+#: src/gtkaccount.c:1313
+#: src/gtkprefs.c:1077
 msgid "Pa_ssword:"
 msgstr "Fjalë_kalim:"
 
@@ -2044,28 +1909,32 @@
 
 #  Register button
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: src/gtkaccount.c:1750
+#: src/protocols/jabber/jabber.c:706
 msgid "Register"
 msgstr "Regjistrohuni"
 
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: src/gtkaccount.c:2118
+#: src/gtksavedstatuses.c:217
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "jeni të sigurtë se doni të fshini %s?"
 
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+#: src/gtkaccount.c:2123
+#: src/gtkrequest.c:265
+#: src/gtksavedstatuses.c:220
 msgid "Delete"
 msgstr "Fshij"
 
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
+#: src/gtkaccount.c:2187
+#: src/gtksavedstatuses.c:686
 #: src/protocols/oscar/oscar.c:5049
 msgid "Screen Name"
 msgstr "Emër në Ekran"
 
 #: src/gtkaccount.c:2210
-#, fuzzy
 msgid "Enabled"
-msgstr "Dështova"
+msgstr "Aktivizuar"
 
 #: src/gtkaccount.c:2218
 msgid "Protocol"
@@ -2091,9 +1960,13 @@
 msgstr "Të shtoj shok te lista juaj?"
 
 #  Add button
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: src/gtkaccount.c:2574
+#: src/gtkblist.c:4496
+#: src/gtkconv.c:1527
+#: src/gtkrequest.c:266
+#: src/protocols/gg/gg.c:655
+#: src/protocols/oscar/oscar.c:4674
+#: src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "Shto"
 
@@ -2102,13 +1975,12 @@
 msgstr "Bashkoju një Fjalosjeje"
 
 #: src/gtkblist.c:616
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Ju lutem jepni të dhënat e duhura rreth fjalosjes ku doni të merrni pjesë.\n"
-
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
+msgstr "Ju lutem jepni të dhënat e duhura rreth fjalosjes ku doni të merrni pjesë.\n"
+
+#: src/gtkblist.c:627
+#: src/gtkpounce.c:415
+#: src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Llogari:"
 
@@ -2128,7 +2000,9 @@
 msgid "Add Buddy _Pounce"
 msgstr "Shto _Cytje Shoku"
 
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
+#: src/gtkblist.c:954
+#: src/gtkblist.c:958
+#: src/gtkblist.c:1056
 #: src/gtkblist.c:1079
 msgid "View _Log"
 msgstr "Shih _Regjistrim"
@@ -2145,15 +2019,21 @@
 msgid "Alias Contact..."
 msgstr "Kontakte Aliasi..."
 
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
+#: src/gtkblist.c:976
+#: src/gtkdialogs.c:808
+#: src/gtkdialogs.c:809
 msgid "Remove Contact"
 msgstr "Hiq Kontakt"
 
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: src/gtkblist.c:980
+#: src/gtkblist.c:1064
+#: src/gtkblist.c:1085
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: src/gtkblist.c:982
+#: src/gtkblist.c:1066
+#: src/gtkblist.c:1087
 msgid "_Remove"
 msgstr "_Hiq"
 
@@ -2175,7 +2055,9 @@
 
 #  join button
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkblist.c:1052
+#: src/gtkroomlist.c:264
+#: src/gtkroomlist.c:409
 #: src/gtkstock.c:118
 msgid "_Join"
 msgstr "_Bashkojuni"
@@ -2184,7 +2066,8 @@
 msgid "Auto-Join"
 msgstr "Vetë-bashkoju"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: src/gtkblist.c:1092
+#: src/gtkblist.c:1115
 msgid "_Collapse"
 msgstr "_Tkurr"
 
@@ -2192,18 +2075,18 @@
 msgid "_Expand"
 msgstr "_Zgjero"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
+#: src/gtkblist.c:1353
+#: src/gtkblist.c:1363
+#: src/gtkblist.c:3326
 #: src/gtkblist.c:3331
-#, fuzzy
 msgid "/Tools/Mute Sounds"
-msgstr "Pa Tinguj"
-
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr ""
-"Për çastin nuk keni hyrë me një llogari nga e cila të mund të shtoni atë "
-"shok."
+msgstr "/Mjete/Pa Tinguj"
+
+#: src/gtkblist.c:1822
+#: src/gtkconv.c:3745
+#: src/gtkpounce.c:314
+msgid "You are not currently signed on with an account that can add that buddy."
+msgstr "Për çastin nuk keni hyrë me një llogari nga e cila të mund të shtoni atë shok."
 
 #  Buddies menu
 #. Buddies menu
@@ -2236,14 +2119,13 @@
 msgstr "/Shokë/Shfaq Grupe _Bosh"
 
 #: src/gtkblist.c:2337
-#, fuzzy
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/Shokë/Shfaq Shokë Jo të lidhur"
-
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
+msgstr "/Shokë/Shfaq _Hollësi Shokësh"
+
+#: src/gtkblist.c:2338
+#: src/gtkblist.c:5158
 msgid "/Buddies/Sort Buddies"
-msgstr "/Shokë/Shfaq Shokë Jo të lidhur"
+msgstr "/Shokë/Radhit Shokë"
 
 #: src/gtkblist.c:2340
 msgid "/Buddies/_Add Buddy..."
@@ -2284,9 +2166,8 @@
 msgstr "/Mjete/Par_apëlqime"
 
 #: src/gtkblist.c:2353
-#, fuzzy
 msgid "/Tools/Plu_gins"
-msgstr "/Mjete/Veprime Shtojcash"
+msgstr "/Mjete/Shtojca"
 
 #: src/gtkblist.c:2354
 msgid "/Tools/Pr_ivacy"
@@ -2301,9 +2182,8 @@
 msgstr "/Mjete/Listë Dh_omash"
 
 #: src/gtkblist.c:2358
-#, fuzzy
 msgid "/Tools/Mute _Sounds"
-msgstr "Pa Tinguj"
+msgstr "/Mjete/Pa _Tinguj"
 
 #: src/gtkblist.c:2359
 msgid "/Tools/View System _Log"
@@ -2326,7 +2206,8 @@
 msgid "/Help/_About"
 msgstr "/Ndihmë/_Rreth"
 
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: src/gtkblist.c:2397
+#: src/gtkblist.c:2464
 #, c-format
 msgid ""
 "\n"
@@ -2336,58 +2217,58 @@
 "<b>Llogari:</b> %s"
 
 #: src/gtkblist.c:2473
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Contact Alias:</b> %s"
 msgstr ""
 "\n"
-"<b>Alias Kontakti:</b>"
+"<b>Alias Kontakti:</b> %s"
 
 #: src/gtkblist.c:2481
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Alias:</b> %s"
 msgstr ""
 "\n"
-"<b>Alias:</b>"
+"<b>Alias:</b> %s"
 
 #: src/gtkblist.c:2489
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Nickname:</b> %s"
 msgstr ""
 "\n"
-"<b>Nofkë:</b>"
+"<b>Nofkë:</b> %s"
 
 #: src/gtkblist.c:2498
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Logged In:</b> %s"
 msgstr ""
 "\n"
-"<b>Futur:</b>"
+"<b>Futur:</b> %s"
 
 #: src/gtkblist.c:2510
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Idle:</b> %s"
 msgstr ""
 "\n"
-"<b>I plogësht:</b>"
+"<b>I plogësht:</b> %s"
 
 #: src/gtkblist.c:2546
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Last Seen:</b> %s ago"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>Parë Së fundi:</b> %s më parë"
 
 #: src/gtkblist.c:2554
 msgid ""
@@ -2406,7 +2287,6 @@
 "<b>Përshkrim:</b> Fjalaman"
 
 #: src/gtkblist.c:2579
-#, fuzzy
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2415,7 +2295,6 @@
 "<b>Gjendje:</b> Awesome"
 
 #: src/gtkblist.c:2581
-#, fuzzy
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2424,7 +2303,7 @@
 "<b>Gjendje:</b> Rockin'"
 
 #: src/gtkblist.c:2843
-#, fuzzy, c-format
+#, c-format
 msgid "Idle (%dh %02dm) "
 msgstr "I plogësht (%dh%02dm) "
 
@@ -2434,7 +2313,6 @@
 msgstr "I plogësht (%dm) "
 
 #: src/gtkblist.c:2848
-#, fuzzy
 msgid "Idle "
 msgstr "I plogësht"
 
@@ -2443,33 +2321,29 @@
 msgstr "Jo i lidhur "
 
 #: src/gtkblist.c:2968
-#, fuzzy
 msgid "/Buddies/New Instant Message..."
-msgstr "/Shokë/_Mesazh i Atypëratyshëm i Ri..."
-
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+msgstr "/Shokë/Mesazh i Atypëratyshëm i Ri..."
+
+#: src/gtkblist.c:2969
+#: src/gtkblist.c:3003
 msgid "/Buddies/Join a Chat..."
 msgstr "/Shokë/Bashkoju njëFjalosjeje..."
 
 #: src/gtkblist.c:2970
-#, fuzzy
 msgid "/Buddies/Get User Info..."
-msgstr "/Shokë/Merr Të _dhëna Përdoruesi..."
+msgstr "/Shokë/Merr Të dhëna Përdoruesi..."
 
 #: src/gtkblist.c:2971
-#, fuzzy
 msgid "/Buddies/Add Buddy..."
-msgstr "/Shokë/_Shto Shokë..."
+msgstr "/Shokë/Shto Shokë..."
 
 #: src/gtkblist.c:2972
-#, fuzzy
 msgid "/Buddies/Add Chat..."
-msgstr "/Shokë/Shto F_jalosje..."
+msgstr "/Shokë/Shto Fjalosje..."
 
 #: src/gtkblist.c:2973
-#, fuzzy
 msgid "/Buddies/Add Group..."
-msgstr "/Shokë/Shto _Grup..."
+msgstr "/Shokë/Shto Grup..."
 
 #: src/gtkblist.c:3006
 msgid "/Tools/Room List"
@@ -2480,12 +2354,10 @@
 msgstr "/Mjete/Vetësi"
 
 #: src/gtkblist.c:3085
-#, fuzzy
 msgid "Manually"
 msgstr "Dorazi"
 
 #: src/gtkblist.c:3087
-#, fuzzy
 msgid "Alphabetically"
 msgstr "Sipas abc-së"
 
@@ -2506,8 +2378,6 @@
 msgstr "/Mjete/Veprime Llogarish"
 
 #. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
 #: src/gtkblist.c:3322
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Shokë/Shfaq Shokë Jo të lidhur"
@@ -2517,29 +2387,25 @@
 msgstr "/Shokë/Shfaq Grupe Bosh"
 
 #: src/gtkblist.c:3328
-#, fuzzy
 msgid "/Buddies/Show Buddy Details"
-msgstr "/Shokë/Shfaq Shokë Jo të lidhur"
-
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
+msgstr "/Shokë/Shfaq Hollësi Shokësh"
+
+#: src/gtkblist.c:4005
+#: src/protocols/silc/buddy.c:736
+#: src/protocols/silc/buddy.c:994
+#: src/protocols/silc/buddy.c:1039
+#: src/protocols/silc/buddy.c:1129
+#: src/protocols/yahoo/yahoo.c:2886
 msgid "Add Buddy"
 msgstr "Shto Shok"
 
 #: src/gtkblist.c:4029
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Ju lutem jepni emrin e ekranit për personin që do të donit ta shtoni te "
-"listë juaja shokësh. Mundet po aq të jepni për shokun një alias, ose një "
-"nofkë. Aliasi do të shfaqet në vend të emrit të ekranit kurdo që të jetë e "
-"mundur.\n"
+msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr "Ju lutem jepni emrin e ekranit për personin që do të donit ta shtoni te listë juaja shokësh. Mundet po aq të jepni për shokun një alias, ose një nofkë. Aliasi do të shfaqet në vend të emrit të ekranit kurdo që të jetë e mundur.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: src/gtkblist.c:4092
+#: src/gtkblist.c:4424
 msgid "Account:"
 msgstr "Llogari:"
 
@@ -2548,9 +2414,7 @@
 msgstr "Ky protokoll nuk mbulon dhoma fjalosjeje."
 
 #: src/gtkblist.c:4373
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
+msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "Për çastin nuk keni hyrë me një protokoll që mundëson fjalosje."
 
 #: src/gtkblist.c:4390
@@ -2558,12 +2422,8 @@
 msgstr "Shto Fjalosje"
 
 #: src/gtkblist.c:4414
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Ju lutem jepni alias, dhe  të dhënat e duhura rreth fjalosjes që do të donit "
-"të shtohet te listë juaja shokësh.\n"
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "Ju lutem jepni alias, dhe  të dhënat e duhura rreth fjalosjes që do të donit të shtohet te listë juaja shokësh.\n"
 
 #: src/gtkblist.c:4493
 msgid "Add Group"
@@ -2579,21 +2439,18 @@
 
 #  Tools
 #: src/gtkblist.c:5094
-#, fuzzy
 msgid "/Tools"
-msgstr "/_Mjete"
+msgstr "/Mjete"
 
 #: src/gtkconn.c:190
-#, fuzzy, c-format
+#, c-format
 msgid "%s disconnected"
-msgstr "I shkëputur."
+msgstr "%s u shkëput"
 
 #: src/gtkconn.c:191
 #, c-format
-msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and re-enable the account to connect."
-msgstr ""
+msgid "%s was disconnected due to an error. %s The account has been disabled. Correct the error and re-enable the account to connect."
+msgstr "%s u shkëput për shkak të një gabimi. %s Llogaria është çaktivizuar. ndreqni gabimin dhe riaktivizoni llogarinë për t´u lidhur."
 
 #: src/gtkconv.c:325
 #, c-format
@@ -2629,30 +2486,25 @@
 msgstr "Urdhri juaj dështoi për një arsye të panjohur."
 
 #: src/gtkconv.c:465
-#, fuzzy
 msgid "That command only works in chats, not IMs."
-msgstr "Ai urdhër punon vetëm në Fjalosje, jo në IM."
+msgstr "Ai urdhër punon vetëm në fjalosje, jo në IM."
 
 #: src/gtkconv.c:468
-#, fuzzy
 msgid "That command only works in IMs, not chats."
-msgstr "Ai urdhër punon vetëm në IM, jo në Fjalosje."
+msgstr "Ai urdhër punon vetëm në IM, jo në fjalosje."
 
 #: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "Ai urdhër nuk punon nën këtë protokoll."
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
-#, fuzzy
+#: src/gtkconv.c:699
+#: src/gtkconv.c:725
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ai shok nuk është në të njëjtin protokoll si kjo fjalosje"
 
 #: src/gtkconv.c:719
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Për çastin nuk keni nënshkruar prej një llogarië nga e cila të mund të ftoni "
-"atë shok."
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr "Për çastin nuk keni nënshkruar prej një llogarië nga e cila të mund të ftoni atë shok."
 
 #: src/gtkconv.c:772
 msgid "Invite Buddy Into Chat Room"
@@ -2660,22 +2512,22 @@
 
 #. Put our happy label in it.
 #: src/gtkconv.c:802
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Ju lutem jepni emrin e përdoruesit që doni të ftoni, bashkë me një mesazh "
-"ftese në daçi."
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgstr "Ju lutem jepni emrin e përdoruesit që doni të ftoni, bashkë me një mesazh ftese në daçi."
 
 #: src/gtkconv.c:823
 msgid "_Buddy:"
 msgstr "_Shok:"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: src/gtkconv.c:843
+#: src/gtksavedstatuses.c:836
 msgid "_Message:"
 msgstr "_Mesazh:"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
+#: src/gtkconv.c:900
+#: src/gtkconv.c:2228
+#: src/gtkdebug.c:217
+#: src/gtkft.c:470
 msgid "Unable to open file."
 msgstr "I pazoti të hap kartelë."
 
@@ -2688,28 +2540,31 @@
 msgid "Save Conversation"
 msgstr "Ruaj Bashkëbisedim"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: src/gtkconv.c:1030
+#: src/gtkdebug.c:165
+#: src/gtkdebug.c:678
 msgid "Find"
 msgstr "Gjej"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: src/gtkconv.c:1056
+#: src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Kërko për:"
 
 #: src/gtkconv.c:1227
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
+msgstr "Regjistrimi nisi. Mesazhet e ardhshëm në këtë bashkëbisedim do të regjistrohen."
 
 #: src/gtkconv.c:1235
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "Regjistrimi u ndal. Mesazhet e ardhshëm në këtë bashkëbisedim nuk do të regjistrohen."
 
 #: src/gtkconv.c:1489
 msgid "IM"
 msgstr "IM"
 
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
+#: src/gtkconv.c:1495
+#: src/protocols/oscar/oscar.c:628
 msgid "Send File"
 msgstr "Dërgo Kartelë"
 
@@ -2726,11 +2581,11 @@
 msgstr "Të dhëna"
 
 #: src/gtkconv.c:1517
-#, fuzzy
 msgid "Get Away Message"
-msgstr "Mesazh i Ri Largimi"
-
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
+msgstr "Mesazh Largimi"
+
+#: src/gtkconv.c:1524
+#: src/gtkrequest.c:267
 msgid "Remove"
 msgstr "Hiq"
 
@@ -2797,9 +2652,8 @@
 msgstr "/Bashkëbisedim/F_to..."
 
 #: src/gtkconv.c:2393
-#, fuzzy
 msgid "/Conversation/Al_ias..."
-msgstr "/Bashkëbisedim/Alias..."
+msgstr "/Bashkëbisedim/A_lias..."
 
 #: src/gtkconv.c:2395
 msgid "/Conversation/_Block..."
@@ -2840,19 +2694,16 @@
 msgstr "/Mundësi/Aktivizo _Tinguj"
 
 #: src/gtkconv.c:2418
-#, fuzzy
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Mundësi/Shfaq _Panel Formatimi"
+msgstr "/Mundësi/Shfaq _Panele Formatimi"
 
 #: src/gtkconv.c:2419
-#, fuzzy
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Mundësi/Shfaq Vula kohore"
+msgstr "/Mundësi/Shfaq Vula _kohore"
 
 #: src/gtkconv.c:2420
-#, fuzzy
 msgid "/Options/Show Buddy _Icon"
-msgstr "Shfaq _ikona shokësh"
+msgstr "/Mundësi/Shfaq _Ikonë Shoku"
 
 #: src/gtkconv.c:2460
 msgid "/Conversation/View Log"
@@ -2907,18 +2758,16 @@
 msgstr "/Mundësi/Aktivizo Tinguj"
 
 #: src/gtkconv.c:2520
-#, fuzzy
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/Mundësi/Shfaq Panel Formatimi"
+msgstr "/Mundësi/Shfaq Panele Formatimi"
 
 #: src/gtkconv.c:2523
 msgid "/Options/Show Timestamps"
 msgstr "/Mundësi/Shfaq Vula kohore"
 
 #: src/gtkconv.c:2526
-#, fuzzy
 msgid "/Options/Show Buddy Icon"
-msgstr "Shfaq _ikona shokësh"
+msgstr "/Mundësi/Shfaq Ikonë Shoku"
 
 #: src/gtkconv.c:2597
 msgid "User is typing..."
@@ -2930,9 +2779,8 @@
 
 #. Build the Send As menu
 #: src/gtkconv.c:2740
-#, fuzzy
 msgid "_Send To"
-msgstr "_Dërgo Si"
+msgstr "_Dërgo Te"
 
 #: src/gtkconv.c:3373
 msgid "Topic:"
@@ -2957,7 +2805,9 @@
 msgstr "Ki të dhëna përdoruesi"
 
 #  Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+#: src/gtkconv.c:4360
+#: src/gtkconv.c:4462
+#: src/gtkconv.c:4517
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -2965,45 +2815,32 @@
 msgstr[1] "%d vetë në dhomë"
 
 #: src/gtkconv.c:5582
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"thoni &lt;mesazh&gt;:  Dërgoni një mesazh normalisht si të mos ishit duke "
-"përdorur një urdhër."
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+msgstr "thoni &lt;mesazh&gt;:  Dërgoni një mesazh normalisht si të mos ishit duke përdorur një urdhër."
 
 #: src/gtkconv.c:5585
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;veprim&gt;:  Dërgoji një shoku a një fjalosjeje një veprim në stil "
-"IRC."
+msgstr "me &lt;veprim&gt;:  Dërgoji një shoku a një fjalosjeje një veprim në stil IRC."
 
 #: src/gtkconv.c:5588
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;mundësi&gt;:  Dërgo te bashkëbisedimi i çastit të dhëna të "
-"ndryshme diagnostikimi."
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr "debug &lt;mundësi&gt;:  Dërgo te bashkëbisedimi i çastit të dhëna të ndryshme diagnostikimi."
 
 #: src/gtkconv.c:5591
-#, fuzzy
 msgid "clear: Clears the conversation scrollback."
-msgstr "%s e mbylli dritaren e bashkëbisedimit."
+msgstr "clear: Pastron rreshtat e bashkëbisedimit."
 
 #: src/gtkconv.c:5594
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;urdhër&gt;:  Ndihmë rreth një urdhri të caktuar."
 
 #: src/gtkconv.c:5709
-#, fuzzy
 msgid "Confirm close"
-msgstr "Ripohoni Llogari"
+msgstr "Ripohoni mbylljen"
 
 #: src/gtkconv.c:5741
-#, fuzzy
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "jeni të sigurtë se doni të fshini %s?"
+msgstr "Keni mesazhe të palexuar. Jeni të sigurtë se doni të mbyllni dritaren?"
 
 #: src/gtkconv.c:6408
 msgid "Close conversation"
@@ -3017,7 +2854,8 @@
 msgid "Separate IM and Chat windows"
 msgstr "Veço dritare IM dhe Chat"
 
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+#: src/gtkconv.c:6876
+#: src/gtkprefs.c:1205
 msgid "New window"
 msgstr "Dritare e re"
 
@@ -3034,48 +2872,52 @@
 msgstr "Ruaj Regjistrim Diagnostikimi"
 
 #: src/gtkdebug.c:586
-#, fuzzy
 msgid "Invert"
-msgstr "_Fut"
+msgstr "Përmbys"
 
 #: src/gtkdebug.c:589
 msgid "Highlight matches"
-msgstr ""
+msgstr "Thekso përputhje"
 
 #: src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "Dritare Diagnostikimesh"
 
 #: src/gtkdebug.c:689
-#, fuzzy
 msgid "Clear"
-msgstr "Mbyll"
+msgstr "Pastro"
 
 #: src/gtkdebug.c:698
 msgid "Pause"
 msgstr "Pushim"
 
-#: src/gtkdebug.c:705 src/gtkdebug.c:706
+#: src/gtkdebug.c:705
+#: src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Vula Kohore"
 
 #: src/gtkdebug.c:724
-#, fuzzy
 msgid "Filter"
-msgstr "Dështova"
+msgstr "Filtër"
 
 #: src/gtkdebug.c:743
-#, fuzzy
 msgid "Right click for more options."
-msgstr "Shfaq më tepër mundësi"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+msgstr "Djathtasklikoni për më tepër mundësi"
+
+#: src/gtkdialogs.c:59
+#: src/gtkdialogs.c:90
 msgid "lead developer"
 msgstr "udhëheqës zhvillimi"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:60
+#: src/gtkdialogs.c:63
+#: src/gtkdialogs.c:64
+#: src/gtkdialogs.c:65
+#: src/gtkdialogs.c:66
+#: src/gtkdialogs.c:67
+#: src/gtkdialogs.c:69
+#: src/gtkdialogs.c:70
+#: src/gtkdialogs.c:71
 msgid "developer"
 msgstr "zhvillues"
 
@@ -3091,42 +2933,46 @@
 msgid "support"
 msgstr "suport"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: src/gtkdialogs.c:88
+#: src/gtkdialogs.c:91
 msgid "maintainer"
 msgstr "mirëmbajtës"
 
 #: src/gtkdialogs.c:89
-#, fuzzy
 msgid "libfaim maintainer"
-msgstr "mirëmbajtësi i dikurshëm i libfaim"
+msgstr "mirëmbajtësi i libfaim"
 
 #: src/gtkdialogs.c:92
-#, fuzzy
 msgid "Jabber developer"
-msgstr "zhvillues i dikurshëm i Jabber-it"
+msgstr "zhvillues i Jabber-it"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
 msgstr "autori fillestra"
 
 #: src/gtkdialogs.c:94
+#, fuzzy
 msgid "hacker and designated driver [lazy bum]"
-msgstr ""
-
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+msgstr "hacker and designated driver [lazy bum]"
+
+#: src/gtkdialogs.c:99
+#: src/gtkdialogs.c:100
+#: src/gtkdialogs.c:144
 msgid "Bulgarian"
 msgstr "Bulgare"
 
 #: src/gtkdialogs.c:101
-#, fuzzy
 msgid "Bosnian"
-msgstr "Estonishte"
-
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
+msgstr "Boshnjake"
+
+#: src/gtkdialogs.c:102
+#: src/gtkdialogs.c:145
+#: src/gtkdialogs.c:146
 msgid "Catalan"
 msgstr "Katalane"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
+#: src/gtkdialogs.c:103
+#: src/gtkdialogs.c:147
 msgid "Czech"
 msgstr "Çeke"
 
@@ -3134,7 +2980,8 @@
 msgid "Danish"
 msgstr "Daneze"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
+#: src/gtkdialogs.c:105
+#: src/gtkdialogs.c:148
 msgid "German"
 msgstr "Gjermane"
 
@@ -3150,15 +2997,18 @@
 msgid "Canadian English"
 msgstr "Anglishte Kanadeze"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:149
 msgid "Spanish"
 msgstr "Spanjolle"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:110
+#: src/gtkdialogs.c:150
 msgid "Finnish"
 msgstr "Finlandeze"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:111
+#: src/gtkdialogs.c:151
 msgid "French"
 msgstr "Frënge"
 
@@ -3174,11 +3024,13 @@
 msgid "Hungarian"
 msgstr "Hungareze"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:152
 msgid "Italian"
 msgstr "Italisht"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:153
 msgid "Japanese"
 msgstr "Japoneze"
 
@@ -3187,16 +3039,15 @@
 msgstr "Lituaneze"
 
 #: src/gtkdialogs.c:118
-#, fuzzy
 msgid "Georgian"
-msgstr "Gjermane"
-
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
+msgstr "Gjeorgjiane"
+
+#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:154
 msgid "Korean"
 msgstr "Koreane"
 
 #: src/gtkdialogs.c:120
-#, fuzzy
 msgid "Dutch, Flemish"
 msgstr "Hollandishte, Flamande"
 
@@ -3208,7 +3059,9 @@
 msgid "Norwegian"
 msgstr "Norvegjiane"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: src/gtkdialogs.c:123
+#: src/gtkdialogs.c:124
+#: src/gtkdialogs.c:155
 msgid "Polish"
 msgstr "Polake"
 
@@ -3224,11 +3077,14 @@
 msgid "Romanian"
 msgstr "Rumune"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:128
+#: src/gtkdialogs.c:156
+#: src/gtkdialogs.c:157
 msgid "Russian"
 msgstr "Ruse"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:129
+#: src/gtkdialogs.c:130
 msgid "Serbian"
 msgstr "Serbe"
 
@@ -3236,13 +3092,14 @@
 msgid "Slovenian"
 msgstr "Slovene"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
+#: src/gtkdialogs.c:132
+#: src/gtkdialogs.c:159
 msgid "Swedish"
 msgstr "Suedeze"
 
 #: src/gtkdialogs.c:133
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #: src/gtkdialogs.c:134
 msgid "Vietnamese"
@@ -3252,11 +3109,14 @@
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh dhe Ekipi Gnome-Vi"
 
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
+#: src/gtkdialogs.c:135
+#: src/gtkdialogs.c:160
 msgid "Simplified Chinese"
 msgstr "Kineze e Thjeshtuar"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
+#: src/gtkdialogs.c:136
+#: src/gtkdialogs.c:137
+#: src/gtkdialogs.c:161
 msgid "Traditional Chinese"
 msgstr "Kineze Tradicionale"
 
@@ -3273,16 +3133,8 @@
 msgstr "Rreth Gaim"
 
 #: src/gtkdialogs.c:226
-#, fuzzy
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr ""
-"Gaim-i është një klient modular shkëmbimi mesazhesh i aftë të përdorë "
-"njëherazi AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, "
-"Napster, Zephyr, dhe Gadu-Gadu.  Është shkruajtur duke përdorur Gtk+ dhe "
-"licensuar sipas GPL.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+msgstr "Gaim-i është një klient modular shkëmbimi mesazhesh i aftë të përdorë njëherazi AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, dhe Gadu-Gadu.  Është shkruajtur duke përdorur Gtk+ dhe licensuar sipas GNU GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:235
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -3313,16 +3165,18 @@
 msgstr "Përkthyesa të Dikurshëm"
 
 #: src/gtkdialogs.c:327
-#, fuzzy
 msgid "Debugging Information"
-msgstr "Të dhëna Përdoruesi"
-
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
-#, fuzzy
+msgstr "Të dhëna Diagnostikimi"
+
+#: src/gtkdialogs.c:489
+#: src/gtkdialogs.c:630
+#: src/gtkdialogs.c:685
 msgid "_Name"
-msgstr "Emër"
-
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
+msgstr "_Emër"
+
+#: src/gtkdialogs.c:494
+#: src/gtkdialogs.c:635
+#: src/gtkdialogs.c:690
 msgid "_Account"
 msgstr "_Llogari"
 
@@ -3331,37 +3185,24 @@
 msgstr "Mesazh i Ri i Atypëratyshëm"
 
 #: src/gtkdialogs.c:504
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr "Ju lutem jepni emër ekrani të personit që do të donit për IM."
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr "Ju lutem jepni emër ekrani ose alias të personit që do të donit për IM."
 
 #: src/gtkdialogs.c:643
 msgid "Get User Info"
 msgstr "Merr Të dhëna Përdoruesi"
 
 #: src/gtkdialogs.c:645
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Ju lutem jepni emër ekrani të personit të dhënat e të cilit do të donit të "
-"shihnit."
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
+msgstr "Ju lutem jepni emër ekrani ose alias të personit të dhënat e të cilit do të donit të shihnit."
 
 #: src/gtkdialogs.c:699
-#, fuzzy
 msgid "View User Log"
-msgstr "Merr Regjistrim Përdoruesi"
+msgstr "Shih Regjistrim Përdoruesi"
 
 #: src/gtkdialogs.c:701
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Ju lutem jepni emër ekrani të personit regjistrimet e të cilit do të donit "
-"të shihnit."
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
+msgstr "Ju lutem jepni emër ekrani ose alias të personit regjistrimet e të cilit do të donit të shihnit."
 
 #: src/gtkdialogs.c:720
 msgid "Alias Contact"
@@ -3371,8 +3212,11 @@
 msgid "Enter an alias for this contact."
 msgstr "Jepni një alias për këtë kontakt"
 
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:723
+#: src/gtkdialogs.c:745
+#: src/gtkdialogs.c:765
+#: src/gtkrequest.c:269
+#: src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "Alias"
 
@@ -3395,51 +3239,38 @@
 
 #: src/gtkdialogs.c:800
 #, fuzzy, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"Jeni duke hequr kontaktin që përmban %s dhe %d shokë të tjerë prej listës "
-"suaj të shokëve.  Doni të vazhdohet?"
-msgstr[1] ""
-"Jeni duke hequr kontaktin që përmban %s dhe %d shokë të tjerë prej listës "
-"suaj të shokëve.  Doni të vazhdohet?"
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr[0] "Jeni duke hequr kontaktin që përmban %s dhe %d shok tjetër prej listës suaj të shokëve.  Doni të vazhdohet?"
+msgstr[1] "Jeni duke hequr kontaktin që përmban %s dhe %d shokë të tjerë prej listës suaj të shokëve.  Doni të vazhdohet?"
 
 #: src/gtkdialogs.c:867
 #, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"Jeni duke hequr grupin %s dhe tërë anëtarët e tij prej listës suaj të "
-"shokëve. Doni të vazhdohet?"
-
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "Jeni duke hequr grupin %s dhe tërë anëtarët e tij prej listës suaj të shokëve. Doni të vazhdohet?"
+
+#: src/gtkdialogs.c:870
+#: src/gtkdialogs.c:871
 msgid "Remove Group"
 msgstr "Hiq Grup"
 
 #: src/gtkdialogs.c:909
 #, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Jeni duke hequr %s prej listës suaj të shokëve.  Doni të vazhdohet?"
 
-#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
+#: src/gtkdialogs.c:912
+#: src/gtkdialogs.c:913
 msgid "Remove Buddy"
 msgstr "Hiq Shok"
 
 #: src/gtkdialogs.c:951
 #, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr ""
-"Jeni duke hequr fjalosjen %s prej listës suaj të shokëve.  Doni të vazhdohet?"
-
-#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+msgstr "Jeni duke hequr fjalosjen %s prej listës suaj të shokëve.  Doni të vazhdohet?"
+
+#: src/gtkdialogs.c:954
+#: src/gtkdialogs.c:955
 msgid "Remove Chat"
 msgstr "Hiq Fjalosje"
 
@@ -3448,15 +3279,18 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: src/gtkft.c:159
+#: src/gtkft.c:1035
 msgid "Finished"
 msgstr "Përfunduar"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: src/gtkft.c:162
+#: src/gtkft.c:986
 msgid "Canceled"
 msgstr "Anuluar"
 
-#: src/gtkft.c:165 src/gtkft.c:905
+#: src/gtkft.c:165
+#: src/gtkft.c:905
 msgid "Waiting for transfer to begin"
 msgstr "Po pres të fillojë shpërngulja"
 
@@ -3485,19 +3319,19 @@
 msgstr "Ndodhi një gabim gjatë hapjes së kartelës."
 
 #: src/gtkft.c:467
-#, fuzzy, c-format
+#, c-format
 msgid "Error launching %s: %s"
-msgstr "Gabim në nisjen e <b>%s</b>: %s"
+msgstr "Gabim në nisjen e %s: %s"
 
 #: src/gtkft.c:476
-#, fuzzy, c-format
+#, c-format
 msgid "Error running %s"
-msgstr "Gabim në hyrjen te fjalosje %s"
+msgstr "Gabim në xhirimin e %s"
 
 #: src/gtkft.c:477
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
+msgstr "Procesi u përgjigj me kod gabimi %d"
 
 #: src/gtkft.c:572
 msgid "Progress"
@@ -3520,9 +3354,8 @@
 msgstr "Emër kartele:"
 
 #: src/gtkft.c:625
-#, fuzzy
 msgid "Local File:"
-msgstr "Përdoruesa Vendorë"
+msgstr "Kartelë Vendore:"
 
 #: src/gtkft.c:626
 msgid "Status:"
@@ -3545,19 +3378,18 @@
 msgstr "_Mbaj dialogun të hapur"
 
 #: src/gtkft.c:725
-#, fuzzy
 msgid "C_lear finished transfers"
 msgstr "_Pastro shpërngulje të përfunduara"
 
 #. "Download Details" arrow
 #: src/gtkft.c:734
-#, fuzzy
 msgid "File transfer _details"
-msgstr "Fshih hollësi shpërnguljeje"
+msgstr "_Hollësi shpërnguljeje kartelash"
 
 #  Pause button
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: src/gtkft.c:764
+#: src/gtkstock.c:122
 msgid "_Pause"
 msgstr "_Pushim"
 
@@ -3584,14 +3416,12 @@
 msgstr "Ngjyrë për vizatim tejlidhjesh.."
 
 #: src/gtkimhtml.c:1317
-#, fuzzy
 msgid "Hyperlink prelight color"
-msgstr "Ngjyrë Tejlidhjeje"
+msgstr "Ngjyrë paratheksimi tejlidhjesh"
 
 #: src/gtkimhtml.c:1318
-#, fuzzy
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Ngjyrë për vizatim tejlidhjesh.."
+msgstr "Ngjyrë për vizatim tejlidhjesh kur mbi to kalon miu."
 
 #: src/gtkimhtml.c:1537
 msgid "_Copy E-Mail Address"
@@ -3611,6 +3441,9 @@
 "\n"
 "Defaulting to PNG."
 msgstr ""
+"<span size='larger' weight='bold'>Tip i papranuar kartele</span>\n"
+"\n"
+"Po kaloj te parazgjedhja PNG."
 
 #: src/gtkimhtml.c:3237
 msgid ""
@@ -3618,27 +3451,34 @@
 "\n"
 "Defaulting to PNG."
 msgstr ""
+"Tip i papranuar kartele\n"
+"\n"
+"Po kaloj te parazgjedhja PNG."
 
 #: src/gtkimhtml.c:3250
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
 "\n"
 "%s"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ka postë për ju!</span>\n"
+"<span size='larger' weight='bold'>Gabim në ruajtje pamjeje</span>\n"
 "\n"
 "%s"
 
 #: src/gtkimhtml.c:3253
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error saving image\n"
 "\n"
 "%s"
-msgstr "Gabim në ruajtje pamjeje: %s "
-
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+msgstr ""
+"Gabim në ruajtje pamjeje\n"
+"\n"
+"%s"
+
+#: src/gtkimhtml.c:3333
+#: src/gtkimhtml.c:3345
 msgid "Save Image"
 msgstr "Ruaj Pamje"
 
@@ -3667,12 +3507,8 @@
 msgstr "_Përshkrim"
 
 #: src/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Ju lutem jepni URL dhe përshkrim për lidhjen që doni të futet. Përshkrimi "
-"është në dëshirën tuaj."
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+msgstr "Ju lutem jepni URL dhe përshkrim për lidhjen që doni të futet. Përshkrimi është në dëshirën tuaj."
 
 #: src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
@@ -3691,7 +3527,8 @@
 msgid "Failed to store image: %s\n"
 msgstr "Dështova në ruajtje pamjeje: %s\n"
 
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+#: src/gtkimhtmltoolbar.c:513
+#: src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Fut Pamje"
 
@@ -3738,9 +3575,8 @@
 msgstr "Ngjyrë sfondi"
 
 #: src/gtkimhtmltoolbar.c:1023
-#, fuzzy
 msgid "Clear formatting"
-msgstr "_Pastro Formatim"
+msgstr "Pastro formatim"
 
 #: src/gtkimhtmltoolbar.c:1038
 msgid "Insert link"
@@ -3755,47 +3591,42 @@
 msgstr "Fut zgërdhimje"
 
 #: src/gtklog.c:200
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "Bashkëbisedime me %s"
+msgstr "Bashkëbisedim në %s te %s"
 
 #: src/gtklog.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "Bashkëbisedime me %s"
+msgstr "Bashkëbisedim me %s te %s"
 
 #: src/gtklog.c:309
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "Ngjarje sistemi do të regjistrohen vetëm nëse është i aktivizuar parapëlqimi \"Regjistro tërë ndryshimet e gjendjes te regjistri i sistemit\"."
 
 #: src/gtklog.c:313
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "mesazhe të atypëratyshëm do të regjistrohen vetëm nëse është i aktivizuar parapëlqimi \"Regjistro tërë mesazhet e atypëratyshëm\"."
 
 #: src/gtklog.c:316
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
+msgid "Chats will only be logged if the \"Log all chats preference\" is enabled."
+msgstr "Fjalosjet do të regjistrohen vetëm nëse është i aktivizuar parapëlqimi \"Regjistro tërë fjalosjet\"."
 
 #: src/gtklog.c:320
 msgid "No logs were found"
-msgstr ""
+msgstr "Nuk u gjetën regjistrime"
 
 #: src/gtklog.c:396
-#, fuzzy
 msgid "Total log size:"
-msgstr "Sipas madhësie regjistrimi"
+msgstr "Madhësi tërësore regjistrimi:"
 
 #: src/gtklog.c:472
-#, fuzzy, c-format
+#, c-format
 msgid "Conversations in %s"
-msgstr "Bashkëbisedime me %s"
-
-#: src/gtklog.c:480 src/gtklog.c:531
+msgstr "Bashkëbisedime në %s"
+
+#: src/gtklog.c:480
+#: src/gtklog.c:531
 #, c-format
 msgid "Conversations with %s"
 msgstr "Bashkëbisedime me %s"
@@ -3825,15 +3656,27 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
+"Gaim %s\n"
+"Përdorimi: %s [MUNDËSI]...\n"
+"\n"
+"  -c, --config=DIR    përdor DIR për kartela formësimi\n"
+"  -d, --debug         shtyp mesazhe diagnostikimi te stdout\n"
+"  -h, --help          shfaq këtë ndihmë dhe dil\n"
+"  -n, --nologin       mos u fut vetvetiu\n"
+"  -l, --login[=EMËR]  futu vetvetiu (argumenti opsional EMËR përcakton\n"
+"                      llogarinë(të) që duhet përdorur, ndarë me presje)\n"
+"  -v, --version       shfaq versionin e çastit dhe dil\n"
 
 #. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
+#: src/gtkmain.c:676
+#: src/gtkmain.c:678
+#: src/gtkmain.c:681
+#: src/gtkstatusbox.c:663
+#: src/gtkstatusbox.c:665
+#: src/gtkstatusbox.c:668
 #: src/status.c:1696
-#, fuzzy
 msgid "Default"
-msgstr "Parazgjedhje GNOME"
+msgstr "Parazgjedhje"
 
 #. Descriptive label
 #: src/gtknotify.c:275
@@ -3880,13 +3723,15 @@
 msgid "Search Results"
 msgstr "Përfundime Kërkimi"
 
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: src/gtknotify.c:643
+#: src/protocols/oscar/oscar.c:4858
 #, c-format
 msgid "Info for %s"
 msgstr "Të dhëna për %s"
 
 #  res[0] == username
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+#: src/gtknotify.c:644
+#: src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Të dhëna Shoku"
 
@@ -3895,19 +3740,21 @@
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "Urdhri i shfletuesit <b>%s</b> është i pavlefshëm."
 
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
+#: src/gtknotify.c:689
+#: src/gtknotify.c:701
+#: src/gtknotify.c:714
 #: src/gtknotify.c:838
 msgid "Unable to open URL"
 msgstr "I pazoti të hap URL"
 
-#: src/gtknotify.c:699 src/gtknotify.c:712
+#: src/gtknotify.c:699
+#: src/gtknotify.c:712
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Gabim në nisjen e <b>%s</b>: %s"
 
 #: src/gtknotify.c:839
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Është zgjedhur urdhër shfletuesi 'Dorazi', por nuk është caktuar cili."
 
 #: src/gtkpounce.c:130
@@ -3920,7 +3767,8 @@
 
 #  "New Buddy Pounce"
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: src/gtkpounce.c:391
+#: src/gtkpounce.c:898
 msgid "New Buddy Pounce"
 msgstr "Cytje e Re Shoku"
 
@@ -4069,20 +3917,17 @@
 msgstr "Akt i panjohur cytjeje. Ju lutem njoftojeni këtë!"
 
 #: src/gtkprefs.c:623
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Përzgjidhni prej listës më poshtë temë karagjozësh që do të donit të "
-"përdornit. Tema të reja mund të instalohen duke i tërhequr e lënë te listë "
-"temash."
+msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
+msgstr "Përzgjidhni prej listës më poshtë temë karagjozësh që do të donit të përdornit. Tema të reja mund të instalohen duke i tërhequr e lënë te listë temash."
 
 #: src/gtkprefs.c:658
 msgid "Icon"
 msgstr "Ikonë"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
+#: src/gtkprefs.c:665
+#: src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:811
+#: src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Përshkrim"
 
@@ -4091,9 +3936,8 @@
 msgstr "Dërgo si mesazhe urdhra të panjohur \"_slash\""
 
 #: src/gtkprefs.c:807
-#, fuzzy
 msgid "Show _formatting on incoming messages"
-msgstr "Shfaq panel _formatimi"
+msgstr "Shfaq _formatim në mesazhe ardhës"
 
 #: src/gtkprefs.c:809
 msgid "Show buddy _icons"
@@ -4112,12 +3956,8 @@
 msgstr "_Thekso fjalë të keqshqiptuara"
 
 #: src/gtkprefs.c:834
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"Ja si do të duket teksti i mesazhit që dërgoni kur përdorni protokolle që "
-"mbulojnë formatim. :)"
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
+msgstr "Ja si do të duket teksti i mesazhit që dërgoni kur përdorni protokolle që mbulojnë formatim. :)"
 
 #  All the tab options!
 #. All the tab options!
@@ -4134,9 +3974,8 @@
 msgstr "Shfaq buton _mbyll në skeda"
 
 #: src/gtkprefs.c:878
-#, fuzzy
 msgid "_Placement:"
-msgstr "ExtPlacement"
+msgstr "_Vendosje:"
 
 #: src/gtkprefs.c:880
 msgid "Top"
@@ -4156,26 +3995,25 @@
 
 #: src/gtkprefs.c:885
 msgid "Left Vertical"
-msgstr ""
+msgstr "Majtas Vertikale"
 
 #: src/gtkprefs.c:886
 msgid "Right Vertical"
-msgstr ""
+msgstr "Djathtas Vertikale"
 
 #: src/gtkprefs.c:891
-#, fuzzy
 msgid "N_ew conversations:"
-msgstr "Mbyll bashkëbisedim"
-
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
+msgstr "Bashkëbisedime të _rinj:"
+
+#: src/gtkprefs.c:942
+#: src/protocols/oscar/oscar.c:779
 #: src/protocols/oscar/oscar.c:5959
 msgid "IP Address"
 msgstr "Vendndodhje IP"
 
 #: src/gtkprefs.c:944
-#, fuzzy
 msgid "STUN Server:"
-msgstr "_Shërbyes:"
+msgstr "Shërbyes STUN:"
 
 #: src/gtkprefs.c:946
 msgid "_Autodetect IP Address"
@@ -4230,7 +4068,6 @@
 msgstr "Galeon"
 
 #: src/gtkprefs.c:1123
-#, fuzzy
 msgid "GNOME Default"
 msgstr "Parazgjedhje GNOME"
 
@@ -4287,7 +4124,8 @@
 "_Manual:\n"
 "(%s për URL)"
 
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+#: src/gtkprefs.c:1256
+#: src/gtkprefs.c:1738
 msgid "Logging"
 msgstr "Hyrje"
 
@@ -4296,9 +4134,8 @@
 msgstr "_Format Regjistrimi:"
 
 #: src/gtkprefs.c:1264
-#, fuzzy
 msgid "Log all _instant messages"
-msgstr "_Regjistro tërë mesazhet e atypëratyshëm"
+msgstr "Regjistro tërë mesazhet e _atypëratyshëm"
 
 #: src/gtkprefs.c:1266
 msgid "Log all c_hats"
@@ -4306,7 +4143,7 @@
 
 #: src/gtkprefs.c:1268
 msgid "Log all _status changes to system log"
-msgstr ""
+msgstr "Regjistro tërë ndryshime _gjendjeje te regjistri i sistemit"
 
 #: src/gtkprefs.c:1400
 msgid "Sound Selection"
@@ -4333,9 +4170,8 @@
 msgstr "Urdhër"
 
 #: src/gtkprefs.c:1465
-#, fuzzy
 msgid "No sounds"
-msgstr "Tinguj"
+msgstr "Pa tinguj"
 
 #: src/gtkprefs.c:1473
 #, c-format
@@ -4382,17 +4218,28 @@
 msgid "Choose..."
 msgstr "Zgjidhni..."
 
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
+#: src/gtkprefs.c:1651
+#: src/gtkstatusbox.c:295
+#: src/protocols/bonjour/bonjour.c:240
+#: src/protocols/irc/irc.c:176
+#: src/protocols/irc/msgs.c:221
+#: src/protocols/jabber/buddy.c:1093
+#: src/protocols/jabber/jabber.c:1055
+#: src/protocols/msn/msn.c:577
+#: src/protocols/novell/novell.c:2825
+#: src/protocols/novell/novell.c:2959
+#: src/protocols/novell/novell.c:3041
+#: src/protocols/oscar/oscar.c:707
+#: src/protocols/oscar/oscar.c:6516
+#: src/protocols/oscar/oscar.c:6585
+#: src/protocols/oscar/oscar.c:7610
+#: src/protocols/oscar/oscar.c:7764
+#: src/protocols/sametime/sametime.c:2764
+#: src/protocols/silc/buddy.c:1417
+#: src/protocols/silc/silc.c:52
+#: src/protocols/yahoo/yahoo.c:3225
+#: src/protocols/zephyr/zephyr.c:2259
+#: src/status.c:158
 msgid "Away"
 msgstr "Larguar"
 
@@ -4409,33 +4256,28 @@
 msgstr "Gjatë largimesh"
 
 #: src/gtkprefs.c:1659
-#, fuzzy
 msgid "When both away and idle"
 msgstr "Vetëm në rast largimi dhe plogështie"
 
 #: src/gtkprefs.c:1662
-#, fuzzy
 msgid "_Report idle time"
-msgstr "Shfaq _kohë plogështie"
+msgstr "_Raporto kohë plogështie"
 
 #: src/gtkprefs.c:1665
 msgid "Auto-away"
 msgstr "I vetëlarguar"
 
 #: src/gtkprefs.c:1666
-#, fuzzy
 msgid "Change status when _idle"
-msgstr "Tregoje të larguar _po qe i plogësht"
+msgstr "Ndrysho gjendjen po qe i _plogësht"
 
 #: src/gtkprefs.c:1670
-#, fuzzy
 msgid "_Minutes before changing status:"
-msgstr "_Minuta para tregimit si të larguar:"
+msgstr "_Minuta para ndryshimit të gjendjes:"
 
 #: src/gtkprefs.c:1678
-#, fuzzy
 msgid "Change _status to:"
-msgstr "Ndrysho Vendndodhje Si:"
+msgstr "Ndrysho _gjendje si:"
 
 #: src/gtkprefs.c:1728
 msgid "Smiley Themes"
@@ -4445,7 +4287,8 @@
 msgid "Sounds"
 msgstr "Tinguj"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: src/gtkprefs.c:1730
+#: src/protocols/silc/silc.c:1589
 msgid "Network"
 msgstr "Rrjet"
 
@@ -4492,7 +4335,8 @@
 msgid "Set privacy for:"
 msgstr "Caktoni vetësi për:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: src/gtkprivacy.c:589
+#: src/gtkprivacy.c:605
 msgid "Permit User"
 msgstr "Lejo Përdorues"
 
@@ -4504,7 +4348,8 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Ju lutem jepni emrin e përdoruesit që doni të mundë t'ju kontaktojë"
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:594
+#: src/gtkprivacy.c:607
 msgid "Permit"
 msgstr "Lejo"
 
@@ -4518,7 +4363,8 @@
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Jeni i sigurt se doni të lejohet %s të lidhet me ju?"
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: src/gtkprivacy.c:628
+#: src/gtkprivacy.c:641
 msgid "Block User"
 msgstr "Blloko Përdorues"
 
@@ -4531,7 +4377,9 @@
 msgstr "Ju lutem jepni emrin e përdoruesit që doni të bllokohet"
 
 #  Block button
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
+#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:643
+#: src/protocols/gg/gg.c:1135
 msgid "Block"
 msgstr "Blloko"
 
@@ -4548,19 +4396,25 @@
 #  *
 #  * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #. *
-#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+#: src/gtkrequest.c:259
+#: src/protocols/msn/dialog.c:113
+#: src/protocols/msn/msn.c:553
+#: src/protocols/msn/msn.c:556
+#: src/protocols/novell/novell.c:1902
+#: src/protocols/silc/buddy.c:312
+#: src/protocols/silc/pk.c:117
+#: src/request.h:1322
 msgid "Yes"
 msgstr "Po"
 
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: src/gtkrequest.c:260
+#: src/protocols/msn/dialog.c:114
+#: src/protocols/msn/msn.c:553
+#: src/protocols/msn/msn.c:556
+#: src/protocols/novell/novell.c:1903
+#: src/protocols/silc/buddy.c:313
+#: src/protocols/silc/pk.c:118
+#: src/request.h:1322
 msgid "No"
 msgstr "Jo"
 
@@ -4568,7 +4422,8 @@
 msgid "Apply"
 msgstr "Zbato"
 
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
+#: src/gtkrequest.c:264
+#: src/protocols/msn/msn.c:357
 #: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "Mbyll"
@@ -4581,11 +4436,13 @@
 msgid "Would you like to overwrite it?"
 msgstr "Do të donit ta mbishkruani?"
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: src/gtkrequest.c:1839
+#: src/gtkrequest.c:1880
 msgid "Save File..."
 msgstr "Ruaj Kartelë..."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: src/gtkrequest.c:1840
+#: src/gtkrequest.c:1881
 msgid "Open File..."
 msgstr "Hap Kartelë..."
 
@@ -4599,77 +4456,91 @@
 msgid "_Get List"
 msgstr "_Ki Listë"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#: src/gtksavedstatuses.c:362
+#: src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:805
+#: src/protocols/novell/novell.c:1460
 msgid "Title"
 msgstr "Titull"
 
 #: src/gtksavedstatuses.c:377
 msgid "Type"
-msgstr ""
-
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
+msgstr "Tip"
+
+#: src/gtksavedstatuses.c:388
+#: src/protocols/bonjour/bonjour.c:234
+#: src/protocols/bonjour/bonjour.c:241
+#: src/protocols/gg/gg.c:1083
+#: src/protocols/gg/gg.c:1088
+#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1107
+#: src/protocols/gg/gg.c:1112
+#: src/protocols/irc/irc.c:177
+#: src/protocols/jabber/jabber.c:1032
+#: src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:1056
+#: src/protocols/jabber/jabber.c:1064
+#: src/protocols/jabber/jabber.c:1072
+#: src/protocols/novell/novell.c:2845
+#: src/protocols/oscar/oscar.c:7758
+#: src/protocols/oscar/oscar.c:7765
 #: src/protocols/sametime/sametime.c:2759
 #: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
+#: src/protocols/sametime/sametime.c:2771
+#: src/protocols/simple/simple.c:255
+#: src/protocols/yahoo/yahoo.c:3220
+#: src/protocols/yahoo/yahoo.c:3226
 #: src/protocols/zephyr/zephyr.c:2260
 msgid "Message"
 msgstr "Mesazh"
 
 #: src/gtksavedstatuses.c:451
-#, fuzzy
 msgid "Saved Statuses"
-msgstr "Statistika Shërbyesi"
+msgstr "Gjendje të Ruajtura"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
 #: src/gtksavedstatuses.c:477
-#, fuzzy
 msgid "_Use"
 msgstr "_Përdor"
 
 #: src/gtksavedstatuses.c:584
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
+msgstr "Titull i përdorur tashmë. Duhet të zgjidhni një titull unik."
 
 #: src/gtksavedstatuses.c:675
-#, fuzzy
 msgid "Custom status"
-msgstr "Sipas gjendjeje"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+msgstr "Gjendje vetjake"
+
+#: src/gtksavedstatuses.c:778
+#: src/protocols/gg/gg.c:1064
+#: src/protocols/gg/gg.c:1069
+#: src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:1005
+#: src/protocols/msn/msn.c:544
+#: src/protocols/novell/novell.c:2844
+#: src/protocols/novell/novell.c:2848
+#: src/protocols/oscar/oscar.c:762
+#: src/protocols/oscar/oscar.c:767
+#: src/protocols/oscar/oscar.c:769
+#: src/protocols/yahoo/yahoo.c:2787
 msgid "Status"
 msgstr "Gjendje"
 
 #: src/gtksavedstatuses.c:797
-#, fuzzy
 msgid "_Title:"
-msgstr "Titull"
+msgstr "_Titull:"
 
 #: src/gtksavedstatuses.c:817
-#, fuzzy
 msgid "_Status:"
-msgstr "Gjendje:"
+msgstr "_Gjendje:"
 
 #. Custom status message expander
 #: src/gtksavedstatuses.c:852
 msgid "Use a _different status for some accounts"
-msgstr ""
+msgstr "Përdor gjendje të _ndryshme për disa llogari"
 
 #: src/gtksound.c:61
 msgid "Buddy logs in"
@@ -4717,82 +4588,94 @@
 msgstr "I pazoti të luaj tingull sepse kartela e zgjedhur (%s) nuk ekziston."
 
 #: src/gtksound.c:430
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-"I pazoti të luaj tingull sepse është zgjedhur metodë 'Urdhri' tingulli, por "
-"nuk është caktuar urdhër."
+msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
+msgstr "I pazoti të luaj tingull sepse është zgjedhur metodë 'Urdhri' tingulli, por nuk është caktuar urdhër."
 
 #: src/gtksound.c:442
 #, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
-"I pazoti të luaj tingull sepse nuk zbatohej dot urdhri i formësuar për "
-"tingujt: %s"
+msgid "Unable to play sound because the configured sound command could not be launched: %s"
+msgstr "I pazoti të luaj tingull sepse nuk zbatohej dot urdhri i formësuar për tingujt: %s"
 
 #: src/gtkstatusbox.c:197
-#, fuzzy
 msgid "Typing"
-msgstr "Ping"
+msgstr "Shkrim"
 
 #  connect to the server
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: src/gtkstatusbox.c:200
+#: src/protocols/irc/irc.c:258
+#: src/protocols/jabber/jabber.c:838
+#: src/protocols/msn/session.c:362
+#: src/protocols/napster/napster.c:525
+#: src/protocols/novell/novell.c:2164
+#: src/protocols/oscar/oscar.c:1816
+#: src/protocols/simple/simple.c:1276
+#: src/protocols/yahoo/yahoo.c:2455
+#: src/protocols/zephyr/zephyr.c:1546
 msgid "Connecting"
 msgstr "Po lidhem"
 
 #. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
+#: src/gtkstatusbox.c:294
+#: src/protocols/bonjour/bonjour.c:233
+#: src/protocols/irc/irc.c:172
+#: src/protocols/jabber/jabber.c:1039
+#: src/protocols/msn/msn.c:573
+#: src/protocols/msn/state.c:29
+#: src/protocols/msn/state.c:30
+#: src/protocols/msn/state.c:37
+#: src/protocols/msn/state.c:38
+#: src/protocols/novell/novell.c:2822
+#: src/protocols/novell/novell.c:2956
+#: src/protocols/novell/novell.c:3039
+#: src/protocols/oscar/oscar.c:808
+#: src/protocols/oscar/oscar.c:7757
+#: src/protocols/simple/simple.c:253
+#: src/protocols/silc/silc.c:48
+#: src/protocols/yahoo/yahoo.c:3214
+#: src/status.c:155
 msgid "Available"
 msgstr "I mundshëm"
 
-#.
 #. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
+#: src/gtkstatusbox.c:296
+#: src/protocols/gg/gg.c:1096
+#: src/protocols/oscar/oscar.c:711
+#: src/protocols/oscar/oscar.c:7771
+#: src/protocols/yahoo/yahoo.c:2633
+#: src/protocols/yahoo/yahoo.c:3257
 msgid "Invisible"
 msgstr "I padukshëm"
 
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
+#: src/gtkstatusbox.c:297
+#: src/protocols/bonjour/bonjour.c:228
+#: src/protocols/gg/gg.c:1082
+#: src/protocols/irc/irc.c:168
+#: src/protocols/jabber/buddy.c:1087
+#: src/protocols/jabber/jabber.c:1032
+#: src/protocols/msn/msn.c:569
+#: src/protocols/napster/napster.c:573
+#: src/protocols/novell/novell.c:2834
+#: src/protocols/novell/novell.c:2953
+#: src/protocols/oscar/oscar.c:769
+#: src/protocols/oscar/oscar.c:7591
+#: src/protocols/oscar/oscar.c:7752
+#: src/protocols/sametime/sametime.c:2754
+#: src/protocols/simple/simple.c:249
+#: src/protocols/silc/silc.c:46
+#: src/protocols/yahoo/yahoo.c:2637
+#: src/protocols/yahoo/yahoo.c:3211
 #: src/status.c:154
 msgid "Offline"
 msgstr "Jo i lidhur"
 
 #: src/gtkstatusbox.c:299
-#, fuzzy
 msgid "Custom..."
-msgstr "Vetjake"
+msgstr "Vetjake..."
 
 #: src/gtkstatusbox.c:300
-#, fuzzy
 msgid "Saved..."
-msgstr "Ruaj Kartelë..."
+msgstr "U ruajt..."
 
 #: src/gtkstock.c:117
 msgid "_Alias"
@@ -4815,85 +4698,72 @@
 msgid "_Warn"
 msgstr "_Sinjalizo"
 
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
-#, fuzzy, c-format
+#: src/gtkutils.c:1393
+#: src/gtkutils.c:1418
+#, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "Ndodhi një gabim i panjohur nënshkrimi: %s."
-
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
-#, fuzzy
+msgstr "Ndodhi gabimi vijues gjatë ngarkimit të %s: %s-."
+
+#: src/gtkutils.c:1395
+#: src/gtkutils.c:1420
 msgid "Failed to load image"
-msgstr "Dështova në ruajtje pamjeje: %s\n"
+msgstr "Dështova në ruajtje pamjeje"
 
 #: src/gtkutils.c:1495
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "S'dërgoj dot kartelë"
+msgstr "S'dërgoj dot dosjen %s."
 
 #: src/gtkutils.c:1497
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
-#, fuzzy
+msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
+msgstr "Gaim-i nuk mund të shpërngulë një dosje. Do t´ju duhet të dërgoni kartelat brendaj saj tek e tek"
+
+#: src/gtkutils.c:1525
+#: src/gtkutils.c:1534
+#: src/gtkutils.c:1539
 msgid "You have dragged an image"
-msgstr "Keni dhënë një emër përdoruesi të pavlefshëm"
+msgstr "Keni tërhequr një pamje"
 
 #: src/gtkutils.c:1526
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
-#, fuzzy
+msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
+msgstr "Mund ta dërgoni këtë pamje si shpërngulje kartele, ta trupëzoni në këtë mesazh, ose përdorni si ikonë shoku për këtë përdorues."
+
+#: src/gtkutils.c:1530
+#: src/gtkutils.c:1545
 msgid "Set as buddy icon"
-msgstr "Shfaq _ikona shokësh"
-
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
-#, fuzzy
+msgstr "Caktoje si ikonë shoku"
+
+#: src/gtkutils.c:1531
+#: src/gtkutils.c:1546
 msgid "Send image file"
-msgstr "Dërgo mesazh"
-
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
-#, fuzzy
+msgstr "Dërgo kartelë pamjeje"
+
+#: src/gtkutils.c:1532
+#: src/gtkutils.c:1546
 msgid "Insert in message"
-msgstr "Fut pamje"
+msgstr "Fute në mesazh"
 
 #: src/gtkutils.c:1535
-#, fuzzy
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Do të donit të merrni pjesë në diskutim?"
+msgstr "Do të donit ta caktoni si ikonë shoku për këtë përdorues?"
 
 #: src/gtkutils.c:1540
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
+msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
+msgstr "Mund ta dërgoni këtë pamje si shpërngulje kartele ose ta trupëzoni në këtë mesazh, ose përdorni si ikonë shoku për këtë përdorues."
 
 #: src/gtkutils.c:1542
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "Mund ta fusni këtë pamje në këtë mesazh, ose përdorni si ikonë shoku për këtë përdorues"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 #: src/gtkutils.c:1596
-#, fuzzy
 msgid "Cannot send launcher"
-msgstr "S'dërgoj dot kartelë"
+msgstr "S'dërgoj dot nisës"
 
 #: src/gtkutils.c:1596
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr "Tërhoqët një nisës desktopi. Ka shumë të ngjarë që donit të dërgonit atë me çka lidhet ky nisës, çfarëdo qoftë ajo, dhe jo vetë nisësin. "
 
 #: src/log.c:129
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -4901,7 +4771,7 @@
 
 #: src/log.c:577
 msgid "Logging of this conversation failed."
-msgstr ""
+msgstr "Regjistrimi i këtij bashkëbisedimi dështoi."
 
 #: src/log.c:839
 msgid "XML"
@@ -4909,27 +4779,21 @@
 
 #: src/log.c:904
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;VETË-"
-"PËRGJIGJU&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;VETË-PËRGJIGJU&gt;:</b></font> %s<br/>\n"
 
 #: src/log.c:906
 #, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;VETË-"
-"PËRGJIGJU&gt;:</b></font> %s<br/>\n"
-
-#: src/log.c:957 src/log.c:1074
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;VETË-PËRGJIGJU&gt;:</b></font> %s<br/>\n"
+
+#: src/log.c:957
+#: src/log.c:1074
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>I pazoti të gjej shteg regjistrimi!</b></font>"
 
-#: src/log.c:967 src/log.c:1086
+#: src/log.c:967
+#: src/log.c:1086
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Nuk mund të lexoj kartelë: %s</b></font>"
@@ -4941,14 +4805,11 @@
 
 #: src/plugin.c:331
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
-msgstr ""
-"Shtojca e nevojshme %s nuk u gjet. Ju lutem instaloni këtë shtojcë dhe "
-"riprovoni."
-
-#: src/plugin.c:336 src/plugin.c:364
+msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgstr "Shtojca e nevojshme %s nuk u gjet. Ju lutem instaloni këtë shtojcë dhe riprovoni."
+
+#: src/plugin.c:336
+#: src/plugin.c:364
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim-i s'qe në gjendje të ngarkonte shtojcën tuaj."
 
@@ -4957,30 +4818,33 @@
 msgid "The required plugin %s was unable to load."
 msgstr "Nuk qe e mundur të ngarkohet shtojca e nevojshme %s."
 
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
+#: src/protocols/bonjour/bonjour.c:298
+#: src/protocols/msn/msn.c:546
+#: src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2831
+#: src/protocols/oscar/oscar.c:5064
+#: src/protocols/yahoo/yahoo.c:2635
 #: src/protocols/yahoo/yahoo_profile.c:660
 msgid "Idle"
 msgstr "I plogësht"
 
 #: src/protocols/bonjour/bonjour.c:303
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Status:</b> %s"
 msgstr ""
 "\n"
-"<b>Gjendje:</b> Awesome"
+"<b>Gjendje:</b> %s"
 
 #: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Message:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>Mesazh:</b> %s"
 
 #  *< api_version
 #  *< type
@@ -4994,231 +4858,220 @@
 #  *  summary
 #  *  description
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #. *  summary
-#. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
+#: src/protocols/bonjour/bonjour.c:388
+#: src/protocols/bonjour/bonjour.c:390
 msgid "Bonjour Protocol Plugin"
-msgstr "Shtojcë Protokolli Yahoo"
+msgstr "Shtojcë Protokolli Bonjour"
 
 #. Creating the user splits
 #: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
 msgid "Host name"
-msgstr "Mbiemër:"
+msgstr "Emër strehe"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
+#: src/protocols/bonjour/bonjour.c:421
+#: src/protocols/irc/irc.c:822
+#: src/protocols/msn/msn.c:1968
+#: src/protocols/napster/napster.c:712
 #: src/protocols/silc/silc.c:1597
 msgid "Port"
 msgstr "Portë"
 
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
-#, fuzzy
+#: src/protocols/bonjour/bonjour.c:424
+#: src/protocols/gg/gg.c:405
 msgid "First name"
-msgstr "Emër:"
-
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
-#, fuzzy
+msgstr "Emër"
+
+#: src/protocols/bonjour/bonjour.c:427
+#: src/protocols/gg/gg.c:401
 msgid "Last name"
-msgstr "Mbiemër:"
-
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
+msgstr "Mbiemër"
+
+#: src/protocols/bonjour/bonjour.c:430
+#: src/protocols/jabber/buddy.c:261
+#: src/protocols/jabber/buddy.c:772
+#: src/protocols/jabber/buddy.c:780
+#: src/protocols/silc/silc.c:661
+#: src/protocols/silc/util.c:511
 #: src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "Email"
 
 #: src/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
-msgstr ""
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
-#, fuzzy
+msgstr "Bonjour"
+
+#: src/protocols/gg/gg.c:136
+#: src/protocols/gg/gg.c:155
 msgid "Save Buddylist..."
-msgstr "Dërgo Listë Shokësh"
+msgstr "Ruaj Listë shokësh..."
 
 #: src/protocols/gg/gg.c:137
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
-
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
+msgstr "Lista juaj e shokëve është bosh, nuk u shkruajt gjë tek kartela."
+
+#: src/protocols/gg/gg.c:143
+#: src/protocols/gg/gg.c:145
 #: src/protocols/gg/gg.c:176
-#, fuzzy
 msgid "Couldn't open file"
-msgstr "S'dërgoj dot kartelë"
+msgstr "S'hapa dot kartelë"
 
 #: src/protocols/gg/gg.c:156
-#, fuzzy
 msgid "Buddylist saved successfully!"
-msgstr "Fjalëkalim i ndryshuar me sukses"
+msgstr "Lista e shokëve u ruajt me sukses"
 
 #: src/protocols/gg/gg.c:178
-#, fuzzy
 msgid "Could't open file"
-msgstr "S'dërgoj dot kartelë"
+msgstr "S'hap dot kartelën"
 
 #: src/protocols/gg/gg.c:199
-#, fuzzy
 msgid "Load Buddylist..."
-msgstr "_Alias Shoku..."
+msgstr "Ngarko Listë shokësh..."
 
 #: src/protocols/gg/gg.c:200
-#, fuzzy
 msgid "Buddylist loaded successfully!"
-msgstr "Fjalëkalim i ndryshuar me sukses"
+msgstr "Lista e shokëve u ngarkua me sukses!"
 
 #: src/protocols/gg/gg.c:211
-#, fuzzy
 msgid "Save buddylist..."
-msgstr "Dërgo Listë Shokësh"
+msgstr "Ruaj listë shokësh..."
 
 #: src/protocols/gg/gg.c:254
 msgid "Fill in the registration fields."
-msgstr ""
+msgstr "Plotësoni fushat e regjistrimin."
 
 #: src/protocols/gg/gg.c:259
-#, fuzzy
 msgid "Passwords do not match."
-msgstr "Fjalëkalimi i ri nuk përputhet."
+msgstr "Fjalëkalimet nuk përputhen."
 
 #: src/protocols/gg/gg.c:266
-#, fuzzy
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "I pazoti të krijoj lidhje të re."
+msgstr "I pazoti të regjistroj llogari të re. ndodhi një gabim.\n"
 
 #: src/protocols/gg/gg.c:279
 msgid "New Gadu-Gadu Account Registered"
-msgstr ""
+msgstr "Loogaria e re Gadu-Gadu u Regjistrua"
 
 #: src/protocols/gg/gg.c:280
-#, fuzzy
 msgid "Registration completed successfully!"
-msgstr "Regjistrim i Sukseshëm"
-
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
+msgstr "Regjistrimi u plotësua me sukses!"
+
+#: src/protocols/gg/gg.c:409
+#: src/protocols/gg/gg.c:1665
+#: src/protocols/jabber/buddy.c:252
+#: src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:1341
+#: src/protocols/jabber/jabber.c:648
+#: src/protocols/msn/msn.c:1394
+#: src/protocols/silc/buddy.c:1480
+#: src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:965
+#: src/protocols/silc/ops.c:1114
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Nofkë"
 
 #  City
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
+#: src/protocols/gg/gg.c:413
+#: src/protocols/jabber/jabber.c:668
+#: src/protocols/oscar/oscar.c:6006
+#: src/protocols/oscar/oscar.c:6014
 msgid "City"
 msgstr "Qytet"
 
 #: src/protocols/gg/gg.c:417
 msgid "Year of birth"
-msgstr ""
+msgstr "Viti i lindjes"
 
 #: src/protocols/gg/gg.c:426
-#, fuzzy
 msgid "Only online"
-msgstr "I lidhur"
-
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
+msgstr "Vetëm i lidhur"
+
+#: src/protocols/gg/gg.c:430
+#: src/protocols/gg/gg.c:431
 #: src/protocols/gg/gg.c:1510
-#, fuzzy
 msgid "Find buddies"
-msgstr "Zbeh shokë të _plogësht"
+msgstr "Gjej shokë"
 
 #: src/protocols/gg/gg.c:432
-#, fuzzy
 msgid "Please, enter your search criteria below"
-msgstr "Ju lutem jepni fjalëkalimin tuaj të ri"
+msgstr "Ju lutem jepni më poshtë kriterin tuaj të kërkimit"
 
 #: src/protocols/gg/gg.c:465
 msgid "Fill in the fields."
-msgstr ""
+msgstr "Plotësoni fushat."
 
 #: src/protocols/gg/gg.c:476
 msgid "Your current password is different from the one that you specified."
-msgstr ""
+msgstr "Fjalëkalimi juaj i çastit është i ndryshëm nga ai që keni treguar."
 
 #: src/protocols/gg/gg.c:491
-#, fuzzy
 msgid "Unable to change password. Error occured.\n"
-msgstr "I pazoti të ndryshoj fjalëkalim Gadu-Gadu"
+msgstr "I pazoti të ndryshoj fjalëkalimin. Ndodhi një gabim.\n"
 
 #: src/protocols/gg/gg.c:500
-#, fuzzy
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Ndrysho fjalëklim për %s"
+msgstr "Ndrysho fjalëklimin për llogari Gadu-Gadu"
 
 #: src/protocols/gg/gg.c:501
-#, fuzzy
 msgid "Password was changed successfully!"
-msgstr "Fjalëkalim i ndryshuar me sukses"
+msgstr "Fjalëkalimi u ndryshua me sukses!"
 
 #: src/protocols/gg/gg.c:535
-#, fuzzy
 msgid "Token Error"
-msgstr "Gabim i Panjohur "
+msgstr ""
 
 #: src/protocols/gg/gg.c:536
-#, fuzzy
 msgid "Unable to fetch the token.\n"
-msgstr "I pazoti të bie listë dhomash."
+msgstr ""
 
 #: src/protocols/gg/gg.c:551
-#, fuzzy
 msgid "Current password"
-msgstr "Fjalëkalim i pasaktë."
-
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
+msgstr "Fjalëkalim i çastit."
+
+#: src/protocols/gg/gg.c:555
+#: src/protocols/gg/gg.c:1476
+#: src/protocols/jabber/jabber.c:632
+#: src/protocols/jabber/jabber.c:1150
 msgid "Password"
 msgstr "Fjalëkalim"
 
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-#, fuzzy
+#: src/protocols/gg/gg.c:559
+#: src/protocols/gg/gg.c:1480
 msgid "Password (retype)"
-msgstr "Fjalëkalim u dërguar"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-#, fuzzy
+msgstr "Fjalëkalim (rishtypeni)"
+
+#: src/protocols/gg/gg.c:563
+#: src/protocols/gg/gg.c:1484
 msgid "Enter current token"
-msgstr "%s jo i futur për çastin."
+msgstr ""
 
 #. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-#, fuzzy
+#: src/protocols/gg/gg.c:568
+#: src/protocols/gg/gg.c:1489
 msgid "Current token"
-msgstr "Për çastin në"
+msgstr ""
 
 #: src/protocols/gg/gg.c:574
-#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr ""
-"Ju lutem jepni fjalëkalimin tuaj të çastit dhe fjalëkalimin tuaj të ri."
-
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
-#, fuzzy
+msgstr "Ju lutem jepni fjalëkalimin tuaj të çastit dhe fjalëkalimin tuaj të ri për UIN:"
+
+#: src/protocols/gg/gg.c:578
+#: src/protocols/gg/gg.c:579
 msgid "Change Gadu-Gadu Password"
-msgstr "I pazoti të ndryshoj fjalëkalim Gadu-Gadu"
+msgstr "Ndrysho fjalëkalim Gadu-Gadu"
 
 #: src/protocols/gg/gg.c:649
-#, fuzzy, c-format
+#, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Hiq fjalosjen prej listës suaj të shokëve"
-
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
-#, fuzzy
+msgstr "Përzgjidhni fjalosje për shokun: %s"
+
+#: src/protocols/gg/gg.c:651
+#: src/protocols/gg/gg.c:652
 msgid "Add to chat..."
-msgstr "Shto një F_jalosje"
+msgstr "Shto te fjalosje..."
 
 #: src/protocols/gg/gg.c:812
 msgid "Unable to read socket"
@@ -5226,132 +5079,114 @@
 
 #: src/protocols/gg/gg.c:959
 msgid "Gadu-Gadu Public Directory"
-msgstr ""
+msgstr "Drejtori Publike Gadu-Gadu"
 
 #: src/protocols/gg/gg.c:960
-#, fuzzy
 msgid "Search results"
-msgstr "Përfundime Kërkimi"
+msgstr "Përfundime kërkimi"
 
 #. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
 #. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
 #. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
+#: src/protocols/gg/gg.c:1087
+#: src/protocols/jabber/buddy.c:1089
+#: src/protocols/napster/napster.c:578
+#: src/protocols/oscar/oscar.c:713
+#: src/protocols/yahoo/yahoo.c:2639
+#: src/protocols/zephyr/zephyr.c:2252
 msgid "Online"
 msgstr "I lidhur"
 
 #. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
+#: src/protocols/gg/gg.c:1106
+#: src/protocols/msn/msn.c:585
+#: src/protocols/msn/state.c:31
+#: src/protocols/novell/novell.c:2828
+#: src/protocols/novell/novell.c:2962
+#: src/protocols/novell/novell.c:3044
+#: src/protocols/silc/buddy.c:1421
+#: src/protocols/silc/silc.c:54
+#: src/protocols/yahoo/yahoo.c:2617
+#: src/protocols/yahoo/yahoo.c:3233
 msgid "Busy"
 msgstr "I zënë"
 
 #  Block button
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+#: src/protocols/gg/gg.c:1111
+#: src/protocols/msn/msn.c:554
 msgid "Blocked"
 msgstr "Bllokuar"
 
 #: src/protocols/gg/gg.c:1129
-#, fuzzy
 msgid "Add to chat"
-msgstr "Shto Fjalosje"
+msgstr "Shto te fjalosje"
 
 #  Block button
 #: src/protocols/gg/gg.c:1133
-#, fuzzy
 msgid "Unblock"
-msgstr "Blloko"
+msgstr "Zhblloko"
 
 #: src/protocols/gg/gg.c:1149
-#, fuzzy
 msgid "Chat _name:"
-msgstr "Mbiemër:"
+msgstr "_Emër fjalosjeje:"
 
 #: src/protocols/gg/gg.c:1183
-#, fuzzy
 msgid "Connection failed."
 msgstr "Lidhja dështoi"
 
 #: src/protocols/gg/gg.c:1357
-#, fuzzy
 msgid "Chat error"
-msgstr "Gabim leximi"
+msgstr "Gabim fjalosjeje"
 
 #: src/protocols/gg/gg.c:1358
-#, fuzzy
 msgid "This chat name is already in use"
-msgstr "Ajo kartelë ekziston tashmë"
+msgstr "Ky emër fjalosjeje është tashmë në përdorim"
 
 #: src/protocols/gg/gg.c:1435
-#, fuzzy
 msgid "Not connected to the server."
-msgstr "Ishit shkëputur prej shërbyesit."
+msgstr "I palidhur te shërbyesi."
 
 #: src/protocols/gg/gg.c:1456
 msgid "Token Error: Unable to fetch the token.\n"
 msgstr ""
 
 #: src/protocols/gg/gg.c:1472
-#, fuzzy
 msgid "e-Mail"
 msgstr "E-Mail"
 
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-#, fuzzy
+#: src/protocols/gg/gg.c:1495
+#: src/protocols/gg/gg.c:1496
 msgid "Register New Gadu-Gadu Account"
-msgstr "Regjistro Llogari të Re Jabber"
+msgstr "Regjistro Llogari të Re Gadu-Gadu"
 
 #: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
-msgstr ""
+msgstr "Ju lutem, plotësoni fushat vijuese"
 
 #  if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1515
-#, fuzzy
 msgid "Change password"
-msgstr "Ndrysho Fjalëkalim"
+msgstr "Ndrysho fjalëkalim"
 
 #: src/protocols/gg/gg.c:1520
-#, fuzzy
 msgid "Upload buddylist to Server"
-msgstr "Eksporto Listë Shokësh te Shërbyesi"
+msgstr "Eksporto listë shokësh te Shërbyesi"
 
 #: src/protocols/gg/gg.c:1523
-#, fuzzy
 msgid "Download buddylist from Server"
-msgstr "Fshij Listë Shokësh prej Shërbyesi"
+msgstr "Shkarko listë shokësh prej Shërbyesi"
 
 #: src/protocols/gg/gg.c:1526
-#, fuzzy
 msgid "Delete buddylist from Server"
-msgstr "Fshij Listë Shokësh prej Shërbyesi"
+msgstr "Fshij listë shokësh prej Shërbyesi"
 
 #: src/protocols/gg/gg.c:1529
 msgid "Save buddylist to file"
-msgstr ""
+msgstr "Ruaj listë shokësh në kartelë"
 
 #: src/protocols/gg/gg.c:1532
-#, fuzzy
 msgid "Load buddylist from file"
-msgstr "Importo Listë Shokësh prej Shërbyesi"
+msgstr "Ngarko listë shokësh prej kartele"
 
 #  *< api_version
 #  *< type
@@ -5365,16 +5200,8 @@
 #  *  summary
 #  *  description
 #. magic
-#. major_version
-#. minor_version
-#. plugin type
 #. ui_requirement
-#. flags
-#. dependencies
-#. priority
 #. id
-#. name
-#. version
 #: src/protocols/gg/gg.c:1617
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Shtojcë Protokolli Gadu-Gadu"
@@ -5382,35 +5209,37 @@
 #. summary
 #: src/protocols/gg/gg.c:1618
 msgid "Polish popular IM"
-msgstr ""
+msgstr "IM popullor polak"
 
 #: src/protocols/gg/gg.c:1665
-#, fuzzy
 msgid "Gadu-Gadu User"
-msgstr "Motor Kërkimesh Gadu-Gadu"
-
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+msgstr "Përdorues Gadu-Gadu"
+
+#: src/protocols/irc/cmds.c:43
+#: src/protocols/silc/silc.c:1313
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Urdhër i panjohur: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
+#: src/protocols/irc/cmds.c:468
+#: src/protocols/jabber/chat.c:592
 #: src/protocols/silc/silc.c:1021
 #, c-format
 msgid "current topic is: %s"
 msgstr "tema e çastit është: %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
+#: src/protocols/irc/cmds.c:472
+#: src/protocols/jabber/chat.c:596
 #: src/protocols/silc/silc.c:1025
 msgid "No topic is set"
 msgstr "Nuk është caktuar temë"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
+#: src/protocols/irc/dcc_send.c:272
+#: src/protocols/yahoo/yahoo_filexfer.c:173
 #: src/protocols/yahoo/yahoo_filexfer.c:182
 #: src/protocols/yahoo/yahoo_filexfer.c:191
-#, fuzzy
 msgid "File Transfer Failed"
-msgstr "Shpërngulje kartelash e anuluar"
+msgstr "Shpërngulja e Kartelave Dështoi"
 
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
@@ -5433,7 +5262,8 @@
 msgid "MOTD for %s"
 msgstr "MOTD për %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
+#: src/protocols/irc/irc.c:103
+#: src/protocols/irc/irc.c:522
 #: src/protocols/irc/irc.c:544
 msgid "Server has disconnected"
 msgstr "Shërbyesi është shkëputur"
@@ -5442,11 +5272,13 @@
 msgid "View MOTD"
 msgstr "Shihni MOTD"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:200
+#: src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:206
+#: src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Fjalëkalim:"
 
@@ -5454,40 +5286,50 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Nofka IRC nuk duhet të përmbajnë hapësira"
 
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
+#: src/protocols/irc/irc.c:266
+#: src/protocols/jabber/jabber.c:433
 #: src/protocols/jabber/jabber.c:770
 msgid "SSL support unavailable"
 msgstr "Suport SSL jo i mundshëm"
 
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
+#: src/protocols/irc/irc.c:277
+#: src/protocols/simple/simple.c:383
 #: src/protocols/simple/simple.c:1219
 msgid "Couldn't create socket"
 msgstr "S'munda të krijoj \"socket\""
 
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+#: src/protocols/irc/irc.c:348
+#: src/protocols/jabber/jabber.c:306
+#: src/protocols/oscar/oscar.c:1744
+#: src/protocols/oscar/oscar.c:1812
 msgid "Couldn't connect to host"
 msgstr "S'munda të lidhem te strehë"
 
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: src/protocols/irc/irc.c:373
+#: src/protocols/jabber/jabber.c:333
 msgid "Connection Failed"
 msgstr "Lidhja Dështoi"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: src/protocols/irc/irc.c:376
+#: src/protocols/jabber/jabber.c:336
 msgid "SSL Handshake Failed"
 msgstr "Dështoi Duarshtrëngim SSL"
 
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: src/protocols/irc/irc.c:519
+#: src/protocols/irc/irc.c:541
 msgid "Read error"
 msgstr "Gabim leximi"
 
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
+#: src/protocols/irc/irc.c:690
+#: src/protocols/silc/chat.c:1388
 #: src/protocols/yahoo/yahoochat.c:1376
 msgid "Users"
 msgstr "Përdoruesa"
 
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: src/protocols/irc/irc.c:693
+#: src/protocols/silc/chat.c:1391
+#: src/protocols/silc/ops.c:1166
+#: src/protocols/yahoo/yahoochat.c:1385
 msgid "Topic"
 msgstr "Temë"
 
@@ -5501,13 +5343,7 @@
 #  *< name
 #  *< version
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #: src/protocols/irc/irc.c:799
 msgid "IRC Protocol Plugin"
 msgstr "Shtojcë Protokolli IRC"
@@ -5518,9 +5354,12 @@
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Shtojca e Protokollit IRC e cila Është më pak e Bezdishme"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
+#: src/protocols/irc/irc.c:819
+#: src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:1708
+#: src/protocols/napster/napster.c:707
+#: src/protocols/simple/simple.c:1428
+#: src/protocols/silc/ops.c:1028
 #: src/protocols/silc/ops.c:1130
 msgid "Server"
 msgstr "Shërbyes"
@@ -5529,10 +5368,14 @@
 msgid "Encodings"
 msgstr "Kodime"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: src/protocols/irc/irc.c:828
+#: src/protocols/irc/msgs.c:227
+#: src/protocols/jabber/jabber.c:628
+#: src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:977
+#: src/protocols/silc/ops.c:1124
+#: src/protocols/silc/ops.c:1126
 msgid "Username"
 msgstr "Emër përdoruesi"
 
@@ -5547,14 +5390,10 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#.
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
-#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-#.
 #: src/protocols/irc/irc.c:839
-#, fuzzy
 msgid "Use SSL"
-msgstr "SSL"
+msgstr "Përdor SSL"
 
 #: src/protocols/irc/msgs.c:105
 msgid "Bad mode"
@@ -5574,13 +5413,15 @@
 msgid "Cannot ban %s: banlist is full"
 msgstr "Nuk mund të ndaloj %s: lista e ndalimeve është plot"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:213
+#: src/protocols/irc/msgs.c:233
 #: src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5952
+#: src/protocols/irc/msgs.c:213
+#: src/protocols/oscar/oscar.c:5952
 #: src/protocols/silc/ops.c:1198
 msgid "Nick"
 msgstr "Nofkë"
@@ -5593,19 +5434,24 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifikuar)</i>"
 
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
+#: src/protocols/irc/msgs.c:221
+#: src/protocols/irc/msgs.c:227
+#: src/protocols/irc/msgs.c:228
+#: src/protocols/irc/msgs.c:239
 #: src/protocols/yahoo/yahoo_profile.c:660
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:228
+#: src/protocols/silc/ops.c:969
+#: src/protocols/silc/ops.c:1118
+#: src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Emër i vërtetë"
 
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:239
+#: src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "Për çastin në"
 
@@ -5705,12 +5551,8 @@
 msgstr "mënyrë (%s %s) prej %s"
 
 #: src/protocols/irc/msgs.c:805
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Emri i llogarisë përzgjedhur prej jush u hodh tej nga shërbyesi. Ka të "
-"ngjarë përmban shenja të pavlefshme."
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgstr "Emri i llogarisë përzgjedhur prej jush u hodh tej nga shërbyesi. Ka të ngjarë përmban shenja të pavlefshme."
 
 #: src/protocols/irc/msgs.c:844
 msgid "Cannot change nick"
@@ -5739,14 +5581,14 @@
 msgid "Cannot join %s:"
 msgstr "S'bashkohem dot me %s:"
 
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:985
+#: src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "S'bashkohem dot me kanal"
 
 #: src/protocols/irc/msgs.c:1019
-#, fuzzy
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Shërbimi është përkohësisht i pamundshëm."
+msgstr "Nofka ose kanali është përkohësisht i pamundshëm."
 
 #: src/protocols/irc/msgs.c:1031
 #, c-format
@@ -5758,157 +5600,89 @@
 msgstr "veprim &lt;veprim për t'u kryer&gt;:  Kryej një veprim."
 
 #: src/protocols/irc/parse.c:115
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"away [mesazh]:  Cakton mesazh largimi, ose nuk fare përdor gjatë kthimit "
-"prej largimesh."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "away [mesazh]:  Cakton mesazh largimi, ose nuk fare përdor gjatë kthimit prej largimesh."
 
 #: src/protocols/irc/parse.c:116
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;nofkë1&gt; [nofkë2] ...:  Hiqi dikujt gjendje operatori kanali. "
-"Duhet të jeni operator kanali pët të bërë këtë."
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;nofkë1&gt; [nofkë2] ...:  Hiqi dikujt gjendje operatori kanali. Duhet të jeni operator kanali pët të bërë këtë."
 
 #: src/protocols/irc/parse.c:117
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;nofkë1&gt; [nofkë2] ...:  Hiqi dikujt gjendjen i zëshëm, duke "
-"mos e lënë të flasë nëse kanali është i moderuar (+m). Duhet të jeni "
-"operator kanali për të bërë këtë."
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;nofkë1&gt; [nofkë2] ...:  Hiqi dikujt gjendjen i zëshëm, duke mos e lënë të flasë nëse kanali është i moderuar (+m). Duhet të jeni operator kanali për të bërë këtë."
 
 #: src/protocols/irc/parse.c:118
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;nofkë&gt; [dhomë]:  Ftoni dikë të bashkohet me ju te kanali i "
-"treguar, ose te kanali i çastit."
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;nofkë&gt; [dhomë]:  Ftoni dikë të bashkohet me ju te kanali i treguar, ose te kanali i çastit."
 
 #: src/protocols/irc/parse.c:119
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;dhomë1&gt;[,dhomë2][,...] [kyç1[,kyç2][,...]]:  Futuni në një ose më "
-"shumë kanale, mbase edhe duke dhënë një kyç kanali për secilin nëse "
-"nevojitet."
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;dhomë1&gt;[,dhomë2][,...] [kyç1[,kyç2][,...]]:  Futuni në një ose më shumë kanale, mbase edhe duke dhënë një kyç kanali për secilin nëse nevojitet."
 
 #: src/protocols/irc/parse.c:120
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;dhomë1&gt;[,dhomë2][,...] [kyç1[,kyç2][,...]]:  Futuni në një ose "
-"më shumë kanale, mbase edhe duke dhënë një kyç kanali për secilin nëse "
-"nevojitet"
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;dhomë1&gt;[,dhomë2][,...] [kyç1[,kyç2][,...]]:  Futuni në një ose më shumë kanale, mbase edhe duke dhënë një kyç kanali për secilin nëse nevojitet"
 
 #: src/protocols/irc/parse.c:121
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;nofkë&gt; [mesazh]:  Hiqni dikë prej një kanali. Duhet të jeni "
-"operator kanali për të bërë këtë."
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;nofkë&gt; [mesazh]:  Hiqni dikë prej një kanali. Duhet të jeni operator kanali për të bërë këtë."
 
 #: src/protocols/irc/parse.c:122
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list:  Shfaq një listë dhomash fjalosjeje të rrjetit. <i>Kujdes, disa "
-"shërbyes mund t'ju shkëpusin nëse kryeni këtë.</i>"
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list:  Shfaq një listë dhomash fjalosjeje të rrjetit. <i>Kujdes, disa shërbyes mund t'ju shkëpusin nëse kryeni këtë.</i>"
 
 #: src/protocols/irc/parse.c:123
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;veprim për t'u kryer&gt;:  Kryej një veprim."
 
 #: src/protocols/irc/parse.c:124
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Vër ose hiq mënyrë për "
-"kanal ose përdorues."
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Vër ose hiq mënyrë për kanal ose përdorues."
 
 #: src/protocols/irc/parse.c:125
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;nofkë&gt; &lt;mesazh&gt;:  Dërgoji një përdoruesi një mesazh vetjak "
-"(jo një kanali)."
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;nofkë&gt; &lt;mesazh&gt;:  Dërgoji një përdoruesi një mesazh vetjak (jo një kanali)."
 
 #: src/protocols/irc/parse.c:126
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Listo përdoruesit e çastit në një kanal."
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
+#: src/protocols/irc/parse.c:127
+#: src/protocols/jabber/jabber.c:1555
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nofkë e re&gt;:  Ndryshoni nofkën tuaj."
 
 #: src/protocols/irc/parse.c:128
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;nofkë1&gt; [nofkë2] ...:  Jepi dikujt gjendje operatori kanali. Duhet "
-"të jeni operator kanali për të bërë këtë."
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;nofkë1&gt; [nofkë2] ...:  Jepi dikujt gjendje operatori kanali. Duhet të jeni operator kanali për të bërë këtë."
 
 #: src/protocols/irc/parse.c:129
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;mesazh&gt;:  Nëse nuk e njihni këtë, ka gjasa të mos arrini ta "
-"përdorni."
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;mesazh&gt;:  Nëse nuk e njihni këtë, ka gjasa të mos arrini ta përdorni."
 
 #: src/protocols/irc/parse.c:130
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [dhomë] [mesazh]:  Lër kanalin e çastit, ose një kanal të treguar, me "
-"një mesazh të mundshëm."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [dhomë] [mesazh]:  Lër kanalin e çastit, ose një kanal të treguar, me një mesazh të mundshëm."
 
 #: src/protocols/irc/parse.c:131
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [nofkë]:  Kontrollon se sa vonesë ka një përdorues (ose shërbyesi, nëse "
-"nuk jepet përdorues)."
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [nofkë]:  Kontrollon se sa vonesë ka një përdorues (ose shërbyesi, nëse nuk jepet përdorues)."
 
 #: src/protocols/irc/parse.c:132
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;nofkë&gt; &lt;mesazh&gt;:  Dërgoji një përdoruesi një mesazh "
-"vetjak (jo një kanali)."
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;nofkë&gt; &lt;mesazh&gt;:  Dërgoji një përdoruesi një mesazh vetjak (jo një kanali)."
 
 #: src/protocols/irc/parse.c:133
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
-"quit [mesazh]:  Shkëputu prej një shërbyesi, me një mesazh të mundshëm."
+msgstr "quit [mesazh]:  Shkëputu prej një shërbyesi, me një mesazh të mundshëm."
 
 #: src/protocols/irc/parse.c:134
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Dërgo një urdhër të papërpunuar te shërbyesi."
 
 #: src/protocols/irc/parse.c:135
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;nofkë&gt; [mesazh]:  Hiq dikë prej një dhome. Duhet të jeni "
-"operator kanali për të bërë këtë."
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;nofkë&gt; [mesazh]:  Hiq dikë prej një dhome. Duhet të jeni operator kanali për të bërë këtë."
 
 #: src/protocols/irc/parse.c:136
 msgid "time: Displays the current local time at the IRC server."
@@ -5923,19 +5697,12 @@
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Vër ose hiq mënyrë përdoruesi."
 
 #: src/protocols/irc/parse.c:139
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;nofkë1&gt; [nofkë2] ...:  Dhuro gjendje kanali të zëshme për dikë. "
-"Duhet të jeni operator kanali për të bërë këtë."
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;nofkë1&gt; [nofkë2] ...:  Dhuro gjendje kanali të zëshme për dikë. Duhet të jeni operator kanali për të bërë këtë."
 
 #: src/protocols/irc/parse.c:140
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;mesazh&gt;:  Nëse nuk dini ç'është kjo, mbase nuk e përdorni dot."
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;mesazh&gt;:  Nëse nuk dini ç'është kjo, mbase nuk e përdorni dot."
 
 #: src/protocols/irc/parse.c:141
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -5954,20 +5721,19 @@
 msgid "CTCP PING reply"
 msgstr "Përgjigje CTCP PING"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
+#: src/protocols/irc/parse.c:526
+#: src/protocols/irc/parse.c:530
+#: src/protocols/oscar/oscar.c:1653
+#: src/protocols/toc/toc.c:190
+#: src/protocols/toc/toc.c:688
+#: src/protocols/toc/toc.c:704
 #: src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "I shkëputur."
 
 #: src/protocols/jabber/auth.c:51
-msgid ""
-"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-"account properties"
-msgstr ""
-"Shërbyesi lyp TLS/SSL për hyrje.  Përzgjidhni \"Përdor TLS nëse gjendet\" te "
-"veti llogarie"
+msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
+msgstr "Shërbyesi lyp TLS/SSL për hyrje.  Përzgjidhni \"Përdor TLS nëse gjendet\" te veti llogarie"
 
 #: src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
@@ -5975,30 +5741,31 @@
 
 #: src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-"karshi një rrjedhe të pakoduar shërbyesi lyp mirëfilltësim me bazë tekst të "
-"thjeshtë"
-
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
+msgstr "karshi një rrjedhe të pakoduar shërbyesi lyp mirëfilltësim me bazë tekst të thjeshtë"
+
+#: src/protocols/jabber/auth.c:133
+#: src/protocols/jabber/auth.c:207
+#: src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:473
+#: src/protocols/jabber/auth.c:485
+#: src/protocols/jabber/jabber.c:110
 msgid "Invalid response from server."
 msgstr "Përgjigje e pavlefshme prej shërbyesit."
 
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: src/protocols/jabber/auth.c:163
+#: src/protocols/jabber/auth.c:164
+#: src/protocols/jabber/auth.c:244
+#: src/protocols/jabber/auth.c:245
 msgid "Plaintext Authentication"
 msgstr "Mirëfilltësim me bazë Tekst të Thjeshtë"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"Ky shërbyes lyp mirëfilltësim në trajtë teksti të thjeshtë përmes një "
-"lidhjeje të pakoduar. Ta lejoj këtë dhe të vazhdoj me mirëfilltësimin? "
-
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: src/protocols/jabber/auth.c:165
+#: src/protocols/jabber/auth.c:246
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "Ky shërbyes lyp mirëfilltësim në trajtë teksti të thjeshtë përmes një lidhjeje të pakoduar. Ta lejoj këtë dhe të vazhdoj me mirëfilltësimin? "
+
+#: src/protocols/jabber/auth.c:173
+#: src/protocols/jabber/auth.c:254
 msgid "Server does not use any supported authentication method"
 msgstr "Shërbyesi nuk përdor ndonjë metodë mirëfilltësimi që mbulohet"
 
@@ -6006,98 +5773,114 @@
 msgid "Invalid challenge from server"
 msgstr "Sfidë e pavlefshme prej shërbyesit."
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:249
+#: src/protocols/jabber/buddy.c:667
 #: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "Emër i Plotë"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:250
+#: src/protocols/jabber/buddy.c:680
 #: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "Emër i Familjes"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
+#: src/protocols/jabber/buddy.c:251
+#: src/protocols/jabber/buddy.c:684
 msgid "Given Name"
 msgstr "Emër Tjetër"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: src/protocols/jabber/buddy.c:253
+#: src/protocols/jabber/jabber.c:688
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+#: src/protocols/jabber/buddy.c:254
+#: src/protocols/jabber/buddy.c:726
 msgid "Street Address"
 msgstr "Vendndodhje Rruge"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:255
+#: src/protocols/jabber/buddy.c:722
 msgid "Extended Address"
 msgstr "Vendndodhje e Zgjeruar"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
+#: src/protocols/jabber/buddy.c:256
+#: src/protocols/jabber/buddy.c:730
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
+#: src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/buddy.c:734
 msgid "Region"
 msgstr "Rajon"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/buddy.c:258
+#: src/protocols/jabber/buddy.c:738
 #: src/protocols/jabber/jabber.c:678
 msgid "Postal Code"
 msgstr "Kod Postal"
 
 #  Country
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: src/protocols/jabber/buddy.c:259
+#: src/protocols/jabber/buddy.c:743
 msgid "Country"
 msgstr "Vend"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
+#: src/protocols/jabber/buddy.c:260
+#: src/protocols/jabber/buddy.c:754
 #: src/protocols/jabber/buddy.c:761
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
+#: src/protocols/jabber/buddy.c:262
+#: src/protocols/jabber/buddy.c:795
 msgid "Organization Name"
 msgstr "Emër Organizmi"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
+#: src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:799
 msgid "Organization Unit"
 msgstr "Njësi Organizative"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
+#: src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:808
 msgid "Role"
 msgstr "Rol"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
+#: src/protocols/jabber/buddy.c:266
+#: src/protocols/jabber/buddy.c:701
 #: src/protocols/oscar/oscar.c:5987
 msgid "Birthday"
 msgstr "Ditëlindje"
 
-#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
+#: src/protocols/jabber/buddy.c:567
+#: src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "Përpuno vCard për Jabber"
 
 #: src/protocols/jabber/buddy.c:569
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
-msgstr ""
-"Tërë elementët më poshtë janë si mundësi. Jepni vetëm të dhënat të cilat "
-"mendoni se nuk ju prishin punë. "
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgstr "Tërë elementët më poshtë janë si mundësi. Jepni vetëm të dhënat të cilat mendoni se nuk ju prishin punë. "
 
 #: src/protocols/jabber/buddy.c:616
 msgid "Jabber ID"
 msgstr "ID Jabber"
 
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+#: src/protocols/jabber/buddy.c:642
+#: src/protocols/jabber/jabber.c:1711
 msgid "Resource"
 msgstr "Burime"
 
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:688
+#: src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "Emër i Mesit"
 
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
+#: src/protocols/jabber/buddy.c:706
+#: src/protocols/jabber/jabber.c:663
+#: src/protocols/oscar/oscar.c:6005
+#: src/protocols/oscar/oscar.c:6013
 #: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "Vendndodhje"
@@ -6136,49 +5919,56 @@
 #  shouldn't this just happen automatically when the buddy is
 #  removed?
 #. if(NOT ME)
-#. shouldn't this just happen automatically when the buddy is
-#. removed?
 #: src/protocols/jabber/buddy.c:1059
 msgid "Unsubscribe"
 msgstr "Çregjistrohu"
 
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
+#: src/protocols/jabber/buddy.c:1085
+#: src/protocols/jabber/chat.c:677
+#: src/protocols/jabber/chat.c:688
+#: src/protocols/jabber/jabber.c:1018
 #: src/protocols/silc/ops.c:1235
 msgid "Error"
 msgstr "Gabim"
 
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/buddy.c:1091
+#: src/protocols/jabber/jabber.c:1047
 msgid "Chatty"
 msgstr "Muhabetçi"
 
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
+#: src/protocols/jabber/buddy.c:1095
+#: src/protocols/jabber/jabber.c:1063
 #: src/status.c:159
 msgid "Extended Away"
 msgstr "Larguar e Zgjeruar"
 
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
+#: src/protocols/jabber/buddy.c:1097
+#: src/protocols/jabber/jabber.c:1071
+#: src/protocols/oscar/oscar.c:701
+#: src/protocols/oscar/oscar.c:7791
 #: src/protocols/sametime/sametime.c:2770
 msgid "Do Not Disturb"
 msgstr "Mos Bezdis"
 
 #: src/protocols/jabber/buddy.c:1235
 msgid "The following are the results of your search"
-msgstr ""
+msgstr "Çka vijon është përfundimi i kërkimit tuaj"
 
 #: src/protocols/jabber/buddy.c:1327
 msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
+msgstr "Plotësoni një ose më tepër fusha për kërkim të cilitdo përdorues Jabber që ka përputhje."
 
 #  First Name
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
+#: src/protocols/jabber/buddy.c:1331
+#: src/protocols/jabber/jabber.c:653
+#: src/protocols/oscar/oscar.c:5962
+#: src/protocols/silc/ops.c:810
 msgid "First Name"
 msgstr "Emër"
 
 #  Last Name
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/buddy.c:1336
+#: src/protocols/jabber/jabber.c:658
 #: src/protocols/oscar/oscar.c:5963
 msgid "Last Name"
 msgstr "Mbiemër"
@@ -6188,32 +5978,29 @@
 msgid "E-Mail Address"
 msgstr "Vendndodhje E-Mail"
 
-#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-#, fuzzy
+#: src/protocols/jabber/buddy.c:1355
+#: src/protocols/jabber/buddy.c:1356
 msgid "Search for Jabber users"
-msgstr "Kërko një shok me vendndodhje e-mail"
+msgstr "Kërko për përdoruesas Jabber"
 
 #: src/protocols/jabber/buddy.c:1370
-#, fuzzy
 msgid "Invalid Directory"
-msgstr "Gabim i pavlefshëm"
+msgstr "Drejtori e Pavlefshme"
 
 #: src/protocols/jabber/buddy.c:1387
-#, fuzzy
 msgid "Enter a User Directory"
-msgstr "Nuk mund të dërgoj një drejtori."
+msgstr "Jepni Drejtori Përdoruesi"
 
 #: src/protocols/jabber/buddy.c:1388
-#, fuzzy
 msgid "Select a user directory to search"
-msgstr "Përzgjidhni një shërbyes konferencash për kërkesë"
+msgstr "Përzgjidhni drejtori përdoruesi për kërkim"
 
 #: src/protocols/jabber/buddy.c:1391
-#, fuzzy
 msgid "Search Directory"
-msgstr "_Kërko për:"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
+msgstr "Drejtori Kërkimi:"
+
+#: src/protocols/jabber/chat.c:41
+#: src/protocols/oscar/oscar.c:7318
 #: src/protocols/yahoo/yahoochat.c:979
 msgid "_Room:"
 msgstr "_Dhomë:"
@@ -6240,7 +6027,8 @@
 msgid "%s is not a valid server name"
 msgstr "%s nuk është emër i vlefshëm shërbyesi"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:230
+#: src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Emër i Pavlefshëm Shërbyesi"
 
@@ -6249,7 +6037,8 @@
 msgid "%s is not a valid room handle"
 msgstr "%s nuk është një nofkë e vlefshme dhome"
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: src/protocols/jabber/chat.c:236
+#: src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Nofkë e Pavlefshme Dhome"
 
@@ -6257,7 +6046,8 @@
 msgid "Configuration error"
 msgstr "Gabim formësimi"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: src/protocols/jabber/chat.c:404
+#: src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "I pazoti të formësoj"
 
@@ -6269,7 +6059,8 @@
 msgid "This room is not capable of being configured"
 msgstr "Kjo dhomë nuk është e aftë të formësohet"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: src/protocols/jabber/chat.c:471
+#: src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Gabim regjistrimi"
 
@@ -6277,9 +6068,9 @@
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Ndryshim nofke jo i mbuluar në dhoma fjalosjeje jo-MUC"
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
+#: src/protocols/jabber/chat.c:678
+#: src/protocols/jabber/chat.c:689
 #: src/protocols/silc/ops.c:1235
-#, fuzzy
 msgid "Error retrieving room list"
 msgstr "Gabim në marrje liste dhome"
 
@@ -6307,15 +6098,18 @@
 msgid "Write error"
 msgstr "Gabim shkrimi"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: src/protocols/jabber/jabber.c:253
+#: src/protocols/jabber/jabber.c:273
 msgid "Read Error"
 msgstr "Gabim Leximi"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: src/protocols/jabber/jabber.c:359
+#: src/protocols/jabber/jabber.c:780
 msgid "Unable to create socket"
 msgstr "I pazoti të krijoj \"socket\""
 
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+#: src/protocols/jabber/jabber.c:403
+#: src/protocols/jabber/jabber.c:740
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber i pavlefshëm"
 
@@ -6324,19 +6118,23 @@
 msgid "Registration of %s@%s successful"
 msgstr "Regjistrim i %s@%s i suksesshëm"
 
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: src/protocols/jabber/jabber.c:475
+#: src/protocols/jabber/jabber.c:476
 msgid "Registration Successful"
 msgstr "Regjistrim i Sukseshëm"
 
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: src/protocols/jabber/jabber.c:482
+#: src/protocols/jabber/jabber.c:1299
 msgid "Unknown Error"
 msgstr "Gabim i Panjohur "
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: src/protocols/jabber/jabber.c:484
+#: src/protocols/jabber/jabber.c:485
 msgid "Registration Failed"
 msgstr "Dështoi Regjistrimi"
 
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: src/protocols/jabber/jabber.c:596
+#: src/protocols/jabber/jabber.c:597
 msgid "Already Registered"
 msgstr "Tashmë i Regjistruar"
 
@@ -6345,13 +6143,16 @@
 msgstr "E-Mail"
 
 #  State
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
+#: src/protocols/jabber/jabber.c:673
+#: src/protocols/oscar/oscar.c:6007
 #: src/protocols/oscar/oscar.c:6015
 msgid "State"
 msgstr "Shtet"
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:683
+#: src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:663
+#: src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Telefon"
 
@@ -6361,11 +6162,10 @@
 
 #: src/protocols/jabber/jabber.c:701
 msgid "Please fill out the information below to register your new account."
-msgstr ""
-"Për të regjistruar llogarinë tuaj të re, ju lutem plotësoni të dhënat më "
-"poshtë. "
-
-#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
+msgstr "Për të regjistruar llogarinë tuaj të re, ju lutem plotësoni të dhënat më poshtë. "
+
+#: src/protocols/jabber/jabber.c:704
+#: src/protocols/jabber/jabber.c:705
 msgid "Register New Jabber Account"
 msgstr "Regjistro Llogari të Re Jabber"
 
@@ -6373,7 +6173,8 @@
 msgid "Initializing Stream"
 msgstr "Po gatis Rrjedhë"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:848
+#: src/protocols/msn/session.c:368
 msgid "Authenticating"
 msgstr "po mirëfilltësoj"
 
@@ -6381,9 +6182,12 @@
 msgid "Re-initializing Stream"
 msgstr "Po rigatis Rrjedhë"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: src/protocols/jabber/jabber.c:928
+#: src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1318
+#: src/protocols/jabber/jabber.c:1351
+#: src/protocols/oscar/oscar.c:767
+#: src/protocols/oscar/oscar.c:7589
 msgid "Not Authorized"
 msgstr "I pa Autorizuar"
 
@@ -6407,7 +6211,8 @@
 msgid "None (To pending)"
 msgstr "Askujt (Në pritje)"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
+#: src/protocols/jabber/jabber.c:982
+#: src/protocols/yahoo/yahoo.c:2780
 msgid "None"
 msgstr "Asnjë"
 
@@ -6415,12 +6220,13 @@
 msgid "Subscription"
 msgstr "Regjistrim"
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
+#: src/protocols/jabber/jabber.c:1039
+#: src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/jabber.c:1055
+#: src/protocols/jabber/jabber.c:1063
 #: src/protocols/jabber/jabber.c:1071
-#, fuzzy
 msgid "Priority"
-msgstr "Portë"
+msgstr "Përparësi"
 
 #: src/protocols/jabber/jabber.c:1093
 msgid "Password Changed"
@@ -6430,7 +6236,8 @@
 msgid "Your password has been changed."
 msgstr "Fjalëkalimi juaj është ndryshuar."
 
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: src/protocols/jabber/jabber.c:1098
+#: src/protocols/jabber/jabber.c:1099
 msgid "Error changing password"
 msgstr "Gabim në ndryshim fjalëkalimi "
 
@@ -6438,7 +6245,8 @@
 msgid "Password (again)"
 msgstr "Fjalëkalim (sërish)"
 
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1161
 msgid "Change Jabber Password"
 msgstr "Ndrysho Fjalëkalim Jabber-i"
 
@@ -6446,21 +6254,22 @@
 msgid "Please enter your new password"
 msgstr "Ju lutem jepni fjalëkalimin tuaj të ri"
 
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
+#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Rregulloni Të dhëna Përdoruesi"
 
 #  if (js->protocol_options & CHANGE_PASSWORD) {
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
+#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/toc/toc.c:1694
 msgid "Change Password"
 msgstr "Ndrysho Fjalëkalim"
 
 #. }
 #: src/protocols/jabber/jabber.c:1181
-#, fuzzy
 msgid "Search for users"
-msgstr "_Kërko për:"
+msgstr "Kërko për përdorues"
 
 #: src/protocols/jabber/jabber.c:1257
 msgid "Bad Request"
@@ -6482,7 +6291,8 @@
 msgid "Gone"
 msgstr "Ikur"
 
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+#: src/protocols/jabber/jabber.c:1267
+#: src/protocols/jabber/jabber.c:1341
 msgid "Internal Server Error"
 msgstr "Gabim i Brendshëm Shërbyesi"
 
@@ -6578,7 +6388,8 @@
 msgid "Resource Conflict"
 msgstr "Kundërshti Burimesh"
 
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+#: src/protocols/jabber/jabber.c:1333
+#: src/protocols/silc/ops.c:1514
 msgid "Connection Timeout"
 msgstr "Skadim Lidhjeje"
 
@@ -6664,14 +6475,14 @@
 msgstr "I pazoti të ndaloj përdoruesin %s"
 
 #: src/protocols/jabber/jabber.c:1464
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Urdhër i panjohur: %s"
+msgstr "Degëzim i panjohur: \"%s\""
 
 #: src/protocols/jabber/jabber.c:1469
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "I pazoti të ftoj përdorues (%s)"
+msgstr "I pazoti të degëzoj përdoruesin %s si \"%s\""
 
 #: src/protocols/jabber/jabber.c:1521
 #, c-format
@@ -6703,31 +6514,24 @@
 msgstr "ban &lt;përdorues&gt; [dhomë]:  Ndaloji një përdoruesi dhomën."
 
 #: src/protocols/jabber/jabber.c:1583
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+msgstr "degëzon &lt;përdorues&gt; &lt;zotërues|admin|anëtar|outcast|asnjë&gt;: Vendos lidhjen e përdoruesit me dhomën."
 
 #: src/protocols/jabber/jabber.c:1589
-#, fuzzy
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;përdorues&gt; [dhomë]:  Fto një përdorues te dhoma"
+msgstr "invite &lt;përdorues&gt; [mesazh]:  Fto një përdorues te dhoma."
 
 #: src/protocols/jabber/jabber.c:1595
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
-"join: &lt;dhomë&gt; [shërbyes]:  Bashkoju një fjalosjeje në këtë shërbyes."
+msgstr "join: &lt;dhomë&gt; [shërbyes]:  Bashkoju një fjalosjeje në këtë shërbyes."
 
 #: src/protocols/jabber/jabber.c:1601
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;përdorues&gt; [dhomë]:  Përzër një përdorues prej dhomës."
 
 #: src/protocols/jabber/jabber.c:1606
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr ""
-"msg &lt;përdorues&gt; &lt;mesazh&gt;:  Dërgo një mesazh vetjak një "
-"përdoruesi tjetër."
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;përdorues&gt; &lt;mesazh&gt;:  Dërgo një mesazh vetjak një përdoruesi tjetër."
 
 #  *< api_version
 #  *< type
@@ -6741,16 +6545,10 @@
 #  *  summary
 #  *  description
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #. *  summary
-#. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: src/protocols/jabber/jabber.c:1686
+#: src/protocols/jabber/jabber.c:1688
 msgid "Jabber Protocol Plugin"
 msgstr "Protokoll Shtojce Jabber"
 
@@ -6760,25 +6558,24 @@
 
 #: src/protocols/jabber/jabber.c:1719
 msgid "Require TLS"
-msgstr ""
+msgstr "Lyp LTS"
 
 #: src/protocols/jabber/jabber.c:1722
-#, fuzzy
 msgid "Force old (port 5223) SSL"
-msgstr "Detyro SSL të vjetër"
+msgstr "Detyro SSL të vjetër (porta 5223)"
 
 #: src/protocols/jabber/jabber.c:1727
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Lejo autorizim në formë teksti të thjeshtë në rrjedha të pakoduara"
 
 #: src/protocols/jabber/jabber.c:1732
-#, fuzzy
 msgid "Connect port"
-msgstr "Lidhu"
+msgstr "Portë lidhjeje"
 
 #  Account options
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: src/protocols/jabber/jabber.c:1736
+#: src/protocols/silc/silc.c:1593
 msgid "Connect server"
 msgstr "Lidhu me shërbyes"
 
@@ -6819,34 +6616,36 @@
 msgid "Unknown Error in presence"
 msgstr "Gabim i Panjohur te prania"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#: src/protocols/jabber/presence.c:289
+#: src/protocols/msn/userlist.c:93
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Përdoruesi %s don të shtojë %s te listë e tij shokësh"
 
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
+#: src/protocols/jabber/presence.c:297
+#: src/protocols/msn/userlist.c:100
+#: src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:7248
 #: src/protocols/yahoo/yahoo.c:895
 msgid "Authorize"
 msgstr "Autorizo"
 
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
+#: src/protocols/jabber/presence.c:298
+#: src/protocols/msn/userlist.c:101
+#: src/protocols/oscar/oscar.c:4604
+#: src/protocols/oscar/oscar.c:7249
 #: src/protocols/yahoo/yahoo.c:897
 msgid "Deny"
 msgstr "Moho"
 
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: src/protocols/jabber/presence.c:345
+#: src/protocols/jabber/presence.c:346
 msgid "Create New Room"
 msgstr "Krijo Dhomë të Re"
 
 #: src/protocols/jabber/presence.c:347
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"Po krijoni një dhomë të re.  Do të donit ta formësoni, apo pranoni "
-"rregullimet parazgjedhje?"
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "Po krijoni një dhomë të re.  Do të donit ta formësoni, apo pranoni rregullimet parazgjedhje?"
 
 #: src/protocols/jabber/presence.c:349
 msgid "Configure Room"
@@ -6869,10 +6668,10 @@
 #: src/protocols/jabber/si.c:591
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-"I pazoti të dërgoj kartelë te %s, përdoruesi nuk mbulon shpërngulje kartelash"
-
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+msgstr "I pazoti të dërgoj kartelë te %s, përdoruesi nuk mbulon shpërngulje kartelash"
+
+#: src/protocols/jabber/si.c:592
+#: src/protocols/jabber/si.c:593
 msgid "File Send Failed"
 msgstr "Dështoi Dërgimi i Kartelës  "
 
@@ -6883,21 +6682,13 @@
 
 #: src/protocols/msn/dialog.c:97
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s i listës vendore është brenda grupit \"%s\" por jo në listën e "
-"shërbyesit. Doni të shtohet ky shok?"
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s i listës vendore është brenda grupit \"%s\" por jo në listën e shërbyesit. Doni të shtohet ky shok?"
 
 #: src/protocols/msn/dialog.c:105
 #, 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 është në listën vendore por jo në listën e shërbyesit. Doni të shtohet ky "
-"shok?"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "%s është në listën vendore por jo në listën e shërbyesit. Doni të shtohet ky shok?"
 
 #: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -6943,7 +6734,8 @@
 msgid "Not on list"
 msgstr "Jo në listë"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: src/protocols/msn/error.c:70
+#: src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "Përdoruesi është i palidhur"
 
@@ -6995,7 +6787,8 @@
 msgid "Too many hits to a FND"
 msgstr "Shumë goditjeje te në FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+#: src/protocols/msn/error.c:112
+#: src/protocols/oscar/oscar.c:206
 msgid "Not logged in"
 msgstr "Jo i futur."
 
@@ -7027,7 +6820,8 @@
 msgid "Server busy"
 msgstr "Shërbyes i zënë"
 
-#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:138
+#: src/protocols/msn/error.c:151
 #: src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Shërbyes i pavlefshëm"
@@ -7088,8 +6882,10 @@
 msgid "Server too busy"
 msgstr "Shërbyesi shumë i zënë"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198
+#: src/protocols/oscar/oscar.c:2756
+#: src/protocols/silc/ops.c:1503
+#: src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Dështoi mirëflltësimi"
 
@@ -7156,12 +6952,8 @@
 msgstr "Të lejoj faqe MSN Mobile?"
 
 #: src/protocols/msn/msn.c:307
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"Doni të lejoj ose jo persona në listën tuaj t'ju dërgojnë faqe MSN Mobile në "
-"celularin tuaj ose të tjera pajisje të ngjashme?"
+msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
+msgstr "Doni të lejoj ose jo persona në listën tuaj t'ju dërgojnë faqe MSN Mobile në celularin tuaj ose të tjera pajisje të ngjashme?"
 
 #: src/protocols/msn/msn.c:311
 msgid "Allow"
@@ -7173,7 +6965,7 @@
 
 #: src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
-msgstr ""
+msgstr "Kjo llogari Hotmail mund të mos jetë vepruese."
 
 #: src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
@@ -7183,8 +6975,10 @@
 msgid "Page"
 msgstr "Faqe"
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/msn/msn.c:544
+#: src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:554
+#: src/protocols/yahoo/yahoo.c:2787
 #: src/protocols/yahoo/yahoo.c:2793
 #, c-format
 msgid ""
@@ -7198,22 +6992,29 @@
 msgid "Has you"
 msgstr "Ju ka"
 
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: src/protocols/msn/msn.c:581
+#: src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2615
+#: src/protocols/yahoo/yahoo.c:3230
 msgid "Be Right Back"
 msgstr "Erdha"
 
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
+#: src/protocols/msn/msn.c:589
+#: src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2625
+#: src/protocols/yahoo/yahoo.c:3245
 msgid "On The Phone"
 msgstr "Në Telefon"
 
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
+#: src/protocols/msn/msn.c:593
+#: src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2629
+#: src/protocols/yahoo/yahoo.c:3251
 msgid "Out To Lunch"
 msgstr "Jashtë Për Drekë"
 
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
+#: src/protocols/msn/msn.c:597
+#: src/protocols/zephyr/zephyr.c:2255
 #: src/status.c:157
 msgid "Hidden"
 msgstr "Padukshëm"
@@ -7244,38 +7045,39 @@
 
 #: src/protocols/msn/msn.c:647
 msgid "Open Hotmail Inbox"
-msgstr ""
+msgstr "Hap Hotmail Inbox"
 
 #: src/protocols/msn/msn.c:671
 msgid "Send to Mobile"
 msgstr "Dërgoje te Celular"
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: src/protocols/msn/msn.c:680
+#: src/protocols/novell/novell.c:3442
 msgid "Initiate _Chat"
 msgstr "Nis _Fjalosje"
 
 #: src/protocols/msn/msn.c:717
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-"Lipset mbulim SSL për MSN. Ju lutem instaloni një librari suporti SSL. Për "
-"më tepër të dhëna shihni http://gaim.sf.net/faq-ssl.php."
+msgid "SSL support is needed for MSN. Please install a supported SSL library. See http://gaim.sf.net/faq-ssl.php for more information."
+msgstr "Lipset mbulim SSL për MSN. Ju lutem instaloni një librari suporti SSL. Për më tepër të dhëna shihni http://gaim.sf.net/faq-ssl.php."
 
 #: src/protocols/msn/msn.c:745
 msgid "Failed to connect to server."
 msgstr "Dështova të lidhem me shërbyesin."
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: src/protocols/msn/msn.c:1387
+#: src/protocols/yahoo/yahoo_profile.c:654
+#: src/protocols/zephyr/zephyr.c:721
+#: src/protocols/zephyr/zephyr.c:1135
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #  put a link to the actual profile URL
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: src/protocols/msn/msn.c:1394
+#: src/protocols/msn/msn.c:1740
+#: src/protocols/yahoo/yahoo_profile.c:1167
+#: src/util.c:801
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
@@ -7284,53 +7086,65 @@
 msgid "MSN Profile"
 msgstr "Profil MSN"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
+#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1727
 #: src/protocols/yahoo/yahoo_profile.c:760
 msgid "Error retrieving profile"
 msgstr "Gabim në marrje profili"
 
 #  Age
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
+#: src/protocols/msn/msn.c:1546
+#: src/protocols/oscar/oscar.c:5992
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Moshë"
 
 #  Gender
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
+#: src/protocols/msn/msn.c:1553
+#: src/protocols/oscar/oscar.c:5979
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Gjini"
 
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/msn/msn.c:1562
+#: src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Gjendje Civile"
 
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
+#: src/protocols/msn/msn.c:1569
+#: src/protocols/novell/novell.c:1454
 #: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Vendndodhje"
 
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/msn/msn.c:1577
+#: src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Punësim"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
+#: src/protocols/msn/msn.c:1594
+#: src/protocols/msn/msn.c:1600
+#: src/protocols/msn/msn.c:1607
+#: src/protocols/msn/msn.c:1615
 #: src/protocols/msn/msn.c:1622
 msgid "A Little About Me"
 msgstr "Pakëz Rreth Meje"
 
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
+#: src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1637
+#: src/protocols/msn/msn.c:1644
+#: src/protocols/msn/msn.c:1651
 msgid "Favorite Things"
 msgstr "Gjëra të Pëlqyera"
 
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
+#: src/protocols/msn/msn.c:1660
+#: src/protocols/msn/msn.c:1666
 #: src/protocols/msn/msn.c:1673
 msgid "Hobbies and Interests"
 msgstr "Hobi dhe Interese"
 
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
+#: src/protocols/msn/msn.c:1682
+#: src/protocols/msn/msn.c:1688
 #: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Thënie e Pëlqyer "
@@ -7340,7 +7154,8 @@
 msgstr "Përditësuar së Fundmi"
 
 #  Homepage
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1707
+#: src/protocols/silc/ops.c:846
 msgid "Homepage"
 msgstr "Faqe Hyrëse"
 
@@ -7349,24 +7164,15 @@
 msgstr "Përdoruesi nuk ka krijuar një profil publik."
 
 #: src/protocols/msn/msn.c:1730
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"MSN raportoi se s'qe në gjendje të gjejë profil përdoruesi. Kjo nënkupton "
-"ose se përdoruesi nuk ekziston, ose që përdoruesi ekziston por nuk ka "
-"krijuar profil publik."
+msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
+msgstr "MSN raportoi se s'qe në gjendje të gjejë profil përdoruesi. Kjo nënkupton ose se përdoruesi nuk ekziston, ose që përdoruesi ekziston por nuk ka krijuar profil publik."
 
 #: src/protocols/msn/msn.c:1734
-msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
-msgstr ""
-"Gaim-i nuk mundi të gjej ndonjë të dhënë në profilin e përdoruesit. "
-"Përdoruesi ka shumë gjasa nuk ekziston."
-
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
+msgstr "Gaim-i nuk mundi të gjej ndonjë të dhënë në profilin e përdoruesit. Përdoruesi ka shumë gjasa nuk ekziston."
+
+#: src/protocols/msn/msn.c:1740
+#: src/protocols/yahoo/yahoo_profile.c:1167
 msgid "Profile URL"
 msgstr "URL Profili"
 
@@ -7382,16 +7188,10 @@
 #  *  summary
 #  *  description
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #. *  summary
-#. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: src/protocols/msn/msn.c:1942
+#: src/protocols/msn/msn.c:1944
 msgid "MSN Protocol Plugin"
 msgstr "Shtojcë Protokolli MSN"
 
@@ -7407,7 +7207,8 @@
 msgid "nudge: nudge a contact to get their attention"
 msgstr ""
 
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
+#: src/protocols/msn/nexus.c:103
+#: src/protocols/msn/servconn.c:127
 #: src/protocols/yahoo/yahoochat.c:1326
 msgid "Unable to connect"
 msgstr "I pazoti të lidhem"
@@ -7417,7 +7218,8 @@
 msgid "%s is not a valid group."
 msgstr "%s nuk është një grup i vlefshëm."
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
+#: src/protocols/msn/notification.c:184
+#: src/protocols/msn/notification.c:528
 #: src/protocols/msn/session.c:347
 msgid "Unknown error."
 msgstr "Gabim i panjohur."
@@ -7463,29 +7265,19 @@
 #: src/protocols/msn/notification.c:1303
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"Shërbyesi MSN do të fiket brenda %d minute për mirëmbajtje. Në atë kohë do "
-"të çnënshkruheni automatikisht.  Ju lutem përfundoni çfarëdo bashkëbisedimi "
-"të hapur.\n"
+"Shërbyesi MSN do të fiket brenda %d minute për mirëmbajtje. Në atë çast do të çnënshkruheni automatikisht.  Ju lutem përfundoni çfarëdo bashkëbisedimi të hapur.\n"
 "\n"
 "Do të mund të nënshkruani me sukses pasi të jetë kryer mirëmbajtja."
 msgstr[1] ""
-"Shërbyesi MSN do të fiket brenda %d minutash për mirëmbajtje. Në atë kohë do "
-"të çnënshkruheni automatikisht.  Ju lutem përfundoni çfarëdo bashkëbisedimi "
-"të hapur.\n"
+"Shërbyesi MSN do të fiket brenda %d minutash për mirëmbajtje. Në atë çast do të çnënshkruheni automatikisht.  Ju lutem përfundoni çfarëdo bashkëbisedimi të hapur.\n"
 "\n"
 "Do të mund të nënshkruani me sukses pasi të jetë kryer mirëmbajtja."
 
@@ -7497,7 +7289,8 @@
 msgid "Reading error"
 msgstr "Gabim leximi"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
+#: src/protocols/msn/servconn.c:133
+#: src/protocols/msn/session.c:339
 #: src/protocols/oscar/oscar.c:4925
 msgid "Unknown error"
 msgstr "Gabim i panjohur"
@@ -7520,16 +7313,16 @@
 msgstr "Gabim në përtypjen e HTTP-së."
 
 #. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: src/protocols/msn/session.c:325
+#: src/protocols/napster/napster.c:450
+#: src/protocols/oscar/oscar.c:5629
+#: src/protocols/yahoo/yahoo.c:194
 msgid "You have signed on from another location."
 msgstr "Keni nënshkruar prej një tjetër vendi."
 
 #: src/protocols/msn/session.c:328
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr ""
-"Shërbyesat MSN janë përkohësisht jashtë pune. Ju lutem prisni dhe riprovoni."
+msgstr "Shërbyesat MSN janë përkohësisht jashtë pune. Ju lutem prisni dhe riprovoni."
 
 #: src/protocols/msn/session.c:333
 msgid "The MSN servers are going down temporarily."
@@ -7542,15 +7335,13 @@
 msgstr "I pazoti të mirëfilltësoj: %s"
 
 #: src/protocols/msn/session.c:342
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-"Lista juaj shokësh MSN është përkohësisht e pakapshme. Ju lutem prisni dhe "
-"riprovoni."
-
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr "Lista juaj shokësh MSN është përkohësisht e pakapshme. Ju lutem prisni dhe riprovoni."
+
+#: src/protocols/msn/session.c:363
+#: src/protocols/msn/session.c:365
 msgid "Handshaking"
-msgstr ""
+msgstr "Duarshtrëngim"
 
 #: src/protocols/msn/session.c:364
 msgid "Transferring"
@@ -7593,8 +7384,7 @@
 msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim lidhjeje:"
 
 #: src/protocols/msn/switchboard.c:423
-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 "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim me \"switchboard\"-in:"
 
 #: src/protocols/msn/switchboard.c:431
@@ -7602,9 +7392,9 @@
 msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim i panjohur:"
 
 #: src/protocols/msn/switchboard.c:952
-#, fuzzy, c-format
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s don t'ju dërgojë një kartelë"
+msgstr ""
 
 #: src/protocols/msn/userlist.c:85
 #, c-format
@@ -7612,24 +7402,23 @@
 msgstr "Përdoruesi %s (%s) don të shtojë %s te listë e tij shokësh."
 
 #: src/protocols/msn/userlist.c:275
-#, fuzzy, c-format
+#, c-format
 msgid "%s has added you to his or her contact list."
-msgstr "Përdoruesi %s don të shtojë %s te listë e tij shokësh"
+msgstr "%s ju ka shtuar te listë e tij/e saj shokësh."
 
 #: src/protocols/msn/userlist.c:339
 #, c-format
 msgid "%s has removed you from his or her contact list."
-msgstr ""
+msgstr "%s ju ka hequr prej listës së tij/saj të kontakteve."
 
 #: src/protocols/msn/userlist.c:659
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add \"%s\"."
-msgstr "I pazoti të lexoj kartelën %s."
+msgstr "I pazoti të lexoj kartelën \"%s\"."
 
 #: src/protocols/msn/userlist.c:661
-#, fuzzy
 msgid "The screen name specified is invalid."
-msgstr "Kyçi SecurID i dhënë është i pavlefshëm."
+msgstr "Emri i ekranit i dhënë është i pavlefshëm."
 
 #: src/protocols/napster/napster.c:260
 msgid "Unable to read header from server"
@@ -7638,14 +7427,11 @@
 #: src/protocols/napster/napster.c:274
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr ""
-"I pazoti të lexoj mesazhe prej shërbyesi: %s.  Urdhri është %hd, gjatësia "
-"është %hd."
+msgstr "I pazoti të lexoj mesazhe prej shërbyesi: %s.  Urdhri është %hd, gjatësia është %hd."
 
 #: src/protocols/napster/napster.c:290
-#, fuzzy
 msgid "Unknown server error."
-msgstr "Gabim i panjohur."
+msgstr "Gabim i panjohur shërbyesi."
 
 #: src/protocols/napster/napster.c:339
 #, c-format
@@ -7660,7 +7446,6 @@
 msgstr "I pazoti të shtoj \"%s\" te listë juaja Napster hotlist"
 
 #. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
 #: src/protocols/napster/napster.c:357
 msgid "You were disconnected from the server."
 msgstr "Ishit shkëputur prej shërbyesit."
@@ -7681,15 +7466,20 @@
 
 #  we didn't successfully connect. tdt->toc_fd is valid here
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
+#: src/protocols/napster/napster.c:501
+#: src/protocols/napster/napster.c:532
+#: src/protocols/toc/toc.c:172
+#: src/protocols/yahoo/yahoo.c:2212
+#: src/protocols/yahoo/yahoo.c:2239
+#: src/protocols/yahoo/yahoo.c:2302
 #: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
+#: src/protocols/yahoo/yahoo_filexfer.c:111
+#: src/protocols/yahoo/ycht.c:481
 msgid "Unable to connect."
 msgstr "I pazoti të lidhem."
 
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:590
+#: src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Grup:"
 
@@ -7705,16 +7495,10 @@
 #  *  summary
 #  *  description
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #. *  summary
-#. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: src/protocols/napster/napster.c:687
+#: src/protocols/napster/napster.c:689
 msgid "NAPSTER Protocol Plugin"
 msgstr "Shtojcë Protokolli NAPSTER"
 
@@ -7799,12 +7583,8 @@
 msgstr "Nuk munda të njoh strehën e emrit të përdoruesit që dhatë"
 
 #: src/protocols/novell/nmuser.c:1932
-msgid ""
-"Your account has been disabled because too many invalid passwords were "
-"entered"
-msgstr ""
-"Llogaria juaj është çaktivizuar sepse janë dhënë shumë fjalëkalime të "
-"pavlefshëm"
+msgid "Your account has been disabled because too many invalid passwords were entered"
+msgstr "Llogaria juaj është çaktivizuar sepse janë dhënë shumë fjalëkalime të pavlefshëm"
 
 #: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
@@ -7831,11 +7611,8 @@
 msgstr "Përdoruesi ju ka bllokuar"
 
 #: src/protocols/novell/nmuser.c:1954
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
-msgstr ""
-"Ky version mostër nuk lejon më tepër se dhjetë përdorues të futen njëherësh"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
+msgstr "Ky version mostër nuk lejon më tepër se dhjetë përdorues të futen njëherësh"
 
 #: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
@@ -7854,8 +7631,7 @@
 #: src/protocols/novell/novell.c:232
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr ""
-"I pazoti të dërgoj mesazh. Nuk arrita të kem hollësi për përdoruesin (%s)."
+msgstr "I pazoti të dërgoj mesazh. Nuk arrita të kem hollësi për përdoruesin (%s)."
 
 #: src/protocols/novell/novell.c:381
 #, c-format
@@ -7869,7 +7645,8 @@
 msgid "Unable to send message (%s)."
 msgstr "I pazoti të dërgoj mesazh (%s)."
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: src/protocols/novell/novell.c:478
+#: src/protocols/novell/novell.c:972
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "I pazoti të ftoj përdorues (%s)"
@@ -7886,28 +7663,21 @@
 
 #: src/protocols/novell/novell.c:569
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"I pazoti të zhvendos përdorues %s te dosje %s në listën nga ana e "
-"shërbyesit. Gabim gjatë krijimit të dosjes (%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "I pazoti të zhvendos përdorues %s te dosje %s në listën nga ana e shërbyesit. Gabim gjatë krijimit të dosjes (%s)."
 
 #: src/protocols/novell/novell.c:617
 #, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"I pazoti të shtoj %s te listë juaj shokësh. Gabim gjatë krijimit të dosjes "
-"në listën nga ana e shërbyesit (%s)."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "I pazoti të shtoj %s te listë juaj shokësh. Gabim gjatë krijimit të dosjes në listën nga ana e shërbyesit (%s)."
 
 #: src/protocols/novell/novell.c:690
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "S'arrita të kem hollësi për përdoruesin %s (%s)."
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: src/protocols/novell/novell.c:736
+#: src/protocols/novell/novell.c:882
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "I pazoti të shtoj përdoruesin te listë vetësie (%s)."
@@ -7927,7 +7697,8 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "I pazoti të heq %s prej liste vetësie (%s)."
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: src/protocols/novell/novell.c:927
+#: src/protocols/novell/novell.c:1628
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "I pazoti të ndryshoj rregullime vetësie të anës së shërbyesit (%s)."
@@ -7937,7 +7708,8 @@
 msgid "Unable to create conference (%s)."
 msgstr "I pazoti të krijoj konferencë (%s)."
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: src/protocols/novell/novell.c:1110
+#: src/protocols/novell/novell.c:1667
 msgid "Error communicating with server. Closing connection."
 msgstr "Gabim gjatë kounikimit me shërbyesin. Po mbyll lidhjen."
 
@@ -7957,7 +7729,8 @@
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
+#: src/protocols/novell/novell.c:1464
+#: src/protocols/oscar/oscar.c:5965
 #: src/protocols/oscar/oscar.c:5972
 msgid "Email Address"
 msgstr "Vendndodhje Email"
@@ -7973,12 +7746,7 @@
 #  tag, value);
 #  }
 #. tag = _("DN");
-#. value = nm_user_record_get_dn(user_record);
-#. if (value) {
-#. g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
 #. tag, value);
-#. }
-#.
 #: src/protocols/novell/novell.c:1494
 msgid "Full name"
 msgstr "Emër i plotë"
@@ -8039,25 +7807,16 @@
 
 #: src/protocols/novell/novell.c:2051
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
-msgstr ""
-"%s duket se është i palidhur dhe nuk e mori mesazhin që sapo i dërguat."
+msgid "%s appears to be offline and did not receive the message that you just sent."
+msgstr "%s duket se është i palidhur dhe nuk e mori mesazhin që sapo i dërguat."
 
 #  TODO: Would be nice to prompt if not set!
 #  *  gaim_request_fields(gc, _("Server Address"),...);
 #  ...but for now just error out with a nice message.
 #. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
 #: src/protocols/novell/novell.c:2149
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-"I pazoti të lidhem me shërbyesin. Ju lutem jepni vendndodhjen e shërbyesit "
-"që doni të kontaktohet."
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
+msgstr "I pazoti të lidhem me shërbyesin. Ju lutem jepni vendndodhjen e shërbyesit që doni të kontaktohet."
 
 #: src/protocols/novell/novell.c:2171
 msgid "Error. SSL support is not installed."
@@ -8067,7 +7826,8 @@
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Kjo konferencë është mbyllur. S'mund të dërgohen më mesazhe."
 
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
+#: src/protocols/novell/novell.c:2965
+#: src/protocols/novell/novell.c:3047
 #: src/protocols/yahoo/yahoo.c:2839
 msgid "Appear Offline"
 msgstr "Shfaqet Jo i lidhur"
@@ -8084,16 +7844,10 @@
 #  *  summary
 #  *  description
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #. *  summary
-#. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: src/protocols/novell/novell.c:3540
+#: src/protocols/novell/novell.c:3542
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Shtojcë Protokolli Novell GroupWise Messenger"
 
@@ -8201,13 +7955,10 @@
 msgid "Not while on AOL"
 msgstr "Jo kur jeni në AOL"
 
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
-msgstr ""
-"(Pati një gabim gjatë marrjes së këtij mesazhi.  Shoku të cilit po i flisni "
-"ka shumë të ngjarë të ketë një klient me të meta.)"
+#: src/protocols/oscar/oscar.c:417
+#: src/protocols/oscar/oscar.c:502
+msgid "(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"
+msgstr "(Pati një gabim gjatë marrjes së këtij mesazhi.  Shoku të cilit po i flisni ka shumë të ngjarë të ketë një klient me të meta.)"
 
 #: src/protocols/oscar/oscar.c:616
 msgid "Voice"
@@ -8217,12 +7968,14 @@
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
+#: src/protocols/oscar/oscar.c:622
+#: src/protocols/silc/silc.c:659
 #: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "Fjalosje"
 
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: src/protocols/oscar/oscar.c:625
+#: src/protocols/oscar/oscar.c:7898
 msgid "Get File"
 msgstr "Merr Kartelë"
 
@@ -8294,15 +8047,18 @@
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+#: src/protocols/oscar/oscar.c:699
+#: src/protocols/oscar/oscar.c:7781
 msgid "Free For Chat"
 msgstr "I lirë Për Fjalosje"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: src/protocols/oscar/oscar.c:703
+#: src/protocols/oscar/oscar.c:7796
 msgid "Not Available"
 msgstr "Jo i mundshëm"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: src/protocols/oscar/oscar.c:705
+#: src/protocols/oscar/oscar.c:7786
 msgid "Occupied"
 msgstr "I zënë"
 
@@ -8310,7 +8066,8 @@
 msgid "Web Aware"
 msgstr "Me Web-in  Parasysh"
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:786
+#: src/protocols/oscar/oscar.c:5050
 msgid "Warning Level"
 msgstr "Shkallë Sinjalizimi"
 
@@ -8336,7 +8093,8 @@
 msgid "Direct Connect failed"
 msgstr "Lidhja e Drejtpërdrejtë dështoi"
 
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:1045
+#: src/protocols/oscar/oscar.c:1176
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM me %s u vendos"
@@ -8361,21 +8119,18 @@
 msgstr "Keni përzgjedhur të hapet një lidhje Direct IM me %s."
 
 #: src/protocols/oscar/oscar.c:1591
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Ngaqë kjo zbulon vendndodhjen tuaj IP, mund të merret si rrezik ndaj "
-"vetësisë.  Doni të vazhdohet?"
-
-#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4361
+msgid "Because this reveals your IP address, it may be considered a privacy risk.  Do you wish to continue?"
+msgstr "Ngaqë kjo zbulon vendndodhjen tuaj IP, mund të merret si rrezik ndaj vetësisë.  Doni të vazhdohet?"
+
+#: src/protocols/oscar/oscar.c:1595
+#: src/protocols/oscar/oscar.c:4361
 msgid "Connect"
 msgstr "Lidhu"
 
 #: src/protocols/oscar/oscar.c:1661
-#, fuzzy, c-format
+#, c-format
 msgid "You have lost your connection to chat room %s."
-msgstr "Jeni shkëputur prej dhome fjalosjesh %s."
+msgstr "Humbët lidhjen me dhomën e fjalosjeve %s."
 
 #: src/protocols/oscar/oscar.c:1684
 msgid "Chat is currently unavailable"
@@ -8387,20 +8142,15 @@
 
 #: src/protocols/oscar/oscar.c:1770
 #, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"I pazoti të futem: Nuk munda të hyj si %s sepse emri i ekranit është i "
-"pavlefshëm.  Emrat e ekranit ose duhet të fillojnë me një gërmë dhe të "
-"përmbajnë vetëm gërma, numra dhe hapësira, ose të përmbajnë vetëm numra."
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "I pazoti të futem: Nuk munda të hyj si %s sepse emri i ekranit është i pavlefshëm.  Emrat e ekranit ose duhet të fillojnë me një gërmë dhe të përmbajnë vetëm gërma, numra dhe hapësira, ose të përmbajnë vetëm numra."
 
 #: src/protocols/oscar/oscar.c:1799
 msgid "Unable to login to AIM"
 msgstr "I pazoti të hyj në AIM"
 
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:1903
+#: src/protocols/oscar/oscar.c:2846
 msgid "Could Not Connect"
 msgstr "Nuk munda të Lidhem"
 
@@ -8409,26 +8159,22 @@
 msgstr "Lidhje e vendosur, \"cookie\" u dërgua"
 
 #. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. Let the user not to lose hope quite yet
 #: src/protocols/oscar/oscar.c:2063
-#, fuzzy
 msgid "Attempting connection redirect..."
-msgstr "Po përpiqem të lidhem me %s te %s:%hu për Direct IM."
+msgstr "Po përpiqem të ridrejtoj lidhjen..."
 
 #. proxyip timed out
-#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
-#. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
 #: src/protocols/oscar/oscar.c:2108
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
+" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/ICQ."
 msgstr ""
-
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
+"Shpërnguljes së kartelës %s i mbaroi koha.\n"
+" Provoni duke aktivizuar shpërngulje kartelash për shërbyesa ndërmjetës te Mjete->Parapëlqime->AIM/ICQ."
+
+#: src/protocols/oscar/oscar.c:2206
+#: src/protocols/yahoo/yahoo_filexfer.c:174
 #: src/protocols/yahoo/yahoo_filexfer.c:183
 #: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
@@ -8438,18 +8184,19 @@
 msgid "Unable to create new connection."
 msgstr "I pazoti të krijoj lidhje të re."
 
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
-#, fuzzy
+#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2468
+#: src/protocols/oscar/oscar.c:2478
 msgid "Unable to log into file transfer proxy."
-msgstr "I pazoti të shkruaj kartelën %s."
+msgstr "I pazoti të futem te ndërmjetës shpërnguljeje kartele."
 
 #: src/protocols/oscar/oscar.c:2532
-#, fuzzy
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "I pazoti të vendos \"socket\" dëgjuesi."
-
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+msgstr "I pazoti të vendos \"socket\" dëgjuesi ose nuk duhet të ketë lidhje me ndërmjetës AOL."
+
+#: src/protocols/oscar/oscar.c:2733
+#: src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Nofkë ose fjalëkalim i pasaktë."
 
@@ -8464,19 +8211,13 @@
 msgstr "Shërbimi AOL Instant Messenger është përkohësisht i pamundur."
 
 #: src/protocols/oscar/oscar.c:2747
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Jeni lidhur e shkëputur shumë shpesh. Prisni dhjetë minuta dhe riprovoni. "
-"nëse vazhdoni të provoni, do t'ju duhet të prisni edhe më."
+msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
+msgstr "Jeni lidhur e shkëputur shumë shpesh. Prisni dhjetë minuta dhe riprovoni. nëse vazhdoni të provoni, do t'ju duhet të prisni edhe më."
 
 #: src/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"Versioni i klientit që po përdorni është shumë i vjetër. Ju lutem "
-"përditësojeni prej %s"
+msgstr "Versioni i klientit që po përdorni është shumë i vjetër. Ju lutem përditësojeni prej %s"
 
 #: src/protocols/oscar/oscar.c:2783
 msgid "Internal Error"
@@ -8498,17 +8239,15 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Jepni numri gjashtëshifror prej paraqitjes shifrore."
 
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
+#: src/protocols/oscar/oscar.c:2932
+#: src/protocols/oscar/oscar.c:2962
 #: src/protocols/oscar/oscar.c:3051
 #, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Edhe pak edhe mundet t'ju shkëpusin.  Mund të doni të përdorni TOC derisa të "
-"ndreqet kjo.  Shihni %s për përditësime."
-
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:2965
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "Edhe pak edhe mundet t'ju shkëpusin.  Mund të doni të përdorni TOC derisa të ndreqet kjo.  Shihni %s për përditësime."
+
+#: src/protocols/oscar/oscar.c:2935
+#: src/protocols/oscar/oscar.c:2965
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim-i s'qe në gjendje të ketë një hash hyrjeje në AIM të vlefshëm."
 
@@ -8526,19 +8265,12 @@
 msgstr "%s sapo kërkoi të lidhet drejtpërsëdrejti me %s"
 
 #: src/protocols/oscar/oscar.c:4355
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"Kjo lyp një lidhje të drejtpërdrejtë mes dy kompjuterave dhe është e "
-"nevojshme për pamje IM.  Ngaqë do të zbulohet vendndodhja juaj IP, kjo mund "
-"të merret si rrezik vetësie."
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "Kjo lyp një lidhje të drejtpërdrejtë mes dy kompjuterave dhe është e nevojshme për pamje IM.  Ngaqë do të zbulohet vendndodhja juaj IP, kjo mund të merret si rrezik vetësie."
 
 #: src/protocols/oscar/oscar.c:4394
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Ju lutem autorizomëni që kështu të mundem t'ju shtoj te listë imja shokësh."
+msgstr "Ju lutem autorizomëni që kështu të mundem t'ju shtoj te listë imja shokësh."
 
 #: src/protocols/oscar/oscar.c:4402
 msgid "Authorization Request Message:"
@@ -8550,20 +8282,20 @@
 
 #: src/protocols/oscar/oscar.c:4433
 #, c-format
-msgid ""
-"The user %s requires authorization before being added to a buddy list.  Do "
-"you want to send an authorization request?"
-msgstr ""
-"Përdoruesi %s kërkon autorizim para se të shtohet te një listë shokësh.  "
-"Doni të dërgoni një kërkesë autorizimi?"
-
-#: src/protocols/oscar/oscar.c:4438 src/protocols/oscar/oscar.c:4440
+msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
+msgstr "Përdoruesi %s kërkon autorizim para se të shtohet te një listë shokësh.  Doni të dërgoni një kërkesë autorizimi?"
+
+#: src/protocols/oscar/oscar.c:4438
+#: src/protocols/oscar/oscar.c:4440
 msgid "Request Authorization"
 msgstr "Kërko Mirëfilltësim"
 
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:4478
+#: src/protocols/oscar/oscar.c:4484
+#: src/protocols/oscar/oscar.c:4588
+#: src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:7234
+#: src/protocols/oscar/oscar.c:7286
 msgid "No reason given."
 msgstr "Nuk u dha arsye."
 
@@ -8577,23 +8309,21 @@
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Përdoruesi %u dëshiron t'ju shtojë te listë e tija shokësh për arsyen "
-"vijuese:\n"
+"Përdoruesi %u dëshiron t'ju shtojë te listë e tija shokësh për arsyen vijuese:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:4600
+#: src/protocols/oscar/oscar.c:7246
 msgid "Authorization Request"
 msgstr "Kërkesë Mirëfilltësimi"
 
 #: src/protocols/oscar/oscar.c:4612
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Përdoruesi %u ka hedhur poshtë kërkesën tuaj për ta shtuar te listë juaja "
-"shokësh për arsyen vijuese:\n"
+"Përdoruesi %u ka hedhur poshtë kërkesën tuaj për ta shtuar te listë juaja shokësh për arsyen vijuese:\n"
 "%s"
 
 #: src/protocols/oscar/oscar.c:4613
@@ -8675,10 +8405,8 @@
 
 #: src/protocols/oscar/oscar.c:4777
 #, 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] "Humbët %hu mesazh prej %s sepse është tejkaluar niveli kufi."
 msgstr[1] "Humbët %hu mesazhe prej %s sepse është tejkaluar niveli kufi"
 
@@ -8720,8 +8448,10 @@
 msgid "Unable to send message: %s"
 msgstr "I pazoti të dërgoj mesazh: %s"
 
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: src/protocols/oscar/oscar.c:4961
+#: src/protocols/oscar/oscar.c:4966
+#: src/protocols/oscar/oscar.c:5024
+#: src/protocols/oscar/oscar.c:5028
 msgid "Unknown reason."
 msgstr "Arsye e panjohur."
 
@@ -8745,7 +8475,8 @@
 msgid "Online Since"
 msgstr "I lidhur që Prej"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:5059
+#: src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Anëtar që Prej"
 
@@ -8756,30 +8487,23 @@
 #  The conversion failed!
 #. The conversion failed!
 #: src/protocols/oscar/oscar.c:5328
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[I pazoti të shfaq mesazh prej këtij përdoruesi sepse përmbante shenja të "
-"pavlefshme.]"
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
+msgstr "[I pazoti të shfaq mesazh prej këtij përdoruesi sepse përmbante shenja të pavlefshme.]"
 
 #: src/protocols/oscar/oscar.c:5554
 msgid "Rate limiting error."
 msgstr "Gabim kufizimi niveli"
 
 #: src/protocols/oscar/oscar.c:5555
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"Veprimi i fundit që provuat s'mund të kryhej sepse keni tejkaluar kufirin "
-"kohor. Ju lutem prisni 10 sekonda dhe riprovoni."
+msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
+msgstr "Veprimi i fundit që provuat s'mund të kryhej sepse keni tejkaluar kufirin kohor. Ju lutem prisni 10 sekonda dhe riprovoni."
 
 #: src/protocols/oscar/oscar.c:5631
 msgid "You have been signed off for an unknown reason."
 msgstr "Jeni çnënshkruar për një arsye të panjohur."
 
-#: src/protocols/oscar/oscar.c:5644 src/protocols/toc/toc.c:971
+#: src/protocols/oscar/oscar.c:5644
+#: src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Jeni shkëputur prej dhome fjalosjesh %s."
@@ -8793,7 +8517,8 @@
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:5977
+#: src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Telefon Celular"
 
@@ -8817,7 +8542,8 @@
 msgid "Home Address"
 msgstr "Vendndodhje Shtëpie"
 
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6008
+#: src/protocols/oscar/oscar.c:6016
 msgid "Zip Code"
 msgstr "Kod Zip"
 
@@ -8875,55 +8601,33 @@
 
 #: src/protocols/oscar/oscar.c:6197
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-"Gabim 0x%04x: I pazoti të formatoj emër ekrani sepse emri i ekranit i "
-"kërkuar ndryshon nga origjinali."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
+msgstr "Gabim 0x%04x: I pazoti të formatoj emër ekrani sepse emri i ekranit i kërkuar ndryshon nga origjinali."
 
 #: src/protocols/oscar/oscar.c:6200
-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-"Gabim 0x%04x: I pazoti të formatoj emër ekrani sepse emri i ekranit i "
-"kërkuar është tepër i gjatë."
+msgstr "Gabim 0x%04x: I pazoti të formatoj emër ekrani ngaqë është i pavlefshëm."
 
 #: src/protocols/oscar/oscar.c:6203
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr ""
-"Gabim 0x%04x: I pazoti të formatoj emër ekrani sepse emri i ekranit i "
-"kërkuar është tepër i gjatë."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
+msgstr "Gabim 0x%04x: I pazoti të formatoj emër ekrani sepse emri i ekranit i kërkuar është tepër i gjatë."
 
 #: src/protocols/oscar/oscar.c:6206
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse për këtë emër "
-"ekrani ka tashmë një kërkesë në pritje."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgstr "Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse për këtë emër ekrani ka tashmë një kërkesë në pritje."
 
 #: src/protocols/oscar/oscar.c:6209
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse vendndodhja e "
-"dhënë ka shumë emra ekrani shoqëruar asaj."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgstr "Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse vendndodhja e dhënë ka shumë emra ekrani shoqëruar asaj."
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
-msgstr ""
-"Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse vendndodhja e "
-"dhënë është e pavlefshme."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgstr "Gabim 0x%04x: I pazoti të ndryshoj vendndodhje e-mail sepse vendndodhja e dhënë është e pavlefshme."
 
 #: src/protocols/oscar/oscar.c:6215
 #, c-format
@@ -8939,7 +8643,8 @@
 "Emri juaj i ekranit për çastin është i formatuar si vijon:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:6226
+#: src/protocols/oscar/oscar.c:6233
 msgid "Account Info"
 msgstr "Të dhëna Llogarie "
 
@@ -8949,61 +8654,38 @@
 msgstr "Vendndodhja e-mail për %s është %s"
 
 #: src/protocols/oscar/oscar.c:6298
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-"Pamja juaj IM nuk u dërgua. Duhet të jeni I lidhur Drejtpërdrejt për të "
-"dërguar Pamje IM."
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "Pamja juaj IM nuk u dërgua. Duhet të jeni I lidhur Drejtpërdrejt për të dërguar Pamje IM."
 
 #: src/protocols/oscar/oscar.c:6480
 msgid "Unable to set AIM profile."
 msgstr "I pazoti të rregulloj profil AIM"
 
 #: src/protocols/oscar/oscar.c:6481
-msgid ""
-"You have probably requested to set your profile before the login procedure "
-"completed.  Your profile remains unset; try setting it again when you are "
-"fully connected."
-msgstr ""
-"Mbase kërkuat të rregulloni profilin tuaj para se të përfundonte procedura e "
-"hyrjes.  Profili juaj mbetet i parregulluar; provoni ta rregulloni kur të "
-"jeni plotësisht i lidhur."
+msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
+msgstr "Mbase kërkuat të rregulloni profilin tuaj para se të përfundonte procedura e hyrjes.  Profili juaj mbetet i parregulluar; provoni ta rregulloni kur të jeni plotësisht i lidhur."
 
 #: src/protocols/oscar/oscar.c:6495
 #, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] ""
-"Është tejkaluar gjatësia më e madhe prej %d bajti për profile.  Gaim-i e "
-"cungoi për ju."
-msgstr[1] ""
-"Është tejkaluar gjatësia më e madhe prej %d bajtesh për profile.  Gaim-i e "
-"cungoi për ju."
+msgid "The maximum profile length of %d byte has been exceeded.  Gaim has truncated it for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
+msgstr[0] "Është tejkaluar gjatësia më e madhe prej %d bajti për profile.  Gaim-i e cungoi për ju."
+msgstr[1] "Është tejkaluar gjatësia më e madhe prej %d bajtesh për profile.  Gaim-i e cungoi për ju."
 
 #: src/protocols/oscar/oscar.c:6500
 msgid "Profile too long."
 msgstr "Profil shumë i gjatë."
 
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] ""
-"Është tejkaluar gjatësia më e madhe prej %d bajti për mesazhe largimi. Gaim-"
-"i e cungoi për ju"
-msgstr[1] ""
-"Është tejkaluar gjatësia më e madhe prej %d bajtesh për mesazhe largimi. "
-"Gaim-i e cungoi për ju"
-
-#: src/protocols/oscar/oscar.c:6528 src/protocols/oscar/oscar.c:6601
+#: src/protocols/oscar/oscar.c:6523
+#: src/protocols/oscar/oscar.c:6596
+#, c-format
+msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
+msgstr[0] "Është tejkaluar gjatësia më e madhe prej %d bajti për mesazhe largimi. Gaim-i e cungoi për ju"
+msgstr[1] "Është tejkaluar gjatësia më e madhe prej %d bajtesh për mesazhe largimi. Gaim-i e cungoi për ju"
+
+#: src/protocols/oscar/oscar.c:6528
+#: src/protocols/oscar/oscar.c:6601
 msgid "Away message too long."
 msgstr "Mesazh largimi shumë i gjatë."
 
@@ -9012,28 +8694,18 @@
 msgstr "I pazoti të rregulloj mesazh largimi AIM."
 
 #: src/protocols/oscar/oscar.c:6561
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-"Mundet të keni kërkuar të caktoni mesazh tuajin largimesh përpara se të "
-"plotësohej procedura e hyrjes.  Mbeteni në gjenjden \"present\"; riprovoni "
-"ta caktoni sapo të jeni futur përfundimisht."
+msgid "You have probably requested to set your away message before the login procedure completed.  You remain in a \"present\" state; try setting it again when you are fully connected."
+msgstr "Mundet të keni kërkuar të caktoni mesazh tuajin largimesh përpara se të plotësohej procedura e hyrjes.  Mbeteni në gjenjden \"present\"; riprovoni ta caktoni sapo të jeni futur përfundimisht."
 
 #: src/protocols/oscar/oscar.c:6691
 #, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-"Nuk munda të shtoj shokun %s sepse emri i ekranit është i pavlefshëm.  Emra "
-"ekrani duhet ose të fillojnë me një gërmë ose të përmbajnë vetëm gërma, "
-"numra dhe hapësira, ose të përmbajnë vetëm numra."
-
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Nuk munda të shtoj shokun %s sepse emri i ekranit është i pavlefshëm.  Emra ekrani duhet ose të fillojnë me një gërmë ose të përmbajnë vetëm gërma, numra dhe hapësira, ose të përmbajnë vetëm numra."
+
+#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:7092
+#: src/protocols/oscar/oscar.c:7106
+#: src/protocols/simple/simple.c:203
 msgid "Unable To Add"
 msgstr "I pazoti të Shtoj"
 
@@ -9042,53 +8714,37 @@
 msgstr "I pazoti Të Marr Listë  Shokësh"
 
 #: src/protocols/oscar/oscar.c:6799
-msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
-msgstr ""
-"Gaim-i s'qe i në gjendje të marrë listë shokësh tuajën prej shërbyesve AIM.  "
-"Lista juaj e shokëve nuk ka humbur, dhe mbase do të jetë e passhme brenda "
-"pak orësh."
-
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+msgid "Gaim was temporarily unable to retrieve your buddy list from the AIM servers.  Your buddy list is not lost, and will probably become available in a few hours."
+msgstr "Gaim-i s'qe i në gjendje të marrë listë shokësh tuajën prej shërbyesve AIM.  Lista juaj e shokëve nuk ka humbur, dhe mbase do të jetë e passhme brenda pak orësh."
+
+#: src/protocols/oscar/oscar.c:6983
+#: src/protocols/oscar/oscar.c:6984
+#: src/protocols/oscar/oscar.c:6989
+#: src/protocols/oscar/oscar.c:7150
+#: src/protocols/oscar/oscar.c:7151
+#: src/protocols/oscar/oscar.c:7156
 msgid "Orphans"
 msgstr "Jetimë"
 
 #: src/protocols/oscar/oscar.c:7090
 #, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"S'munda të shtoj shokun %s sepse keni shumë shokë në listë shokësh tuajën.  "
-"Ju lutem hiqni një dhe riprovoni."
-
-#: src/protocols/oscar/oscar.c:7090 src/protocols/oscar/oscar.c:7104
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "S'munda të shtoj shokun %s sepse keni shumë shokë në listë shokësh tuajën.  Ju lutem hiqni një dhe riprovoni."
+
+#: src/protocols/oscar/oscar.c:7090
+#: src/protocols/oscar/oscar.c:7104
 msgid "(no name)"
 msgstr "(pa emër)"
 
 #: src/protocols/oscar/oscar.c:7104
 #, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"Për arsye të panjohur nuk munda të shtoj shokun %s.  Arsyeja më e zakonshme "
-"për këtë është pasja e numrit më të madh shokësh të lejuar në listën tuaj të "
-"shokëve."
+msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
+msgstr "Për arsye të panjohur nuk munda të shtoj shokun %s.  Arsyeja më e zakonshme për këtë është pasja e numrit më të madh shokësh të lejuar në listën tuaj të shokëve."
 
 #: src/protocols/oscar/oscar.c:7187
 #, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr ""
-"Përdoruesi %s ju ka dhënë leje të shtoheni te listë e tij shokësh.  Doni "
-"t'ju shtoj?"
+msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
+msgstr "Përdoruesi %s ju ka dhënë leje të shtoheni te listë e tij shokësh.  Doni t'ju shtoj?"
 
 #: src/protocols/oscar/oscar.c:7193
 msgid "Authorization Given"
@@ -9100,8 +8756,7 @@
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Përdoruesi %s dëshiron t'ju shtojë te listë e tija shokësh për arsyen "
-"vijuese:\n"
+"Përdoruesi %s dëshiron t'ju shtojë te listë e tija shokësh për arsyen vijuese:\n"
 "%s"
 
 #  Granted
@@ -9120,19 +8775,18 @@
 #: src/protocols/oscar/oscar.c:7286
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Përdoruesi %s ka hedhur tej kërkesën tuaj për t'i shtuar te listë juaj "
-"shokësh për arsyen vijuese:\n"
+"Përdoruesi %s ka hedhur tej kërkesën tuaj për t'i shtuar te listë juaj shokësh për arsyen vijuese:\n"
 "%s"
 
 #: src/protocols/oscar/oscar.c:7287
 msgid "Authorization Denied"
 msgstr "Autorizim i Mohuar"
 
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:7324
+#: src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Shkëmbe:"
 
@@ -9142,8 +8796,7 @@
 
 #: src/protocols/oscar/oscar.c:7430
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"Pamja juaj IM nuk u dërgua. S'mund të dërgoni pamje IM në fjalosje AIM."
+msgstr "Pamja juaj IM nuk u dërgua. S'mund të dërgoni pamje IM në fjalosje AIM."
 
 #: src/protocols/oscar/oscar.c:7565
 msgid "Away Message"
@@ -9175,24 +8828,20 @@
 msgstr "Rikërko Autorizim"
 
 #: src/protocols/oscar/oscar.c:7969
-#, fuzzy
 msgid "Require authorization"
-msgstr "Kërko Mirëfilltësim"
+msgstr "Kërko autorizim"
 
 #: src/protocols/oscar/oscar.c:7972
-#, fuzzy
 msgid "Hide IP address"
-msgstr "Vendndodhje IP"
+msgstr "Fshih Vendndodhje IP"
 
 #: src/protocols/oscar/oscar.c:7975
-#, fuzzy
 msgid "Web aware"
-msgstr "Me Web-in  Parasysh"
+msgstr "Me Web-in  parasysh"
 
 #: src/protocols/oscar/oscar.c:7980
-#, fuzzy
 msgid "ICQ Privacy Options"
-msgstr "Mundësi \"Proxy\""
+msgstr "Mundësi Vetësie ICQ"
 
 #: src/protocols/oscar/oscar.c:7997
 msgid "The new formatting is invalid."
@@ -9200,9 +8849,7 @@
 
 #: src/protocols/oscar/oscar.c:7998
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-"Formatimi i emrave të ekranit mund të ndryshojë vetëm gërmat e mëdhaja dhe "
-"hapësirat boshe."
+msgstr "Formatimi i emrave të ekranit mund të ndryshojë vetëm gërmat e mëdhaja dhe hapësirat boshe."
 
 #: src/protocols/oscar/oscar.c:8005
 msgid "New screen name formatting:"
@@ -9221,12 +8868,8 @@
 msgstr "Po prisni autorizim prej shokëve vijues"
 
 #: src/protocols/oscar/oscar.c:8106
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"Mund të rikërkoni autorizim prej këtyre shokëve duke djathtas klikuar mbi ta "
-"dhe përzgjedhur \"Rikërko Autorizim.\""
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "Mund të rikërkoni autorizim prej këtyre shokëve duke djathtas klikuar mbi ta dhe përzgjedhur \"Rikërko Autorizim.\""
 
 #: src/protocols/oscar/oscar.c:8123
 msgid "Find Buddy by E-Mail"
@@ -9240,7 +8883,8 @@
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Shtypni vendndodhjen e-mail të shokut që po kërkoni."
 
-#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
+#: src/protocols/oscar/oscar.c:8212
+#: src/protocols/silc/silc.c:817
 msgid "Set User Info..."
 msgstr "Caktoni Të dhëna Përdoruesi."
 
@@ -9248,7 +8892,8 @@
 msgid "Set User Info (URL)..."
 msgstr "Caktoni Të dhëna Përdoruesi (URL)..."
 
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
+#: src/protocols/oscar/oscar.c:8223
+#: src/protocols/silc/silc.c:813
 msgid "Change Password..."
 msgstr "Ndrysho Fjalëkalim..."
 
@@ -9262,9 +8907,8 @@
 
 #. ICQ actions
 #: src/protocols/oscar/oscar.c:8243
-#, fuzzy
 msgid "Show privacy options..."
-msgstr "Shfaq më tepër mundësi"
+msgstr "Shfaq mundësi vetësie..."
 
 #. AIM actions
 #: src/protocols/oscar/oscar.c:8250
@@ -9296,18 +8940,16 @@
 msgstr "Kërko për Shokë sipas Të dhënash"
 
 #: src/protocols/oscar/oscar.c:8350
-#, fuzzy
 msgid "Use recent buddies group"
-msgstr "Përdorues jo i grupit"
+msgstr "Përdor grup të fundit shokësh"
 
 #: src/protocols/oscar/oscar.c:8353
-#, fuzzy
 msgid "Show how long you have been idle"
-msgstr "Ju lejon të formësoni dorazi sa gjatë keni qenë i plogësht"
+msgstr "Tregon për sa kohë keni qenë i plogësht"
 
 #: src/protocols/oscar/oscar.c:8362
 msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr ""
+msgstr "Përdor shërbyesa AIM/ICQ ndërmjetës (Më të Ngadaltë/Më të Sigurtë/Zakonisht Funksionon)"
 
 #  *< api_version
 #  *< type
@@ -9321,16 +8963,10 @@
 #  *  summary
 #  *  description
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #. *  summary
-#. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: src/protocols/oscar/oscar.c:8476
+#: src/protocols/oscar/oscar.c:8478
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Shtojcë Protokolli AIM/ICQ"
 
@@ -9342,54 +8978,49 @@
 msgid "Auth port"
 msgstr "Portë autorizimi"
 
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:8503
+#: src/protocols/zephyr/zephyr.c:2892
 msgid "Encoding"
 msgstr "Kodim"
 
 #: src/protocols/sametime/sametime.c:1134
-#, fuzzy
 msgid "Sending Handshake"
-msgstr "Po dërgoj \"cookie\""
+msgstr "Po dërgoj \"Handshake\""
 
 #: src/protocols/sametime/sametime.c:1139
-#, fuzzy
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Po pres të fillojë shpërngulja"
+msgstr "Po pres të Pranohet \"Handshake\""
 
 #: src/protocols/sametime/sametime.c:1144
+#, fuzzy
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "Duarshtrëngimi u Pranua, Po dërgoj Të dhëna Futjeje"
 
 #: src/protocols/sametime/sametime.c:1149
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
+msgstr "Po pres për Pranim të Hyrjes"
 
 #: src/protocols/sametime/sametime.c:1154
-#, fuzzy
 msgid "Login Redirected"
-msgstr "Shërbyes hyrjeje"
+msgstr "Hyrja u Ridrejtua"
 
 #: src/protocols/sametime/sametime.c:1159
-#, fuzzy
 msgid "Forcing Login"
-msgstr "Po hyj"
+msgstr "Po detyroj Hyrje"
 
 #: src/protocols/sametime/sametime.c:1163
 msgid "Login Acknowledged"
-msgstr ""
+msgstr "Hyrje e Pranuar"
 
 #  Progress
 #: src/protocols/sametime/sametime.c:1168
-#, fuzzy
 msgid "Connected to Sametime Community Server"
-msgstr "Po lidhem me Shërbyes SILC"
+msgstr "U lidha me Shërbyesin e Bashkësisë Sametime"
 
 #. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
 #: src/protocols/sametime/sametime.c:1263
 msgid "Admin Alert"
-msgstr ""
+msgstr "Sinjalizim Admin"
 
 #: src/protocols/sametime/sametime.c:2758
 msgid "Active"
@@ -9397,20 +9028,16 @@
 
 #: src/protocols/simple/simple.c:202
 #, c-format
-msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
-msgstr ""
+msgid "Could not add the buddy %s because every simple user has to start with 'sip:'."
+msgstr "Nuk shtova dot shokun %s sepse secili përdorues i thjeshtë duhet të fillojë me 'sip:'."
 
 #: src/protocols/simple/simple.c:1209
-#, fuzzy
 msgid "Could not create listen socket"
-msgstr "S'munda të krijoj \"socket\""
+msgstr "S'munda të krijoj \"listen socket\""
 
 #: src/protocols/simple/simple.c:1263
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "Nofka IRC nuk duhet të përmbajnë hapësira"
+msgstr "Emrat e përdoruesve në SIP mund të mos përmbajnë hapësira apo simbole @"
 
 #  *< api_version
 #  *< type
@@ -9423,17 +9050,10 @@
 #  *< version
 #  *  summary
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #: src/protocols/simple/simple.c:1408
-#, fuzzy
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Shtojcë Protokolli SILC"
+msgstr "Shtojcë Protokolli SIP/SIMPLE"
 
 #  *< api_version
 #  *< type
@@ -9447,45 +9067,47 @@
 #  *  summary
 #. *  summary
 #: src/protocols/simple/simple.c:1409
-#, fuzzy
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "Shtojcë Protokolli SILC"
+msgstr "Shtojca e Protokollit SIP/SIMPLE"
 
 #. *  description
 #: src/protocols/simple/simple.c:1410
 msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr ""
+msgstr "Thomas Butter <butter@uni-mannheim.de>"
 
 #: src/protocols/simple/simple.c:1431
 msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
+msgstr "Gjendje Botimi (shënim: mund t'ju shohë kushdo)"
 
 #: src/protocols/simple/simple.c:1434
-#, fuzzy
 msgid "Use UDP"
-msgstr "ID Përdoruesi"
+msgstr "Përdor UDP"
 
 #: src/protocols/simple/simple.c:1436
-#, fuzzy
 msgid "Use Proxy"
-msgstr "Pa \"Proxy\""
+msgstr "Përdor Ndërmjetës"
 
 #: src/protocols/simple/simple.c:1438
-#, fuzzy
 msgid "Proxy"
-msgstr "Pa \"Proxy\""
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
+msgstr "Ndërmjetës"
+
+#: src/protocols/silc/buddy.c:51
+#: src/protocols/silc/buddy.c:419
+#: src/protocols/silc/buddy.c:544
+#: src/protocols/silc/buddy.c:711
 #: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Përdoruesi %s nuk është i pranishëm në rrjetin."
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: src/protocols/silc/buddy.c:52
+#: src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119
+#: src/protocols/silc/buddy.c:123
+#: src/protocols/silc/buddy.c:128
+#: src/protocols/silc/buddy.c:133
+#: src/protocols/silc/buddy.c:138
+#: src/protocols/silc/buddy.c:256
 msgid "Key Agreement"
 msgstr "Marrëveshje Kyçash"
 
@@ -9517,19 +9139,16 @@
 msgid "Key agreement cannot be started with yourself"
 msgstr "Nuk mund të nisni marrëveshje kyçash me vetveten"
 
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
+#: src/protocols/silc/buddy.c:257
+#: src/protocols/silc/buddy.c:387
 #: src/protocols/silc/buddy.c:512
 msgid "The remote user is not present in the network any more"
 msgstr "Përdoruesi i largët nuk është më i pranishëm në rrjet"
 
 #: src/protocols/silc/buddy.c:293
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-msgstr ""
-"Kërkesë pranimi kyçi marrë prej %s. Do të donit të përmbushet  pranimi i "
-"kyçit?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgstr "Kërkesë pranimi kyçi marrë prej %s. Do të donit të përmbushet  pranimi i kyçit?"
 
 #: src/protocols/silc/buddy.c:297
 #, c-format
@@ -9546,7 +9165,8 @@
 msgid "Key Agreement Request"
 msgstr "Kërkesë Marrëveshjeje Kyçash"
 
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
+#: src/protocols/silc/buddy.c:386
+#: src/protocols/silc/buddy.c:421
 #: src/protocols/silc/buddy.c:463
 msgid "IM With Password"
 msgstr "IM Me Fjalëkalim"
@@ -9559,32 +9179,41 @@
 msgid "Set IM Password"
 msgstr "Caktoni Fjalëkalim IM"
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: src/protocols/silc/buddy.c:511
+#: src/protocols/silc/buddy.c:546
+#: src/protocols/silc/ops.c:1278
+#: src/protocols/silc/ops.c:1289
 msgid "Get Public Key"
 msgstr "Merr Kyç Publik"
 
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
+#: src/protocols/silc/buddy.c:547
+#: src/protocols/silc/ops.c:1279
 #: src/protocols/silc/ops.c:1290
 msgid "Cannot fetch the public key"
 msgstr "S'bie dot kyç publik"
 
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:634
+#: src/protocols/silc/buddy.c:1583
 msgid "Show Public Key"
 msgstr "Shfaq Kyç Publik"
 
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
+#: src/protocols/silc/buddy.c:635
+#: src/protocols/silc/buddy.c:994
 #: src/protocols/silc/chat.c:235
 msgid "Could not load public key"
 msgstr "S'ngarkova dot kyç publik"
 
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:712
+#: src/protocols/silc/ops.c:873
+#: src/protocols/silc/ops.c:945
+#: src/protocols/silc/ops.c:1080
+#: src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1099
 msgid "User Information"
 msgstr "Të dhëna Përdoruesi"
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
+#: src/protocols/silc/buddy.c:713
+#: src/protocols/silc/ops.c:946
 #: src/protocols/silc/ops.c:1100
 msgid "Cannot get user information"
 msgstr "S'arrij të kem të dhëna përdoruesi"
@@ -9595,12 +9224,8 @@
 msgstr "Shoku %s nuk është i besueshëm"
 
 #: src/protocols/silc/buddy.c:737
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"S'merrni dot njoftime shokësh pa importuar kyçin e tij/saj publik.  Mund të "
-"përdorni urdhrin Merr Kyç Publik për të pasur kyç publik."
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "S'merrni dot njoftime shokësh pa importuar kyçin e tij/saj publik.  Mund të përdorni urdhrin Merr Kyç Publik për të pasur kyç publik."
 
 #  Open file selector to select the public key.
 #. Open file selector to select the public key.
@@ -9614,12 +9239,8 @@
 msgstr "Shoku %s nuk është i pranishëm në rrjet"
 
 #: src/protocols/silc/buddy.c:1040
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"Për të shtuar shokun duhet të ipmortoni kyçin e tij/saj publik. Shtypni "
-"Importo për të importuar një kyç publik."
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "Për të shtuar shokun duhet të ipmortoni kyçin e tij/saj publik. Shtypni Importo për të importuar një kyç publik."
 
 #: src/protocols/silc/buddy.c:1043
 msgid "Import..."
@@ -9630,34 +9251,29 @@
 msgstr "Përzgjidhni përdoruesin e duhur"
 
 #: src/protocols/silc/buddy.c:1132
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"U gjet më shumë se një përdorues me të njëjtin kyç publik. Përzgjidhni prej "
-"listës përdoruesin e duhur i cili të shtohet te lista e shokëve."
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "U gjet më shumë se një përdorues me të njëjtin kyç publik. Përzgjidhni prej listës përdoruesin e duhur i cili të shtohet te lista e shokëve."
 
 #: src/protocols/silc/buddy.c:1134
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"U gjet më shumë se një përdorues me të njëjtin emër. Përzgjidhni prej listës "
-"përdoruesin e duhur i cili të shtohet te lista e shokëve."
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "U gjet më shumë se një përdorues me të njëjtin emër. Përzgjidhni prej listës përdoruesin e duhur i cili të shtohet te lista e shokëve."
 
 #: src/protocols/silc/buddy.c:1415
 msgid "Detached"
 msgstr "Shkëputur"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1419
+#: src/protocols/silc/silc.c:56
 msgid "Indisposed"
 msgstr "Pa qejf"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1423
+#: src/protocols/silc/silc.c:58
 msgid "Wake Me Up"
 msgstr "Zgjomë"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1425
+#: src/protocols/silc/silc.c:50
 msgid "Hyper Active"
 msgstr "Tej mase Veprues"
 
@@ -9665,91 +9281,111 @@
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
+#: src/protocols/silc/buddy.c:1434
+#: src/protocols/silc/silc.c:634
 #: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "I lumtur"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
+#: src/protocols/silc/buddy.c:1436
+#: src/protocols/silc/silc.c:636
 #: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "I trishtuar"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
+#: src/protocols/silc/buddy.c:1438
+#: src/protocols/silc/silc.c:638
 #: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "I nxehur"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
+#: src/protocols/silc/buddy.c:1440
+#: src/protocols/silc/silc.c:640
 #: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Xheloz"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
+#: src/protocols/silc/buddy.c:1442
+#: src/protocols/silc/silc.c:642
 #: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "I turpëruar"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
+#: src/protocols/silc/buddy.c:1444
+#: src/protocols/silc/silc.c:644
 #: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "I pamposhtur"
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
+#: src/protocols/silc/buddy.c:1446
+#: src/protocols/silc/silc.c:646
 #: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "I dashuruar"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
+#: src/protocols/silc/buddy.c:1448
+#: src/protocols/silc/silc.c:648
 #: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Përgjumësh"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
+#: src/protocols/silc/buddy.c:1450
+#: src/protocols/silc/silc.c:650
 #: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "I mërzitur"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
+#: src/protocols/silc/buddy.c:1452
+#: src/protocols/silc/silc.c:652
 #: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "I eksituar"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
+#: src/protocols/silc/buddy.c:1454
+#: src/protocols/silc/silc.c:654
 #: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "I merakosur"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1486
+#: src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr "Mënyra Përdoruesi"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr "Humor"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/ops.c:997
 msgid "Status Text"
 msgstr "Tekst Gjendjesh"
 
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1504
+#: src/protocols/silc/ops.c:1003
 msgid "Preferred Contact"
 msgstr "Kontakt i Parapëlqyer"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1509
+#: src/protocols/silc/ops.c:1008
 msgid "Preferred Language"
 msgstr "Gjuhë e Parapëlqyer"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1514
+#: src/protocols/silc/ops.c:1013
 msgid "Device"
 msgstr "Pajisje"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: src/protocols/silc/buddy.c:1519
+#: src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:702
+#: src/protocols/silc/silc.c:704
 msgid "Timezone"
 msgstr "Zonë kohe"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1524
+#: src/protocols/silc/ops.c:1023
 msgid "Geolocation"
 msgstr "Gjeovendndodhje"
 
@@ -9769,7 +9405,8 @@
 msgid "Get Public Key..."
 msgstr "Merr Kyç Publik..."
 
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: src/protocols/silc/buddy.c:1595
+#: src/protocols/silc/ops.c:1409
 msgid "Kill User"
 msgstr "Asgjëso Përdorues"
 
@@ -9782,7 +9419,8 @@
 msgid "Channel %s does not exist in the network"
 msgstr "Kanali %s nuk ekziston në rrjet"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:80
+#: src/protocols/silc/chat.c:172
 msgid "Channel Information"
 msgstr "Të dhëna Kanali"
 
@@ -9853,26 +9491,19 @@
 msgstr "Listë Kyçesh Publikë Kanali"
 
 #: src/protocols/silc/chat.c:410
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"Mirëfilltësimi i kanalit përdoret për të siguruar kanalin kundrejt hyrjesh "
-"të paautorizuara. Mirëfilltësimi mund të bazohet në parulla dhe nënshkrime "
-"numerikë. Nëse është caktuar parullë, nevojitet për të mundësuar hyrjen. "
-"Nëse janë caktuar kyçe publikë kanali, atëherë vetëm përdoruesit që kanë "
-"kyçe publikë të listuar janë në gjendje të futen."
-
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "Mirëfilltësimi i kanalit përdoret për të siguruar kanalin kundrejt hyrjesh të paautorizuara. Mirëfilltësimi mund të bazohet në parulla dhe nënshkrime numerikë. Nëse është caktuar parullë, nevojitet për të mundësuar hyrjen. Nëse janë caktuar kyçe publikë kanali, atëherë vetëm përdoruesit që kanë kyçe publikë të listuar janë në gjendje të futen."
+
+#: src/protocols/silc/chat.c:419
+#: src/protocols/silc/chat.c:420
+#: src/protocols/silc/chat.c:457
+#: src/protocols/silc/chat.c:458
 #: src/protocols/silc/chat.c:891
 msgid "Channel Authentication"
 msgstr "Mirëfilltësim Kanali"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:421
+#: src/protocols/silc/chat.c:459
 msgid "Add / Remove"
 msgstr "Shto / Hiq"
 
@@ -9880,7 +9511,8 @@
 msgid "Group Name"
 msgstr "Emër Grupi"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: src/protocols/silc/chat.c:580
+#: src/protocols/silc/ops.c:1694
 msgid "Passphrase"
 msgstr "Parullë"
 
@@ -9899,9 +9531,7 @@
 
 #: src/protocols/silc/chat.c:721
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr ""
-"Caktoni kufi përdoruesish në kanal. Vëreni zero për të ricaktuar kufi "
-"përdoruesish."
+msgstr "Caktoni kufi përdoruesish në kanal. Vëreni zero për të ricaktuar kufi përdoruesish."
 
 #: src/protocols/silc/chat.c:863
 msgid "Get Info"
@@ -9967,11 +9597,8 @@
 
 #: src/protocols/silc/chat.c:1071
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
-msgstr ""
-"Duhet të futeni në kanalin %s para se të mundni t'i bashkoheni një grupi "
-"privat"
+msgid "You have to join the %s channel before you are able to join the private group"
+msgstr "Duhet të futeni në kanalin %s para se të mundni t'i bashkoheni një grupi privat"
 
 #: src/protocols/silc/chat.c:1073
 msgid "Join Private Group"
@@ -9981,24 +9608,33 @@
 msgid "Cannot join private group"
 msgstr "S'i bashkohem dot grupit privat"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: src/protocols/silc/chat.c:1267
+#: src/protocols/silc/silc.c:917
 msgid "Cannot call command"
 msgstr "S'thërras dot urdhër"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: src/protocols/silc/chat.c:1268
+#: src/protocols/silc/silc.c:918
 msgid "Unknown command"
 msgstr "Urdhër i panjohur"
 
-#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
-#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
-#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
+#: src/protocols/silc/ft.c:89
+#: src/protocols/silc/ft.c:92
+#: src/protocols/silc/ft.c:96
+#: src/protocols/silc/ft.c:100
+#: src/protocols/silc/ft.c:104
+#: src/protocols/silc/ft.c:205
+#: src/protocols/silc/ft.c:210
+#: src/protocols/silc/ft.c:215
+#: src/protocols/silc/ft.c:221
+#: src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Shpërngulje e Sigurtë Kartelash"
 
-#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
+#: src/protocols/silc/ft.c:90
+#: src/protocols/silc/ft.c:93
+#: src/protocols/silc/ft.c:97
+#: src/protocols/silc/ft.c:101
 #: src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Gabim gjatë shpërnguljeje kartele"
@@ -10012,7 +9648,6 @@
 msgstr "Marrëveshja e kyçave dështoi"
 
 #: src/protocols/silc/ft.c:102
-#, fuzzy
 msgid "File transfer session does not exist"
 msgstr "Nuk ka sesione shpërngulje kartelash"
 
@@ -10036,7 +9671,8 @@
 msgid "Cannot send file"
 msgstr "S'dërgoj dot kartelë"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
+#: src/protocols/silc/ops.c:341
+#: src/protocols/silc/ops.c:350
 #: src/protocols/silc/ops.c:359
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
@@ -10067,13 +9703,15 @@
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Jeni përzënë <I>%s</I> prej <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
+#: src/protocols/silc/ops.c:529
+#: src/protocols/silc/ops.c:534
 #: src/protocols/silc/ops.c:539
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Jeni asgjësuar prej %s (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
+#: src/protocols/silc/ops.c:560
+#: src/protocols/silc/ops.c:565
 #: src/protocols/silc/ops.c:570
 #, c-format
 msgid "Killed by %s (%s)"
@@ -10119,11 +9757,13 @@
 msgid "Join Chat"
 msgstr "Futu në Fjalosje"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1070
+#: src/protocols/silc/ops.c:1140
 msgid "Public Key Fingerprint"
 msgstr "Gjurmë gishtash Kyçi Publik"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: src/protocols/silc/ops.c:1071
+#: src/protocols/silc/ops.c:1141
 msgid "Public Key Babbleprint"
 msgstr "\"Babbleprint\" Kyçi Publik"
 
@@ -10131,7 +9771,8 @@
 msgid "More..."
 msgstr "Më..."
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: src/protocols/silc/ops.c:1155
+#: src/protocols/silc/silc.c:805
 msgid "Detach From Server"
 msgstr "Shkëput Prej Serveri"
 
@@ -10148,7 +9789,6 @@
 msgstr "Dështova në ndryshim nofke"
 
 #: src/protocols/silc/ops.c:1246
-#, fuzzy
 msgid "Roomlist"
 msgstr "Listë Dhomash"
 
@@ -10160,7 +9800,8 @@
 msgid "No public key was received"
 msgstr "S'u mor kuç publik"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: src/protocols/silc/ops.c:1304
+#: src/protocols/silc/ops.c:1317
 msgid "Server Information"
 msgstr "Të dhëna Shërbyesi"
 
@@ -10168,7 +9809,8 @@
 msgid "Cannot get server information"
 msgstr "S'arrij të kem të dhëna shërbyesi"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1334
+#: src/protocols/silc/ops.c:1343
 msgid "Server Statistics"
 msgstr "Statistika Shërbyesi"
 
@@ -10219,7 +9861,8 @@
 msgid "Network Statistics"
 msgstr "Statistika Rrjeti"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1402
 msgid "Ping"
 msgstr "Ping"
 
@@ -10244,17 +9887,15 @@
 msgstr "Shkëmbimi i Kyçave dështoi"
 
 #: src/protocols/silc/ops.c:1508
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Dështoi rimarrja e sesionit të shkëputur. Shtypni Rilidhu për të krijuar një "
-"lidhje të re."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "Dështoi rimarrja e sesionit të shkëputur. Shtypni Rilidhu për të krijuar një lidhje të re."
 
 #: src/protocols/silc/ops.c:1543
 msgid "Disconnected by server"
 msgstr "Shkëputur prej shërbyesit"
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
+#: src/protocols/silc/ops.c:1605
+#: src/protocols/silc/ops.c:1652
 #: src/protocols/silc/silc.c:194
 msgid "Resuming session"
 msgstr "Po i rikthehem sesionit"
@@ -10313,12 +9954,8 @@
 
 #: src/protocols/silc/pk.c:103
 #, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-"Mora kyç publik për %s. Kopja juaj vendore nuk përputhet me këtë kyç. Do të "
-"donit ende të pranohet ky kyç publik?"
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
+msgstr "Mora kyç publik për %s. Kopja juaj vendore nuk përputhet me këtë kyç. Do të donit ende të pranohet ky kyç publik?"
 
 #: src/protocols/silc/pk.c:108
 #, c-format
@@ -10338,7 +9975,8 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
+#: src/protocols/silc/pk.c:115
+#: src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Verifiko Kyç Publik"
 
@@ -10388,15 +10026,18 @@
 "\n"
 "Metoda Kontakti Tuajat të Parapëlqyera "
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:665
+#: src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:667
+#: src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:669
+#: src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "Videokonferencë"
 
@@ -10420,21 +10061,17 @@
 msgid "Your VCard File"
 msgstr "Kartela juaj VCard"
 
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: src/protocols/silc/silc.c:710
+#: src/protocols/silc/silc.c:711
 msgid "User Online Status Attributes"
 msgstr "Atribute Gjendjeje Përdoruesi të Lidhur"
 
 #: src/protocols/silc/silc.c:712
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"Mund t'i lejoni përdoruesit e tjerë të shohin të dhëna rreth gjendjes suaj "
-"online dhe të dhëna vetjake. Ju lutem plotësoni të dhëna rreth jush që do të "
-"donit të shiheshin nga përdoruesit e tjerë."
-
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
+msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
+msgstr "Mund t'i lejoni përdoruesit e tjerë të shohin të dhëna rreth gjendjes suaj online dhe të dhëna vetjake. Ju lutem plotësoni të dhëna rreth jush që do të donit të shiheshin nga përdoruesit e tjerë."
+
+#: src/protocols/silc/silc.c:752
+#: src/protocols/silc/silc.c:758
 #: src/protocols/silc/silc.c:1162
 msgid "Message of the Day"
 msgstr "Mesazhi i Ditës"
@@ -10443,7 +10080,8 @@
 msgid "No Message of the Day available"
 msgstr "Pa Mesazh të Ditës të mundshëm"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: src/protocols/silc/silc.c:753
+#: src/protocols/silc/silc.c:1157
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Nuk ka Mesazh të Ditës shoqëruar kësaj lidhjeje"
 
@@ -10507,9 +10145,7 @@
 
 #: src/protocols/silc/silc.c:1342
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-"join &lt;kanal&gt; [&lt;fjalëkalim&gt;]:  Bashkoju një fjalosjeje në këtë "
-"rrjet"
+msgstr "join &lt;kanal&gt; [&lt;fjalëkalim&gt;]:  Bashkoju një fjalosjeje në këtë rrjet"
 
 #: src/protocols/silc/silc.c:1346
 msgid "list:  List channels on this network"
@@ -10519,16 +10155,14 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nofkë&gt;:  Shihni të dhëna nofke"
 
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/silc/silc.c:1354
+#: src/protocols/zephyr/zephyr.c:2597
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr ""
-"msg &lt;nokë&gt; &lt;mesazh&gt;:  Dërgoji një përdoruesi një mesazh vetjak"
+msgstr "msg &lt;nokë&gt; &lt;mesazh&gt;:  Dërgoji një përdoruesi një mesazh vetjak"
 
 #: src/protocols/silc/silc.c:1358
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr ""
-"query &lt;nofkë&gt; [&lt;mesazh&gt;]:  Dërgo një mesazh vetjak te një "
-"përdorues"
+msgstr "query &lt;nofkë&gt; [&lt;mesazh&gt;]:  Dërgo një mesazh vetjak te një përdorues"
 
 #: src/protocols/silc/silc.c:1362
 msgid "motd:  View the server's Message Of The Day"
@@ -10559,20 +10193,12 @@
 msgstr "whowas &lt;nofkë&gt;:  Shihni të dhëna nofke"
 
 #: src/protocols/silc/silc.c:1392
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;kanal&gt; [+|-&lt;mënyra&gt;] [argumente]:  Ndrysho ose shfaq "
-"mënyra kanali"
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;kanal&gt; [+|-&lt;mënyra&gt;] [argumente]:  Ndrysho ose shfaq mënyra kanali"
 
 #: src/protocols/silc/silc.c:1396
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;kanal&gt; +|-&lt;mënyra&gt; &lt;nofkë&gt;:  Ndrysho mënyra nofke "
-"në kanal"
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;kanal&gt; +|-&lt;mënyra&gt; &lt;nofkë&gt;:  Ndrysho mënyra nofke në kanal"
 
 #: src/protocols/silc/silc.c:1400
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
@@ -10583,12 +10209,8 @@
 msgstr "oper &lt;nofkë&gt; [-pubkey]:  Merr privilegje operatori shërbyesi"
 
 #: src/protocols/silc/silc.c:1408
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;kanal&gt; [-|+]&lt;nofkë&gt;:  fto nofkë ose shto/hiq prej liste "
-"ftesash kanali"
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;kanal&gt; [-|+]&lt;nofkë&gt;:  fto nofkë ose shto/hiq prej liste ftesash kanali"
 
 #: src/protocols/silc/silc.c:1412
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
@@ -10619,12 +10241,8 @@
 msgstr "users &lt;kanal&gt;:  Listo përdoruesa në kanal"
 
 #: src/protocols/silc/silc.c:1441
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(s)&gt;:  Listo "
-"përdorues të vetë në kanal(e)"
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(s)&gt;:  Listo përdorues të vetë në kanal(e)"
 
 #: src/protocols/silc/silc.c:1453
 msgid "Instant Messages"
@@ -10661,13 +10279,7 @@
 #  *< version
 #  *  summary
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #. *  summary
 #: src/protocols/silc/silc.c:1564
 msgid "SILC Protocol Plugin"
@@ -10680,14 +10292,12 @@
 msgstr "Protokoll Secure Internet Live Conferencing (SILC)"
 
 #: src/protocols/silc/silc.c:1600
-#, fuzzy
 msgid "Public Key file"
 msgstr "Kartelë Kyçi Publik"
 
 #: src/protocols/silc/silc.c:1604
-#, fuzzy
 msgid "Private Key file"
-msgstr "Kartelë Kyçi Vetiak"
+msgstr "Kartelë Kyçi Vetjak"
 
 #: src/protocols/silc/silc.c:1607
 msgid "Public key authentication"
@@ -10709,7 +10319,8 @@
 msgid "Reject online status attribute requests"
 msgstr "Hidh poshtë kërkesa rreth atributesh gjendjeje \"online\""
 
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: src/protocols/silc/util.c:205
+#: src/protocols/silc/util.c:230
 msgid "Creating SILC key pair..."
 msgstr "Po krijoj çift kyçesh SILC..."
 
@@ -10717,8 +10328,6 @@
 #  the next strings (short strings: 2 tabs, longer strings 1 tab,
 #  sum: 3 tabs or 24 characters)
 #. Hint for translators: Please check the tabulator width here and in
-#. the next strings (short strings: 2 tabs, longer strings 1 tab,
-#. sum: 3 tabs or 24 characters)
 #: src/protocols/silc/util.c:313
 #, c-format
 msgid "Real Name: \t%s\n"
@@ -10779,7 +10388,8 @@
 "\"Babbleprint\" Kyçi Publik:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: src/protocols/silc/util.c:332
+#: src/protocols/silc/util.c:333
 msgid "Public Key Information"
 msgstr "Të dhëna Kyçi Publik"
 
@@ -10913,12 +10523,8 @@
 msgstr "Niveli juaj i sinjalizimeve për çastin është tepër i lartë për hyrje."
 
 #: src/protocols/toc/toc.c:552
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"Jeni lidhur e shkëputur si shumë shpesh.  Prisni dhjetë minuta dhe "
-"riprovoni.  Nëse vazhdoni të provoni, do t'ju duhet të prisni akoma më gjatë."
+msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
+msgstr "Jeni lidhur e shkëputur si shumë shpesh.  Prisni dhjetë minuta dhe riprovoni.  Nëse vazhdoni të provoni, do t'ju duhet të prisni akoma më gjatë."
 
 #: src/protocols/toc/toc.c:554
 #, c-format
@@ -10931,9 +10537,8 @@
 msgstr "Ndodhi një gabim i panjohur, %d.  Të dhëna: %s"
 
 #: src/protocols/toc/toc.c:584
-#, fuzzy
 msgid "Invalid Groupname"
-msgstr "Grup i pavlefshëm"
+msgstr "Emër i pavlefshëm grupi"
 
 #: src/protocols/toc/toc.c:668
 msgid "Connection Closed"
@@ -10945,8 +10550,7 @@
 
 #: src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"TOC e mori veten pas pushimit. Tani mundeni të dërgoni mesazhet tuaj sërish."
+msgstr "TOC e mori veten pas pushimit. Tani mundeni të dërgoni mesazhet tuaj sërish."
 
 #: src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
@@ -10957,14 +10561,8 @@
 msgstr "TOC ka dërguar një urdhër PUSHIMI."
 
 #: src/protocols/toc/toc.c:994
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-"Kur ndodh kjo, TOC shpërfill çfarëdo mesazhi dërguar asaj, dhe mund t'ju "
-"përzërë nëse dërgoni mesazh. Gaim-i do të parandalojë gjithçka që shpie "
-"atje. Vetëm përkohësisht, ndaj bëni durim."
+msgid "When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
+msgstr "Kur ndodh kjo, TOC shpërfill çfarëdo mesazhi dërguar asaj, dhe mund t'ju përzërë nëse dërgoni mesazh. Gaim-i do të parandalojë gjithçka që shpie atje. Vetëm përkohësisht, ndaj bëni durim."
 
 #: src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
@@ -10983,8 +10581,10 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr "Shpërngulja e kartelës dështoi; mbase ana tjetër e anuloi."
 
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+#: src/protocols/toc/toc.c:1892
+#: src/protocols/toc/toc.c:1932
+#: src/protocols/toc/toc.c:2056
+#: src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "S'u lidha dot për shpërngulje."
 
@@ -11020,16 +10620,10 @@
 #  *  summary
 #  *  description
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #. *  summary
-#. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: src/protocols/toc/toc.c:2316
+#: src/protocols/toc/toc.c:2318
 msgid "TOC Protocol Plugin"
 msgstr "Shtojcë Protokolli TOC"
 
@@ -11045,7 +10639,8 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "Mesazhi juaj Yahoo! nuk u dërgua."
 
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: src/protocols/yahoo/yahoo.c:752
+#: src/protocols/yahoo/yahoo.c:3499
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
@@ -11055,33 +10650,24 @@
 msgstr "Mesazh sistemi Yahoo! për %s:"
 
 #. TODO: this is almost exactly the same as what MSN does,
-#. * this should probably be moved to the core.
-#.
 #: src/protocols/yahoo/yahoo.c:887
-#, fuzzy, c-format
+#, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "Përdoruesi %s don të shtojë %s te listë e tij shokësh"
+msgstr "Përdoruesi %s dëshiron të shtojë %s te lista e tij/saj e shokëve%s%s."
 
 #: src/protocols/yahoo/yahoo.c:893
-#, fuzzy
 msgid "Message (optional) :"
-msgstr "Njoftim Mesazhesh"
+msgstr "Mesazh (opsional) :"
 
 #: src/protocols/yahoo/yahoo.c:935
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s ka hedhur tej (në mënyrë prapavepruese) kërkesën tuaj për ta shtuar te "
-"lista juaj."
+msgstr "%s ka hedhur tej (në mënyrë prapavepruese) kërkesën tuaj për ta shtuar te lista juaj."
 
 #: src/protocols/yahoo/yahoo.c:938
 #, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s ka hedhur tej (në mënyrë prapavepruese) kërkesën tuaj për ta shtuar te "
-"lista juaj për arsyen vijuese: %s."
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "%s ka hedhur tej (në mënyrë prapavepruese) kërkesën tuaj për ta shtuar te lista juaj për arsyen vijuese: %s."
 
 #: src/protocols/yahoo/yahoo.c:941
 msgid "Add buddy rejected"
@@ -11089,14 +10675,8 @@
 
 #: src/protocols/yahoo/yahoo.c:1684
 #, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-"Shërbyesi Yahoo ka kërkuar përdorimin e një metode mirëfilltësimi të "
-"papranuar.  Ky version i Gaim-it ka gjasa të mos mundë të hyjë me sukses te "
-"Yahoo.  Shihni %s për përditësime."
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "Shërbyesi Yahoo ka kërkuar përdorimin e një metode mirëfilltësimi të papranuar.  Ky version i Gaim-it ka gjasa të mos mundë të hyjë me sukses te Yahoo.  Shihni %s për përditësime."
 
 #: src/protocols/yahoo/yahoo.c:1687
 msgid "Failed Yahoo! Authentication"
@@ -11104,12 +10684,8 @@
 
 #: src/protocols/yahoo/yahoo.c:1760
 #, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"Provuat të shpërfillni %s, por përdoruesi gjendet në listën tuaj të "
-"shokëve.  Klikimi i \"Po\"-së do ta heqë dhe shpërfillë shokun."
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "Provuat të shpërfillni %s, por përdoruesi gjendet në listën tuaj të shokëve.  Klikimi i \"Po\"-së do ta heqë dhe shpërfillë shokun."
 
 #: src/protocols/yahoo/yahoo.c:1763
 msgid "Ignore buddy?"
@@ -11124,16 +10700,8 @@
 msgstr "Mirëfilltësimi normal dështoi"
 
 #: src/protocols/yahoo/yahoo.c:1809
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-"Mirëfilltësimi normal dështoi. Kjo do të thotë ose që fjalëkalimi juaj është "
-"i pasaktë, ose që skema e mirëfillltësimit te Yahoo! ka ndryshuar. Gaim-i do "
-"të përpiqet tani të hyjë duke përdorur mirëfilltësimin Web Messenger, çka "
-"përkthehet në anë dhe veprimtari më të ulët."
+msgid "The normal authentication method has failed. This means either your password is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now attempt to log in using Web Messenger authentication, which will result in reduced functionality and features."
+msgstr "Mirëfilltësimi normal dështoi. Kjo do të thotë ose që fjalëkalimi juaj është i pasaktë, ose që skema e mirëfillltësimit te Yahoo! ka ndryshuar. Gaim-i do të përpiqet tani të hyjë duke përdorur mirëfilltësimin Web Messenger, çka përkthehet në anë dhe veprimtari më të ulët."
 
 #: src/protocols/yahoo/yahoo.c:1817
 msgid "Incorrect password."
@@ -11146,9 +10714,7 @@
 #: src/protocols/yahoo/yahoo.c:1823
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"Numrë gabimi të panjohur %d. Hyrja te \"site\"-i web Yahoo! mund ta ndreqë "
-"këtë."
+msgstr "Numrë gabimi të panjohur %d. Hyrja te \"site\"-i web Yahoo! mund ta ndreqë këtë."
 
 #: src/protocols/yahoo/yahoo.c:1877
 #, c-format
@@ -11159,62 +10725,70 @@
 msgid "Could not add buddy to server list"
 msgstr "S'munda të shtoj shok te listë shërbyesi"
 
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
+#: src/protocols/yahoo/yahoo.c:2124
+#: src/protocols/yahoo/yahoo.c:2270
 #: src/protocols/yahoo/ycht.c:413
 msgid "Unable to read"
 msgstr "I pazoti të lexoj"
 
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/yahoo.c:2292
+#: src/protocols/yahoo/yahoo.c:2420
+#: src/protocols/yahoo/yahoo.c:2506
+#: src/protocols/yahoo/yahoo.c:2516
+#: src/protocols/yahoo/yahoochat.c:1393
+#: src/protocols/yahoo/yahoochat.c:1460
 #: src/protocols/yahoo/ycht.c:517
 msgid "Connection problem"
 msgstr "Problem lidhjeje"
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
+#: src/protocols/yahoo/yahoo.c:2619
+#: src/protocols/yahoo/yahoo.c:3236
 msgid "Not At Home"
 msgstr "Jo Në Shtëpi"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
+#: src/protocols/yahoo/yahoo.c:2621
+#: src/protocols/yahoo/yahoo.c:3239
 msgid "Not At Desk"
 msgstr "Jo Në Tryezë"
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
+#: src/protocols/yahoo/yahoo.c:2623
+#: src/protocols/yahoo/yahoo.c:3242
 msgid "Not In Office"
 msgstr "Jo Në Zyrë"
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: src/protocols/yahoo/yahoo.c:2627
+#: src/protocols/yahoo/yahoo.c:3248
 msgid "On Vacation"
 msgstr "Me Pushime"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: src/protocols/yahoo/yahoo.c:2631
+#: src/protocols/yahoo/yahoo.c:3254
 msgid "Stepped Out"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2723
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Not on server list"
 msgstr "Jo në listë shërbyesi"
 
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
-#, fuzzy
+#: src/protocols/yahoo/yahoo.c:2773
+#: src/protocols/yahoo/yahoo.c:2833
 msgid "Appear Online"
-msgstr "Shfaqet Jo i lidhur"
-
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
-#, fuzzy
+msgstr "Shfaqu I lidhur"
+
+#: src/protocols/yahoo/yahoo.c:2776
+#: src/protocols/yahoo/yahoo.c:2855
 msgid "Appear Permanently Offline"
-msgstr "Shfaqet Jo i lidhur"
+msgstr "Shfaqu Përherë Jo i lidhur"
 
 #  State
 #: src/protocols/yahoo/yahoo.c:2794
-#, fuzzy
 msgid "Stealth"
-msgstr "Shtet"
+msgstr "Stealth"
 
 #: src/protocols/yahoo/yahoo.c:2849
-#, fuzzy
 msgid "Don't Appear Permanently Offline"
-msgstr "Shfaqet Jo i lidhur"
+msgstr "Mos u Duk Përherë Jo i lidhur"
 
 #: src/protocols/yahoo/yahoo.c:2896
 msgid "Join in Chat"
@@ -11226,7 +10800,7 @@
 
 #: src/protocols/yahoo/yahoo.c:2926
 msgid "Stealth Settings"
-msgstr ""
+msgstr "Rregullime për Stealth"
 
 #: src/protocols/yahoo/yahoo.c:2932
 msgid "Start Doodling"
@@ -11249,14 +10823,13 @@
 msgstr "Bashkoju përdoruesi në fjalosje..."
 
 #: src/protocols/yahoo/yahoo.c:3541
-#, fuzzy
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join: &lt;dhomë&gt; [shërbyes]:  Bashkoju një fjalosjeje në këtë shërbyes."
+msgstr "join &lt;dhomë&gt; Bashkoju një dhome fjalosjeje në rrjetin Yahoo"
 
 #: src/protocols/yahoo/yahoo.c:3545
+#, fuzzy
 msgid "buzz: Buzz a contact to get their attention"
-msgstr ""
+msgstr "buzz: Tërhiqi vëmendjen një kontakti"
 
 #: src/protocols/yahoo/yahoo.c:3550
 msgid "doodle: Request user to start a Doodle session"
@@ -11274,16 +10847,10 @@
 #  *  summary
 #  *  description
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #. *  summary
-#. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: src/protocols/yahoo/yahoo.c:3639
+#: src/protocols/yahoo/yahoo.c:3641
 msgid "Yahoo Protocol Plugin"
 msgstr "Shtojcë Protokolli Yahoo"
 
@@ -11316,9 +10883,8 @@
 msgstr "Portë shpërnguljesh kartelash"
 
 #: src/protocols/yahoo/yahoo.c:3679
-#, fuzzy
 msgid "Chat Room Locale"
-msgstr "Url Liste Dhome Fjalosjeje"
+msgstr "Vendore Dhome Fjalosjeje"
 
 #: src/protocols/yahoo/yahoo.c:3682
 msgid "Chat Room List Url"
@@ -11346,20 +10912,12 @@
 msgstr "Profil Yahoo!"
 
 #: src/protocols/yahoo/yahoo_profile.c:793
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr ""
-"Më vjen keq, profile me shenjë përmbajtjeje materialesh për të rritur nuk "
-"mbulohen tani për tani. "
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
+msgstr "Më vjen keq, profile me shenjë përmbajtjeje materialesh për të rritur nuk mbulohen tani për tani. "
 
 #: src/protocols/yahoo/yahoo_profile.c:795
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr ""
-"Nëse doni të vizitoni këtë profil, ju duhet të vizitoni këtë lidhje me "
-"shfletuesin tuaj web"
+msgid "If you wish to view this profile, you will need to visit this link in your web browser"
+msgstr "Nëse doni të vizitoni këtë profil, ju duhet të vizitoni këtë lidhje me shfletuesin tuaj web"
 
 #: src/protocols/yahoo/yahoo_profile.c:971
 msgid "Yahoo! ID"
@@ -11393,9 +10951,8 @@
 msgstr "Lidhje \"Cool\" 3"
 
 #: src/protocols/yahoo/yahoo_profile.c:1123
-#, fuzzy
 msgid "Last Update"
-msgstr "Përditësuar së Fundmi"
+msgstr "Përditësimi i Fundit"
 
 #: src/protocols/yahoo/yahoo_profile.c:1129
 #, c-format
@@ -11403,30 +10960,16 @@
 msgstr "Të dhëna përdoruesi për %s të pamundshme"
 
 #: src/protocols/yahoo/yahoo_profile.c:1135
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
-msgstr ""
-"Më ndjeni, ky profil duket të jetë në një gjuhë që nuk mbulohet në këtë kohë."
+msgid "Sorry, this profile seems to be in a language that is not supported at this time."
+msgstr "Më ndjeni, ky profil duket të jetë në një gjuhë që nuk mbulohet në këtë kohë."
 
 #: src/protocols/yahoo/yahoo_profile.c:1151
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"S'munda të marr profil e përdoruesit. Ka shumë të ngjarë të jetë një problem "
-"i shërbyesit. Ju lutem riprovoni më vonë."
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "S'munda të marr profil e përdoruesit. Ka shumë të ngjarë të jetë një problem i shërbyesit. Ju lutem riprovoni më vonë."
 
 #: src/protocols/yahoo/yahoo_profile.c:1154
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"S'munda të marr profilin e përdoruesit. Ka shumë të ngjarë që kjo do të "
-"thotë se përdoruesi nuk ekziston; sidoqoftë, Yahoo! ndonjëherë nuk ja del të "
-"gjejë një profil përdoruesi. Nëse e dini që përdoruesi ekziston, ju lutem "
-"riprovoni më vonë."
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "S'munda të marr profilin e përdoruesit. Ka shumë të ngjarë që kjo do të thotë se përdoruesi nuk ekziston; sidoqoftë, Yahoo! ndonjëherë nuk ja del të gjejë një profil përdoruesi. Nëse e dini që përdoruesi ekziston, ju lutem riprovoni më vonë."
 
 #: src/protocols/yahoo/yahoo_profile.c:1162
 msgid "The user's profile is empty."
@@ -11474,7 +11017,8 @@
 msgid "Webcams"
 msgstr "Kamera web"
 
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/yahoochat.c:1393
+#: src/protocols/yahoo/yahoochat.c:1460
 msgid "Unable to fetch room list."
 msgstr "I pazoti të bie listë dhomash."
 
@@ -11487,33 +11031,33 @@
 msgstr "Problem lidhjeje me shërbyesin YCHT."
 
 #: src/protocols/zephyr/zephyr.c:331
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr ""
-"(Pati një gabim në shndërrimin e këtij mesazhi.\tkontrolloni mundësinë "
-"'Kodime' te Përpunues Llogarish)"
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgstr "(Pati një gabim në shndërrimin e këtij mesazhi.\tkontrolloni mundësinë 'Kodime' te Përpunues Llogarish)"
 
 #: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "Çaktivizo dërgo te fjalosje %s,%s,%s"
-
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+msgstr "I pazoti të dërgoj fjalosje te %s,%s,%s"
+
+#: src/protocols/zephyr/zephyr.c:719
+#: src/protocols/zephyr/zephyr.c:1133
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Përdorues:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: src/protocols/zephyr/zephyr.c:723
+#: src/protocols/zephyr/zephyr.c:1138
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>I fshehur ose jo i futur"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: src/protocols/zephyr/zephyr.c:728
+#: src/protocols/zephyr/zephyr.c:1140
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Në %s që prej %s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1471
+#: src/protocols/zephyr/zephyr.c:1472
 msgid "Anyone"
 msgstr "Cilido"
 
@@ -11544,55 +11088,35 @@
 
 #: src/protocols/zephyr/zephyr.c:2612
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"instance &lt;instancë&gt;: Caktoni instancën për t'u përdorur në këtë klasë"
+msgstr "instance &lt;instancë&gt;: Caktoni instancën për t'u përdorur në këtë klasë"
 
 #: src/protocols/zephyr/zephyr.c:2617
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"inst &lt;instancë&gt;: Caktoni instancën për t'u përdorur në këtë klasë"
+msgstr "inst &lt;instancë&gt;: Caktoni instancën për t'u përdorur në këtë klasë"
 
 #: src/protocols/zephyr/zephyr.c:2622
-#, fuzzy
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"inst &lt;instancë&gt;: Caktoni instancën për t'u përdorur në këtë klasë"
+msgstr "inst &lt;instancë&gt;: Caktoni instancën për t'u përdorur në këtë klasë"
 
 #: src/protocols/zephyr/zephyr.c:2628
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
-"sub &lt;klasë&gt; &lt;instancë&gt; &lt;marrës&gt;: Bashkoju një fjalosjeje "
-"të re"
+msgstr "sub &lt;klasë&gt; &lt;instancë&gt; &lt;marrës&gt;: Bashkoju një fjalosjeje të re"
 
 #: src/protocols/zephyr/zephyr.c:2633
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;instance&gt;: Dërgo një mesazh te &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;: Dërgo një mesazh te &lt;message,<i>instance</i>,*&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2639
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;class&gt; &lt;instance&gt;: Dërgo një mesazh te &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;class&gt; &lt;instance&gt;: Dërgo një mesazh te &lt;<i>class</i>,<i>instance</i>,*&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2645
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Dërgo një mesazh te "
-"&lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Dërgo një mesazh te &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2651
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Dërgo mesazh te &lt;MESAZH,"
-"<i>instance</i>,<i>recipient</i>&gt;"
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;instance&gt; &lt;recipient&gt;: Dërgo mesazh te &lt;MESAZH,<i>instance</i>,<i>recipient</i>&gt;"
 
 #: src/protocols/zephyr/zephyr.c:2656
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
@@ -11618,16 +11142,10 @@
 #  *  summary
 #  *  description
 #. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
 #. *< priority
-#. *< id
-#. *< name
-#. *< version
 #. *  summary
-#. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2847
+#: src/protocols/zephyr/zephyr.c:2849
 msgid "Zephyr Protocol Plugin"
 msgstr "Shtojcë Protokolli Zephyr"
 
@@ -11640,17 +11158,14 @@
 msgstr "Eksporto te .zephyr.subs"
 
 #: src/protocols/zephyr/zephyr.c:2880
-#, fuzzy
 msgid "Import from .anyone"
-msgstr "Eksporto te .cilido"
+msgstr "Importo prej .cilitdo"
 
 #: src/protocols/zephyr/zephyr.c:2883
-#, fuzzy
 msgid "Import from .zephyr.subs"
-msgstr "Eksporto te .zephyr.subs"
+msgstr "Importo prej .zephyr.subs"
 
 #: src/protocols/zephyr/zephyr.c:2886
-#, fuzzy
 msgid "Realm"
 msgstr "Emër i vërtetë"
 
@@ -11661,7 +11176,6 @@
 #  XXX: why in the hell are we calling gaim_connection_error() here?
 #  Forbidden
 #. XXX: why in the hell are we calling gaim_connection_error() here?
-#. Forbidden
 #: src/proxy.c:1036
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
@@ -11677,18 +11191,12 @@
 msgstr "Rregullime \"proxy\" të pavlefshme"
 
 #: src/proxy.c:1874
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"Ose emri i strehës, ose numri i portës së treguar për tipin tuaj të \"proxy"
-"\"-it  është i pavlefshëm."
+msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgstr "Ose emri i strehës, ose numri i portës së treguar për tipin tuaj të \"proxy\"-it  është i pavlefshëm."
 
 #  *
 #  * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#.
 #: src/request.h:1341
 msgid "Accept"
 msgstr "Prano"
@@ -11710,11 +11218,13 @@
 msgstr "(1 mesazh)"
 
 #: src/server.c:859
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s ka ftuar %s te doma e fjalosjes %s\n"
+msgstr ""
+"%s ka ftuar %s te doma e fjalosjes %s:\n"
+"%s"
 
 #: src/server.c:864
 #, c-format
@@ -11726,9 +11236,8 @@
 msgstr "Të pranoj ftesë fjalosjeje?"
 
 #: src/status.c:153
-#, fuzzy
 msgid "Unset"
-msgstr "Njësi"
+msgstr "Hiq"
 
 #: src/status.c:156
 msgid "Unavailable"
@@ -11755,25 +11264,18 @@
 msgstr "%s u gjallërua"
 
 #: src/status.c:1697
-#, fuzzy
 msgid "Default auto-away"
-msgstr "I vetëlarguar"
+msgstr "Vetëlargim parazgjedhje"
 
 #: src/util.c:2121
-#, fuzzy, c-format
+#, c-format
 msgid "Error Reading %s"
-msgstr ""
-"Gabim në leximin e %s: \n"
-"%s.\n"
+msgstr "Gabim në Leximin e %s"
 
 #: src/util.c:2122
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"U has një gabim gjatë përtypjes së listës tuaj të shokëve.  E cila nuk u "
-"ngarkua, dhe kartela e vjetër është kaluar te blist.xml~."
+#, 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 "U has një gabim gjatë leximit të %s suaj.  Nuk u ngarkuan, dhe kartela e vjetër është riemërtuar %s~."
 
 #: src/util.c:2567
 msgid "Calculating..."
@@ -11811,1115 +11313,3 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Gabim në hapje lidhjeje.\n"
 
-#~ msgid "Buddy List Sorting"
-#~ msgstr "Renditje Liste Shokësh"
-
-#~ msgid "_Sorting:"
-#~ msgstr "_Po rendis:"
-
-#~ msgid "Buddy Display"
-#~ msgstr "Shfaqje Shoku"
-
-#, fuzzy
-#~ msgid "Show more buddy details"
-#~ msgstr "Shfaq hollësi përdoruesi"
-
-#~ msgid "Gnome Default"
-#~ msgstr "Parazgjedhje GNOME"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "M_esazh largimi:"
-
-#, fuzzy
-#~ msgid "Quit message"
-#~ msgstr "(1 mesazh)"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Rikthe Gjendje Largimi Gjatë Rilidhjeje"
-
-#~ msgid "Mail Server"
-#~ msgstr "Shërbyes Poste"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d të rinj/%d gjithsej)"
-
-#~ msgid "Check Mail"
-#~ msgstr "Kontrollo Postë"
-
-#~ msgid "Check e-mail every X seconds.\n"
-#~ msgstr "Kontrollo postë çdo X sekonda.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Vetëhyrje"
-
-#~ msgid "New..."
-#~ msgstr "I ri..."
-
-#  else...
-#~ msgid "Back"
-#~ msgstr "Prapa"
-
-#~ msgid "Signoff"
-#~ msgstr "Çnënshkruani"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "Formësim Shtylle Ikonash"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "_Fshih mesazhe deri sa të klikohet shtylla e ikonave"
-
-#, fuzzy
-#~ msgid "Orientation"
-#~ msgstr "Organizëm"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "Jo i lidhur me AIM"
-
-#~ msgid "No screenname given."
-#~ msgstr "Pa emër ekrani të dhënë."
-
-#~ msgid "No roomname given."
-#~ msgstr "Pa emër dhome të dhënë."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "URI AIM-i i pavlefshëm"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Dështova në caktimin e %s te një \"socket\"-i:\n"
-#~ "%s"
-
-#~ msgid "Unable to open socket"
-#~ msgstr "I pazoti të hap \"socket\""
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#~ msgid "Remote Control"
-#~ msgstr "Kontroll nga Larg"
-
-#  *< name
-#  *< version
-#  *  summary
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "Mundëson kontroll nga larg për zbatime Gaim."
-
-#  *  description
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "I jep Gaim-it mundësinë të kontrollohet së largëti përmes zbatimesh "
-#~ "palësh të treta ose përmes mjeti gaim-së-largëti."
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#~ msgid "GTK Signals Test"
-#~ msgstr "Provë Sinjalesh GTK"
-
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr "Provo për të parë që tërë sinjalet ui punojnë në rregull."
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "Kur hapet një bashkëbisedim i ri kjo shtojcë do të fusë bashkëbisedimin e "
-#~ "fundit te bashkëbisedimi i çastit."
-
-#~ msgid "_Apply"
-#~ msgstr "_Zbato"
-
-#  Docked Blist On Top
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "Listë e Luajtshme _Shokësh rri përherë sipër"
-
-#~ msgid "Away!"
-#~ msgstr "Larguar!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "Përpunoni Këtë Mesazh"
-
-#  else...
-#~ msgid "I'm Back!"
-#~ msgstr "U ktheva!"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "Jeni të sigurtë se doni të hiqni mesazhin e largimit \"%s\"?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "Hiq Mesazh Largimi"
-
-#~ msgid "Set All Away"
-#~ msgstr "Vëri të Tërë si të Larguar"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "Nuk mund të ruani një mesazh largimi me një titull bosh"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr ""
-#~ "Ju lutemi vërini një titull mesazhit, ose zgjidhni \"Përdor\" për ta "
-#~ "përdorur pa e ruajtur."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "Nuk mund të krijoni një mesazh largimi bosh"
-
-#~ msgid "New away message"
-#~ msgstr "Mesazh i ri largimi"
-
-#~ msgid "Away title: "
-#~ msgstr "Titull largimi:"
-
-#~ msgid "_Save"
-#~ msgstr "_Ruaj"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "Rua_j & Përdor"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "Gabim Liste Shokësh"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "Madhësi e shigjetës së zgjeruesit"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "Përdorimi: %s urdhër [MUNDËSI] [URI]\n"
-#~ "\n"
-#~ "    URDHRA:\n"
-#~ "       uri                      Trajto AIM: URI\n"
-#~ "       away                     Shfaq dialogun e largimit me mesazhin "
-#~ "parazgjedhje\n"
-#~ "       back                     Hiq dialogun e largimit\n"
-#~ "       quit                     Mbyll kopjen xhiruese të Gaim-it\n"
-#~ "\n"
-#~ "    MUNDËSI:\n"
-#~ "       -h, --help [urdhër]     Shfaq ndihmë për urdhër\n"
-
-#~ msgid ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "Gaim-i nuk po xhiron (në sesionin 0)\n"
-#~ "A është e ngarkuar shtojca \"Kontroll Së largëti\"?\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Të përdorurit e AIM-it: URI-ra:\n"
-#~ "Dërgimi i një IM-je te një emër ekrani:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "Në këtë rast, 'Penguin' është emri i ekranit të cilit duam t'i  nisim IM, "
-#~ "dhe 'hello world'\n"
-#~ "është mesazhi që duam të dërgojmë.  Në vend të hapësirave duhet përdorur "
-#~ "'+'.\n"
-#~ "Ju lutem vini re thojzat e përdorura më sipër - nëse e jepni këtë prej "
-#~ "një shelli, '&'\n"
-#~ "lipset të lihet jashtë, ose urdhri do të ndalet në atë pikë.\n"
-#~ "Tjetër, sa më poshtë do të hapë thjesht një dritare bashkëbisedimi për "
-#~ "një emër ekrani,\n"
-#~ "pa mesazh:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Pjesmarrje në një fjalosje:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...i bashkohet dhome fjalosjesh 'PenguinLounge'.\n"
-#~ "\n"
-#~ "Shtimi i një shoku te listë juaja shokësh:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...ju lejon të shtoni 'Pinguinin' te listë juaja shokësh.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Mbyll kopje punuese të Gaim-it \n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Shëno tërë llogaritë si \"i larguar\" me mesazhin parazgjedhje.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vëri tërë llogaritë si jo i larguar.\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "Shfaq më pak mundësi"
-
-#~ msgid "Information"
-#~ msgstr "Të dhëna"
-
-#, fuzzy
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Shokë/_Lër"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/Mjete/i _Larguar"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/Mjete/Veprime Sh_tojcash"
-
-#~ msgid "Rename Group"
-#~ msgstr "Riemërto Grup"
-
-#~ msgid "New group name"
-#~ msgstr "Emër i ri grupi"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Ju lutem jepni emër të ri për grupin e përzgjedhur."
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Llogari:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>I sinjalizuar:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Sinjalizuar (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/Mjete/Larguar"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Dërgo një mesazh për shokun e përzgjedhur."
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Ki të dhëna mbi shokun e përzgjedhur"
-
-#~ msgid "_Chat"
-#~ msgstr "_Fjalosje"
-
-#~ msgid "Join a chat room"
-#~ msgstr "Bashkoju një dhome fjalosjeje"
-
-#~ msgid "_Away"
-#~ msgstr "_Larguar"
-
-#~ msgid "Set an away message"
-#~ msgstr "Dërgo një mesazh largimi"
-
-#~ msgid "Done."
-#~ msgstr "Kryer"
-
-#~ msgid "Signon: "
-#~ msgstr "Nënshkrim:"
-
-#~ msgid "Signon"
-#~ msgstr "Nënshkruani"
-
-#~ msgid "Cancel All"
-#~ msgstr "Anulo Tërë"
-
-#~ msgid "_Reconnect"
-#~ msgstr "_Rilidhu"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s është shkëputur.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "Arsye e Panjohur."
-
-#~ msgid "Reconnect _All"
-#~ msgstr "Rilidhu me _Tërë"
-
-#~ msgid "Time"
-#~ msgstr "Kohë"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "Mesazh Largimi"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Bashkëbisedim/_Sinjalizo..."
-
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/Bashkëbisedim/A_lias..."
-
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/Mundësi/Shfaq _Vula kohore"
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Bashkëbisedim/Sinjalizo..."
-
-#~ msgid "Warn"
-#~ msgstr "Sinjalizo"
-
-#~ msgid "Warn the user"
-#~ msgstr "Sinjalizo përdoruesin"
-
-#~ msgid "Block the user"
-#~ msgstr "Blloko përdoruesin"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "Dërgo një kartelë te përdoruesi."
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Shto përdoruesin te lista juaj e shokëve"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "Hiq përdoruesin prej listës suaj të shokëve"
-
-#~ msgid "Send"
-#~ msgstr "Dërgo"
-
-#  Invite
-#~ msgid "Invite"
-#~ msgstr "Fto"
-
-#~ msgid "Invite a user"
-#~ msgstr "Fto një përdorues"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Shto fjalosjen te listë juaja shokësh"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Bashkëbisedim/Mbyll"
-
-#~ msgid "former lead developer"
-#~ msgstr "udhëheqsi i dikurshëm i zhvilluesave"
-
-#~ msgid "former maintainer"
-#~ msgstr "mirëmbajtësi i dikurshëm"
-
-#, fuzzy
-#~ msgid "Azerbaijani"
-#~ msgstr "Serbe"
-
-#~ msgid "Burmese"
-#~ msgstr "Burmeze"
-
-#, fuzzy
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "Norvegjiane"
-
-#~ msgid "Albanian"
-#~ msgstr "Shqipe"
-
-#~ msgid "Turkish"
-#~ msgstr "Turke"
-
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrainase"
-
-#~ msgid "Chinese"
-#~ msgstr "Kineze"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "_Screen name"
-#~ msgstr "_Emër ekrani"
-
-#~ msgid "Warn User"
-#~ msgstr "Sinjalizo Përdorues"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Të sinjalizoj %s?</span>\n"
-#~ "\n"
-#~ "Kjo do të rrisë shkallë sinjalizimi për %s dhe ai ose ajo do të jenë "
-#~ "subjekt kufizimesh më të ashpra.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "Ta njoftoj _anonimisht?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>Njoftimet anonime janë më pak të ashpra.</b>"
-
-#  "Download Details" arrow
-#~ msgid "Show transfer details"
-#~ msgstr "Shfaq hollësi shpërnguljeje"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "Sh_faq nofka të largëta nëse nuk ka aliase të caktuar"
-
-#~ msgid "Display"
-#~ msgstr "Shfaq"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "Shfaq _vulë kohore te mesazhet"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "Shpërfill n_gjyra"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "Shpërfill ti_pe gërmash"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Shpërfill _madhësi gërmash"
-
-#~ msgid "Default Formatting"
-#~ msgstr "Formatim Parazgjedhje"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "_Dërgo formatim parazgjedhje me mesazhet që dërgohen"
-
-#~ msgid "Send Message"
-#~ msgstr "Dërgo Mesazh"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "Enter _dërgon mesazh"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "C_ontrol-Enter dërgon mesazh."
-
-#~ msgid "Window Closing"
-#~ msgstr "Mbyllje Dritareje"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_Escape mbyll dritare"
-
-#~ msgid "Insertions"
-#~ msgstr "Futje"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U} ndryshon _formatim"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(number) _fut surretër"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "Shfaq _butona si:"
-
-#~ msgid "Pictures"
-#~ msgstr "Pamje"
-
-#~ msgid "Text"
-#~ msgstr "Tekst"
-
-#~ msgid "Pictures and text"
-#~ msgstr "Pamje dhe tekst"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "_Ngri dritare në rast ngjarjesh"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "Shfaq shkallë _sinjalizimi"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "Zgjero _automatikisht kontakte"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "Aktivizo urdhra \"_slash\""
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "Shfaq _aliase në skeda/tituj"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "_Ngri dritare IM gjatë ngjarjesh"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "Ngri _dritare fjalosjeje gjatë ngjarjesh"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "Përdor emra _shumëngjyrësh ekrani në fjalosje"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "V_endosje Skede:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "Vendosje bashkëbisedimi të ri:"
-
-#~ msgid "Message Logs"
-#~ msgstr "Regjistrime Mesazhesh"
-
-#~ msgid "System Logs"
-#~ msgstr "Regjistrime Sistemi"
-
-#~ msgid "_Enable system log"
-#~ msgstr "_Mundëso regjistrim sistemi"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "Regjistro kur shokët _hyjnë/dalin"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "Regjistro kur shokët bëhen të _plogësht/jo të plogësht"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "Regjistro kur shokët largohen/kthehe_n"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "Regjistroni nënshkrimet/plogështinë/largimet _tuaj"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "Raportim _kohe plogështie:"
-
-#~ msgid "Gaim usage"
-#~ msgstr "Përdorim Gaim-i"
-
-#~ msgid "X usage"
-#~ msgstr "Përdorim X-i"
-
-#~ msgid "Windows usage"
-#~ msgstr "përdorim në Windows"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Shkruar nga:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Emër kartele:</span>\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Shkruar nga:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">Emër kartele:</span>  %s"
-
-#~ msgid "Load"
-#~ msgstr "Ngarko"
-
-#~ msgid "Summary"
-#~ msgstr "Përmbledhje"
-
-#~ msgid "Details"
-#~ msgstr "Hollësi"
-
-#~ msgid "_Edit"
-#~ msgstr "_Përpunoni"
-
-#~ msgid "Interface"
-#~ msgstr "Ndërfaqe"
-
-#~ msgid "Message Text"
-#~ msgstr "Tekst Mesazhi"
-
-#~ msgid "Shortcuts"
-#~ msgstr "Shkurtprerje"
-
-#~ msgid "Away Messages"
-#~ msgstr "Mesazhe për i Larguar "
-
-#~ msgid "Plugins"
-#~ msgstr "Shtojca"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "Tekst i thjeshtë"
-
-#~ msgid "Please create an account."
-#~ msgstr "Ju lutem krijoni një llogari."
-
-#~ msgid "Login"
-#~ msgstr "Hyrje"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_Llogari:</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "_Fjalëkalim:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "Llogari"
-
-#~ msgid "P_references"
-#~ msgstr "P_arapëlqime"
-
-#~ msgid "_Sign on"
-#~ msgstr "_Nënshkruani"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "Përdorimi: %s [MUNDËSI]...\n"
-#~ "\n"
-#~ "  -a, --acct          shfaq dritare përpunuesi llogarish\n"
-#~ "  -w, --away[=MESG]   gjatë nënshkrimit bëje të larguar (argumenti "
-#~ "opsional MESG përcakton\n"
-#~ "                      emrin e mesazhit të largimit që duhet përdorur)\n"
-#~ "  -l, --login[=NAME]  hyr automatikisht (argumenti opsional NAME "
-#~ "përcakton\n"
-#~ "                      llogarinë(të) për t'u përdorur, ndarë me presje)\n"
-#~ "  -n, --loginwin      mos hyr automatikisht; shfaq dritare hyrjeje\n"
-#~ "  -u, --user=NAME     përdor llogarinë NAME\n"
-#~ "  -c, --config=DIR    përdor DIR për kartela formësimi\n"
-#~ "  -d, --debug         shtyp mesazhe diagnostikimi tek stdout\n"
-#~ "  -v, --version       shfaq versionin e tanishëm dhe dil\n"
-#~ "  -h, --help          shfaq këtë ndihmë dhe dil\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "I pazoti të ngarkoj parapëlqim"
-
-#~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Gaim-i s'qe në gjendje të ngarkojë parapëlqimet tuaj sepse janë ruajtur "
-#~ "në një format të vjetër i cili nuk përdoret më.  ju lutem riformësoni "
-#~ "rregullimet tuaj duke përdorur dritaren Parapëlqime."
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "Parazgjedhje pakëz më pak e mërzitshme"
-
-#~ msgid "Available for friends only"
-#~ msgstr "E mundshme vetëm për shokë"
-
-#~ msgid "Away for friends only"
-#~ msgstr "Larguar vetëm për miqtë"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "I padukshëm vetëm për miq"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "I pazoti të gjej emër strehe."
-
-#~ msgid "Error while reading from socket."
-#~ msgstr "Gabim gjatë leximit prej \"socket\"-i."
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "Gabim gjatw shkrimit te \"socket\"-i."
-
-#~ msgid "Authentication failed."
-#~ msgstr "Mirëfilltësim dështoi."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "Kod Gabimi i Panjohur ."
-
-#~ msgid "Status: %s"
-#~ msgstr "Gjendje: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "S'munda të lidhem"
-
-#~ msgid "Reading data"
-#~ msgstr "Po lexoj të dhëna"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "Shtrëngim duarsh me barazpeshuesin"
-
-#~ msgid "Reading server key"
-#~ msgstr "Po lexoj kyç shërbyesi"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "Po shkëmbej hash kyçi"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "Gabim kritik në librari GG\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "I pazoti të pingoj shërbyes"
-
-#~ msgid "Send as message"
-#~ msgstr "Dërgoje si  mesazh"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "Po kërkoj shërbyes GG"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "Dhënë UIN Gadu-Gadu i pavlefshëm"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr ""
-#~ "Po provoni të dërgoni një mesazh te një UIN Gadu-Gadu të pavlefshëm."
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "S'arrita të kem përfundime kërkimi"
-
-#~ msgid "Birth Year"
-#~ msgstr "Vit Lindjeje"
-
-#~ msgid "Sex"
-#~ msgstr "Seks"
-
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "Nuk ka Listë Shokësh të depozituar në shërbyesin Gadu-Gadu."
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "S'munda të Importoj Listë Shokësh prej Shërbyesit"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Listë Shokësh e shpërngulur me sukses te shërbyes Gadu-Gadu"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "S'munda të shpërngul Listë Shokësh te shërbyes Gadu-Gadu"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Listë Shokësh fshirë me sukses prej shërbyesi Gadu-Gadu"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "S'mund të shfij Listë Shokësh prej shërbyesit Gadu-Gadu"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "Fjalëkalimi nuk mund të ndryshohej"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Gabim gjatë komunikimit me shërbyesin Gadu-Gadu"
-
-#~ msgid ""
-#~ "Gaim was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim-i s'qe në gjendje të plotësojë kërkesën tuaj për shkak të një "
-#~ "problemi gjatë komunikimit me shërbyesin HTTP Gadu-Gadu.  Ju lutem "
-#~ "riprovoni më vonë."
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "I pazoti të importoj listë shokësh Gadu-Gadu"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr ""
-#~ "Gaim-i qe i pazoti të lidhet me shërbyes liste shokësh Gadu-Gadu.  Ju "
-#~ "lutem riprovoni më vonë."
-
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "S'munda të eksportoj listë shokësh"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the buddy list server.  Please try again "
-#~ "later."
-#~ msgstr ""
-#~ "Gaim-i qe i pazoti të lidhet me shërbyes liste shokësh.  Ju lutem "
-#~ "riprovoni më vonë."
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "I pazoti të fshij listë shokësh Gadu-Gadu"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "I pazoti të futem në drejtori"
-
-#~ msgid ""
-#~ "Gaim was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim-i s'qe në gjendje të kërkonte në Drejtorinë sepse qe i pazoti të "
-#~ "lidhet me shërbyes drejtorie.  Ju lutem riprovoni më vonë."
-
-#~ msgid ""
-#~ "Gaim was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim s'qe në gjendje të ndryshojë fjalëkalimin tuaj për shkak të një "
-#~ "gabimi gjatë lidhjes me shërbyesin Gadu-Gadu.  Ju lutem riprovoni më vonë."
-
-#~ msgid "Directory Search"
-#~ msgstr "Kërkim Drejtorie"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "I pazoti të futem në profil përdoruesi."
-
-#~ msgid ""
-#~ "Gaim was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim s'qe në gjendje të futet te ky profil përdoruesi për shkak të një "
-#~ "gabimi gjatë lidhjes me shërbyesin e drejtorisë.  Ju lutem riprovoni më "
-#~ "vonë."
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gabim hasi një gabim gjatë komunikimit me shërbyesin ICQ."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "Përdoruesi %s (%s%s%s%s%s) don që ju ti autorizoni ata."
-
-#~ msgid "Send message through server"
-#~ msgstr "Dërgo përgjigje përmes shërbyesit."
-
-#  connect to the server
-#~ msgid "Connecting..."
-#~ msgstr "Po lidhem..."
-
-#~ msgid "Nick:"
-#~ msgstr "Nofkë:"
-
-#~ msgid "Gaim User"
-#~ msgstr "Përdorues Gaim-i"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "Shpërngulje Kartelash e Ndërprerë"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "Të dhëna Shoku për %s"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "Nofkë '%s' e pavlefshme"
-
-#~ msgid "Invalid nickname"
-#~ msgstr "Nofkë e pavlefshme"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Profil Jabber"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "Gabim Liste Dhome "
-
-#~ msgid "Logged out"
-#~ msgstr "Dalë"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "Fshi Sistemim Operativ"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "Përdoruesi %s don t'ju shtojë te listë e tija shokësh."
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Shfaq njoftime mbylljeje bashkëbisedimesh"
-
-#~ msgid "Display timeout notices"
-#~ msgstr "Shfaq njoftime mbarimi kohe"
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr "Shërbyesi ju shkëputi, ngaqë u futët prej një vendndodhje tjetër"
-
-#~ msgid "User Properties"
-#~ msgstr "Veti Përdoruesi"
-
-#, fuzzy
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "Shpërngulje e kartelës %s e plotësuar"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "Jeni shkëputur sepse keni nënshkruar me këtë emër ekrani nga një tjetër "
-#~ "vendndodhje."
-
-#~ msgid "Not specified"
-#~ msgstr "I papërcaktuar"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "Të dhëna ICQ për %s"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "Gabim 0x%04x: I pazoti të formatoj emër ekrani sepse emri i ekranit i "
-#~ "kërkuar përfundon me një hapësirë."
-
-#~ msgid "Visible"
-#~ msgstr "I dukshëm"
-
-#~ msgid "Available Message:"
-#~ msgstr "Mesazh i Mundshëm:"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "Cakto Mesazh për i Gatshëm..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "Dështova të lë kanalin"
-
-#  Basic Profile group.
-#~ msgid "Basic Profile"
-#~ msgstr "Profil Bazë"
-
-#~ msgid "Profile Information"
-#~ msgstr "Të dhëna Profili"
-
-#  Instant Messagers
-#~ msgid "Instant Messagers"
-#~ msgstr "Lajmëtarë të Atypëratyshëm"
-
-#  AIM
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#  ICQ
-#~ msgid "ICQ UIN"
-#~ msgstr "ICQ UIN"
-
-#  MSN
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#  Yahoo
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#  I'm From
-#~ msgid "I'm From"
-#~ msgstr "Jam Prej"
-
-#  Call the dialog.
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "Caktoni të dhëna tuajat për profil Trepia."
-
-#~ msgid "Profile"
-#~ msgstr "Profil"
-
-#~ msgid "Set Profile"
-#~ msgstr "Rregullo Profil"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "Vizitoni Hyrjen"
-
-#~ msgid "Local Users"
-#~ msgstr "Përdoruesa Vendorë"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Shtojcë Protokolli Trepia"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr ""
-#~ "Jeni lënë jashtë ngaqë jeni futur nga një makinë ose pajisje tjetër."
-
-#~ msgid "Please enter your password"
-#~ msgstr "Ju lutem jepni fjalëkalimin tuaj"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s u fut."
-
-#~ msgid "%s signed on"
-#~ msgstr "%s nënshkroi"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s doli."
-
-#~ msgid "%s signed off"
-#~ msgstr "%s çnënshkroi"
-
-#~ msgid "an anonymous person"
-#~ msgstr "dikush i paemërt"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s ka ftuar %s te dhomë jfalosjeje %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Më ndjeni, dola për pak!"
-
-#~ msgid ""
-#~ "Unable to guess the image type based on the file extension supplied.  "
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "I pazoti të hamendësoj tipin e pamjes bazuar në zgjatimin e kartelës së "
-#~ "dhënë.  Po përdor PNG si parazgjedhje."
-
-#~ msgid "Default SILC Key Pair"
-#~ msgstr "Çift Kyçash SILC Parazgjedhje "
-
-#~ msgid "SILC Public Key"
-#~ msgstr "Kyç SILC Publik"
-
-#~ msgid "SILC Private Key"
-#~ msgstr "Kyç SILC Vetiak "
--- a/po/zh_TW.po	Mon Oct 30 21:48:42 2006 +0000
+++ b/po/zh_TW.po	Mon Oct 30 22:45:28 2006 +0000
@@ -1,9 +1,9 @@
 # Gaim Traditional Chinese translation
-# Copyright (C) 2002-2005, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2005, Ambrose C. Li <acli@ada.dhs.org>
+# Copyright (C) 2002-2006, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2006, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the Gaim package.
-# $InternalId: zh_TW.po,v 1.324 2004/11/29 09:58:29 acli Exp $
+# $InternalId: zh_TW.po,v 1.406 2006/10/30 05:59:52 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -42,15 +42,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 1.5.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-29 22:03+0800\n"
-"PO-Revision-Date: 2006-07-30 00:30+0800\n"
-"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
+"Project-Id-Version: Gaim 2.0.0\n"
+"POT-Creation-Date: 2006-10-29 00:00-0400\n"
+"PO-Revision-Date: 2006-10-29 23:16-0500\n"
+"Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../gaim.desktop.in.h:1
@@ -65,2373 +65,1189 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "透過多種通訊協定發送即時訊息"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ciphertest.c:264
-msgid "Cipher Test"
-msgstr "加密測試"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ciphertest.c:267
-#: ../plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr ""
-
-#: ../plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "好友閒置"
-
-#: ../plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "好友離開"
-
-#: ../plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "好友離開"
-
-#. Not used yet.
-#: ../plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "好友使用行動裝置"
-
-#: ../plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "好友離線"
-
-#: ../plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "個別好友狀態的得分值:"
-
-#: ../plugins/contact_priority.c:118
-msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
-msgstr ""
-
-#: ../plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr ""
-
-# NOTE 怪怪的,不知道指的是什麼?!
-#: ../plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "個別帳號的得分值"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "好友優先次序"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/contact_priority.c:185
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "讓你自定各個好友狀態的得分值。"
-
-#. *< description
-#: ../plugins/contact_priority.c:187
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr "讓你自定「閒置」、「離開」及「離線」狀態的得分值,以便計算好友帳號的優先次序。"
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/crazychat/cc_gaim_plugin.c:146
-msgid "Crazychat"
-msgstr "Crazychat"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/crazychat/cc_gaim_plugin.c:149
-msgid "Plugin to establish a Crazychat session."
-msgstr ""
-
-#. *  description
-#: ../plugins/crazychat/cc_gaim_plugin.c:151
-msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr ""
-
-#. make the network configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:295
-msgid "Network Configuration"
-msgstr "網路設定"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:307
-msgid "TCP port"
-msgstr "TCP通訊埠"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:317
-msgid "UDP port"
-msgstr "UDP通訊埠"
-
-#. make the feature configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:329
-#, fuzzy
-msgid "Feature Calibration"
-msgstr "要求認證"
-
-#. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345
-#: ../src/gtkaccount.c:2268
-#: ../src/gtkplugin.c:574
-msgid "Enabled"
-msgstr "啟動"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:350
-msgid "Disabled"
-msgstr "停用"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/dbus-example.c:155
-#, fuzzy
-msgid "DBus Example"
-msgstr "DBus模組範例"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/dbus-example.c:158
-#: ../plugins/dbus-example.c:160
-msgid "DBus Plugin Example"
-msgstr "DBus模組範例"
-
-#  NOTE 譯文更動 by Ambrose
-#: ../plugins/docklet/docklet.c:154
-msgid "Right-click for more unread messages...\n"
-msgstr "按右鍵以讀取未讀訊息...\n"
-
-#: ../plugins/docklet/docklet.c:157
-#: ../src/gtkblist.c:3262
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
-msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
-
-#: ../plugins/docklet/docklet.c:432
-msgid "Change Status"
-msgstr "變更狀態"
-
-#: ../plugins/docklet/docklet.c:435
-#: ../src/gtkstatusbox.c:673
-#: ../src/protocols/gg/gg.c:996
-#: ../src/protocols/jabber/buddy.c:1363
-#: ../src/protocols/msn/state.c:29
-#: ../src/protocols/msn/state.c:30
-#: ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38
-#: ../src/protocols/novell/novell.c:2843
-#: ../src/protocols/yahoo/yahoo.c:2741
-#: ../src/status.c:155
-msgid "Available"
-msgstr "上線"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../plugins/docklet/docklet.c:439
-#: ../src/gtkprefs.c:1774
-#: ../src/gtkstatusbox.c:674
-#: ../src/protocols/gg/gg.c:999
-#: ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/jabber/buddy.c:1367
-#: ../src/protocols/novell/novell.c:2846
-#: ../src/protocols/oscar/oscar.c:719
-#: ../src/protocols/oscar/oscar.c:4423
-#: ../src/protocols/oscar/oscar.c:5466
-#: ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3211
-#: ../src/protocols/yahoo/yahoo.c:3284
-#: ../src/status.c:158
-msgid "Away"
-msgstr "離開"
-
-#: ../plugins/docklet/docklet.c:443
-#: ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:723
-#: ../src/protocols/yahoo/yahoo.c:2735
-#: ../src/status.c:157
-msgid "Invisible"
-msgstr "隱身"
-
-#: ../plugins/docklet/docklet.c:447
-#: ../src/gtkblist.c:2966
-#: ../src/gtkstatusbox.c:676
-#: ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/buddy.c:1361
-#: ../src/protocols/novell/novell.c:2855
-#: ../src/protocols/oscar/oscar.c:794
-#: ../src/protocols/oscar/oscar.c:5438
-#: ../src/protocols/yahoo/yahoo.c:2739
-#: ../src/status.c:154
-msgid "Offline"
-msgstr "離線"
-
-#: ../plugins/docklet/docklet.c:467
-#: ../src/gtkstatusbox.c:681
-#, fuzzy
-msgid "New..."
-msgstr "檢視..."
-
-# XXX 要覆查
-#: ../plugins/docklet/docklet.c:468
-#: ../src/gtkstatusbox.c:682
-msgid "Saved..."
-msgstr "已儲存..."
-
-#: ../plugins/docklet/docklet.c:484
-msgid "Show Buddy List"
-msgstr "顯示好友清單"
-
-#: ../plugins/docklet/docklet.c:489
-#: ../src/gtkconv.c:5743
-msgid "Unread Messages"
-msgstr "未讀訊息"
-
-#: ../plugins/docklet/docklet.c:510
-msgid "New Message..."
-msgstr "新訊息..."
-
-#: ../plugins/docklet/docklet.c:519
-#: ../src/gtkaccount.c:2484
+#: ../console/gntaccount.c:119 ../console/gntblist.c:259
+#: ../console/gntblist.c:377 ../console/gntblist.c:390
+#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
+#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
+#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libgaim/protocols/jabber/chat.c:677
+#: ../libgaim/protocols/jabber/chat.c:688
+#: ../libgaim/protocols/jabber/jabber.c:1188
+#: ../libgaim/protocols/qq/group_join.c:322
+#: ../libgaim/protocols/silc/ops.c:1449
+msgid "Error"
+msgstr "錯誤"
+
+# FIXME 譯文有待改進 - 20061028
+#: ../console/gntaccount.c:119
+msgid "Account was not added"
+msgstr "帳號未被新增"
+
+#: ../console/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "帳號不可留空。"
+
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558
+msgid "New mail notifications"
+msgstr "新郵件通知"
+
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487
+msgid "Remember password"
+msgstr "記住密碼"
+
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3777
+msgid "Modify Account"
+msgstr "修改帳號"
+
+# XXX check
+#: ../console/gntaccount.c:474
+msgid "New Account"
+msgstr "新帳號"
+
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695
+msgid "Protocol:"
+msgstr "通訊協定:"
+
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4922
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "帳號:"
+
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478
+msgid "Password:"
+msgstr "密碼:"
+
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4943 ../gtk/gtkblist.c:5308
+msgid "Alias:"
+msgstr "別名:"
+
+#. Cancel
+#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
+#: ../console/gntaccount.c:834 ../console/gntblist.c:300
+#: ../console/gntblist.c:367 ../console/gntblist.c:400
+#: ../console/gntblist.c:724 ../console/gntblist.c:893
+#: ../console/gntblist.c:984 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:139 ../console/gntstatus.c:471
+#: ../console/gntstatus.c:596 ../gtk/gtkaccount.c:1833
+#: ../gtk/gtkaccount.c:2303 ../gtk/gtkblist.c:5364 ../gtk/gtkdialogs.c:678
+#: ../gtk/gtkdialogs.c:815 ../gtk/gtkdialogs.c:906 ../gtk/gtkdialogs.c:925
+#: ../gtk/gtkdialogs.c:947 ../gtk/gtkdialogs.c:967 ../gtk/gtkdialogs.c:1011
+#: ../gtk/gtkdialogs.c:1049 ../gtk/gtkdialogs.c:1103 ../gtk/gtkdialogs.c:1140
+#: ../gtk/gtkdialogs.c:1165 ../gtk/gtkimhtmltoolbar.c:419
+#: ../gtk/gtkplugin.c:296 ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566
+#: ../gtk/gtkprivacy.c:579 ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615
+#: ../gtk/gtkrequest.c:270 ../gtk/gtksavedstatuses.c:296
+#: ../libgaim/account.c:964 ../libgaim/account.c:1135
+#: ../libgaim/account.c:1169 ../libgaim/conversation.c:1164
+#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1725
+#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libgaim/protocols/jabber/chat.c:780
+#: ../libgaim/protocols/jabber/jabber.c:850
+#: ../libgaim/protocols/jabber/jabber.c:1343
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
+#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
+#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
+#: ../libgaim/protocols/oscar/oscar.c:1387
+#: ../libgaim/protocols/oscar/oscar.c:2151
+#: ../libgaim/protocols/oscar/oscar.c:2190
+#: ../libgaim/protocols/oscar/oscar.c:2238
+#: ../libgaim/protocols/oscar/oscar.c:5732
+#: ../libgaim/protocols/oscar/oscar.c:5784
+#: ../libgaim/protocols/oscar/oscar.c:5936
+#: ../libgaim/protocols/oscar/oscar.c:5961
+#: ../libgaim/protocols/oscar/oscar.c:6017
+#: ../libgaim/protocols/oscar/oscar.c:6086
+#: ../libgaim/protocols/oscar/peer.c:991
+#: ../libgaim/protocols/qq/buddy_info.c:480
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/buddy_opt.c:400 ../libgaim/protocols/qq/group.c:122
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_join.c:357
+#: ../libgaim/protocols/qq/group_opt.c:140
+#: ../libgaim/protocols/qq/group_opt.c:390 ../libgaim/protocols/qq/qq.c:459
+#: ../libgaim/protocols/qq/sendqueue.c:201
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:3361
+#: ../libgaim/protocols/sametime/sametime.c:3446
+#: ../libgaim/protocols/sametime/sametime.c:3616
+#: ../libgaim/protocols/sametime/sametime.c:5311
+#: ../libgaim/protocols/sametime/sametime.c:5400
+#: ../libgaim/protocols/sametime/sametime.c:5524
+#: ../libgaim/protocols/silc/buddy.c:467
+#: ../libgaim/protocols/silc/buddy.c:1078
+#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1910
+#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
+#: ../libgaim/request.h:1354
+msgid "Cancel"
+msgstr "取消"
+
+#. Save
+#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:474 ../console/gntstatus.c:584 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1168
+#: ../libgaim/protocols/jabber/buddy.c:587
+msgid "Save"
+msgstr "儲存"
+
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827
+#: ../gtk/gtksavedstatuses.c:293
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "您確定要刪除 %s?"
+
+#. Close any other opened delete window
+#: ../console/gntaccount.c:614
+msgid "Delete Account"
+msgstr "刪除帳號"
+
+#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
+#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
+#: ../gtk/gtkaccount.c:1832 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:295
+msgid "Delete"
+msgstr "刪除"
+
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1760
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2135 ../gtk/gtkdocklet.c:500
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: ../plugins/docklet/docklet.c:520
-#: ../src/gtkplugin.c:538
-msgid "Plugins"
-msgstr "模組清單"
-
-#: ../plugins/docklet/docklet.c:521
-#: ../src/gtkprefs.c:1915
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: ../plugins/docklet/docklet.c:525
-msgid "Mute Sounds"
-msgstr "靜音"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../plugins/docklet/docklet.c:538
-msgid "Quit"
-msgstr "結束程式"
-
-#: ../plugins/docklet/docklet.c:679
-msgid "Blink tray icon for unread..."
-msgstr "有未讀取訊息時,閃爍工作匣圖示..."
-
-#: ../plugins/docklet/docklet.c:682
-msgid "_Instant Messages:"
-msgstr "即時訊息(_I):"
-
-#: ../plugins/docklet/docklet.c:684
-#: ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:462
-#: ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1764
-#: ../src/gtkprefs.c:1778
-msgid "Never"
-msgstr "從不"
-
-#: ../plugins/docklet/docklet.c:685
-msgid "In hidden conversations"
-msgstr "在隱藏交談"
-
-#: ../plugins/docklet/docklet.c:686
-#: ../plugins/docklet/docklet.c:694
-#: ../plugins/timestamp_format.c:39
-#: ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:463
-#: ../src/gtkprefs.c:825
-msgid "Always"
-msgstr "離開"
-
-#: ../plugins/docklet/docklet.c:690
-msgid "C_hat Messages:"
-msgstr "聊天訊息(_H):"
-
-#: ../plugins/docklet/docklet.c:693
-msgid "When my nick is said"
-msgstr "當我的暱稱被提到"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/docklet/docklet.c:720
-msgid "System Tray Icon"
-msgstr "系統工作匣圖示"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/docklet/docklet.c:723
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "在系統工作匣中顯示 Gaim 的圖示。"
-
-# NOTE queuing semantics clarified by marv on #gaim
-#. *  description
-#: ../plugins/docklet/docklet.c:725
-msgid "Displays a system tray icon (in GNOME, KDE, or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list. Also provides options to blink for unread messages."
-msgstr "將 Gaim 目前的狀態,顯示於系統工作匣圖示上(例如於 GNOME、KDE 或微軟視窗等),同時提供對常用功能的快速操作,以及整合好友清單的顯示。它也提供在收到未讀取訊息時,閃爍工作匣圖示的功能(可選)。"
-
-#: ../plugins/docklet/eggtrayicon.c:123
-#, fuzzy
-msgid "Orientation"
-msgstr "所屬機構"
-
-#: ../plugins/docklet/eggtrayicon.c:124
-msgid "The orientation of the tray."
-msgstr ""
-
-#: ../plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "依交談個數"
-
-#: ../plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "交談位置"
-
-#: ../plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "視窗內之交談個數上限"
-
-#  XXX 要核實譯文!
-#: ../plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "依交談個數放置新交談時,以不同的視窗顯示即時訊息和聊天"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "視窗位置額外選項"
-
-#. *< name
-#. *< version
-#: ../plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "交談視窗位置額外選項。"
-
-#  XXX 譯得很差,請改良 :-(
-#. *< summary
-#. *  description
-#: ../plugins/extplacement.c:139
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "限制視窗可容之交談數目,亦可選擇以不同的視窗顯示即時訊息和聊天"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "Gaim 檔案控制"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/filectl.c:251
-#: ../plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "允許您在檔案中輸入指令以控制 Gaim。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim 範例模組"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "一個 Gaim 的範例模組 - 請看介紹。"
-
-# NOTE 譯文更動 by Ambrose
-#. *  description
-#: ../plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"這是一個很有趣的模組,它具有下列的功能:\n"
-"- 它可以在您登入的時候,告訴您是誰寫了這個程式\n"
-"- 它會將所有收到的訊息左右掉轉\n"
-"- 它會在您的好友登入時,立刻送出一個訊息給他們"
-
-#: ../plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "游標顏色"
-
-#: ../plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr ""
-
-#: ../plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "超連結顏色"
-
-#: ../plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView展開器大小"
-
-#: ../plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr ""
-
-#: ../plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr ""
-
-#: ../plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "交談歷史"
-
-#: ../plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "日誌檢視器"
-
-#: ../plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr ""
-
-#: ../plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr ""
-
-#: ../plugins/gaimrc.c:91
-#, fuzzy
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView展開器大小"
-
-#: ../plugins/gaimrc.c:287
-#, c-format
-msgid "Select Color for %s"
-msgstr "為%s選擇顏色"
-
-#: ../plugins/gaimrc.c:289
-msgid "Select Color"
-msgstr "選擇顏色"
-
-#: ../plugins/gaimrc.c:324
-#, c-format
-msgid "Select Font for %s"
-msgstr "為%s選擇字型"
-
-#: ../plugins/gaimrc.c:364
-msgid "Select Interface Font"
-msgstr "選擇介面字型"
-
-#: ../plugins/gaimrc.c:420
-msgid "General"
-msgstr "一般"
-
-#: ../plugins/gaimrc.c:425
-msgid "GTK+ Interface Font"
-msgstr "GTK+介面字型"
-
-#: ../plugins/gaimrc.c:445
-msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: ../plugins/gaimrc.c:480
-msgid "Interface colors"
-msgstr "介面顏色"
-
-#: ../plugins/gaimrc.c:504
-msgid "Widget Sizes"
-msgstr "Widget 大小"
-
-#: ../plugins/gaimrc.c:525
-msgid "Fonts"
-msgstr "字型"
-
-#: ../plugins/gaimrc.c:548
-msgid "Tools"
-msgstr "工具"
-
-#: ../plugins/gaimrc.c:553
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "將設定寫入%s%sgtkrc-2.0"
-
-#: ../plugins/gaimrc.c:561
-msgid "Re-read gtkrc files"
-msgstr "重新讀取gtkrc檔案"
-
-#: ../plugins/gaimrc.c:588
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+ 佈景主題設定"
-
-#: ../plugins/gaimrc.c:590
-#: ../plugins/gaimrc.c:591
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "提供一般 gtkrc 設定的存取"
-
-#. Configuration frame
-#: ../plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "滑鼠動作設定"
-
-#: ../plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "滑鼠中鍵"
-
-#: ../plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "滑鼠右鍵"
-
-#. "Visual gesture display" checkbox
-#: ../plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "顯示動作路徑(_V)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "滑鼠動作"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "提供滑鼠動作的支援"
-
-#. *  description
-#: ../plugins/gestures/gestures.c:294
-msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-"支援交談視窗中的滑鼠動作。\n"
-"按下滑鼠中間鍵並拖曳滑鼠以執行實際動作:\n"
-"\n"
-"往下後向右拖曳為關閉一個交談。\n"
-"往上後向左拖曳為切換到前一個交談。\n"
-"往上後向右拖曳為切換到下一個交談。"
+#: ../console/gntaccount.c:650
+msgid "You can enable/disable accounts from the following list."
+msgstr "以下列表的帳號可隨意啟用、停用。"
+
+#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
+#: ../console/gntblist.c:300 ../console/gntblist.c:367
+#: ../console/gntblist.c:400 ../console/gntnotify.c:306
+#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2302 ../gtk/gtkblist.c:5363
+#: ../gtk/gtkconv.c:1632 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2429
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:5399
+#: ../libgaim/protocols/silc/chat.c:596
+msgid "Add"
+msgstr "加入"
+
+#: ../console/gntaccount.c:677
+msgid "Modify"
+msgstr "修改"
+
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2251
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s"
+
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2300
+msgid "Add buddy to your list?"
+msgstr "將使用者加入您的好友清單?"
+
+#: ../console/gntblist.c:251
+msgid "You must provide a screename for the buddy."
+msgstr "必須為好友指定帳號。"
+
+#: ../console/gntblist.c:253
+msgid "You must provide a group."
+msgstr "必須為好友指定群組。"
+
+#: ../console/gntblist.c:255
+msgid "You must select an account."
+msgstr "必須指定帳號"
+
+#: ../console/gntblist.c:259
+msgid "Error adding buddy"
+msgstr "新增好友途中發生了錯誤"
+
+#: ../console/gntblist.c:284 ../gtk/gtkaccount.c:1896
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2803
+msgid "Screen Name"
+msgstr "帳號"
+
+#: ../console/gntblist.c:287 ../console/gntblist.c:359 ../gtk/gtkdialogs.c:924
+#: ../gtk/gtkdialogs.c:946 ../gtk/gtkdialogs.c:966 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/silc/chat.c:587
+msgid "Alias"
+msgstr "別名"
+
+#: ../console/gntblist.c:290 ../console/gntblist.c:362
+msgid "Group"
+msgstr "群組"
+
+#: ../console/gntblist.c:293 ../console/gntblist.c:350
+#: ../console/gntnotify.c:155 ../console/gntstatus.c:562
+#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
+#: ../gtk/plugins/gevolution/gevolution.c:451 ../libgaim/plugins/idle.c:153
+#: ../libgaim/plugins/idle.c:189
+msgid "Account"
+msgstr "帳號"
+
+#: ../console/gntblist.c:299 ../console/gntblist.c:771 ../gtk/gtkblist.c:4876
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libgaim/protocols/silc/buddy.c:736
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/buddy.c:1075
+#: ../libgaim/protocols/silc/buddy.c:1174
+#: ../libgaim/protocols/yahoo/yahoo.c:3128
+msgid "Add Buddy"
+msgstr "新增好友"
+
+# TODO 要覆查 - 20061025
+#: ../console/gntblist.c:299
+msgid "Please enter buddy information."
+msgstr "請輸入好友的資訊。"
+
+#: ../console/gntblist.c:322 ../libgaim/blist.c:1195
+msgid "Chats"
+msgstr "聊天"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
 #. Contact Info
 #. Personal
 #. Business
-#: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119
-#: ../src/gtkplugin.c:587
-#: ../src/gtkroomlist.c:604
-#: ../src/protocols/jabber/jabber.c:771
-#: ../src/protocols/msn/msn.c:1529
-#: ../src/protocols/msn/msn.c:1582
-#: ../src/protocols/msn/msn.c:1603
+#: ../console/gntblist.c:356 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
+#: ../gtk/plugins/gevolution/assoc-buddy.c:123
+#: ../libgaim/protocols/jabber/jabber.c:781
+#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
+#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
 msgid "Name"
 msgstr "名稱"
 
-#  NOTE 原始碼指這個解「(即時訊息系統的)帳別」,我覺得有點離譜
-#  NOTE 譯文更動 by Ambrose
-#: ../plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "即時傳訊帳號"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:442
-#: ../src/gtkblist.c:4570
-#: ../src/protocols/silc/buddy.c:736
-#: ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174
-#: ../src/protocols/yahoo/yahoo.c:2984
-msgid "Add Buddy"
-msgstr "新增好友"
-
-#  Add the label.
-#. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:455
-msgid "Select a person from your address book below, or add a new person."
-msgstr "請在下面從目錄服務選擇連絡人,或新增一個連絡人。"
-
-#. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:468
-#: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1720
-#: ../src/protocols/oscar/oscar.c:6068
-#: ../src/protocols/sametime/sametime.c:5529
-msgid "Search"
-msgstr "搜尋"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:549
-#: ../plugins/gevolution/new_person_dialog.c:307
-#: ../src/gtkblist.c:4654
-#: ../src/gtkblist.c:5018
-msgid "Group:"
-msgstr "群組:"
-
-#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
-#. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:575
-#: ../plugins/gevolution/assoc-buddy.c:464
-#: ../plugins/gevolution/new_person_dialog.c:251
-msgid "New Person"
-msgstr "新增連絡人"
-
-#. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:592
-msgid "Select Buddy"
-msgstr "選擇好友"
-
-#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
-#. Add the label.
-#: ../plugins/gevolution/assoc-buddy.c:340
-msgid "Select a person from your address book to add this buddy to, or create a new person."
-msgstr "請從你的目錄服務選擇一個連絡人,好把這個好友加進去;你亦可以選擇新增一個連絡人。"
-
-# XXX 暫譯
-#. Add the expander
-#: ../plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-msgstr "使用者細節 (_D)"
-
-# XXX 暫譯
-#. "Associate Buddy" button
-#: ../plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr "聯結好友 (_A)"
-
-#: ../plugins/gevolution/eds-utils.c:73
-#: ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1134
-msgid "None"
-msgstr "無"
-
-#: ../plugins/gevolution/gevo-util.c:64
-#: ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516
-#: ../src/blist.c:1281
-#: ../src/blist.c:1508
-#: ../src/gtkblist.c:4460
-#: ../src/protocols/jabber/roster.c:67
-msgid "Buddies"
-msgstr "好友"
-
-#: ../plugins/gevolution/gevolution.c:262
-#: ../plugins/gevolution/gevolution.c:268
-msgid "Unable to send e-mail"
-msgstr "無法送出電子郵件"
-
-#: ../plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr "在 PATH 裡找不到可執行的 Evolution 程式。"
-
-#: ../plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "指定的好友不在 Evolution 聯絡人清單中。"
-
-#  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: ../plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
-msgstr "增加到通訊錄"
-
-#: ../plugins/gevolution/gevolution.c:290
-msgid "Send E-Mail"
-msgstr "傳送電子郵件"
-
-#. Configuration frame
-#: ../plugins/gevolution/gevolution.c:417
-msgid "Evolution Integration Configuration"
-msgstr "Evolution 整合設定"
-
-# NOTE (00:38:50) LSchiere: wing: the statement quotes only makes sense in terms of the realization that there is no inherent correlation between im of any type and email
-# NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
-# NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
-#. Label
-#: ../plugins/gevolution/gevolution.c:420
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "請選擇新增好友至那幾個帳號。"
-
-#: ../plugins/gevolution/gevolution.c:450
-#: ../plugins/idle.c:153
-#: ../plugins/idle.c:189
-#: ../src/gtknotify.c:402
-#: ../src/gtkpounce.c:1255
-msgid "Account"
-msgstr "帳號"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Evolution 整合"
-
-#  *< name
-#  *< version
-#  *  summary
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gevolution/gevolution.c:530
-#: ../plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "提供和 Evolution 的整合。"
-
-#: ../plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "請在下面輸入這個使用者的資訊。"
-
-#: ../plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "請在下面輸入好友的帳號及其類別。"
-
-#: ../plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "帳號類型:"
-
-#: ../plugins/gevolution/new_person_dialog.c:295
-#: ../src/gtkaccount.c:784
-#: ../src/gtkblist.c:4616
-msgid "Screen name:"
+#: ../console/gntblist.c:365 ../console/gntblist.c:773 ../gtk/gtkblist.c:5254
+msgid "Add Chat"
+msgstr "新增聊天室"
+
+#: ../console/gntblist.c:366
+msgid "You can edit more information from the context menu later."
+msgstr "如果要繼續修改其他細節,請用快顯選單。"
+
+#: ../console/gntblist.c:377 ../console/gntblist.c:390
+msgid "Error adding group"
+msgstr "新增群組途中發生了錯誤"
+
+#: ../console/gntblist.c:378
+msgid "You must give a name for the group to add."
+msgstr "請給您新增的群組輸入名稱。"
+
+#: ../console/gntblist.c:391
+msgid "A group with the name already exists."
+msgstr "那個群組已經存在"
+
+# TODO 請覆查核實:是「加入」抑或「新增」?
+#: ../console/gntblist.c:398 ../console/gntblist.c:775 ../gtk/gtkblist.c:5360
+#: ../libgaim/protocols/sametime/sametime.c:5310
+#: ../libgaim/protocols/sametime/sametime.c:5397
+msgid "Add Group"
+msgstr "加入群組"
+
+# TODO 要覆查 - 20061026
+#: ../console/gntblist.c:398
+msgid "Enter the name of the group"
+msgstr "請給群組輸入名稱。"
+
+#: ../console/gntblist.c:723
+msgid "Edit Chat"
+msgstr "修改聊天室"
+
+#: ../console/gntblist.c:723
+msgid "Please Update the necessary fields."
+msgstr "請按需要更新欄位內的資訊。"
+
+# TODO 要覆查 - 20061025
+#: ../console/gntblist.c:724 ../console/gntstatus.c:196
+msgid "Edit"
+msgstr "修改"
+
+#: ../console/gntblist.c:738
+msgid "Auto-join"
+msgstr "自動加入"
+
+# XXX 還是「修改選項」?
+#: ../console/gntblist.c:747
+msgid "Edit Settings"
+msgstr "修改設定"
+
+#: ../console/gntblist.c:793 ../libgaim/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "取得資訊"
+
+#: ../console/gntblist.c:798
+msgid "Add Buddy Pounce"
+msgstr "加入好友狀態捕捉"
+
+#: ../console/gntblist.c:805 ../gtk/gtkconv.c:1580
+#: ../libgaim/protocols/oscar/oscar.c:615
+msgid "Send File"
+msgstr "傳送檔案"
+
+#: ../console/gntblist.c:809
+msgid "View Log"
+msgstr "觀看日誌"
+
+#: ../console/gntblist.c:889
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "請輸入 %s 的新密碼"
+
+#: ../console/gntblist.c:891 ../console/gntblist.c:892
+#: ../console/gntblist.c:1061
+msgid "Rename"
+msgstr "重命名"
+
+# FIXME 譯文有待改進 - 20061029
+#: ../console/gntblist.c:891
+msgid "Enter empty string to reset the name."
+msgstr "如果要重置名稱,請輸入空白字串。"
+
+#: ../console/gntblist.c:964
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "移除這組好友會同時移除裏面的所有好友"
+
+#: ../console/gntblist.c:972
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "移除這個群組會同時移除裏面的所有好友"
+
+#: ../console/gntblist.c:977
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "您確定要刪除 %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../console/gntblist.c:980
+msgid "Confirm Remove"
+msgstr "確認移除"
+
+#: ../console/gntblist.c:983 ../console/gntblist.c:1063 ../gtk/gtkblist.c:1039
+#: ../gtk/gtkconv.c:1629 ../gtk/gtkrequest.c:275
+msgid "Remove"
+msgstr "移除"
+
+#. Buddy List
+#: ../console/gntblist.c:1038 ../console/gntblist.c:1872
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3894
+#: ../gtk/plugins/win32/winprefs/winprefs.c:327
+msgid "Buddy List"
+msgstr "好友清單"
+
+#: ../console/gntblist.c:1067
+#, fuzzy
+msgid "Place tagged"
+msgstr "成功為空間加標記"
+
+#: ../console/gntblist.c:1070
+msgid "Tag"
+msgstr "標記"
+
+#: ../console/gntblist.c:1097 ../console/gntblist.c:1198
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "帳號:%s (%s)"
+
+#: ../console/gntblist.c:1122
+#, c-format
+msgid ""
+"\n"
+"Idle: %s"
+msgstr ""
+"\n"
+"閒置:%s"
+
+#: ../console/gntblist.c:1177
+#, c-format
+msgid "Nickname: %s\n"
+msgstr "暱稱:%s\n"
+
+#: ../console/gntblist.c:1189
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"上線:%d 人\n"
+"總數:%d 人"
+
+#: ../console/gntblist.c:1210
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"<b>最後見到:</b>%s前"
+
+# XXX check
+#: ../console/gntblist.c:1433 ../gtk/gtkdocklet.c:448
+#: ../gtk/gtkstatusbox.c:984
+msgid "New..."
+msgstr "新增..."
+
+# NOTE 這是很差的原文,指「已儲存」(Saved) 的「狀態」:P
+# NOTE 上下文有一些常用(?)的狀態及「新增」(新增一個狀態),彈出的視窗也有「新增」,可能「其他」已足夠
+#: ../console/gntblist.c:1440 ../gtk/gtkdocklet.c:449
+#: ../gtk/gtkstatusbox.c:985
+msgid "Saved..."
+msgstr "其他..."
+
+#. Create the "Options" frame.
+#: ../console/gntblist.c:1830 ../gtk/gtkpounce.c:766
+msgid "Options"
+msgstr "選項"
+
+# FIXME 譯文有待改進 - 20061028
+#: ../console/gntblist.c:1836
+msgid "Toggle offline buddies"
+msgstr "顯示/不顯示離線好友"
+
+#: ../console/gntblist.c:1840
+msgid "Sort by status"
+msgstr "依照狀態排列"
+
+#: ../console/gntblist.c:1844
+msgid "Sort alphabetically"
+msgstr "依照字母排列"
+
+#: ../console/gntblist.c:1848
+msgid "Sort by log size"
+msgstr "依照日誌大小排列"
+
+#: ../console/gntconn.c:36
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../console/gntconn.c:39
+#, c-format
+msgid "%s disconnected."
+msgstr "%s 結束連線。"
+
+#: ../console/gntconn.c:40
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"%s 因下列錯誤結束了連線:\n"
+"%s"
+
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3774 ../libgaim/account.c:991
+#: ../libgaim/connection.c:107
+msgid "Connection Error"
+msgstr "連線錯誤"
+
+#: ../console/gntconv.c:71 ../gtk/gtkconv.c:484
+msgid "No such command."
+msgstr "無此指令。"
+
+#: ../console/gntconv.c:75 ../gtk/gtkconv.c:491
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "語法錯誤:輸入的參數少於指令所需的參數數量。"
+
+#: ../console/gntconv.c:80 ../gtk/gtkconv.c:496
+msgid "Your command failed for an unknown reason."
+msgstr "指令執行失敗,原因不明。"
+
+#: ../console/gntconv.c:85 ../gtk/gtkconv.c:502
+msgid "That command only works in chats, not IMs."
+msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
+
+#: ../console/gntconv.c:88 ../gtk/gtkconv.c:505
+msgid "That command only works in IMs, not chats."
+msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
+
+#: ../console/gntconv.c:92 ../gtk/gtkconv.c:509
+msgid "That command doesn't work on this protocol."
+msgstr "這個指令在這個通訊協定內無效。"
+
+# NOTE 沒辦法,用不到着重號,又沒法改換字型……
+#: ../console/gntconv.c:99
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "尚未支援指令,訊息因此沒有被送出。"
+
+# XXX 這是什麼?
+#: ../console/gntconv.c:196
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../console/gntconv.c:217
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../console/gntconv.c:347
+msgid "<AUTO-REPLY> "
+msgstr "<自動回應> "
+
+#. Print the list of users in the room
+#: ../console/gntconv.c:441
+msgid "List of users:\n"
+msgstr "使用者列表:\n"
+
+#: ../console/gntconv.c:565 ../gtk/gtkconv.c:378
+msgid "Supported debug options are:  version"
+msgstr "支援的除錯選項有:version"
+
+#: ../console/gntconv.c:600 ../gtk/gtkconv.c:414
+msgid "No such command (in this context)."
+msgstr "沒有這個指令(可在這裏使用)"
+
+#: ../console/gntconv.c:603 ../gtk/gtkconv.c:417
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"要獲得某一指令的說明,輸入「/help &lt;指令&gt;」即可。\n"
+"在這裏,可用的指令有:\n"
+
+#: ../console/gntconv.c:642 ../gtk/gtkconv.c:6645
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr "say &lt;訊息&gt;:將指定的訊息當成一般訊息正常送出,而非當為指令處理。"
+
+#: ../console/gntconv.c:645 ../gtk/gtkconv.c:6648
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
+
+#: ../console/gntconv.c:648 ../gtk/gtkconv.c:6651
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
+
+# XXX
+#: ../console/gntconv.c:651 ../gtk/gtkconv.c:6654
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear:清空交談的回捲緩衝區"
+
+#: ../console/gntconv.c:654 ../gtk/gtkconv.c:6657
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
+
+#: ../console/gntconv.c:659
+msgid "plugins: Show the plugins window."
+msgstr "plugins:顯示「模組」視窗"
+
+#: ../console/gntconv.c:662
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist:顯示好友清單。"
+
+#: ../console/gntconv.c:665
+msgid "accounts: Show the accounts window."
+msgstr "accounts:顯示帳號清單。"
+
+#: ../console/gntconv.c:668
+msgid "debugwin: Show the debug window."
+msgstr "debugwin:顯示除錯視窗"
+
+#: ../console/gntconv.c:671
+msgid "prefs: Show the preference window."
+msgstr "prefs:顯示「偏好設定」視窗"
+
+# FIXME - 20061028
+#: ../console/gntconv.c:674
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses:「已儲存的狀態」視窗"
+
+#: ../console/gntdebug.c:203 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "除錯視窗"
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * 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.
+#.
+#: ../console/gntdebug.c:220 ../gtk/gtkdebug.c:767
+msgid "Clear"
+msgstr "清除"
+
+#: ../console/gntdebug.c:225 ../gtk/gtkdebug.c:776
+msgid "Pause"
+msgstr "暫停"
+
+#: ../console/gntdebug.c:230 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "時間戳記"
+
+#: ../console/gntgaim.c:166
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s。執行「%s -h」以獲得更進一步的資訊。\n"
+
+#: ../console/gntgaim.c:168
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"Gaim %s\n"
+"使用方法: %s [選項]...\n"
+"\n"
+"  -c, --config=DIR    設定檔所在目錄\n"
+"  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -h, --help          顯示輔助訊息並離開\n"
+"  -n, --nologin       不自動登入\n"
+"  -v, --version       顯示版本訊息並離開\n"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../console/gntnotify.c:79 ../gtk/gtkblist.c:3776 ../gtk/gtkdialogs.c:677
+#: ../gtk/gtkdialogs.c:814 ../gtk/gtkdialogs.c:905 ../gtk/gtkrequest.c:269
+#: ../libgaim/account.c:963 ../libgaim/account.c:1134
+#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1342
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
+#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
+#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libgaim/protocols/oscar/oscar.c:2150
+#: ../libgaim/protocols/oscar/oscar.c:2237
+#: ../libgaim/protocols/oscar/oscar.c:5731
+#: ../libgaim/protocols/oscar/oscar.c:5935
+#: ../libgaim/protocols/oscar/oscar.c:5960
+#: ../libgaim/protocols/oscar/oscar.c:6016
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:749
+#: ../libgaim/protocols/yahoo/yahoo.c:3213
+#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+msgid "OK"
+msgstr "確定"
+
+#: ../console/gntnotify.c:146
+msgid "Emails"
+msgstr "電子郵件"
+
+# XXX 要覆查
+#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+msgid "You have mail!"
+msgstr "您收到郵件!"
+
+# FIXME check - 20061025
+#  NOTE Jabber 術語,見上
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
+#: ../libgaim/protocols/jabber/jabber.c:1138
+msgid "From"
+msgstr "已認證對方"
+
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+msgid "Subject"
+msgstr "主題"
+
+#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
+#: ../console/gntplugin.c:274 ../console/gntstatus.c:206
+#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
+#: ../libgaim/protocols/silc/util.c:377
+msgid "Close"
+msgstr "關閉"
+
+#: ../console/gntnotify.c:182
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] "%s (%s) 有 %d 封新郵件。"
+msgstr[1] "%s (%s) 有 %d 封新郵件。"
+
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+msgid "New Mail"
+msgstr "新郵件"
+
+#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
+#: ../libgaim/protocols/oscar/oscar.c:2610
+#, c-format
+msgid "Info for %s"
+msgstr "%s 的資訊"
+
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../libgaim/protocols/toc/toc.c:476
+msgid "Buddy Information"
+msgstr "好友資訊"
+
+#: ../console/gntnotify.c:303
+msgid "Continue"
+msgstr "繼續"
+
+# XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
+# XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
+# XXX 注:現在 (2.0.0b4) 不是了,除錯視窗的「過濾程度」竟有「Info」(資訊)級別……
+#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1608 ../gtk/gtkdebug.c:862
+msgid "Info"
+msgstr "資訊"
+
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1569
+msgid "IM"
+msgstr "即時訊息"
+
+#: ../console/gntnotify.c:315
+msgid "Join"
+msgstr "加入"
+
+#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3445
+msgid "Invite"
+msgstr "邀請"
+
+# TODO 要覆查 - 20061028
+#: ../console/gntnotify.c:321
+msgid "(none)"
+msgstr "(沒有名字)"
+
+#: ../console/gntplugin.c:117
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+"名稱:%s\n"
+"板本:%s\n"
+"簡介:%s\n"
+"作者:%s\n"
+"網站:%s\n"
+"檔名:%s\n"
+
+#: ../console/gntplugin.c:170
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "設定模組前,請先載入模組。"
+
+#: ../console/gntplugin.c:208
+msgid "..."
+msgstr "..."
+
+#: ../console/gntplugin.c:209
+msgid "Still need to do something about this."
+msgstr ""
+
+#: ../console/gntplugin.c:215
+msgid "No configuration options for this plugin."
+msgstr "此模組並無選項可供設定。"
+
+#: ../console/gntplugin.c:231 ../console/gntui.c:73 ../gtk/gtkdocklet.c:501
+#: ../gtk/gtkplugin.c:538
+msgid "Plugins"
+msgstr "模組清單"
+
+#: ../console/gntplugin.c:236
+msgid "You can (un)load plugins from the following list."
+msgstr "您可透過以下列表載入或卸載模組。"
+
+#: ../console/gntplugin.c:279
+msgid "Configure Plugin"
+msgstr "設定模組"
+
+#: ../console/gntprefs.c:122
+msgid "Show Idle Time"
+msgstr "顯示閒置時間"
+
+#: ../console/gntprefs.c:123
+msgid "Show Offline Buddies"
+msgstr "顯示離線好友"
+
+#: ../console/gntprefs.c:129
+msgid "Show Timestamps"
+msgstr "顯示時間戳記"
+
+#: ../console/gntprefs.c:130
+msgid "Notify buddies when you are typing"
+msgstr "通知您的好友您正在發訊息給他們"
+
+#: ../console/gntprefs.c:136
+msgid "Log format"
+msgstr "日誌格式"
+
+#: ../console/gntprefs.c:137
+msgid "Log IMs"
+msgstr "記錄所有即時訊息內容"
+
+#: ../console/gntprefs.c:138
+msgid "Log chats"
+msgstr "記錄所有聊天內容"
+
+#: ../console/gntprefs.c:139
+msgid "Log status change events"
+msgstr "記錄所有的狀態改變"
+
+#. Conversations
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:822 ../gtk/gtkprefs.c:1888
+#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+msgid "Conversations"
+msgstr "交談"
+
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1318 ../gtk/gtkprefs.c:1899
+msgid "Logging"
+msgstr "日誌"
+
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:502
+#: ../gtk/gtkprefs.c:1924
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: ../console/gntrequest.c:495
+msgid "Not implemented yet."
+msgstr "該功能尚未實作"
+
+#: ../console/gntstatus.c:135
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "您確定要刪除「%s」?"
+
+#: ../console/gntstatus.c:138
+msgid "Delete Status"
+msgstr "移除狀態"
+
+# FIXME 譯得太差了
+#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:526
+msgid "Saved Statuses"
+msgstr "已儲存的狀態"
+
+# FIXME 原文一詞兩義,根本無法翻譯
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:525
+#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../libgaim/protocols/novell/novell.c:1484
+msgid "Title"
+msgstr "職銜"
+
+# NOTE 應指儲存時的格式
+#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:448
+msgid "Type"
+msgstr "格式"
+
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:550
+#: ../console/gntstatus.c:562 ../gtk/gtksavedstatuses.c:459
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../libgaim/protocols/bonjour/bonjour.c:263
+#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/gg/gg.c:1602
+#: ../libgaim/protocols/gg/gg.c:1608 ../libgaim/protocols/gg/gg.c:1617
+#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1205
+#: ../libgaim/protocols/jabber/jabber.c:1215
+#: ../libgaim/protocols/jabber/jabber.c:1225
+#: ../libgaim/protocols/jabber/jabber.c:1235
+#: ../libgaim/protocols/jabber/jabber.c:1245
+#: ../libgaim/protocols/jabber/jabber.c:1257
+#: ../libgaim/protocols/novell/novell.c:2876
+#: ../libgaim/protocols/novell/novell.c:2982
+#: ../libgaim/protocols/novell/novell.c:2988
+#: ../libgaim/protocols/novell/novell.c:2994
+#: ../libgaim/protocols/oscar/oscar.c:5395
+#: ../libgaim/protocols/oscar/oscar.c:5410
+#: ../libgaim/protocols/oscar/oscar.c:5415
+#: ../libgaim/protocols/oscar/oscar.c:5623
+#: ../libgaim/protocols/oscar/oscar.c:5635
+#: ../libgaim/protocols/oscar/oscar.c:5648
+#: ../libgaim/protocols/oscar/oscar.c:5655
+#: ../libgaim/protocols/oscar/oscar.c:5662
+#: ../libgaim/protocols/sametime/sametime.c:3259
+#: ../libgaim/protocols/sametime/sametime.c:3265
+#: ../libgaim/protocols/sametime/sametime.c:3271
+#: ../libgaim/protocols/sametime/sametime.c:3350
+#: ../libgaim/protocols/silc/buddy.c:1544
+#: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3456
+#: ../libgaim/protocols/yahoo/yahoo.c:3462
+#: ../libgaim/protocols/zephyr/zephyr.c:2333
+msgid "Message"
+msgstr "訊息"
+
+#. Use
+#: ../console/gntstatus.c:186 ../console/gntstatus.c:579
+msgid "Use"
+msgstr "使用"
+
+#: ../console/gntstatus.c:291
+msgid "Invalid title"
+msgstr "無效的標題"
+
+#: ../console/gntstatus.c:292
+msgid "Please enter a non-empty title for the status."
+msgstr "請為這個狀態輸入一個非空白的標題。"
+
+#: ../console/gntstatus.c:299
+msgid "Duplicate title"
+msgstr "標題重覆"
+
+#: ../console/gntstatus.c:300
+msgid "Please enter a different title for the status."
+msgstr "為給這個狀態輸入另一個標題。"
+
+#: ../console/gntstatus.c:439
+msgid "Substatus"
+msgstr "子狀態"
+
+#. Set up stuff for the account box
+#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:4970 ../gtk/gtkblist.c:5288
+msgid "Account:"
 msgstr "帳號:"
 
-#  NOTE 選擇性資訊
-#. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "其他資訊:"
-
-#. Label
-#: ../plugins/gevolution/new_person_dialog.c:338
-#: ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446
-#: ../src/protocols/oscar/oscar.c:625
-msgid "Buddy Icon"
-msgstr "好友圖示"
-
-#: ../plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "名:"
-
-#: ../plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "姓:"
-
-#: ../plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "電子郵件:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK信號測試"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gtk-signals-test.c:163
-#: ../plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr "檢查使用者介面的各種信號是否都能正常運作。"
-
-#: ../plugins/history.c:120
+#: ../console/gntstatus.c:450 ../gtk/gtkft.c:698
+msgid "Status:"
+msgstr "狀態:"
+
+#: ../console/gntstatus.c:465
+msgid "Message:"
+msgstr "訊息:"
+
+#: ../console/gntstatus.c:514
+msgid "Edit Status"
+msgstr "修改狀態"
+
+#: ../console/gntstatus.c:533 ../console/gntstatus.c:562
+#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1575
+#: ../libgaim/protocols/gg/gg.c:1579 ../libgaim/protocols/jabber/buddy.c:623
+#: ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:658
+#: ../libgaim/protocols/jabber/jabber.c:1176
+#: ../libgaim/protocols/msn/msn.c:546
+#: ../libgaim/protocols/novell/novell.c:2875
+#: ../libgaim/protocols/novell/novell.c:2879
+#: ../libgaim/protocols/oscar/oscar.c:759
+#: ../libgaim/protocols/oscar/oscar.c:765
+#: ../libgaim/protocols/oscar/oscar.c:768
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+msgid "Status"
+msgstr "狀態"
+
+#: ../console/gntstatus.c:556
+msgid "Use different status for following accounts"
+msgstr "為部份帳號設定不同的狀態"
+
+#. Save & Use
+#: ../console/gntstatus.c:590
+msgid "Save & Use"
+msgstr "儲存並使用"
+
+#: ../console/gntui.c:75
+msgid "Statuses"
+msgstr "狀態"
+
+#: ../console/plugins/gntgf.c:209
+#, c-format
+msgid "%s just signed on"
+msgstr "%s 登入"
+
+#: ../console/plugins/gntgf.c:216
+#, c-format
+msgid "%s just signed off"
+msgstr "%s 登出"
+
+#: ../console/plugins/gntgf.c:224
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s 送出一個訊息給您"
+
+#: ../console/plugins/gntgf.c:243
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s 在 %s 提到您的暱稱"
+
+#: ../console/plugins/gntgf.c:245
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s 在 %s 送出一個訊息給您。"
+
+#: ../console/plugins/gntgf.c:283
+msgid "Buddy signs on/off"
+msgstr "好友登入/登出"
+
+#: ../console/plugins/gntgf.c:284
+msgid "You receive an IM"
+msgstr "您收到即時訊息"
+
+#: ../console/plugins/gntgf.c:285
+msgid "Someone speaks in a chat"
+msgstr "有人在聊天室談話"
+
+#: ../console/plugins/gntgf.c:286
+msgid "Someone says your name in a chat"
+msgstr "有人在聊天室中提到您的名字"
+
+#: ../console/plugins/gntgf.c:314
+msgid "Notify with a toaster when"
+msgstr ""
+
+#: ../console/plugins/gntgf.c:329
+msgid "Beep too!"
+msgstr ""
+
+#: ../console/plugins/gntgf.c:335
+msgid "Set URGENT for the terminal window."
+msgstr "給終端機視窗設定「URGENT」(緊急資訊)提示"
+
+#: ../console/plugins/gntgf.c:355
+msgid "GntGf"
+msgstr ""
+
+#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
+msgid "Toaster plugin for Gaim-Text."
+msgstr ""
+
+#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>與 %s 於 %s 的交談;</b><br>"
 
-#: ../plugins/history.c:147
+#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: ../plugins/history.c:148
+msgstr "使用歷史記錄模組,先要啟用日誌功能"
+
+#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
 msgstr ""
 "日誌功能可以從「工具」->「偏好設定」->「日誌」來啟動。\n"
 "\n"
 "開啟即時訊息及聊天室的日誌功能將會為相同類別的交談留下歷史記錄。"
 
-#: ../plugins/history.c:188
-msgid "History"
+#: ../console/plugins/gnthistory.c:179
+msgid "GntHistory"
 msgstr "歷史記錄"
 
-#: ../plugins/history.c:190
+#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "顯示最近所記錄的交談到新的交談視窗中"
 
-#: ../plugins/history.c:191
-msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
 msgstr "當新的交談開啟時,這個模組將會把上次的交談內容也顯示出來。"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "離開時最小化"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/iconaway.c:85
-#: ../plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "在您離開時,最小化好友清單及各交談視窗。"
-
-#  NOTE 這是是輸入欄位左邊的標籤,「幾多分鐘」、「分鐘數」的意思
-#  FIXME 譯文有待改進
-#: ../plugins/idle.c:158
-#: ../plugins/idle.c:216
-msgid "Minutes"
-msgstr "分鐘數"
-
-#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
-#. If that doesn't translate well into your language, drop the 's before translating.
-#: ../plugins/idle.c:165
-#: ../plugins/idle.c:198
-#: ../plugins/idle.c:223
-#: ../plugins/idle.c:315
-msgid "I'dle Mak'er"
-msgstr "I'dle Mak'er"
-
-#: ../plugins/idle.c:166
-#: ../plugins/idle.c:255
-msgid "Set Account Idle Time"
-msgstr "自定個別帳號的閒置時間"
-
-#: ../plugins/idle.c:169
-#: ../plugins/idle.c:227
-msgid "_Set"
-msgstr "設定(_S)"
-
-#: ../plugins/idle.c:170
-#: ../plugins/idle.c:203
-#: ../plugins/idle.c:228
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../plugins/idle.c:183
-msgid "None of your accounts are idle."
-msgstr "您的帳號都不是閒置狀態。"
-
-#: ../plugins/idle.c:199
-#: ../plugins/idle.c:259
-msgid "Unset Account Idle Time"
-msgstr "取消帳號閒置時間設定"
-
-#: ../plugins/idle.c:202
-msgid "_Unset"
-msgstr "取消設定(_U)"
-
-#: ../plugins/idle.c:224
-#: ../plugins/idle.c:263
-msgid "Set Idle Time for All Accounts"
-msgstr "設定所有帳號的閒置時間"
-
-#: ../plugins/idle.c:268
-msgid "Unset Idle Time for All Idled Accounts"
-msgstr "取消所有已閒置帳號的閒置時間"
-
-#: ../plugins/idle.c:317
-#: ../plugins/idle.c:318
-msgid "Allows you to hand-configure how long you've been idle"
-msgstr "允許您手動設定您已閒置了多久時間"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr "IPC 測試用戶端"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr "以用戶端身份測試插件系統的 IPC 支援。"
-
-# FIXME 務必要覆核這段譯文!!!
-# NOTE 譯文更動 by Paladin
-# NOTE Patch by Kevin Leung
-#. *  description
-#: ../plugins/ipc-test-client.c:92
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
-msgstr "以用戶端身份測試模組系統的 IPC 支援,即是找尋伺服器模組後呼叫事先掛載的指令。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "IPC 測試伺服器"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr "以伺服器身份測試插件系統的 IPC 支援。"
-
-# FIXME 務必要覆核這段譯文!!!
-# NOTE 譯文更動 by Paladin
-# NOTE Patch by Kevin Leung
-#. *  description
-#: ../plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "以伺服器身份測試模組系統的 IPC 支援,即是掛載測試用的 IPC 指令。"
-
-#: ../plugins/log_reader.c:1405
-msgid "User is offline."
-msgstr "使用者是離線的。"
-
-#: ../plugins/log_reader.c:1411
-msgid "Auto-response sent:"
-msgstr "自動回應送出:"
-
-#: ../plugins/log_reader.c:1421
-#: ../plugins/log_reader.c:1424
-#: ../plugins/statenotify.c:80
-#, c-format
-msgid "%s has signed off."
-msgstr "%s 已經登出。"
-
-#: ../plugins/log_reader.c:1438
-msgid "One or more messages may have been undeliverable."
-msgstr ""
-
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: ../plugins/log_reader.c:1448
-#: ../src/protocols/napster/napster.c:363
-msgid "You were disconnected from the server."
-msgstr "您已經停止與伺服器的連線。"
-
-#: ../plugins/log_reader.c:1456
-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
-msgstr "您目前是離線狀態。在您重新登入前,將無法收到任何訊息。"
-
-#: ../plugins/log_reader.c:1471
-msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "由於達到長度上限,所以訊息無法送出。"
-
-#: ../plugins/log_reader.c:1476
-msgid "Message could not be sent."
-msgstr "訊息無法送出。"
-
-# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1838
-#: ../plugins/log_reader.c:1943
-msgid "Adium"
-msgstr "Adium"
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1850
-#: ../plugins/log_reader.c:1947
-msgid "Fire"
-msgstr "Fire"
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1862
-#: ../plugins/log_reader.c:1951
-msgid "Messenger Plus!"
-msgstr "Messenger Plus!"
-
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1874
-#: ../plugins/log_reader.c:1955
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
-#. The names of IM clients are marked for translation at the request of
-#. translators who wanted to transliterate them.  Many translators
-#. choose to leave them alone.  Choose what's best for your language.
-#: ../plugins/log_reader.c:1886
-#: ../plugins/log_reader.c:1959
-msgid "Trillian"
-msgstr "Trillian"
-
-#. Add general preferences.
-#: ../plugins/log_reader.c:1925
-msgid "General Log Reading Configuration"
-msgstr "基本日誌讀取設定"
-
-#: ../plugins/log_reader.c:1929
-msgid "Fast size calculations"
-msgstr "快速計算日誌大小"
-
-#: ../plugins/log_reader.c:1933
-msgid "Use name heuristics"
-msgstr ""
-
-#. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1939
-msgid "Log Directory"
-msgstr "日誌目錄"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/log_reader.c:1982
-msgid "Log Reader"
-msgstr "日誌檢視器"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/log_reader.c:1986
-msgid "Includes other IM clients' logs in the log viewer."
-msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
-
-#. * description
-#: ../plugins/log_reader.c:1990
-msgid "When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and Trillian."
-msgstr "當瀏覽日誌時,這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 Adium、Fire、Messenger Plus!、MSN Messenger,以及 Trillian。"
-
-#: ../plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "郵件檢查"
-
-#: ../plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "檢查本地端的新郵件。"
-
-#: ../plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "在好友清單內加一小格,用來顯示您有沒有新郵件。"
-
-#: ../plugins/mono/loader/mono.c:213
-msgid "Mono Plugin Loader"
-msgstr "Mono 模組載入器"
-
-#: ../plugins/mono/loader/mono.c:215
-#: ../plugins/mono/loader/mono.c:216
-msgid "Loads .NET plugins with Mono."
-msgstr "使用Mono讀取.NET模組"
-
-#: ../plugins/musicmessaging/musicmessaging.c:44
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
-msgstr ""
-
-#: ../plugins/musicmessaging/musicmessaging.c:45
-#, fuzzy
-msgid "Music messaging session confirmed."
-msgstr "滑鼠動作設定"
-
-#  NOTE 原始碼指這個解「(即時訊息系統的)帳別」,我覺得有點離譜
-#  NOTE 譯文更動 by Ambrose
-#: ../plugins/musicmessaging/musicmessaging.c:416
-#, fuzzy
-msgid "Music Messaging"
-msgstr "即時傳訊帳號"
-
-#: ../plugins/musicmessaging/musicmessaging.c:417
-msgid "There was a conflict in running the command:"
-msgstr "執行下列指令時發生衝突:"
-
-#: ../plugins/musicmessaging/musicmessaging.c:525
-#, fuzzy
-msgid "Error Running Editor"
-msgstr "執行 %s 時發生錯誤"
-
-#: ../plugins/musicmessaging/musicmessaging.c:526
-#, fuzzy
-msgid "The following error has occured:"
-msgstr "發生了一個未知的登入錯誤:%s。"
-
-#. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:625
-#, fuzzy
-msgid "Music Messaging Configuration"
-msgstr "滑鼠動作設定"
-
-#: ../plugins/musicmessaging/musicmessaging.c:629
-msgid "Score Editor Path"
-msgstr ""
-
-#: ../plugins/musicmessaging/musicmessaging.c:630
-msgid "_Apply"
-msgstr "套用(_A)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../plugins/musicmessaging/musicmessaging.c:665
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
-
-#. *  summary
-#: ../plugins/musicmessaging/musicmessaging.c:667
-msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
-msgstr ""
-
-#. ---------- "Notify For" ----------
-#: ../plugins/notify.c:638
-msgid "Notify For"
-msgstr "通知種類"
-
-#: ../plugins/notify.c:642
-msgid "_IM windows"
-msgstr "即時訊息視窗(_I)"
-
-#: ../plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "聊天視窗(_H)"
-
-#: ../plugins/notify.c:657
-msgid "\t_Only when someone says your screen name"
-msgstr "\t只當有人提到您的名字(_O)"
-
-#: ../plugins/notify.c:667
-msgid "_Focused windows"
-msgstr "焦點視窗(_F)"
-
-#. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:675
-msgid "Notification Methods"
-msgstr "通知方式"
-
-#: ../plugins/notify.c:682
-msgid "Prepend _string into window title:"
-msgstr "加入字串到視窗標題之前(_S):"
-
-#. Count method button
-#: ../plugins/notify.c:701
-msgid "Insert c_ount of new messages into window title"
-msgstr "加入新訊息數目到視窗標題中(_O)"
-
-# NOTE 有關「_URGENT」的資料可參閱 http://tronche.com/gui/x/icccm/sec-4.html
-# NOTE「URGENT」一字大概應該保留,因為絕大多數的視窗管理員都不支援,而且會引致奇怪的後果
-# NOTE 譯文更動 by Ambrose
-#. Urgent method button
-#: ../plugins/notify.c:710
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "設定視窗的「URGENT」(緊急資訊)提示(_U)"
-
-#. Raise window method button
-#: ../plugins/notify.c:719
-msgid "R_aise conversation window"
-msgstr "浮現交談視窗(_A)"
-
-#. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:727
-msgid "Notification Removal"
-msgstr "通知移除"
-
-#. Remove on focus button
-#: ../plugins/notify.c:732
-msgid "Remove when conversation window _gains focus"
-msgstr "當交談取得輸入焦點時移除通知(_G)"
-
-#. Remove on click button
-#: ../plugins/notify.c:739
-msgid "Remove when conversation window _receives click"
-msgstr "當交談視窗被點選時移除通知(_R)"
-
-#. Remove on type button
-#: ../plugins/notify.c:747
-msgid "Remove when _typing in conversation window"
-msgstr "當在交談視窗中輸入時移除通知(_T)"
-
-#. Remove on message send button
-#: ../plugins/notify.c:755
-msgid "Remove when a _message gets sent"
-msgstr "送出訊息後移除通知(_M)"
-
-#. Remove on conversation switch button
-#: ../plugins/notify.c:764
-msgid "Remove on switch to conversation ta_b"
-msgstr "當視窗標籤被點選後移除通知(_B)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/notify.c:853
-msgid "Message Notification"
-msgstr "訊息通知"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/notify.c:856
-#: ../plugins/notify.c:858
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "提供多種方式來通知您有未讀取的訊息。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/perl/perl.c:583
-msgid "Perl Plugin Loader"
-msgstr "Perl 模組載入器"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/perl/perl.c:585
-#: ../plugins/perl/perl.c:586
-msgid "Provides support for loading perl plugins."
-msgstr "提供讀入 Perl 模組的支援。"
-
-#: ../plugins/psychic.c:19
-msgid "Psychic Mode"
-msgstr ""
-
-#: ../plugins/psychic.c:20
-#, fuzzy
-msgid "Psychic mode for incoming conversation"
-msgstr "無法接收連入的即時訊息連線\n"
-
-#: ../plugins/psychic.c:21
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-
-#. This is a quote from Star Wars.  You should
-#. probably not translate it literally.  If
-#. you can't find a fitting cultural reference
-#. in your language, consider translating
-#. something like this instead:
-#. "You feel a new message coming."
-#: ../plugins/psychic.c:63
-msgid "You feel a disturbance in the force..."
-msgstr "您感受到了原力的擾動..."
-
-#: ../plugins/psychic.c:82
-#, fuzzy
-msgid "Only enable for users on the buddy list"
-msgstr "只允許好友清單中的使用者"
-
-#: ../plugins/psychic.c:87
-msgid "Disable when away"
-msgstr "離開時停用"
-
-#: ../plugins/psychic.c:91
-msgid "Display notification message in conversations"
-msgstr ""
-
-# TODO Untranslated
-# TODO 微軟視窗的Adobe印表機驅動程式可以找到一個「Raw」的譯法 (但我忘了)
-#: ../plugins/raw.c:175
-msgid "Raw"
-msgstr ""
-
-# NOTE: 舊的譯文不清楚,而且唸起來怪怪的。
-#: ../plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "讓您直接輸入指令對各種文字模式的通訊協定進行操作。"
-
-#: ../plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "讓您直接輸入指令對各種文字模式的通訊協定(例如 Jabber、MSN、IRC 及 TOC)進行操作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
-
-# XXX 暫譯
-#: ../plugins/relnot.c:63
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "您目前使用的 Gaim 版本為 %s ,最新的版本是 %s。<hr>"
-
-#: ../plugins/relnot.c:69
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>功能說明:</b>\n"
-"%s<br><br>"
-
-#: ../plugins/relnot.c:74
-#, c-format
-msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
-msgstr "您可以由下列網址,取得最新的 Gaim %s 版:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
-
-#: ../plugins/relnot.c:78
-#: ../plugins/relnot.c:79
-msgid "New Version Available"
-msgstr "有新版本"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/relnot.c:137
-msgid "Release Notification"
-msgstr "新版本通知"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/relnot.c:140
-msgid "Checks periodically for new releases."
-msgstr "不時查看有沒有新版本。"
-
-#. *  description
-#: ../plugins/relnot.c:142
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "不時查看有沒有新版本。一發現有,就隨即連同該版本的功能說明一併通知使用者。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/signals-test.c:684
-msgid "Signals Test"
-msgstr "信號測試"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/signals-test.c:687
-#: ../plugins/signals-test.c:689
-msgid "Test to see that all signals are working properly."
-msgstr "檢查各種信號是否都能正常運作。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/simple.c:37
-msgid "Simple Plugin"
-msgstr "簡易模組"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/simple.c:40
-#: ../plugins/simple.c:42
-msgid "Tests to see that most things are working."
-msgstr "用來測試是否大部份的東西都能正常運作。"
-
-#: ../plugins/spellchk.c:1945
-msgid "Duplicate Correction"
-msgstr ""
-
-#: ../plugins/spellchk.c:1946
-msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: ../plugins/spellchk.c:2154
-msgid "Text Replacements"
-msgstr "文字取代"
-
-#: ../plugins/spellchk.c:2177
-msgid "You type"
-msgstr "當您輸入"
-
-#: ../plugins/spellchk.c:2191
-msgid "You send"
-msgstr "將會送出"
-
-#: ../plugins/spellchk.c:2205
-msgid "Whole words only"
-msgstr ""
-
-#: ../plugins/spellchk.c:2217
-msgid "Case sensitive"
-msgstr "區分大小寫"
-
-#: ../plugins/spellchk.c:2243
-msgid "Add a new text replacement"
-msgstr "加入一個新的文字取代規則"
-
-#: ../plugins/spellchk.c:2259
-msgid "You _type:"
-msgstr "當您輸入(_T):"
-
-#: ../plugins/spellchk.c:2276
-msgid "You _send:"
-msgstr "將會送出(_S):"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2288
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "大小寫完全相同(不選取為自動大小寫處理)"
-
-#: ../plugins/spellchk.c:2290
-msgid "Only replace _whole words"
-msgstr "只取代完整的字(_W)"
-
-#: ../plugins/spellchk.c:2315
-msgid "General Text Replacement Options"
-msgstr "一般文字取代選項"
-
-#: ../plugins/spellchk.c:2316
-msgid "Enable replacement of last word on send"
-msgstr ""
-
-#: ../plugins/spellchk.c:2341
-msgid "Text replacement"
-msgstr "文字取代"
-
-#: ../plugins/spellchk.c:2343
-#: ../plugins/spellchk.c:2344
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-gnutls.c:256
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-gnutls.c:259
-#: ../plugins/ssl/ssl-gnutls.c:261
-msgid "Provides SSL support through GNUTLS."
-msgstr "透過 GNUTLS 提供 SSL 的支援。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-nss.c:412
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-nss.c:415
-#: ../plugins/ssl/ssl-nss.c:417
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl.c:97
-#: ../plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
-
-#: ../plugins/statenotify.c:50
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s 由離開返回。"
-
-#: ../plugins/statenotify.c:52
-#, c-format
-msgid "%s has gone away."
-msgstr "%s 已經離開。"
-
-#: ../plugins/statenotify.c:62
-#, c-format
-msgid "%s has become idle."
-msgstr "%s 變更狀態為閒置。"
-
-#: ../plugins/statenotify.c:64
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s 由閒置返回。"
-
-#: ../plugins/statenotify.c:73
-#, c-format
-msgid "%s has signed on."
-msgstr "%s 已經登入。"
-
-#: ../plugins/statenotify.c:91
-msgid "Notify When"
-msgstr "何時通知"
-
-#: ../plugins/statenotify.c:94
-msgid "Buddy Goes _Away"
-msgstr "好友離開(_A)"
-
-#: ../plugins/statenotify.c:97
-msgid "Buddy Goes _Idle"
-msgstr "好友閒置(_I)"
-
-#: ../plugins/statenotify.c:100
-msgid "Buddy _Signs On/Off"
-msgstr "好友登入/登出 (_S)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/statenotify.c:142
-msgid "Buddy State Notification"
-msgstr "好友狀態通知"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/statenotify.c:145
-#: ../plugins/statenotify.c:148
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
-msgstr "在交談視窗中顯示好友離開或是由離開(閒置)返回的通知訊息。"
-
-#: ../plugins/tcl/tcl.c:413
-msgid "Tcl Plugin Loader"
-msgstr "Tcl 模組載入器"
-
-#: ../plugins/tcl/tcl.c:415
-#: ../plugins/tcl/tcl.c:416
-msgid "Provides support for loading Tcl plugins"
-msgstr "提供讀入 Tcl 模組的支援"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ticker/ticker.c:77
-#: ../plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "好友跑馬燈"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ticker/ticker.c:358
-#: ../plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "好友清單的水平捲動版本"
-
-#: ../plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "iChat 時間戳記"
-
-#: ../plugins/timestamp.c:193
-msgid "Delay"
-msgstr "延遲"
-
-#: ../plugins/timestamp.c:200
-msgid "minutes."
-msgstr "分鐘。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp.c:256
-msgid "Timestamp"
-msgstr "時間戳記"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/timestamp.c:259
-#: ../plugins/timestamp.c:261
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "每隔 N 分鐘加入 iChat 風格的時間戳記到交談中。"
-
-#: ../plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "時間戳記格式選項"
-
-#: ../plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "強制24小時時間格式(傳統Gaim)(_F)"
-
-#: ../plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "顯示日期於..."
-
-#: ../plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "交談(_N):"
-
-#: ../plugins/timestamp_format.c:37
-#: ../plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "未讀訊息"
-
-#: ../plugins/timestamp_format.c:38
-#: ../plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr ""
-
-#: ../plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "訊息日誌(_M):"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp_format.c:149
-msgid "Message Timestamp Formats"
-msgstr "訊息時間戳記格式"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/timestamp_format.c:152
-msgid "Customizes the message timestamp formats."
-msgstr "使用者自定的訊息時間戳記格式。"
-
-#. *  description
-#: ../plugins/timestamp_format.c:154
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
-msgstr "這個模組允許使用者自行設定交談與日誌的訊息時間戳記格式。"
-
-#: ../plugins/win32/transparency/win2ktrans.c:183
-#: ../plugins/win32/transparency/win2ktrans.c:569
-#: ../plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "不透明度:"
-
-#. IM Convo trans options
-#: ../plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "即時訊息交談視窗"
-
-#: ../plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "即時訊息視窗透明度(_I)"
-
-#: ../plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
-
-#: ../plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "在即時訊息視窗取得焦點時移除透明度"
-
-# XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。
-#: ../plugins/win32/transparency/win2ktrans.c:558
-#: ../plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "總是在最上層"
-
-#. Buddy List trans options
-#: ../plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "好友清單視窗"
-
-#: ../plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "好友清單視窗透明度(_B)"
-
-#: ../plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "取得輸入焦點時移除好友清單視窗透明度"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "透明度"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "交談視窗及好友清單產生的半透明效果。"
-
-#. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:663
-#, fuzzy
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"這個模組可以讓交談視窗及好友清單產生半透明的效果。\n"
-"\n"
-"* 請注意:這個模組需要 Win2000 或 WinXP 才能產生效果。"
-
-#: ../plugins/win32/winprefs/winprefs.c:434
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ Runtime 版本"
-
-#. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:442
-msgid "Startup"
-msgstr "啟動"
-
-#: ../plugins/win32/winprefs/winprefs.c:443
-msgid "_Start Gaim on Windows startup"
-msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
-
-#. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:455
-#: ../src/gtkblist.c:3695
-msgid "Buddy List"
-msgstr "好友清單"
-
-#: ../plugins/win32/winprefs/winprefs.c:456
-msgid "_Dockable Buddy List"
-msgstr "可停駐的好友清單(_D)"
-
-#. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:460
-msgid "_Keep Buddy List window on top:"
-msgstr "好友清單視窗保持在桌面最上層(_K);"
-
-#. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:465
-msgid "Only when docked"
-msgstr ""
-
-#. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:469
-#: ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1879
-msgid "Conversations"
-msgstr "交談"
-
-#: ../plugins/win32/winprefs/winprefs.c:470
-#, fuzzy
-msgid "_Flash window when messages are received"
-msgstr "收到訊息後閃動視窗(_F)"
-
-#: ../plugins/win32/winprefs/winprefs.c:494
-msgid "WinGaim Options"
-msgstr "WinGaim 選項"
-
-#: ../plugins/win32/winprefs/winprefs.c:496
-msgid "Options specific to Windows Gaim."
-msgstr "Windows Gaim 的相關選項。"
-
-#: ../plugins/win32/winprefs/winprefs.c:497
-msgid "Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."
-msgstr ""
-
-#: ../src/account.c:773
-msgid "accounts"
-msgstr "帳號清單"
-
-#: ../src/account.c:918
-msgid "Password is required to sign on."
-msgstr "登入時需要密碼。"
-
-#: ../src/account.c:943
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "輸入 %s (%s) 的密碼"
-
-#: ../src/account.c:950
-msgid "Enter Password"
-msgstr "輸入密碼"
-
-#: ../src/account.c:955
-msgid "Save password"
-msgstr "儲存密碼"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../src/account.c:963
-#: ../src/account.c:1134
-#: ../src/gtkblist.c:3579
-#: ../src/gtkdialogs.c:613
-#: ../src/gtkdialogs.c:750
-#: ../src/gtkdialogs.c:824
-#: ../src/gtkrequest.c:269
-#: ../src/protocols/gg/gg.c:497
-#: ../src/protocols/gg/gg.c:655
-#: ../src/protocols/gg/gg.c:791
-#: ../src/protocols/jabber/jabber.c:1331
-#: ../src/protocols/jabber/xdata.c:337
-#: ../src/protocols/msn/msn.c:250
-#: ../src/protocols/msn/msn.c:265
-#: ../src/protocols/msn/msn.c:280
-#: ../src/protocols/msn/msn.c:295
-#: ../src/protocols/oscar/oscar.c:1417
-#: ../src/protocols/oscar/oscar.c:2176
-#: ../src/protocols/oscar/oscar.c:2263
-#: ../src/protocols/oscar/oscar.c:5716
-#: ../src/protocols/oscar/oscar.c:5918
-#: ../src/protocols/oscar/oscar.c:5943
-#: ../src/protocols/oscar/oscar.c:5999
-#: ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182
-#: ../src/protocols/silc/chat.c:424
-#: ../src/protocols/silc/chat.c:462
-#: ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1297
-#: ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:755
-#: ../src/protocols/yahoo/yahoo.c:3069
-#: ../src/protocols/yahoo/yahoo.c:3078
-#: ../src/request.h:1344
-msgid "OK"
-msgstr "確定"
-
-#: ../src/account.c:964
-#: ../src/account.c:1135
-#: ../src/account.c:1172
-#: ../src/gtkaccount.c:2182
-#: ../src/gtkaccount.c:2655
-#: ../src/gtkblist.c:5059
-#: ../src/gtkdialogs.c:614
-#: ../src/gtkdialogs.c:751
-#: ../src/gtkdialogs.c:825
-#: ../src/gtkdialogs.c:844
-#: ../src/gtkdialogs.c:866
-#: ../src/gtkdialogs.c:886
-#: ../src/gtkdialogs.c:930
-#: ../src/gtkdialogs.c:985
-#: ../src/gtkdialogs.c:1022
-#: ../src/gtkdialogs.c:1047
-#: ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296
-#: ../src/gtkpounce.c:1088
-#: ../src/gtkprivacy.c:568
-#: ../src/gtkprivacy.c:581
-#: ../src/gtkprivacy.c:606
-#: ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:270
-#: ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:498
-#: ../src/protocols/gg/gg.c:656
-#: ../src/protocols/gg/gg.c:792
-#: ../src/protocols/gg/gg.c:871
-#: ../src/protocols/jabber/buddy.c:594
-#: ../src/protocols/jabber/buddy.c:1721
-#: ../src/protocols/jabber/buddy.c:1755
-#: ../src/protocols/jabber/chat.c:778
-#: ../src/protocols/jabber/jabber.c:840
-#: ../src/protocols/jabber/jabber.c:1332
-#: ../src/protocols/jabber/xdata.c:338
-#: ../src/protocols/msn/msn.c:251
-#: ../src/protocols/msn/msn.c:266
-#: ../src/protocols/msn/msn.c:281
-#: ../src/protocols/msn/msn.c:296
-#: ../src/protocols/msn/msn.c:313
-#: ../src/protocols/oscar/oscar.c:1418
-#: ../src/protocols/oscar/oscar.c:2177
-#: ../src/protocols/oscar/oscar.c:2216
-#: ../src/protocols/oscar/oscar.c:2264
-#: ../src/protocols/oscar/oscar.c:5717
-#: ../src/protocols/oscar/oscar.c:5769
-#: ../src/protocols/oscar/oscar.c:5919
-#: ../src/protocols/oscar/oscar.c:5944
-#: ../src/protocols/oscar/oscar.c:6000
-#: ../src/protocols/oscar/oscar.c:6069
-#: ../src/protocols/oscar/peer.c:942
-#: ../src/protocols/sametime/sametime.c:3368
-#: ../src/protocols/sametime/sametime.c:3453
-#: ../src/protocols/sametime/sametime.c:3623
-#: ../src/protocols/sametime/sametime.c:5317
-#: ../src/protocols/sametime/sametime.c:5406
-#: ../src/protocols/sametime/sametime.c:5530
-#: ../src/protocols/silc/buddy.c:467
-#: ../src/protocols/silc/buddy.c:1078
-#: ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:597
-#: ../src/protocols/silc/chat.c:726
-#: ../src/protocols/silc/ops.c:1911
-#: ../src/protocols/silc/silc.c:756
-#: ../src/protocols/silc/silc.c:961
-#: ../src/protocols/yahoo/yahoo.c:3070
-#: ../src/protocols/yahoo/yahoo.c:3079
-#: ../src/request.h:1344
-#: ../src/request.h:1354
-msgid "Cancel"
-msgstr "取消"
-
-#: ../src/account.c:989
-#: ../src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "找不到 %s 的協定模組"
-
-#: ../src/account.c:991
-#: ../src/connection.c:99
-#: ../src/gtkblist.c:3577
-msgid "Connection Error"
-msgstr "連線錯誤"
-
-#: ../src/account.c:1071
-#: ../src/protocols/gg/gg.c:696
-#: ../src/protocols/jabber/jabber.c:1284
-msgid "New passwords do not match."
-msgstr "新密碼並不相符。"
-
-# NOTE 譯文更動 by Ambrose
-#: ../src/account.c:1080
-msgid "Fill out all fields completely."
-msgstr "請填妥整份表格所有的欄位。"
-
-#: ../src/account.c:1103
-msgid "Original password"
-msgstr "舊密碼"
-
-#: ../src/account.c:1110
-msgid "New password"
-msgstr "新密碼"
-
-#: ../src/account.c:1117
-msgid "New password (again)"
-msgstr "新密碼(再次確認)"
-
-#: ../src/account.c:1123
-#, c-format
-msgid "Change password for %s"
-msgstr "修改 %s 的密碼"
-
-#: ../src/account.c:1131
-msgid "Please enter your current password and your new password."
-msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
-
-#: ../src/account.c:1164
-#, c-format
-msgid "Change user information for %s"
-msgstr "更改 %s 的個人資訊"
-
-#: ../src/account.c:1167
-#: ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "設定使用者資訊"
-
-#: ../src/account.c:1171
-#: ../src/gtkdebug.c:684
-#: ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:593
-msgid "Save"
-msgstr "儲存"
-
-#: ../src/account.c:1681
-#: ../src/gtkft.c:159
-#: ../src/protocols/gg/gg.c:1002
-#: ../src/protocols/jabber/buddy.c:636
-#: ../src/protocols/jabber/buddy.c:1357
-#: ../src/protocols/jabber/buddy.c:1374
-#: ../src/protocols/novell/novell.c:2858
-msgid "Unknown"
-msgstr "未知"
-
-#: ../src/blist.c:543
-msgid "buddy list"
-msgstr "好友清單"
-
-#: ../src/blist.c:1182
-msgid "Chats"
-msgstr "聊天"
-
-#: ../src/blist.c:1904
-#, fuzzy, c-format
-msgid "%d buddy from group %s was not removed because it belongs to an account which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural "%d buddies from group %s were not removed because they belong to accounts which are currently disabled or offline.  These buddies and the group were not removed.\n"
-msgstr[0] "%d 個在 %s 群組的好友並沒有被移除,因為他(她)所對應的帳號並沒有登入。這個好友及群組沒有被移除。\n"
-msgstr[1] "%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號並沒有登入。這些好友及群組沒有被移除。\n"
-
-#: ../src/blist.c:1914
-msgid "Group not removed"
-msgstr "群組未被移除"
-
-#: ../src/connection.c:98
-msgid "Registration Error"
-msgstr "註冊錯誤"
-
-#: ../src/connection.c:277
-#, c-format
-msgid "+++ %s signed on"
-msgstr "+++ %s 登入"
-
-#: ../src/connection.c:310
-#, c-format
-msgid "+++ %s signed off"
-msgstr "+++ %s 登出"
-
-#: ../src/conversation.c:164
-msgid "Unable to send message: The message is too large."
-msgstr "無法送出訊息:這個訊息太大了。"
-
-#: ../src/conversation.c:167
-#: ../src/conversation.c:180
-#, c-format
-msgid "Unable to send message to %s."
-msgstr "無法送出訊息給 %s。"
-
-#: ../src/conversation.c:168
-msgid "The message is too large."
-msgstr "這個訊息太大了。"
-
-#: ../src/conversation.c:177
-msgid "Unable to send message."
-msgstr "無法送出訊息。"
-
-# #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-# #: src/buddy_chat.c:1544
-# #, c-format
-# msgid "%d %s in room"
-# msgstr "聊天室有 %d 家伙"
-#: ../src/conversation.c:1546
-#, c-format
-msgid "%s entered the room."
-msgstr "%s 進入聊天室。"
-
-# #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-# #: src/buddy_chat.c:1544
-# #, c-format
-# msgid "%d %s in room"
-# msgstr "聊天室有 %d 家伙"
-#: ../src/conversation.c:1549
-#, c-format
-msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] 進入聊天室。"
-
-#: ../src/conversation.c:1654
-#, c-format
-msgid "You are now known as %s"
-msgstr "你改變暱稱為 %s"
-
-#: ../src/conversation.c:1674
-#, c-format
-msgid "%s is now known as %s"
-msgstr "%s 改變暱稱為 %s"
-
-#: ../src/conversation.c:1747
-#, c-format
-msgid "%s left the room."
-msgstr "%s 離開聊天室。"
-
-#: ../src/conversation.c:1750
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s 離開聊天室 (%s)。"
-
-# NOTE 暫譯,或許有其他意義
-#: ../src/desktopitem.c:286
-#: ../src/desktopitem.c:877
-msgid "No name"
-msgstr "未命名"
-
-#: ../src/ft.c:189
-#: ../src/protocols/msn/msn.c:410
-#, c-format
-msgid ""
-"Error reading %s: \n"
-"%s.\n"
-msgstr ""
-"讀取 %s 途中發生了錯誤:\n"
-"%s。\n"
-
-#: ../src/ft.c:193
-#, c-format
-msgid ""
-"Error writing %s: \n"
-"%s.\n"
-msgstr ""
-"寫入 %s 途中發生了錯誤:\n"
-"%s。\n"
-
-#: ../src/ft.c:197
-#, c-format
-msgid ""
-"Error accessing %s: \n"
-"%s.\n"
-msgstr ""
-"存取 %s 途中發生了錯誤:\n"
-"%s。\n"
-
-#: ../src/ft.c:230
-msgid "Cannot send a file of 0 bytes."
-msgstr "無法傳送空的檔案。"
-
-#: ../src/ft.c:240
-msgid "Cannot send a directory."
-msgstr "無法傳送目錄。"
-
-#: ../src/ft.c:249
-#, c-format
-msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s 不是一般檔案,因此不會覆蓋它。\n"
-
-#: ../src/ft.c:307
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s 想要送 %s (%s) 給您"
-
-#: ../src/ft.c:314
-#, c-format
-msgid "%s wants to send you a file"
-msgstr "%s 想要傳送個檔案給您"
-
-#: ../src/ft.c:355
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
-
-#  XXX 暫譯
-#: ../src/ft.c:359
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"有檔案可以下載:\n"
-"遠端主機 :%s\n"
-"遠端通訊埠:%d"
-
-#: ../src/ft.c:392
-#, c-format
-msgid "%s is offering to send file %s"
-msgstr "%s 提出傳送檔案「%s」"
-
-#: ../src/ft.c:444
-#, c-format
-msgid "%s is not a valid filename.\n"
-msgstr "%s 不是一個有效的檔案名稱。\n"
-
-#: ../src/ft.c:465
-#, c-format
-msgid "Offering to send %s to %s"
-msgstr "向 %2$s 提出傳送 %1$s 中"
-
-#: ../src/ft.c:477
-#, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "開始自 %2$s 傳送 %1$s"
-
-#: ../src/ft.c:631
-#, c-format
-msgid "Transfer of file %s complete"
-msgstr "檔案 %s 傳送完畢"
-
-#: ../src/ft.c:634
-msgid "File transfer complete"
-msgstr "檔案傳輸完畢"
-
-#: ../src/ft.c:1031
-#, c-format
-msgid "You canceled the transfer of %s"
-msgstr "你取消了 %s 的傳送"
-
-#: ../src/ft.c:1036
-msgid "File transfer cancelled"
-msgstr "檔案傳輸已取消"
-
-#: ../src/ft.c:1094
-#, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s 取消了 %s 的傳送"
-
-#: ../src/ft.c:1099
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s 取消了檔案傳輸"
-
-#: ../src/ft.c:1156
-#, c-format
-msgid "File transfer to %s failed."
-msgstr "傳送檔案到 %s 失敗。"
-
-#: ../src/ft.c:1158
-#, c-format
-msgid "File transfer from %s failed."
-msgstr "自 %s 傳送檔案失敗。"
-
-#: ../src/gtkaccount.c:374
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>檔名:</b> %s\n"
-"<b>檔案大小:</b> %s\n"
-"<b>圖像尺寸:</b> %d×%d"
+#: ../console/plugins/lastlog.c:69
+msgid "Lastlog"
+msgstr ""
+
+#: ../console/plugins/lastlog.c:99
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr ""
+
+#: ../console/plugins/lastlog.c:121
+msgid "GntLastlog"
+msgstr "歷史記錄"
+
+#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
+msgid "Lastlog plugin for gaim-text."
+msgstr ""
+
+#: ../gtk/eggtrayicon.c:129
+msgid "Orientation"
+msgstr ""
+
+#: ../gtk/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr ""
+
+#: ../gtk/gaimstock.c:137
+msgid "_Alias"
+msgstr "別名(_A)"
+
+#. join button
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1120 ../gtk/gtkroomlist.c:285
+#: ../gtk/gtkroomlist.c:442
+msgid "_Join"
+msgstr "加入(_J)"
+
+#: ../gtk/gaimstock.c:139
+msgid "Close _tabs"
+msgstr "關閉分頁(_T)"
+
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1004
+msgid "I_M"
+msgstr "即時訊息(_M)"
+
+#: ../gtk/gaimstock.c:141
+msgid "_Get Info"
+msgstr "取得資訊(_G)"
+
+#: ../gtk/gaimstock.c:142
+msgid "_Invite"
+msgstr "邀請(_I)"
+
+#: ../gtk/gaimstock.c:143
+msgid "_Modify"
+msgstr "修改(_M)"
+
+#: ../gtk/gaimstock.c:144
+msgid "_Open Mail"
+msgstr "開啟郵件(_O)"
+
+#. Pause button
+#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
+msgid "_Pause"
+msgstr "暫停(_P)"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:762
+#: ../gtk/gtkaccount.c:382
 msgid "Login Options"
 msgstr "登入選項"
 
-#: ../src/gtkaccount.c:779
-#: ../src/gtkft.c:642
-msgid "Protocol:"
-msgstr "通訊協定:"
-
-#: ../src/gtkaccount.c:858
-msgid "Password:"
-msgstr "密碼:"
-
-#: ../src/gtkaccount.c:863
-#: ../src/gtkblist.c:4637
-#: ../src/gtkblist.c:5003
-msgid "Alias:"
-msgstr "別名:"
-
-#: ../src/gtkaccount.c:867
-msgid "Remember password"
-msgstr "記住密碼"
+# NOTE Debian 譯「local」為「本地端」,「本機」是Windows譯法,但在這裏好像比較妥當
+# XXX
+#: ../gtk/gtkaccount.c:483
+msgid "Local alias:"
+msgstr "帳號別名(只在本機生效):"
 
 #. Build the user options frame.
-#: ../src/gtkaccount.c:919
+#: ../gtk/gtkaccount.c:545
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: ../src/gtkaccount.c:932
-msgid "New mail notifications"
-msgstr "新郵件通知"
-
-#: ../src/gtkaccount.c:941
-msgid "Buddy icon:"
-msgstr "好友圖示:"
+#. Buddy icon
+#: ../gtk/gtkaccount.c:563
+msgid "Use this buddy icon for this account:"
+msgstr "使用下列好友圖示:"
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:1032
+#: ../gtk/gtkaccount.c:671
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: ../src/gtkaccount.c:1233
+#: ../gtk/gtkaccount.c:867
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
-#: ../src/gtkaccount.c:1239
+#: ../gtk/gtkaccount.c:873
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../src/gtkaccount.c:1245
+#: ../gtk/gtkaccount.c:879
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/gtkaccount.c:1251
+#: ../gtk/gtkaccount.c:885
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../src/gtkaccount.c:1257
+#: ../gtk/gtkaccount.c:891
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1263
-#: ../src/gtkprefs.c:1058
+#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1065
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -2440,346 +1256,270 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../src/gtkaccount.c:1302
+#: ../gtk/gtkaccount.c:936
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../src/gtkaccount.c:1305
+#: ../gtk/gtkaccount.c:939
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../src/gtkaccount.c:1326
+#: ../gtk/gtkaccount.c:960
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../src/gtkaccount.c:1340
-#: ../src/gtkprefs.c:1052
+#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1059
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: ../src/gtkaccount.c:1349
-#: ../src/gtkprefs.c:1073
+#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1080
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: ../src/gtkaccount.c:1353
-#: ../src/gtkprefs.c:1091
+#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1098
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: ../src/gtkaccount.c:1361
+#: ../gtk/gtkaccount.c:995
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: ../src/gtkaccount.c:1367
-#: ../src/gtkprefs.c:1128
+#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1135
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: ../src/gtkaccount.c:1747
+#: ../gtk/gtkaccount.c:1398
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../src/gtkaccount.c:1749
-#: ../src/gtkblist.c:3580
-msgid "Modify Account"
-msgstr "修改帳號"
-
-#: ../src/gtkaccount.c:1771
+#: ../gtk/gtkaccount.c:1422
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../src/gtkaccount.c:1782
+#: ../gtk/gtkaccount.c:1433
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
 #. Register button
-#: ../src/gtkaccount.c:1797
-#: ../src/protocols/jabber/jabber.c:839
+#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:849
 msgid "Register"
 msgstr "註冊"
 
-#: ../src/gtkaccount.c:2176
-#: ../src/gtksavedstatuses.c:293
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "您確定要刪除 %s?"
-
-#: ../src/gtkaccount.c:2181
-#: ../src/gtkpounce.c:1087
-#: ../src/gtkrequest.c:273
-#: ../src/gtksavedstatuses.c:295
-msgid "Delete"
-msgstr "刪除"
-
-#: ../src/gtkaccount.c:2245
-#: ../src/gtksavedstatuses.c:893
-#: ../src/protocols/oscar/oscar.c:2828
-msgid "Screen Name"
-msgstr "帳號"
-
-#: ../src/gtkaccount.c:2276
+#: ../gtk/gtkaccount.c:1919 ../gtk/gtkplugin.c:576
+msgid "Enabled"
+msgstr "啟動"
+
+#: ../gtk/gtkaccount.c:1927
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../src/gtkaccount.c:2603
-#, fuzzy, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s%s"
-
-#: ../src/gtkaccount.c:2652
-msgid "Add buddy to your list?"
-msgstr "將使用者加入您的好友清單?"
-
-#: ../src/gtkaccount.c:2654
-#: ../src/gtkblist.c:5058
-#: ../src/gtkconv.c:1624
-#: ../src/gtkrequest.c:274
-#: ../src/protocols/gg/gg.c:870
-#: ../src/protocols/oscar/oscar.c:2454
-#: ../src/protocols/sametime/sametime.c:5405
-#: ../src/protocols/silc/chat.c:596
-msgid "Add"
-msgstr "加入"
-
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../src/gtkblist.c:685
+#: ../gtk/gtkblist.c:705
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../src/gtkblist.c:706
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
+#: ../gtk/gtkblist.c:726
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../src/gtkblist.c:717
-#: ../src/gtkpounce.c:523
-#: ../src/gtkroomlist.c:377
+#: ../gtk/gtkblist.c:737 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../src/gtkblist.c:960
+#: ../gtk/gtkblist.c:1001
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../src/gtkblist.c:963
-#: ../src/gtkstock.c:141
-msgid "I_M"
-msgstr "即時訊息(_M)"
-
-#: ../src/gtkblist.c:969
+#: ../gtk/gtkblist.c:1010
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../src/gtkblist.c:976
+#: ../gtk/gtkblist.c:1017
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../src/gtkblist.c:980
-#: ../src/gtkblist.c:984
-#: ../src/gtkblist.c:1083
-#: ../src/gtkblist.c:1106
+#: ../gtk/gtkblist.c:1021 ../gtk/gtkblist.c:1025 ../gtk/gtkblist.c:1124
+#: ../gtk/gtkblist.c:1147
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../src/gtkblist.c:995
+#: ../gtk/gtkblist.c:1036
 msgid "Alias..."
 msgstr "別名..."
 
-#: ../src/gtkblist.c:998
-#: ../src/gtkconv.c:1621
-#: ../src/gtkrequest.c:275
-msgid "Remove"
-msgstr "移除"
-
-#: ../src/gtkblist.c:1004
-#: ../src/gtkblist.c:1091
-#: ../src/gtkblist.c:1112
+#: ../gtk/gtkblist.c:1045 ../gtk/gtkblist.c:1132 ../gtk/gtkblist.c:1153
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../src/gtkblist.c:1006
-#: ../src/gtkblist.c:1093
-#: ../src/gtkblist.c:1114
+#: ../gtk/gtkblist.c:1047 ../gtk/gtkblist.c:1134 ../gtk/gtkblist.c:1155
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../src/gtkblist.c:1054
+#: ../gtk/gtkblist.c:1095
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../src/gtkblist.c:1056
+#: ../gtk/gtkblist.c:1097
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../src/gtkblist.c:1059
+#: ../gtk/gtkblist.c:1100
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../src/gtkblist.c:1061
+#: ../gtk/gtkblist.c:1102
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#. join button
-#: ../src/gtkblist.c:1079
-#: ../src/gtkroomlist.c:285
-#: ../src/gtkroomlist.c:441
-#: ../src/gtkstock.c:139
-msgid "_Join"
-msgstr "加入(_J)"
-
-#: ../src/gtkblist.c:1081
+#: ../gtk/gtkblist.c:1122
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../src/gtkblist.c:1119
-#: ../src/gtkblist.c:1142
+#: ../gtk/gtkblist.c:1160 ../gtk/gtkblist.c:1183
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../src/gtkblist.c:1147
+#: ../gtk/gtkblist.c:1188
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../src/gtkblist.c:1393
-#: ../src/gtkblist.c:1405
-#: ../src/gtkblist.c:3840
-#: ../src/gtkblist.c:3850
+#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4095
+#: ../gtk/gtkblist.c:4105
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../src/gtkblist.c:1870
-#: ../src/gtkconv.c:4292
-#: ../src/gtkpounce.c:422
-msgid "You are not currently signed on with an account that can add that buddy."
+#: ../gtk/gtkblist.c:1906 ../gtk/gtkconv.c:4277 ../gtk/gtkpounce.c:422
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../src/gtkblist.c:2444
+#: ../gtk/gtkblist.c:2480
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../src/gtkblist.c:2445
+#: ../gtk/gtkblist.c:2481
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../src/gtkblist.c:2446
+#: ../gtk/gtkblist.c:2482
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../src/gtkblist.c:2447
+#: ../gtk/gtkblist.c:2483
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../src/gtkblist.c:2448
+#: ../gtk/gtkblist.c:2484
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../src/gtkblist.c:2450
+#: ../gtk/gtkblist.c:2486
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: ../src/gtkblist.c:2451
+#: ../gtk/gtkblist.c:2487
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: ../src/gtkblist.c:2452
+#: ../gtk/gtkblist.c:2488
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/好友/顯示好友細節(_D)"
 
-#: ../src/gtkblist.c:2453
+#: ../gtk/gtkblist.c:2489
 msgid "/Buddies/Show Idle _Times"
 msgstr "/好友/顯示閒置時間(_T)"
 
-#: ../src/gtkblist.c:2454
+#: ../gtk/gtkblist.c:2490
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../src/gtkblist.c:2456
+#: ../gtk/gtkblist.c:2492
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../src/gtkblist.c:2457
+#: ../gtk/gtkblist.c:2493
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../src/gtkblist.c:2458
+#: ../gtk/gtkblist.c:2494
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../src/gtkblist.c:2460
+#: ../gtk/gtkblist.c:2496
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2463
+#: ../gtk/gtkblist.c:2499
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../src/gtkblist.c:2464
-#: ../src/gtkblist.c:5635
+#: ../gtk/gtkblist.c:2500 ../gtk/gtkblist.c:5947
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../src/gtkblist.c:2467
+#: ../gtk/gtkblist.c:2503
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../src/gtkblist.c:2468
+#: ../gtk/gtkblist.c:2504
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../src/gtkblist.c:2469
+#: ../gtk/gtkblist.c:2505
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../src/gtkblist.c:2470
+#: ../gtk/gtkblist.c:2506
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../src/gtkblist.c:2471
+#: ../gtk/gtkblist.c:2507
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../src/gtkblist.c:2473
+#: ../gtk/gtkblist.c:2509
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../src/gtkblist.c:2474
+#: ../gtk/gtkblist.c:2510
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../src/gtkblist.c:2475
+#: ../gtk/gtkblist.c:2511
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../src/gtkblist.c:2477
+#: ../gtk/gtkblist.c:2513
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../src/gtkblist.c:2480
+#: ../gtk/gtkblist.c:2516
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: ../src/gtkblist.c:2481
+#: ../gtk/gtkblist.c:2517
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: ../src/gtkblist.c:2482
+#: ../gtk/gtkblist.c:2518
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../src/gtkblist.c:2483
+#: ../gtk/gtkblist.c:2519
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../src/gtkblist.c:2515
-#: ../src/gtkblist.c:2584
+#: ../gtk/gtkblist.c:2551 ../gtk/gtkblist.c:2620
 #, c-format
 msgid ""
 "\n"
@@ -2788,7 +1528,7 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: ../src/gtkblist.c:2596
+#: ../gtk/gtkblist.c:2632
 #, c-format
 msgid ""
 "\n"
@@ -2797,7 +1537,7 @@
 "\n"
 "<b>好友別名:</b>%s"
 
-#: ../src/gtkblist.c:2608
+#: ../gtk/gtkblist.c:2644
 #, c-format
 msgid ""
 "\n"
@@ -2806,7 +1546,7 @@
 "\n"
 "<b>暱稱:</b>%s"
 
-#: ../src/gtkblist.c:2617
+#: ../gtk/gtkblist.c:2653
 #, c-format
 msgid ""
 "\n"
@@ -2815,7 +1555,7 @@
 "\n"
 "<b>登入時間:</b>%s"
 
-#: ../src/gtkblist.c:2628
+#: ../gtk/gtkblist.c:2664
 #, c-format
 msgid ""
 "\n"
@@ -2824,7 +1564,7 @@
 "\n"
 "<b>閒置:</b>%s"
 
-#: ../src/gtkblist.c:2663
+#: ../gtk/gtkblist.c:2699
 #, c-format
 msgid ""
 "\n"
@@ -2833,7 +1573,7 @@
 "\n"
 "<b>最後見到:</b>%s 前"
 
-#: ../src/gtkblist.c:2672
+#: ../gtk/gtkblist.c:2708
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2841,7 +1581,7 @@
 "\n"
 "<b>狀態:</b>離線"
 
-#: ../src/gtkblist.c:2683
+#: ../gtk/gtkblist.c:2719
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2849,8 +1589,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: ../src/gtkblist.c:2685
-#, fuzzy
+#: ../gtk/gtkblist.c:2721
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2858,8 +1597,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: ../src/gtkblist.c:2687
-#, fuzzy
+#: ../gtk/gtkblist.c:2723
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2867,866 +1605,801 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: ../src/gtkblist.c:2982
+#: ../gtk/gtkblist.c:3190 ../gtk/gtkdocklet.c:428 ../gtk/gtkstatusbox.c:974
+#: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1365
+#: ../libgaim/protocols/novell/novell.c:2865
+#: ../libgaim/protocols/oscar/oscar.c:769
+#: ../libgaim/protocols/oscar/oscar.c:5445
+#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
+msgid "Offline"
+msgstr "離線"
+
+#: ../gtk/gtkblist.c:3206
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../src/gtkblist.c:2984
+#: ../gtk/gtkblist.c:3208
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2987
-#: ../src/gtkprefs.c:1760
-#: ../src/protocols/bonjour/bonjour.c:333
-#: ../src/protocols/jabber/buddy.c:641
-#: ../src/protocols/jabber/buddy.c:672
-#: ../src/protocols/msn/msn.c:548
-#: ../src/protocols/msn/state.c:32
-#: ../src/protocols/novell/novell.c:2852
-#: ../src/protocols/oscar/oscar.c:2849
-#: ../src/protocols/yahoo/yahoo.c:2737
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../gtk/gtkblist.c:3211 ../gtk/gtkprefs.c:1769
+#: ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:635
+#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2862
+#: ../libgaim/protocols/oscar/oscar.c:2824
+#: ../libgaim/protocols/yahoo/yahoo.c:2881
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "閒置"
 
-#: ../src/gtkblist.c:3120
+#: ../gtk/gtkblist.c:3339
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../src/gtkblist.c:3121
-#: ../src/gtkblist.c:3154
+#: ../gtk/gtkblist.c:3340 ../gtk/gtkblist.c:3373
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../src/gtkblist.c:3122
+#: ../gtk/gtkblist.c:3341
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../src/gtkblist.c:3123
+#: ../gtk/gtkblist.c:3342
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../src/gtkblist.c:3124
-#: ../src/gtkblist.c:3157
+#: ../gtk/gtkblist.c:3343 ../gtk/gtkblist.c:3376
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../src/gtkblist.c:3125
+#: ../gtk/gtkblist.c:3344
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../src/gtkblist.c:3160
+#: ../gtk/gtkblist.c:3379
 msgid "/Tools/Buddy Pounces"
 msgstr "/工具/好友狀態捕捉"
 
-#: ../src/gtkblist.c:3163
+#: ../gtk/gtkblist.c:3382
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../src/gtkblist.c:3166
+#: ../gtk/gtkblist.c:3385
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../src/gtkblist.c:3360
+#: ../gtk/gtkblist.c:3481 ../gtk/gtkdocklet.c:136
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
+msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
+
+#: ../gtk/gtkblist.c:3557
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../src/gtkblist.c:3362
+#: ../gtk/gtkblist.c:3559
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../src/gtkblist.c:3363
+#: ../gtk/gtkblist.c:3560
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../src/gtkblist.c:3364
+#: ../gtk/gtkblist.c:3561
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../src/gtkblist.c:3572
-#: ../src/gtkconn.c:186
+#: ../gtk/gtkblist.c:3769 ../gtk/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../src/gtkblist.c:3581
-#: ../src/protocols/sametime/sametime.c:3622
+#: ../gtk/gtkblist.c:3778 ../libgaim/protocols/sametime/sametime.c:3615
 msgid "Connect"
 msgstr "連線"
 
-#: ../src/gtkblist.c:3581
+#: ../gtk/gtkblist.c:3778
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../src/gtkblist.c:3602
+#: ../gtk/gtkblist.c:3799
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr ""
-
-#: ../src/gtkblist.c:3729
+msgstr "<span color=\"red\">%s 結束連線:%s</span>"
+
+#: ../gtk/gtkblist.c:3928
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3834
+#: ../gtk/gtkblist.c:4089
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: ../src/gtkblist.c:3837
+#: ../gtk/gtkblist.c:4092
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: ../src/gtkblist.c:3843
+#: ../gtk/gtkblist.c:4098
 msgid "/Buddies/Show Buddy Details"
 msgstr "/好友/顯示好友細節"
 
-#: ../src/gtkblist.c:3846
+#: ../gtk/gtkblist.c:4101
 msgid "/Buddies/Show Idle Times"
 msgstr "/好友/顯示閒置時間"
 
-#: ../src/gtkblist.c:4594
-msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,而這個設定將會在好友清單中顯示。\n"
-
-#. Set up stuff for the account box
-#: ../src/gtkblist.c:4664
-#: ../src/gtkblist.c:4983
-msgid "Account:"
-msgstr "帳號:"
-
-#: ../src/gtkblist.c:4916
+#: ../gtk/gtkblist.c:4766 ../gtk/plugins/gevolution/gevolution.c:97
+#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
+#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
+#: ../libgaim/protocols/jabber/roster.c:67
+msgid "Buddies"
+msgstr "好友"
+
+#: ../gtk/gtkblist.c:4900
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,而這個設定將會"
+"在好友清單中顯示。\n"
+
+#: ../gtk/gtkblist.c:4960 ../gtk/gtkblist.c:5323
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
+#: ../gtk/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "群組:"
+
+#: ../gtk/gtkblist.c:5221
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../src/gtkblist.c:4932
-msgid "You are not currently signed on with any protocols that have the ability to chat."
+#: ../gtk/gtkblist.c:5237
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../src/gtkblist.c:4949
-msgid "Add Chat"
-msgstr "新增聊天室"
-
-#: ../src/gtkblist.c:4973
-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+#: ../gtk/gtkblist.c:5278
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
 msgstr "請輸入別名,或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../src/gtkblist.c:5055
-#: ../src/protocols/sametime/sametime.c:5316
-#: ../src/protocols/sametime/sametime.c:5403
-msgid "Add Group"
-msgstr "加入群組"
-
-#: ../src/gtkblist.c:5056
+#: ../gtk/gtkblist.c:5361
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../src/gtkblist.c:5675
+#: ../gtk/gtkblist.c:5987
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: ../src/gtkblist.c:5708
-#: ../src/gtkblist.c:5714
-#: ../src/gtkconv.c:2750
+#: ../gtk/gtkblist.c:6020 ../gtk/gtkblist.c:6026 ../gtk/gtkconv.c:2781
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../src/gtkblist.c:5722
+#: ../gtk/gtkblist.c:6034
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../src/gtkblist.c:5734
+#: ../gtk/gtkblist.c:6046
 msgid "Enable Account"
 msgstr "啟動帳號"
 
-#: ../src/gtkblist.c:5787
+#: ../gtk/gtkblist.c:6099
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../src/gtkblist.c:5873
+#: ../gtk/gtkblist.c:6185
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
-#: ../src/gtkconn.c:187
+#: ../gtk/gtkconn.c:179
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
-"Gaim will not attempt to reconnect the account until you correct the error and re-enable the account."
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
 msgstr ""
 "%s 因為下列原因而離線:%s\n"
 "在您更正這個錯誤並重新啟動這個帳號前,Gaim 將不會再試著重新連線。"
 
-#: ../src/gtkconv.c:372
-msgid "Supported debug options are:  version"
-msgstr "支援的除錯選項有:version"
-
-#: ../src/gtkconv.c:408
-msgid "No such command (in this context)."
-msgstr "沒有這個指令(可在這裏使用)"
-
-#: ../src/gtkconv.c:411
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-"要獲得某一指令的說明,輸入「/help &lt;指令&gt;」即可。\n"
-"在這裏,可用的指令有:\n"
-
-#: ../src/gtkconv.c:478
-msgid "No such command."
-msgstr "無此指令。"
-
-#: ../src/gtkconv.c:485
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "語法錯誤:輸入的參數少於指令所需的參數數量。"
-
-#: ../src/gtkconv.c:490
-msgid "Your command failed for an unknown reason."
-msgstr "指令執行失敗,原因不明。"
-
-#: ../src/gtkconv.c:497
-msgid "That command only works in chats, not IMs."
-msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
-
-#: ../src/gtkconv.c:500
-msgid "That command only works in IMs, not chats."
-msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
-
-#: ../src/gtkconv.c:504
-msgid "That command doesn't work on this protocol."
-msgstr "這個指令在這個通訊協定內無效。"
-
-#: ../src/gtkconv.c:739
-#: ../src/gtkconv.c:765
+#: ../gtk/gtkconv.c:744 ../gtk/gtkconv.c:770
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../src/gtkconv.c:759
-msgid "You are not currently signed on with an account that can invite that buddy."
+#: ../gtk/gtkconv.c:764
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../src/gtkconv.c:812
+#: ../gtk/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:842
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+#: ../gtk/gtkconv.c:847
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: ../src/gtkconv.c:863
+#: ../gtk/gtkconv.c:868
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: ../src/gtkconv.c:883
-#: ../src/gtksavedstatuses.c:1111
-#: ../src/gtksavedstatuses.c:1447
+#: ../gtk/gtkconv.c:888 ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: ../src/gtkconv.c:940
-#: ../src/gtkconv.c:2367
-#: ../src/gtkdebug.c:217
-#: ../src/gtkft.c:490
+#: ../gtk/gtkconv.c:945 ../gtk/gtkconv.c:2398 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../src/gtkconv.c:946
+#: ../gtk/gtkconv.c:951
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../src/gtkconv.c:970
+#: ../gtk/gtkconv.c:975
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../src/gtkconv.c:1091
-#: ../src/gtkdebug.c:165
-#: ../src/gtkdebug.c:678
+#: ../gtk/gtkconv.c:1122 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "搜尋"
 
-#: ../src/gtkconv.c:1117
-#: ../src/gtkdebug.c:193
+#: ../gtk/gtkconv.c:1148 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: ../src/gtkconv.c:1288
+#: ../gtk/gtkconv.c:1319
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../src/gtkconv.c:1296
-msgid "Logging stopped. Future messages in this conversation will not be logged."
+#: ../gtk/gtkconv.c:1327
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../src/gtkconv.c:1561
-msgid "IM"
-msgstr "即時訊息"
-
-#: ../src/gtkconv.c:1572
-#: ../src/protocols/oscar/oscar.c:640
-msgid "Send File"
-msgstr "傳送檔案"
-
-#: ../src/gtkconv.c:1587
+#: ../gtk/gtkconv.c:1595
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#: ../src/gtkconv.c:1590
+#: ../gtk/gtkconv.c:1598
 msgid "Ignore"
 msgstr "忽略"
 
-# XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
-# XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
-#: ../src/gtkconv.c:1600
-msgid "Info"
-msgstr "取得資訊"
-
-#: ../src/gtkconv.c:1610
+#: ../gtk/gtkconv.c:1618
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../src/gtkconv.c:1633
+#: ../gtk/gtkconv.c:1641
 #, fuzzy
 msgid "Last said"
 msgstr "更新日期"
 
-#: ../src/gtkconv.c:2375
+#: ../gtk/gtkconv.c:2406
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../src/gtkconv.c:2399
+#: ../gtk/gtkconv.c:2430
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../src/gtkconv.c:2448
+#: ../gtk/gtkconv.c:2479
 msgid "Animate"
 msgstr "動畫"
 
-#: ../src/gtkconv.c:2453
+#: ../gtk/gtkconv.c:2484
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令,譯「As」為「為」會很奇怪
-#: ../src/gtkconv.c:2459
+#: ../gtk/gtkconv.c:2490
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2599
+#: ../gtk/gtkconv.c:2630
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../src/gtkconv.c:2601
+#: ../gtk/gtkconv.c:2632
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../src/gtkconv.c:2606
+#: ../gtk/gtkconv.c:2637
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../src/gtkconv.c:2608
+#: ../gtk/gtkconv.c:2639
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../src/gtkconv.c:2609
+#: ../gtk/gtkconv.c:2640
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../src/gtkconv.c:2611
+#: ../gtk/gtkconv.c:2642
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../src/gtkconv.c:2615
+#: ../gtk/gtkconv.c:2646
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../src/gtkconv.c:2616
+#: ../gtk/gtkconv.c:2647
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../src/gtkconv.c:2618
+#: ../gtk/gtkconv.c:2649
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../src/gtkconv.c:2620
+#: ../gtk/gtkconv.c:2651
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../src/gtkconv.c:2622
+#: ../gtk/gtkconv.c:2653
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../src/gtkconv.c:2626
+#: ../gtk/gtkconv.c:2657
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../src/gtkconv.c:2628
+#: ../gtk/gtkconv.c:2659
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../src/gtkconv.c:2630
+#: ../gtk/gtkconv.c:2661
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../src/gtkconv.c:2632
+#: ../gtk/gtkconv.c:2663
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../src/gtkconv.c:2637
+#: ../gtk/gtkconv.c:2668
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: ../src/gtkconv.c:2639
+#: ../gtk/gtkconv.c:2670
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: ../src/gtkconv.c:2644
+#: ../gtk/gtkconv.c:2675
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../src/gtkconv.c:2648
+#: ../gtk/gtkconv.c:2679
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../src/gtkconv.c:2649
+#: ../gtk/gtkconv.c:2680
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../src/gtkconv.c:2650
+#: ../gtk/gtkconv.c:2681
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../src/gtkconv.c:2651
+#: ../gtk/gtkconv.c:2682
 msgid "/Options/Show Buddy _Icon"
 msgstr "/選項/顯示好友圖示(_I)"
 
-#: ../src/gtkconv.c:2653
+#: ../gtk/gtkconv.c:2684
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../src/gtkconv.c:2654
+#: ../gtk/gtkconv.c:2685
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../src/gtkconv.c:2729
+#: ../gtk/gtkconv.c:2760
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
-#: ../src/gtkconv.c:2767
-#: ../src/gtkconv.c:2794
+#: ../gtk/gtkconv.c:2798 ../gtk/gtkconv.c:2825
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../src/gtkconv.c:2804
+#: ../gtk/gtkconv.c:2835
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../src/gtkconv.c:2810
+#: ../gtk/gtkconv.c:2841
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../src/gtkconv.c:2814
+#: ../gtk/gtkconv.c:2845
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../src/gtkconv.c:2820
+#: ../gtk/gtkconv.c:2851
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../src/gtkconv.c:2824
+#: ../gtk/gtkconv.c:2855
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../src/gtkconv.c:2830
+#: ../gtk/gtkconv.c:2861
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../src/gtkconv.c:2834
+#: ../gtk/gtkconv.c:2865
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../src/gtkconv.c:2838
+#: ../gtk/gtkconv.c:2869
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../src/gtkconv.c:2842
+#: ../gtk/gtkconv.c:2873
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../src/gtkconv.c:2848
+#: ../gtk/gtkconv.c:2879
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: ../src/gtkconv.c:2852
+#: ../gtk/gtkconv.c:2883
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: ../src/gtkconv.c:2858
+#: ../gtk/gtkconv.c:2889
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../src/gtkconv.c:2861
+#: ../gtk/gtkconv.c:2892
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../src/gtkconv.c:2874
+#: ../gtk/gtkconv.c:2905
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../src/gtkconv.c:2877
+#: ../gtk/gtkconv.c:2908
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../src/gtkconv.c:2880
+#: ../gtk/gtkconv.c:2911
 msgid "/Options/Show Buddy Icon"
 msgstr "/選項/顯示好友圖示"
 
-#: ../src/gtkconv.c:2956
+#: ../gtk/gtkconv.c:2987
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: ../src/gtkconv.c:2959
+#: ../gtk/gtkconv.c:2990
 msgid "User has typed something and stopped"
 msgstr "使用者輸入了一些東西,不過暫停了"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3142
+#: ../gtk/gtkconv.c:3173
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../src/gtkconv.c:3849
+#: ../gtk/gtkconv.c:3875
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: ../src/gtkconv.c:3904
-#: ../src/protocols/sametime/sametime.c:3564
+#: ../gtk/gtkconv.c:3929 ../libgaim/protocols/sametime/sametime.c:3557
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3956
+#: ../gtk/gtkconv.c:3981
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../src/gtkconv.c:4034
-msgid "IM the user"
-msgstr "送出即時訊息給使用者"
-
-#: ../src/gtkconv.c:4047
-msgid "Ignore the user"
-msgstr "忽略使用者"
-
-#: ../src/gtkconv.c:4059
-msgid "Get the user's information"
-msgstr "取得使用者資訊"
-
-#: ../src/gtkconv.c:5048
-#: ../src/gtkconv.c:5167
+#: ../gtk/gtkconv.c:5028 ../gtk/gtkconv.c:5149
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../src/gtkconv.c:5727
-#: ../src/gtkstatusbox.c:366
+#: ../gtk/gtkconv.c:5702 ../gtk/gtkstatusbox.c:541
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../src/gtkconv.c:5733
+#: ../gtk/gtkconv.c:5708
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../src/gtkconv.c:5738
-#, fuzzy
+#: ../gtk/gtkconv.c:5713
 msgid "Nick Said"
-msgstr "暱稱"
-
-#: ../src/gtkconv.c:5748
+msgstr "暱稱被提及"
+
+#: ../gtk/gtkconv.c:5718 ../gtk/gtkdocklet.c:470
+msgid "Unread Messages"
+msgstr "未讀訊息"
+
+#: ../gtk/gtkconv.c:5723
 msgid "New Event"
 msgstr "新事件"
 
-#: ../src/gtkconv.c:6650
-msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
-msgstr "say &lt;訊息&gt;:將指定的訊息當成一般訊息正常送出,而非當為指令處理。"
-
-#: ../src/gtkconv.c:6653
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
-
-#: ../src/gtkconv.c:6656
-msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
-msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
-
-# XXX
-#: ../src/gtkconv.c:6659
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear:清空交談的回捲緩衝區"
-
-#: ../src/gtkconv.c:6662
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
-
-#: ../src/gtkconv.c:6821
+#: ../gtk/gtkconv.c:6818
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../src/gtkconv.c:6853
+#: ../gtk/gtkconv.c:6850
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎?"
 
-#: ../src/gtkconv.c:7375
+#: ../gtk/gtkconv.c:7385
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../src/gtkconv.c:7381
+#: ../gtk/gtkconv.c:7391
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../src/gtkconv.c:7389
+#: ../gtk/gtkconv.c:7399
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../src/gtkconv.c:7395
+#: ../gtk/gtkconv.c:7405
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../src/gtkconv.c:7655
+#: ../gtk/gtkconv.c:7672
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../src/gtkconv.c:8119
+#: ../gtk/gtkconv.c:8136
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../src/gtkconv.c:8121
+#: ../gtk/gtkconv.c:8138
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../src/gtkconv.c:8123
-#: ../src/gtkprefs.c:1258
+#: ../gtk/gtkconv.c:8140 ../gtk/gtkprefs.c:1267
 msgid "New window"
 msgstr "新視窗"
 
-#: ../src/gtkconv.c:8125
+#: ../gtk/gtkconv.c:8142
 msgid "By group"
 msgstr "依群組"
 
-#: ../src/gtkconv.c:8127
+#: ../gtk/gtkconv.c:8144
 msgid "By account"
 msgstr "依帳號"
 
 #  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
-#: ../src/gtkdebug.c:232
+#: ../gtk/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
 # NOTE 可能是指「反向選取」
-#: ../src/gtkdebug.c:586
+#: ../gtk/gtkdebug.c:594
 msgid "Invert"
 msgstr "反向"
 
-#: ../src/gtkdebug.c:589
+# XXX TODO 我非常討厭把「Highlight」譯成「高亮度」,但譯文可以改進 - Ambrose 20061029
+#: ../gtk/gtkdebug.c:597
 msgid "Highlight matches"
-msgstr ""
-
-#: ../src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "除錯視窗"
-
-#: ../src/gtkdebug.c:689
-msgid "Clear"
-msgstr "清除"
-
-#: ../src/gtkdebug.c:698
-msgid "Pause"
-msgstr "暫停"
-
-#: ../src/gtkdebug.c:705
-#: ../src/gtkdebug.c:706
-msgid "Timestamps"
-msgstr "時間戳記"
-
-#: ../src/gtkdebug.c:724
+msgstr "標示匹配字串"
+
+#  NOTE 除錯視窗的工具列的快取選單的指令,指「工具列的按紐以圖示標示」,下二同
+#: ../gtk/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "顯示圖示(_I)"
+
+#: ../gtk/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "顯示文字(_T)"
+
+#: ../gtk/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "顯示圖示和文字(_B)"
+
+#: ../gtk/gtkdebug.c:802
 msgid "Filter"
 msgstr "過濾器"
 
-#: ../src/gtkdebug.c:743
+#: ../gtk/gtkdebug.c:821
 msgid "Right click for more options."
 msgstr "按右鍵以顯示更多選項。"
 
-#: ../src/gtkdialogs.c:61
-#: ../src/gtkdialogs.c:104
+# TODO 要覆查 - 20061025
+#: ../gtk/gtkdebug.c:851
+msgid "Level "
+msgstr "過濾程度 "
+
+#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr "選擇除錯訊息的過濾程度。"
+
+# TODO 要覆查 - 20061025
+#: ../gtk/gtkdebug.c:860
+msgid "All"
+msgstr "全部訊息"
+
+# NOTE 這個不是指「Info」(因為已經有「Info」一項),而是一種比「Info」還要低層次的除錯訊息,應是指「Debug」
+#: ../gtk/gtkdebug.c:861
+msgid "Misc"
+msgstr "閒雜訊息"
+
+# TODO 要覆查 - 20061025
+#: ../gtk/gtkdebug.c:863
+msgid "Warning"
+msgstr "警告訊息"
+
+# TODO 要覆查 - 20061025
+#: ../gtk/gtkdebug.c:864
+msgid "Error "
+msgstr "錯誤訊息"
+
+# TODO 要覆查 - 20061025
+#: ../gtk/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "嚴重錯誤訊息"
+
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:109
 msgid "lead developer"
 msgstr "主要開發者"
 
-#: ../src/gtkdialogs.c:62
-#: ../src/gtkdialogs.c:63
-#: ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:66
-#: ../src/gtkdialogs.c:68
-#: ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70
-#: ../src/gtkdialogs.c:71
-#: ../src/gtkdialogs.c:72
-#: ../src/gtkdialogs.c:73
-#: ../src/gtkdialogs.c:75
-#: ../src/gtkdialogs.c:76
-#: ../src/gtkdialogs.c:77
+#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
+#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
+#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
+#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:80
+#: ../gtk/gtkdialogs.c:81 ../gtk/gtkdialogs.c:82
 msgid "developer"
 msgstr "開發者"
 
-#: ../src/gtkdialogs.c:64
-msgid "win32 port"
-msgstr "Windows 版本移植"
-
-#: ../src/gtkdialogs.c:67
+#: ../gtk/gtkdialogs.c:72
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
-#: ../src/gtkdialogs.c:74
+#: ../gtk/gtkdialogs.c:79
 msgid "support"
 msgstr "支援"
 
-#: ../src/gtkdialogs.c:97
-#: ../src/gtkdialogs.c:98
+#: ../gtk/gtkdialogs.c:101
+msgid "win32 port"
+msgstr "Windows 版本移植"
+
+#: ../gtk/gtkdialogs.c:102 ../gtk/gtkdialogs.c:103
 msgid "maintainer"
 msgstr "維護者"
 
-#: ../src/gtkdialogs.c:99
+#: ../gtk/gtkdialogs.c:104
 msgid "libfaim maintainer"
 msgstr "libfaim 維護者"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../src/gtkdialogs.c:101
+#: ../gtk/gtkdialogs.c:106
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: ../src/gtkdialogs.c:102
+#: ../gtk/gtkdialogs.c:107
 msgid "Jabber developer"
 msgstr "Jabber 開發者"
 
-#: ../src/gtkdialogs.c:103
+#: ../gtk/gtkdialogs.c:108
 msgid "original author"
 msgstr "原作者"
 
-#: ../src/gtkdialogs.c:110
-#: ../src/gtkdialogs.c:111
-#: ../src/gtkdialogs.c:174
+#: ../gtk/gtkdialogs.c:115
+msgid "Arabic"
+msgstr "阿拉伯文"
+
+#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:184
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: ../src/gtkdialogs.c:112
-#: ../src/gtkdialogs.c:113
+#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:119
 msgid "Bengali"
 msgstr "孟加拉文"
 
-#: ../src/gtkdialogs.c:114
+# NOTE 港譯「波斯尼亞」
+#: ../gtk/gtkdialogs.c:120
 msgid "Bosnian"
 msgstr "波士尼亞文"
 
-#: ../src/gtkdialogs.c:115
-#: ../src/gtkdialogs.c:175
-#: ../src/gtkdialogs.c:176
+#: ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:185 ../gtk/gtkdialogs.c:186
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: ../src/gtkdialogs.c:116
-#: ../src/gtkdialogs.c:117
-#, fuzzy
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
 msgid "Valencian-Catalan"
-msgstr "瓦倫西亞文"
-
-#: ../src/gtkdialogs.c:118
-#: ../src/gtkdialogs.c:177
+msgstr "瓦倫西亞式加泰隆文"
+
+#: ../gtk/gtkdialogs.c:124 ../gtk/gtkdialogs.c:187
 msgid "Czech"
 msgstr "捷克文"
 
-#: ../src/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:125
 msgid "Danish"
 msgstr "丹麥文"
 
-#: ../src/gtkdialogs.c:120
-#: ../src/gtkdialogs.c:121
-#: ../src/gtkdialogs.c:178
+#: ../gtk/gtkdialogs.c:126 ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:188
 msgid "German"
 msgstr "德文"
 
-#: ../src/gtkdialogs.c:122
-#: ../src/gtkdialogs.c:123
+#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
 msgid "Greek"
 msgstr "希臘文"
 
-#: ../src/gtkdialogs.c:124
+#: ../gtk/gtkdialogs.c:130
 msgid "Australian English"
 msgstr "澳洲式英文"
 
-#: ../src/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:131
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: ../src/gtkdialogs.c:126
+#: ../gtk/gtkdialogs.c:132
 msgid "British English"
 msgstr "英式英文"
 
-#: ../src/gtkdialogs.c:127
-#: ../src/gtkdialogs.c:179
-#: ../src/gtkdialogs.c:180
-#: ../src/gtkdialogs.c:181
-#: ../src/gtkdialogs.c:182
+#  XXX 寫下的應是文,不是語,但實在真是好像沒有人寫「世界文」的 - Ambrose
+#: ../gtk/gtkdialogs.c:133
+msgid "Esperanto"
+msgstr "世界語"
+
+#: ../gtk/gtkdialogs.c:134 ../gtk/gtkdialogs.c:189 ../gtk/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: ../src/gtkdialogs.c:128
-#: ../src/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:135 ../gtk/gtkdialogs.c:136
 msgid "Euskera(Basque)"
-msgstr ""
-
-#: ../src/gtkdialogs.c:130
-#: ../src/gtkdialogs.c:131
+msgstr "巴斯克文"
+
+#: ../gtk/gtkdialogs.c:137 ../gtk/gtkdialogs.c:138
 msgid "Persian"
 msgstr "波斯文"
 
-#: ../src/gtkdialogs.c:132
-#: ../src/gtkdialogs.c:183
-#: ../src/gtkdialogs.c:184
+#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:193 ../gtk/gtkdialogs.c:194
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: ../src/gtkdialogs.c:133
-#: ../src/gtkdialogs.c:185
-#: ../src/gtkdialogs.c:186
-#: ../src/gtkdialogs.c:187
-#: ../src/gtkdialogs.c:188
+#: ../gtk/gtkdialogs.c:140 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
+#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
 msgid "French"
 msgstr "法文"
 
-#: ../src/gtkdialogs.c:134
+#: ../gtk/gtkdialogs.c:141
 msgid "Galician"
-msgstr "加里西亞語"
-
-#: ../src/gtkdialogs.c:135
-#: ../src/gtkdialogs.c:189
+msgstr "加里西亞文"
+
+#: ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
+msgid "Gujarati"
+msgstr "古吉拉特文"
+
+#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: ../src/gtkdialogs.c:136
+#: ../gtk/gtkdialogs.c:145
 msgid "Hindi"
 msgstr "北印度文"
 
-#: ../src/gtkdialogs.c:137
+#: ../gtk/gtkdialogs.c:146
 msgid "Hungarian"
 msgstr "匈牙利文"
 
@@ -3734,86 +2407,76 @@
 #  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
-#: ../src/gtkdialogs.c:138
-#: ../src/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:200
 msgid "Italian"
 msgstr "意大利文"
 
-#: ../src/gtkdialogs.c:139
-#: ../src/gtkdialogs.c:191
-#: ../src/gtkdialogs.c:192
-#: ../src/gtkdialogs.c:193
+#: ../gtk/gtkdialogs.c:148 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:203
 msgid "Japanese"
 msgstr "日文"
 
-#: ../src/gtkdialogs.c:140
-#: ../src/gtkdialogs.c:194
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:204
 msgid "Georgian"
 msgstr "喬治亞文"
 
-#: ../src/gtkdialogs.c:141
-#: ../src/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:205
 msgid "Korean"
 msgstr "韓文"
 
-#: ../src/gtkdialogs.c:142
-#: ../src/gtkdialogs.c:143
-#: ../src/gtkdialogs.c:144
+# NOTE 港譯「庫爾德」
+#: ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:153
 msgid "Kurdish"
 msgstr "庫德文"
 
-#: ../src/gtkdialogs.c:145
-#: ../src/gtkdialogs.c:196
-#: ../src/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:206 ../gtk/gtkdialogs.c:207
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: ../src/gtkdialogs.c:146
+#: ../gtk/gtkdialogs.c:155
 msgid "Macedonian"
 msgstr "馬其頓文"
 
+#: ../gtk/gtkdialogs.c:156
+msgid "Nepali"
+msgstr "尼泊爾文"
+
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: ../src/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:157
 msgid "Dutch, Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
-#: ../src/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:158
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: ../src/gtkdialogs.c:149
-#: ../src/gtkdialogs.c:150
-#: ../src/gtkdialogs.c:198
+#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:160 ../gtk/gtkdialogs.c:208
 msgid "Polish"
 msgstr "波蘭文"
 
-#: ../src/gtkdialogs.c:151
+#: ../gtk/gtkdialogs.c:161
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: ../src/gtkdialogs.c:152
+#: ../gtk/gtkdialogs.c:162
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: ../src/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:163
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: ../src/gtkdialogs.c:154
-#: ../src/gtkdialogs.c:199
-#: ../src/gtkdialogs.c:200
+#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:209 ../gtk/gtkdialogs.c:210
 msgid "Russian"
 msgstr "俄文"
 
-#: ../src/gtkdialogs.c:155
-#: ../src/gtkdialogs.c:156
+#: ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:166
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: ../src/gtkdialogs.c:157
-#: ../src/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:167 ../gtk/gtkdialogs.c:211
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
@@ -3821,413 +2484,513 @@
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: ../src/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:168
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: ../src/gtkdialogs.c:159
-#: ../src/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:212
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: ../src/gtkdialogs.c:160
+# NOTE 港譯「泰米爾」
+#: ../gtk/gtkdialogs.c:170
 msgid "Tamil"
-msgstr "終端機"
-
-#: ../src/gtkdialogs.c:161
+msgstr "塔米爾文"
+
+#: ../gtk/gtkdialogs.c:171
 msgid "Telugu"
 msgstr "特魯固文"
 
-#: ../src/gtkdialogs.c:162
+#: ../gtk/gtkdialogs.c:172
 msgid "Thai"
-msgstr "泰語"
-
-#: ../src/gtkdialogs.c:163
+msgstr "泰文"
+
+#: ../gtk/gtkdialogs.c:173
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: ../src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:174
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:174
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: ../src/gtkdialogs.c:165
-#: ../src/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:213
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: ../src/gtkdialogs.c:166
-#: ../src/gtkdialogs.c:167
-#: ../src/gtkdialogs.c:204
+#: ../gtk/gtkdialogs.c:176 ../gtk/gtkdialogs.c:177 ../gtk/gtkdialogs.c:214
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
 # XXX Yahoo譯法
-#: ../src/gtkdialogs.c:173
+#: ../gtk/gtkdialogs.c:183
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../src/gtkdialogs.c:245
+#: ../gtk/gtkdialogs.c:295
 msgid "About Gaim"
 msgstr "關於 Gaim"
 
-#: ../src/gtkdialogs.c:269
-#, fuzzy
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
-msgstr "Gaim 是一個模組化的訊息程式,同時提供 AIM、MSN、Yahoo!、Jabber、ICQ、IRC、SILC、Novell GroupWise、Lotus Sametime、Napster、Zephyr,以及 Gadu-Gadu 等功能。它是以 GTK+ 開發,並以 GPL 的方式發佈。<BR><BR>"
-
-#: ../src/gtkdialogs.c:283
+#: ../gtk/gtkdialogs.c:329
+msgid ""
+"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
+"and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  "
+"Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+"Gaim 係一個以 GTK+ 開發的模組化訊息程式,同時提供 AIM、MSN、Yahoo!、Jabber、"
+"ICQ、IRC、SILC、Novell GroupWise、Lotus Sametime、Zephyr,Gadu-Gadu 及 QQ 等"
+"功能。<BR><BR>倘若您希望修改或發佈這個程式,只需按照 GPL(第二版或任何以後的"
+"版本)的條款即可;Gaim 內已附有一份 GPL, 可在名為「COPYING」的檔案之內找到。"
+"Gaim 是有版權的著作,版權為 Gaim 的全部貢獻者所有,芳名詳列在名為"
+"「COPYRIGHT」的檔案內。本程式並不提供任何保用。<BR><BR>"
+
+#: ../gtk/gtkdialogs.c:343
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim 頻道<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim 頻道<BR><BR>"
 
 # NOTE  contains zh_TW-specific info here!!
-#: ../src/gtkdialogs.c:286
+#: ../gtk/gtkdialogs.c:346
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim 頻道<BR><BR><FONT SIZE=\"4\">正體中文化資訊:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/\">http://gaim.myweb.hinet.net/</A><BR><BR>"
-
-#: ../src/gtkdialogs.c:292
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim 頻道<BR><BR><FONT "
+"SIZE=\"4\">正體中文化資訊:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/"
+"\">http://gaim.myweb.hinet.net/</A><BR><BR>"
+
+#: ../gtk/gtkdialogs.c:352
 msgid "Current Developers"
 msgstr "現任開發者"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 不過,翻成「狂熱的模組作者」會比較好
-#: ../src/gtkdialogs.c:307
+#: ../gtk/gtkdialogs.c:367
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../src/gtkdialogs.c:322
+#: ../gtk/gtkdialogs.c:382
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: ../src/gtkdialogs.c:337
+#: ../gtk/gtkdialogs.c:397
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../src/gtkdialogs.c:357
+#: ../gtk/gtkdialogs.c:417
 msgid "Past Translators"
 msgstr "前任譯者"
 
-#: ../src/gtkdialogs.c:375
+#: ../gtk/gtkdialogs.c:435
 msgid "Debugging Information"
 msgstr "除錯訊息"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: ../src/gtkdialogs.c:595
-#: ../src/gtkdialogs.c:732
-#: ../src/gtkdialogs.c:795
+#: ../gtk/gtkdialogs.c:659 ../gtk/gtkdialogs.c:796 ../gtk/gtkdialogs.c:876
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../src/gtkdialogs.c:600
-#: ../src/gtkdialogs.c:737
-#: ../src/gtkdialogs.c:800
+#: ../gtk/gtkdialogs.c:664 ../gtk/gtkdialogs.c:801 ../gtk/gtkdialogs.c:881
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../src/gtkdialogs.c:608
+#: ../gtk/gtkdialogs.c:672
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../src/gtkdialogs.c:610
-msgid "Please enter the screen name or alias of the person you would like to IM."
+#: ../gtk/gtkdialogs.c:674
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: ../src/gtkdialogs.c:745
+#: ../gtk/gtkdialogs.c:809
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../src/gtkdialogs.c:747
-msgid "Please enter the screen name or alias of the person whose info you would like to view."
+#: ../gtk/gtkdialogs.c:811
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../src/gtkdialogs.c:819
+#: ../gtk/gtkdialogs.c:900
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../src/gtkdialogs.c:821
-#, fuzzy
-msgid "Please enter the screen name or alias of the person whose log you would like to view."
-msgstr "請輸入您所想要讀取日誌的使用者的帳號。"
+#: ../gtk/gtkdialogs.c:902
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../src/gtkdialogs.c:840
+#: ../gtk/gtkdialogs.c:921
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../src/gtkdialogs.c:841
+#: ../gtk/gtkdialogs.c:922
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../src/gtkdialogs.c:843
-#: ../src/gtkdialogs.c:865
-#: ../src/gtkdialogs.c:885
-#: ../src/gtkrequest.c:277
-#: ../src/protocols/silc/chat.c:587
-msgid "Alias"
-msgstr "別名"
-
-#: ../src/gtkdialogs.c:861
+#: ../gtk/gtkdialogs.c:942
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../src/gtkdialogs.c:863
+#: ../gtk/gtkdialogs.c:944
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../src/gtkdialogs.c:882
+#: ../gtk/gtkdialogs.c:963
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../src/gtkdialogs.c:883
+#: ../gtk/gtkdialogs.c:964
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../src/gtkdialogs.c:920
-#, c-format
-msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
-msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
-msgstr[0] "您正試著將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個動作嗎?"
-msgstr[1] "您正試著將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個動作嗎?"
+#: ../gtk/gtkdialogs.c:1001
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"您正試著將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個動"
+"作嗎?"
+msgstr[1] ""
+"您正試著將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個動"
+"作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: ../src/gtkdialogs.c:928
+#: ../gtk/gtkdialogs.c:1009
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: ../src/gtkdialogs.c:929
+#: ../gtk/gtkdialogs.c:1010
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
-#: ../src/gtkdialogs.c:980
-#, c-format
-msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
-msgstr "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
-
-#: ../src/gtkdialogs.c:983
+# TODO 譯文有待改進 - 20061025
+#: ../gtk/gtkdialogs.c:1040
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr "您正試著將群組 %s 與 %s 合併,新群組以後者命名。您要繼續這個動作嗎?"
+
+#: ../gtk/gtkdialogs.c:1047
+msgid "Merge Groups"
+msgstr "合併群組"
+
+#: ../gtk/gtkdialogs.c:1048
+msgid "_Merge Groups"
+msgstr "合併群組(_M)"
+
+#: ../gtk/gtkdialogs.c:1098
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
+
+#: ../gtk/gtkdialogs.c:1101
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../src/gtkdialogs.c:984
+#: ../gtk/gtkdialogs.c:1102
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../src/gtkdialogs.c:1017
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+#: ../gtk/gtkdialogs.c:1135
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: ../src/gtkdialogs.c:1020
+#: ../gtk/gtkdialogs.c:1138
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: ../src/gtkdialogs.c:1021
+#: ../gtk/gtkdialogs.c:1139
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../src/gtkdialogs.c:1042
-#, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+#: ../gtk/gtkdialogs.c:1160
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: ../src/gtkdialogs.c:1045
+#: ../gtk/gtkdialogs.c:1163
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../src/gtkdialogs.c:1046
+#: ../gtk/gtkdialogs.c:1164
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
-#: ../src/gtkft.c:133
+#  NOTE 譯文更動 by Ambrose
+#: ../gtk/gtkdocklet.c:133
+msgid "Right-click for more unread messages...\n"
+msgstr "按右鍵以讀取未讀訊息...\n"
+
+#: ../gtk/gtkdocklet.c:413
+msgid "Change Status"
+msgstr "變更狀態"
+
+#: ../gtk/gtkdocklet.c:416 ../gtk/gtkstatusbox.c:971
+#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1367
+#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
+#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
+#: ../libgaim/protocols/novell/novell.c:2853
+#: ../libgaim/protocols/yahoo/yahoo.c:2885 ../libgaim/status.c:155
+msgid "Available"
+msgstr "上線"
+
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../gtk/gtkdocklet.c:420 ../gtk/gtkprefs.c:1783 ../gtk/gtkstatusbox.c:972
+#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
+#: ../libgaim/protocols/irc/msgs.c:223
+#: ../libgaim/protocols/jabber/buddy.c:1371
+#: ../libgaim/protocols/novell/novell.c:2856
+#: ../libgaim/protocols/oscar/oscar.c:694
+#: ../libgaim/protocols/oscar/oscar.c:4406
+#: ../libgaim/protocols/oscar/oscar.c:5473
+#: ../libgaim/protocols/silc/buddy.c:1469
+#: ../libgaim/protocols/yahoo/yahoo.c:3359
+#: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
+msgid "Away"
+msgstr "離開"
+
+#: ../gtk/gtkdocklet.c:424 ../gtk/gtkstatusbox.c:973
+#: ../libgaim/protocols/oscar/oscar.c:698
+#: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
+msgid "Invisible"
+msgstr "隱身"
+
+#: ../gtk/gtkdocklet.c:465
+msgid "Show Buddy List"
+msgstr "顯示好友清單"
+
+#: ../gtk/gtkdocklet.c:491
+msgid "New Message..."
+msgstr "新訊息..."
+
+#: ../gtk/gtkdocklet.c:506
+msgid "Mute Sounds"
+msgstr "靜音"
+
+#: ../gtk/gtkdocklet.c:513
+msgid "Blink on new message"
+msgstr "有新訊息時閃動"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../gtk/gtkdocklet.c:524
+msgid "Quit"
+msgstr "結束程式"
+
+#: ../gtk/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kB/s"
 
 #  XXX 這個太奇怪了 (^^;)
-#: ../src/gtkft.c:153
+#: ../gtk/gtkft.c:153
 msgid "Not started"
 msgstr "未啟動"
 
-#: ../src/gtkft.c:162
-#: ../src/gtkft.c:1063
+#: ../gtk/gtkft.c:159 ../libgaim/account.c:1662
+#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:630
+#: ../libgaim/protocols/jabber/buddy.c:1361
+#: ../libgaim/protocols/jabber/buddy.c:1378
+#: ../libgaim/protocols/novell/novell.c:2868
+msgid "Unknown"
+msgstr "未知"
+
+#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1119
 msgid "Finished"
 msgstr "已完成"
 
-#: ../src/gtkft.c:165
-#: ../src/gtkft.c:1003
+#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1059
 msgid "Canceled"
 msgstr "已取消"
 
 #  XXX 暫譯
-#: ../src/gtkft.c:168
-#: ../src/gtkft.c:922
+#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
+#: ../gtk/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "檔案傳輸:%2$d 個檔案完成了 %1$d%%"
+
+#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
+msgid "File Transfers"
+msgstr "檔案傳輸"
+
 # XXX 暫譯
-#: ../src/gtkft.c:221
+#: ../gtk/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr "<b>以何身分接收:</b>"
 
-#: ../src/gtkft.c:223
+#: ../gtk/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr "<b>接收自:</b>"
 
-#: ../src/gtkft.c:227
+#: ../gtk/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送到:</b>"
 
 # XXX 暫譯
-#: ../src/gtkft.c:229
+#: ../gtk/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr "<b>以何身分傳送:</b>"
 
-#: ../src/gtkft.c:445
+#: ../gtk/gtkft.c:497
 msgid "There is no application configured to open this type of file."
 msgstr "沒有設定任何應用程式可以開啟這類檔案。"
 
-#: ../src/gtkft.c:450
+#: ../gtk/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr "開啟檔案途中發生錯誤。"
 
-#: ../src/gtkft.c:487
+#: ../gtk/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "啟動 %s 時發生錯誤:%s"
 
-#: ../src/gtkft.c:496
+#: ../gtk/gtkft.c:548
 #, c-format
 msgid "Error running %s"
 msgstr "執行 %s 時發生錯誤"
 
-#: ../src/gtkft.c:497
+#: ../gtk/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
 msgstr "回應處理錯誤代碼 %d"
 
-#: ../src/gtkft.c:591
+#: ../gtk/gtkft.c:644
 msgid "Progress"
 msgstr "進度"
 
-#: ../src/gtkft.c:598
+#: ../gtk/gtkft.c:651
 msgid "Filename"
 msgstr "檔名"
 
-#: ../src/gtkft.c:605
+#: ../gtk/gtkft.c:658
 msgid "Size"
 msgstr "大小"
 
-#: ../src/gtkft.c:612
+#: ../gtk/gtkft.c:665
 msgid "Remaining"
 msgstr "剩餘"
 
-#: ../src/gtkft.c:643
+#: ../gtk/gtkft.c:696
 msgid "Filename:"
 msgstr "檔名:"
 
 # NOTE Debian 譯「local」為「本地端」
 # XXX
-#: ../src/gtkft.c:644
+#: ../gtk/gtkft.c:697
 msgid "Local File:"
 msgstr "本地端檔案:"
 
-#: ../src/gtkft.c:645
-msgid "Status:"
-msgstr "狀態:"
-
-#: ../src/gtkft.c:646
+#: ../gtk/gtkft.c:699
 msgid "Speed:"
 msgstr "速度:"
 
-#: ../src/gtkft.c:647
+#: ../gtk/gtkft.c:700
 msgid "Time Elapsed:"
 msgstr "經過時間:"
 
-#: ../src/gtkft.c:648
+#: ../gtk/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "尚需時間:"
 
-#: ../src/gtkft.c:710
-msgid "File Transfers"
-msgstr "檔案傳輸"
-
-#: ../src/gtkft.c:733
+#: ../gtk/gtkft.c:786
 msgid "Close this window when all transfers _finish"
-msgstr "所有的檔案傳牏完畢時,關閉這個視窗(_F)"
-
-#: ../src/gtkft.c:743
+msgstr "所有的檔案傳輸完畢時,關閉這個視窗(_F)"
+
+#: ../gtk/gtkft.c:796
 msgid "C_lear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
 # XXX 暫譯
 #. "Download Details" arrow
-#: ../src/gtkft.c:752
+#: ../gtk/gtkft.c:805
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
-#. Pause button
-#: ../src/gtkft.c:782
-#: ../src/gtkstock.c:146
-msgid "_Pause"
-msgstr "暫停(_P)"
-
 #. Resume button
-#: ../src/gtkft.c:792
+#: ../gtk/gtkft.c:845
 msgid "_Resume"
 msgstr "恢復(_R)"
 
-#: ../src/gtkft.c:1005
+#: ../gtk/gtkft.c:1061
 msgid "Failed"
 msgstr "失敗"
 
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
-#: ../src/gtkimhtml.c:821
+#: ../gtk/gtkimhtml.c:814
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../src/gtkimhtml.c:833
+#: ../gtk/gtkimhtml.c:826
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
-#: ../src/gtkimhtml.c:1327
+#: ../gtk/gtkimhtml.c:1318
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: ../src/gtkimhtml.c:1328
+#: ../gtk/gtkimhtml.c:1319
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: ../src/gtkimhtml.c:1331
+#: ../gtk/gtkimhtml.c:1322
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: ../src/gtkimhtml.c:1332
+#: ../gtk/gtkimhtml.c:1323
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "當滑鼠經過連結時的連結顏色。"
 
-#: ../src/gtkimhtml.c:1553
+#: ../gtk/gtkimhtml.c:1544
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: ../src/gtkimhtml.c:1565
+#: ../gtk/gtkimhtml.c:1556
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: ../src/gtkimhtml.c:1575
+#: ../gtk/gtkimhtml.c:1566
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../src/gtkimhtml.c:3275
+#: ../gtk/gtkimhtml.c:3298
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -4238,7 +3001,7 @@
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../src/gtkimhtml.c:3278
+#: ../gtk/gtkimhtml.c:3301
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -4248,7 +3011,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../src/gtkimhtml.c:3291
+#: ../gtk/gtkimhtml.c:3314
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -4259,7 +3022,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3294
+#: ../gtk/gtkimhtml.c:3317
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -4270,174 +3033,183 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3374
-#: ../src/gtkimhtml.c:3386
+#: ../gtk/gtkimhtml.c:3397 ../gtk/gtkimhtml.c:3409
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../src/gtkimhtml.c:3414
+#: ../gtk/gtkimhtml.c:3437
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: ../src/gtkimhtmltoolbar.c:147
+#: ../gtk/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: ../src/gtkimhtmltoolbar.c:226
+#: ../gtk/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: ../src/gtkimhtmltoolbar.c:305
+#: ../gtk/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: ../src/gtkimhtmltoolbar.c:394
+#: ../gtk/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: ../src/gtkimhtmltoolbar.c:402
+#: ../gtk/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: ../src/gtkimhtmltoolbar.c:405
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+#: ../gtk/gtkimhtmltoolbar.c:405
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
 msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。"
 
-#: ../src/gtkimhtmltoolbar.c:409
+#: ../gtk/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "請輸入您所要插入的 URL。"
 
-#: ../src/gtkimhtmltoolbar.c:414
+#: ../gtk/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: ../src/gtkimhtmltoolbar.c:418
+#: ../gtk/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../src/gtkimhtmltoolbar.c:487
+#: ../gtk/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像:%s\n"
 
-#: ../src/gtkimhtmltoolbar.c:513
-#: ../src/gtkimhtmltoolbar.c:523
+#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: ../src/gtkimhtmltoolbar.c:721
+#: ../gtk/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: ../src/gtkimhtmltoolbar.c:735
+#: ../gtk/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: ../src/gtkimhtmltoolbar.c:923
+#: ../gtk/gtkimhtmltoolbar.c:922
 msgid "Bold"
 msgstr "粗體"
 
-#: ../src/gtkimhtmltoolbar.c:934
+# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型,「斜體」其實是誤譯,但已根深蒂固,不可能改正
+#: ../gtk/gtkimhtmltoolbar.c:933
 msgid "Italic"
 msgstr "斜體"
 
-#: ../src/gtkimhtmltoolbar.c:945
+#: ../gtk/gtkimhtmltoolbar.c:944
 msgid "Underline"
 msgstr "底線"
 
-#: ../src/gtkimhtmltoolbar.c:961
+#: ../gtk/gtkimhtmltoolbar.c:960
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: ../src/gtkimhtmltoolbar.c:973
+#: ../gtk/gtkimhtmltoolbar.c:972
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: ../src/gtkimhtmltoolbar.c:990
-msgid "Font Face"
+#: ../gtk/gtkimhtmltoolbar.c:989
+msgid "Font face"
 msgstr "字型"
 
-#: ../src/gtkimhtmltoolbar.c:1002
+#: ../gtk/gtkimhtmltoolbar.c:1001
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: ../src/gtkimhtmltoolbar.c:1014
+#: ../gtk/gtkimhtmltoolbar.c:1013
 msgid "Background color"
 msgstr "背景顏色"
 
-#: ../src/gtkimhtmltoolbar.c:1030
+#: ../gtk/gtkimhtmltoolbar.c:1029
 msgid "Reset formatting"
 msgstr "清除格式化"
 
-#: ../src/gtkimhtmltoolbar.c:1045
+#: ../gtk/gtkimhtmltoolbar.c:1044
 msgid "Insert link"
 msgstr "插入連結"
 
-#: ../src/gtkimhtmltoolbar.c:1055
+#: ../gtk/gtkimhtmltoolbar.c:1054
 msgid "Insert image"
 msgstr "插入影像"
 
-#: ../src/gtkimhtmltoolbar.c:1066
+#: ../gtk/gtkimhtmltoolbar.c:1065
 msgid "Insert smiley"
 msgstr "插入表情"
 
-#: ../src/gtklog.c:207
+#  NOTE 第一個 %s 是聊天室名稱,第二個 %s 是時間
+#: ../gtk/gtklog.c:219
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr ""
-
-#: ../src/gtklog.c:212
+msgstr "<span size='larger' weight='bold'>在%s於 %s 的交談</span>"
+
+#  NOTE 第一個 %s 是聯絡人名稱,第二個 %s 是時間
+#: ../gtk/gtklog.c:224
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>與 %s 在 %s 交談</span>"
-
-#: ../src/gtklog.c:261
+msgstr "<span size='larger' weight='bold'>與%s於 %s 的交談</span>"
+
+#: ../gtk/gtklog.c:273
 msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../src/gtklog.c:308
-msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
-msgstr "只有在「記錄所有狀態改變至系統日誌」選項被啟動時,系統事件才會被記錄到系統日誌中。"
-
-#: ../src/gtklog.c:312
-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "%Y年%m月"
+
+#: ../gtk/gtklog.c:320
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"只有在「記錄所有狀態改變至系統日誌」選項被啟動時,系統事件才會被記錄到系統日"
+"誌中。"
+
+#: ../gtk/gtklog.c:324
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
 msgstr "即時訊息只有在「記錄所有即時訊息」選項被開啟時才會被記錄。"
 
-#: ../src/gtklog.c:315
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+#: ../gtk/gtklog.c:327
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "聊天室的內容將只有在「記錄所有的聊天室」選項被啟動時才會被記錄。"
 
-#: ../src/gtklog.c:319
+#: ../gtk/gtklog.c:331
 msgid "No logs were found"
 msgstr "找不到日誌"
 
-#: ../src/gtklog.c:398
+#: ../gtk/gtklog.c:410
 msgid "Total log size:"
-msgstr "全部日誌小大:"
-
-#: ../src/gtklog.c:464
+msgstr "全部日誌大小:"
+
+#: ../gtk/gtklog.c:476
 #, c-format
 msgid "Conversations in %s"
 msgstr "於 %s 的交談"
 
-#: ../src/gtklog.c:472
-#: ../src/gtklog.c:523
+#: ../gtk/gtklog.c:484 ../gtk/gtklog.c:535
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: ../src/gtklog.c:548
+#: ../gtk/gtklog.c:560
 msgid "System Log"
 msgstr "系統日誌"
 
-#: ../src/gtkmain.c:307
+#: ../gtk/gtkmain.c:344
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: ../src/gtkmain.c:309
+#: ../gtk/gtkmain.c:346
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4462,7 +3234,7 @@
 "哪些帳號,並使用逗號分隔) \n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../src/gtkmain.c:493
+#: ../gtk/gtkmain.c:528
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4484,36 +3256,22 @@
 "%scontactinfo.php\n"
 msgstr ""
 
-#: ../src/gtknotify.c:332
-msgid "New Mail"
-msgstr "新郵件"
-
-#: ../src/gtknotify.c:348
+#: ../gtk/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
 
-#  NOTE Jabber 術語,見上
-#: ../src/gtknotify.c:414
-#: ../src/protocols/jabber/jabber.c:1127
-msgid "From"
-msgstr "已認證對方"
-
-#: ../src/gtknotify.c:423
-msgid "Subject"
-msgstr ""
-
-#: ../src/gtknotify.c:432
+#: ../gtk/gtknotify.c:432
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有郵件!</span>"
 
-#: ../src/gtknotify.c:498
+#: ../gtk/gtknotify.c:498
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 msgstr[1] "%s 有 %d 封新郵件。"
 
-#: ../src/gtknotify.c:503
+#: ../gtk/gtknotify.c:503
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4524,57 +3282,43 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:692
-#: ../src/protocols/sametime/sametime.c:5456
+#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5450
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../src/gtknotify.c:849
-#: ../src/protocols/oscar/oscar.c:2635
-#, c-format
-msgid "Info for %s"
-msgstr "%s 的資訊"
-
-#: ../src/gtknotify.c:850
-#: ../src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "好友資訊"
-
-#: ../src/gtknotify.c:890
+#: ../gtk/gtknotify.c:890
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: ../src/gtknotify.c:892
-#: ../src/gtknotify.c:904
-#: ../src/gtknotify.c:917
-#: ../src/gtknotify.c:1040
+#: ../gtk/gtknotify.c:892 ../gtk/gtknotify.c:904 ../gtk/gtknotify.c:917
+#: ../gtk/gtknotify.c:1045
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: ../src/gtknotify.c:902
-#: ../src/gtknotify.c:915
+#: ../gtk/gtknotify.c:902 ../gtk/gtknotify.c:915
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤:%s"
 
-#: ../src/gtknotify.c:1041
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
+#: ../gtk/gtknotify.c:1046
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
 
-#: ../src/gtkplugin.c:274
+#: ../gtk/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr "以下的模組將會被卸載。"
 
-#: ../src/gtkplugin.c:293
+#: ../gtk/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "多個模組將會被卸載。"
 
-#: ../src/gtkplugin.c:295
+#: ../gtk/gtkplugin.c:295
 msgid "Unload Plugins"
 msgstr "卸載模組"
 
-#: ../src/gtkplugin.c:407
+#: ../gtk/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4585,7 +3329,7 @@
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: ../src/gtkplugin.c:417
+#: ../gtk/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4596,426 +3340,444 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">錯誤: %s\n"
 "檢查模組的網站以獲得更新。</span>"
 
-#: ../src/gtkplugin.c:543
+#: ../gtk/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "設定模組(_U)"
 
-#: ../src/gtkplugin.c:601
+#: ../gtk/gtkplugin.c:603
 msgid "<b>Plugin Details</b>"
 msgstr "<b>模組明細</b>"
 
-#: ../src/gtkpounce.c:155
+#: ../gtk/gtkpounce.c:155
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#: ../src/gtkpounce.c:252
+#: ../gtk/gtkpounce.c:252
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#: ../src/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:499
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: ../src/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:499
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:516
+#: ../gtk/gtkpounce.c:516
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../src/gtkpounce.c:543
+#: ../gtk/gtkpounce.c:543
 msgid "_Buddy name:"
 msgstr "好友名稱(_B):"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:569
+#: ../gtk/gtkpounce.c:569
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
-#: ../src/gtkpounce.c:577
+#: ../gtk/gtkpounce.c:577
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../src/gtkpounce.c:579
+#: ../gtk/gtkpounce.c:579
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../src/gtkpounce.c:581
+#: ../gtk/gtkpounce.c:581
 msgid "Goes a_way"
 msgstr "離開(_W)"
 
-#: ../src/gtkpounce.c:583
+#: ../gtk/gtkpounce.c:583
 msgid "Ret_urns from away"
 msgstr "返回(_U)"
 
-#: ../src/gtkpounce.c:585
+#: ../gtk/gtkpounce.c:585
 msgid "Becomes _idle"
 msgstr "閒置(_I)"
 
-#: ../src/gtkpounce.c:587
+#: ../gtk/gtkpounce.c:587
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../src/gtkpounce.c:589
+#: ../gtk/gtkpounce.c:589
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../src/gtkpounce.c:591
+#: ../gtk/gtkpounce.c:591
 msgid "P_auses while typing"
-msgstr ""
-
-#: ../src/gtkpounce.c:593
+msgstr "暫停輸入(_A)"
+
+#: ../gtk/gtkpounce.c:593
 msgid "Stops t_yping"
 msgstr "停止輸入(_Y)"
 
-#: ../src/gtkpounce.c:595
+#: ../gtk/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:630
+#: ../gtk/gtkpounce.c:630
 msgid "Action"
 msgstr "執行動作"
 
-#: ../src/gtkpounce.c:638
+#: ../gtk/gtkpounce.c:638
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../src/gtkpounce.c:640
+#: ../gtk/gtkpounce.c:640
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../src/gtkpounce.c:642
+#: ../gtk/gtkpounce.c:642
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../src/gtkpounce.c:644
+#: ../gtk/gtkpounce.c:644
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: ../src/gtkpounce.c:646
+#: ../gtk/gtkpounce.c:646
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: ../src/gtkpounce.c:651
+#: ../gtk/gtkpounce.c:651
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: ../src/gtkpounce.c:653
+#: ../gtk/gtkpounce.c:653
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../src/gtkpounce.c:654
+#: ../gtk/gtkpounce.c:654
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#. Create the "Options" frame.
-#: ../src/gtkpounce.c:766
-msgid "Options"
-msgstr "選項"
-
-#: ../src/gtkpounce.c:774
+#: ../gtk/gtkpounce.c:774
 msgid "P_ounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../src/gtkpounce.c:779
+#: ../gtk/gtkpounce.c:779
 msgid "_Recurring"
 msgstr "重覆發生(_R)"
 
-#: ../src/gtkpounce.c:1085
+#: ../gtk/gtkpounce.c:1085
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉?"
 
-#: ../src/gtkpounce.c:1233
+#: ../gtk/gtkpounce.c:1233
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
-#: ../src/gtkpounce.c:1268
+#: ../gtk/gtkpounce.c:1268
 msgid "Recurring"
 msgstr "重覆發生"
 
-#: ../src/gtkpounce.c:1315
+#: ../gtk/gtkpounce.c:1315
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../src/gtkpounce.c:1442
+#: ../gtk/gtkpounce.c:1442
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: ../src/gtkpounce.c:1444
+#: ../gtk/gtkpounce.c:1444
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 暫停輸入訊息給您 (%s)"
 
-#: ../src/gtkpounce.c:1446
+#: ../gtk/gtkpounce.c:1446
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../src/gtkpounce.c:1448
+#: ../gtk/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../src/gtkpounce.c:1450
+#: ../gtk/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../src/gtkpounce.c:1452
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: ../src/gtkpounce.c:1454
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../src/gtkpounce.c:1456
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
-#: ../src/gtkpounce.c:1458
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../src/gtkpounce.c:1460
+#: ../gtk/gtkpounce.c:1460
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
-#: ../src/gtkpounce.c:1461
+#: ../gtk/gtkpounce.c:1461
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
-#: ../src/gtkprefs.c:512
+# XXX 要覆查 - 20061025
+#: ../gtk/gtkprefs.c:512
 msgid "Smiley theme failed to unpack."
-msgstr ""
-
-#: ../src/gtkprefs.c:638
-msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
-msgstr "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題安裝到清單中。"
-
-#: ../src/gtkprefs.c:673
+msgstr "無法打開表情主題。"
+
+#: ../gtk/gtkprefs.c:641
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
+"安裝到清單中。"
+
+#: ../gtk/gtkprefs.c:676
 msgid "Icon"
 msgstr "圖示"
 
-#: ../src/gtkprefs.c:680
-#: ../src/protocols/jabber/buddy.c:286
-#: ../src/protocols/jabber/buddy.c:926
-#: ../src/protocols/jabber/chat.c:767
+#: ../gtk/gtkprefs.c:683 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:923
+#: ../libgaim/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "描述"
 
-#: ../src/gtkprefs.c:821
+#: ../gtk/gtkprefs.c:824
 msgid "_Hide new IM conversations"
 msgstr "隱藏新的即時訊息交談(_H)"
 
-#: ../src/gtkprefs.c:824
-#: ../src/gtkprefs.c:1779
+#: ../gtk/gtkprefs.c:826 ../gtk/gtkprefs.c:1773 ../gtk/gtkprefs.c:1787
+#: ../gtk/plugins/win32/winprefs/winprefs.c:334
+msgid "Never"
+msgstr "從不"
+
+#: ../gtk/gtkprefs.c:827 ../gtk/gtkprefs.c:1788
 msgid "When away"
 msgstr "離開期間"
 
-#: ../src/gtkprefs.c:828
+#: ../gtk/gtkprefs.c:828 ../gtk/plugins/timestamp_format.c:39
+#: ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:335
+msgid "Always"
+msgstr "務必"
+
+#: ../gtk/gtkprefs.c:831
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "不明的「斜線」指令,一律當成訊息送出(_S)"
 
-#: ../src/gtkprefs.c:830
+#: ../gtk/gtkprefs.c:833
 msgid "Show _formatting on incoming messages"
 msgstr "顯示所收訊息的格式化(_F)"
 
-#: ../src/gtkprefs.c:833
+#: ../gtk/gtkprefs.c:836
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: ../src/gtkprefs.c:835
+#: ../gtk/gtkprefs.c:838
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: ../src/gtkprefs.c:842
+#: ../gtk/gtkprefs.c:845
 msgid "_Notify buddies that you are typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_N)"
 
-#: ../src/gtkprefs.c:845
+#: ../gtk/gtkprefs.c:848
 msgid "Highlight _misspelled words"
 msgstr "標示出拼錯的字(_M)"
 
-#: ../src/gtkprefs.c:849
+#: ../gtk/gtkprefs.c:852
 msgid "Use smooth-scrolling"
 msgstr "使用平滑捲軸"
 
-#: ../src/gtkprefs.c:865
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
+#: ../gtk/gtkprefs.c:855
+msgid "F_lash window when IMs are received"
+msgstr "收到即時訊息後閃動視窗(_F)"
+
+#: ../gtk/gtkprefs.c:872
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
 msgstr "假如您使用的協定支援格式化,送出訊息的式樣將會類似以下的樣本:"
 
 #. All the tab options!
-#: ../src/gtkprefs.c:887
+#: ../gtk/gtkprefs.c:894
 msgid "Tab Options"
 msgstr "分頁選項"
 
-#: ../src/gtkprefs.c:889
+#: ../gtk/gtkprefs.c:896
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用分頁視窗顯示即時訊息和聊天(_T)"
 
-#: ../src/gtkprefs.c:903
+#: ../gtk/gtkprefs.c:910
 msgid "Show close b_utton on tabs"
 msgstr "在分頁上顯示關閉鍵(_U)"
 
-#: ../src/gtkprefs.c:909
+#: ../gtk/gtkprefs.c:916
 msgid "_Placement:"
 msgstr "視窗位置額外選項(_P):"
 
-#: ../src/gtkprefs.c:911
+#: ../gtk/gtkprefs.c:918
 msgid "Top"
 msgstr "視窗上方"
 
-#: ../src/gtkprefs.c:912
+#: ../gtk/gtkprefs.c:919
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: ../src/gtkprefs.c:913
+#: ../gtk/gtkprefs.c:920
 msgid "Left"
 msgstr "視窗左側"
 
-#: ../src/gtkprefs.c:914
+#: ../gtk/gtkprefs.c:921
 msgid "Right"
 msgstr "視窗右側"
 
-#: ../src/gtkprefs.c:916
+#: ../gtk/gtkprefs.c:923
 msgid "Left Vertical"
 msgstr "左邊垂直"
 
-#: ../src/gtkprefs.c:917
+#: ../gtk/gtkprefs.c:924
 msgid "Right Vertical"
 msgstr "右邊垂直"
 
-#: ../src/gtkprefs.c:922
+#: ../gtk/gtkprefs.c:929
 msgid "N_ew conversations:"
 msgstr "新交談(_E):"
 
-#: ../src/gtkprefs.c:973
-#: ../src/protocols/oscar/oscar.c:804
-#: ../src/protocols/oscar/oscar.c:3652
+#: ../gtk/gtkprefs.c:980 ../libgaim/protocols/oscar/oscar.c:779
+#: ../libgaim/protocols/oscar/oscar.c:3627
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../src/gtkprefs.c:975
+#: ../gtk/gtkprefs.c:982
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_S):"
 
-#: ../src/gtkprefs.c:987
+#: ../gtk/gtkprefs.c:994
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr ""
-
-#: ../src/gtkprefs.c:991
+msgstr "<span style=\"italic\">例:stunserver.org</span>"
+
+#: ../gtk/gtkprefs.c:998
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: ../src/gtkprefs.c:1000
+#: ../gtk/gtkprefs.c:1007
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: ../src/gtkprefs.c:1029
+#: ../gtk/gtkprefs.c:1036
 msgid "Ports"
 msgstr "通訊埠"
 
-#: ../src/gtkprefs.c:1032
+#: ../gtk/gtkprefs.c:1039
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: ../src/gtkprefs.c:1035
+#: ../gtk/gtkprefs.c:1042
 msgid "_Start port:"
 msgstr "啟始通訊埠(_S):"
 
-#: ../src/gtkprefs.c:1042
+#: ../gtk/gtkprefs.c:1049
 msgid "_End port:"
 msgstr "結束通訊埠(_E):"
 
-#: ../src/gtkprefs.c:1050
+#: ../gtk/gtkprefs.c:1057
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: ../src/gtkprefs.c:1054
+#: ../gtk/gtkprefs.c:1061
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: ../src/gtkprefs.c:1110
+#: ../gtk/gtkprefs.c:1117
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: ../src/gtkprefs.c:1172
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../src/gtkprefs.c:1173
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../src/gtkprefs.c:1174
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../src/gtkprefs.c:1175
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../src/gtkprefs.c:1176
-msgid "GNOME Default"
-msgstr "GNOME預設"
-
-#: ../src/gtkprefs.c:1177
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../src/gtkprefs.c:1178
+#: ../gtk/gtkprefs.c:1180
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../gtk/gtkprefs.c:1181
+msgid "Opera"
+msgstr "Opera"
+
+#: ../gtk/gtkprefs.c:1182
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../gtk/gtkprefs.c:1183
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../src/gtkprefs.c:1179
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../src/gtkprefs.c:1180
-msgid "Opera"
-msgstr "Opera"
-
-#: ../src/gtkprefs.c:1189
+#: ../gtk/gtkprefs.c:1184
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../gtk/gtkprefs.c:1185
+msgid "GNOME Default"
+msgstr "GNOME預設"
+
+#: ../gtk/gtkprefs.c:1186
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../gtk/gtkprefs.c:1187
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../gtk/gtkprefs.c:1188
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../gtk/gtkprefs.c:1189
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../gtk/gtkprefs.c:1198
 msgid "Manual"
 msgstr "使用者自定"
 
-#: ../src/gtkprefs.c:1242
+#: ../gtk/gtkprefs.c:1251
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: ../src/gtkprefs.c:1246
+#: ../gtk/gtkprefs.c:1255
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: ../src/gtkprefs.c:1254
+#: ../gtk/gtkprefs.c:1263
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: ../src/gtkprefs.c:1256
+#: ../gtk/gtkprefs.c:1265
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: ../src/gtkprefs.c:1257
+#: ../gtk/gtkprefs.c:1266
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: ../src/gtkprefs.c:1259
+#: ../gtk/gtkprefs.c:1268
 msgid "New tab"
 msgstr "新分頁"
 
-#: ../src/gtkprefs.c:1273
+#: ../gtk/gtkprefs.c:1282
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -5024,85 +3786,79 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: ../src/gtkprefs.c:1309
-#: ../src/gtkprefs.c:1890
-msgid "Logging"
-msgstr "日誌"
-
-#: ../src/gtkprefs.c:1312
+#: ../gtk/gtkprefs.c:1321
 msgid "Log _format:"
 msgstr "日誌格式(_F):"
 
-#: ../src/gtkprefs.c:1317
+#: ../gtk/gtkprefs.c:1326
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: ../src/gtkprefs.c:1319
+#: ../gtk/gtkprefs.c:1328
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: ../src/gtkprefs.c:1321
+#: ../gtk/gtkprefs.c:1330
 msgid "Log all _status changes to system log"
 msgstr "記錄所有的狀態改變至系統日誌"
 
-#: ../src/gtkprefs.c:1469
+#: ../gtk/gtkprefs.c:1478
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../src/gtkprefs.c:1477
+#: ../gtk/gtkprefs.c:1486
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../src/gtkprefs.c:1479
+#: ../gtk/gtkprefs.c:1488
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../src/gtkprefs.c:1481
+#: ../gtk/gtkprefs.c:1490
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../src/gtkprefs.c:1483
-#: ../src/protocols/silc/silc.c:672
+#: ../gtk/gtkprefs.c:1492 ../libgaim/protocols/silc/silc.c:666
 msgid "Normal"
 msgstr "正常"
 
-#: ../src/gtkprefs.c:1485
+#: ../gtk/gtkprefs.c:1494
 msgid "Loud"
 msgstr "大聲"
 
-#: ../src/gtkprefs.c:1487
+#: ../gtk/gtkprefs.c:1496
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../src/gtkprefs.c:1489
+#: ../gtk/gtkprefs.c:1498
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../src/gtkprefs.c:1552
+#: ../gtk/gtkprefs.c:1561
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: ../src/gtkprefs.c:1553
+#: ../gtk/gtkprefs.c:1562
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: ../src/gtkprefs.c:1555
+#: ../gtk/gtkprefs.c:1564
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../src/gtkprefs.c:1557
+#: ../gtk/gtkprefs.c:1566
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/gtkprefs.c:1562
+#: ../gtk/gtkprefs.c:1571
 msgid "Command"
 msgstr "指令"
 
-#: ../src/gtkprefs.c:1563
+#: ../gtk/gtkprefs.c:1572
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../src/gtkprefs.c:1571
+#: ../gtk/gtkprefs.c:1580
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -5111,203 +3867,198 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: ../src/gtkprefs.c:1597
+#: ../gtk/gtkprefs.c:1606
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: ../src/gtkprefs.c:1598
+#: ../gtk/gtkprefs.c:1607
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../src/gtkprefs.c:1600
+#: ../gtk/gtkprefs.c:1609
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: ../src/gtkprefs.c:1607
+#: ../gtk/gtkprefs.c:1616
 msgid "Volume:"
 msgstr "音量:"
 
-#: ../src/gtkprefs.c:1635
+#: ../gtk/gtkprefs.c:1644
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../src/gtkprefs.c:1686
+#: ../gtk/gtkprefs.c:1695
 msgid "Play"
 msgstr "播放"
 
-#: ../src/gtkprefs.c:1693
+#: ../gtk/gtkprefs.c:1702
 msgid "Event"
 msgstr "事件"
 
-#: ../src/gtkprefs.c:1712
+#: ../gtk/gtkprefs.c:1721
 msgid "Test"
 msgstr "測試"
 
-#: ../src/gtkprefs.c:1716
+#: ../gtk/gtkprefs.c:1725
 msgid "Reset"
 msgstr "重置"
 
-#: ../src/gtkprefs.c:1720
+#: ../gtk/gtkprefs.c:1729
 msgid "Choose..."
 msgstr "選擇..."
 
-#: ../src/gtkprefs.c:1762
+#: ../gtk/gtkprefs.c:1771
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../src/gtkprefs.c:1765
+#: ../gtk/gtkprefs.c:1774
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
-#: ../src/gtkprefs.c:1767
+#: ../gtk/gtkprefs.c:1776
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../src/gtkprefs.c:1776
+#: ../gtk/gtkprefs.c:1785
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應:"
 
-#: ../src/gtkprefs.c:1780
+#: ../gtk/gtkprefs.c:1789
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../src/gtkprefs.c:1786
+#: ../gtk/gtkprefs.c:1795
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../src/gtkprefs.c:1788
+#: ../gtk/gtkprefs.c:1797
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../src/gtkprefs.c:1792
+#: ../gtk/gtkprefs.c:1801
 msgid "_Minutes before changing status:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: ../src/gtkprefs.c:1800
+#: ../gtk/gtkprefs.c:1809
 msgid "Change _status to:"
 msgstr "更改狀態為(_S):"
 
 #. Signon status stuff
-#: ../src/gtkprefs.c:1821
+#: ../gtk/gtkprefs.c:1830
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../src/gtkprefs.c:1823
+#: ../gtk/gtkprefs.c:1832
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../src/gtkprefs.c:1829
+#: ../gtk/gtkprefs.c:1838
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態:"
 
-#: ../src/gtkprefs.c:1880
+#: ../gtk/gtkprefs.c:1889
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../src/gtkprefs.c:1881
+#: ../gtk/gtkprefs.c:1890
 msgid "Sounds"
 msgstr "音效"
 
-#: ../src/gtkprefs.c:1882
-#: ../src/protocols/silc/silc.c:1852
+#: ../gtk/gtkprefs.c:1891 ../libgaim/protocols/silc/silc.c:1847
 msgid "Network"
 msgstr "網路"
 
-#: ../src/gtkprefs.c:1887
+#: ../gtk/gtkprefs.c:1896
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../src/gtkprefs.c:1891
-msgid "Away / Idle"
-msgstr "離開 / 閒置"
-
-#: ../src/gtkprivacy.c:79
+#: ../gtk/gtkprefs.c:1900
+msgid "Status / Idle"
+msgstr "狀態/閒置"
+
+#: ../gtk/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: ../src/gtkprivacy.c:80
+#: ../gtk/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "只允許好友清單中的使用者"
 
-#: ../src/gtkprivacy.c:81
+#: ../gtk/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "允許下列的使用者和我聯絡"
 
-#: ../src/gtkprivacy.c:82
+#: ../gtk/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "拒絕所有使用者"
 
-#: ../src/gtkprivacy.c:83
+#: ../gtk/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: ../src/gtkprivacy.c:372
+#: ../gtk/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: ../src/gtkprivacy.c:385
+#: ../gtk/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
 #. "Set privacy for:" label
-#: ../src/gtkprivacy.c:397
+#: ../gtk/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: ../src/gtkprivacy.c:562
-#: ../src/gtkprivacy.c:578
+#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: ../src/gtkprivacy.c:563
+#: ../gtk/gtkprivacy.c:561
 msgid "Type a user you permit to contact you."
 msgstr "輸入您所許可聯絡您的使用者。"
 
-#: ../src/gtkprivacy.c:564
+#: ../gtk/gtkprivacy.c:562
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: ../src/gtkprivacy.c:567
-#: ../src/gtkprivacy.c:580
+#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "許可(_P)"
 
-#: ../src/gtkprivacy.c:572
+#: ../gtk/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您?"
 
-#: ../src/gtkprivacy.c:574
+#: ../gtk/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎?"
 
-#: ../src/gtkprivacy.c:601
-#: ../src/gtkprivacy.c:614
+#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: ../src/gtkprivacy.c:602
+#: ../gtk/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: ../src/gtkprivacy.c:603
+#: ../gtk/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: ../src/gtkprivacy.c:605
-#: ../src/gtkprivacy.c:616
+#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
 msgid "_Block"
-msgstr "封鎖"
-
-#: ../src/gtkprivacy.c:610
+msgstr "封鎖(_B)"
+
+#: ../gtk/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s?"
 
-#: ../src/gtkprivacy.c:612
+#: ../gtk/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s?"
@@ -5315,472 +4066,2485 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../src/gtkrequest.c:267
-#: ../src/protocols/msn/dialog.c:132
-#: ../src/protocols/msn/msn.c:555
-#: ../src/protocols/msn/msn.c:564
-#: ../src/protocols/novell/novell.c:1919
-#: ../src/protocols/silc/buddy.c:313
-#: ../src/protocols/silc/pk.c:117
-#: ../src/protocols/silc/wb.c:303
-#: ../src/request.h:1335
+#: ../gtk/gtkrequest.c:267 ../libgaim/protocols/msn/dialog.c:132
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1920
+#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
+#: ../libgaim/protocols/silc/wb.c:303 ../libgaim/request.h:1335
 msgid "Yes"
 msgstr "是"
 
-#: ../src/gtkrequest.c:268
-#: ../src/protocols/msn/dialog.c:133
-#: ../src/protocols/msn/msn.c:555
-#: ../src/protocols/msn/msn.c:564
-#: ../src/protocols/novell/novell.c:1920
-#: ../src/protocols/silc/buddy.c:314
-#: ../src/protocols/silc/pk.c:118
-#: ../src/protocols/silc/wb.c:304
-#: ../src/request.h:1335
+#: ../gtk/gtkrequest.c:268 ../libgaim/protocols/msn/dialog.c:133
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1921
+#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
+#: ../libgaim/protocols/silc/wb.c:304 ../libgaim/request.h:1335
 msgid "No"
 msgstr "否"
 
-#: ../src/gtkrequest.c:271
+#: ../gtk/gtkrequest.c:271
 msgid "Apply"
 msgstr "套用"
 
-#: ../src/gtkrequest.c:272
-#: ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:350
-msgid "Close"
-msgstr "關閉"
-
-#: ../src/gtkrequest.c:1467
+#: ../gtk/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../src/gtkrequest.c:1468
+#: ../gtk/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: ../src/gtkrequest.c:1469
+#: ../gtk/gtkrequest.c:1469
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../src/gtkrequest.c:1470
+#: ../gtk/gtkrequest.c:1470
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../src/gtkrequest.c:1512
-#: ../src/gtkrequest.c:1553
+#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../src/gtkrequest.c:1513
-#: ../src/gtkrequest.c:1554
+#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "開啟檔案..."
 
-#: ../src/gtkrequest.c:1601
-#: ../src/gtkrequest.c:1615
+#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
-#: ../src/gtkroomlist.c:287
+#: ../gtk/gtkroomlist.c:287
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../src/gtkroomlist.c:354
+#: ../gtk/gtkroomlist.c:355
 msgid "Room List"
 msgstr "聊天室清單"
 
 #  list button
 #. list button
-#: ../src/gtkroomlist.c:424
+#: ../gtk/gtkroomlist.c:425
 msgid "_Get List"
 msgstr "取得清單(_G)"
 
 #. add button
-#: ../src/gtkroomlist.c:432
+#: ../gtk/gtkroomlist.c:433
 msgid "_Add Chat"
 msgstr "新增聊天室(_A)"
 
-#: ../src/gtksavedstatuses.c:433
-#: ../src/protocols/jabber/buddy.c:283
-#: ../src/protocols/jabber/buddy.c:920
-#: ../src/protocols/novell/novell.c:1484
-msgid "Title"
-msgstr "職銜"
-
-# NOTE 應指除存時的格式
-#: ../src/gtksavedstatuses.c:448
-msgid "Type"
-msgstr "格式"
-
-#: ../src/gtksavedstatuses.c:459
-#: ../src/gtksavedstatuses.c:923
-#: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263
-#: ../src/protocols/gg/gg.c:1591
-#: ../src/protocols/gg/gg.c:1601
-#: ../src/protocols/gg/gg.c:1607
-#: ../src/protocols/gg/gg.c:1616
-#: ../src/protocols/gg/gg.c:1621
-#: ../src/protocols/irc/irc.c:227
-#: ../src/protocols/jabber/jabber.c:1194
-#: ../src/protocols/jabber/jabber.c:1204
-#: ../src/protocols/jabber/jabber.c:1214
-#: ../src/protocols/jabber/jabber.c:1224
-#: ../src/protocols/jabber/jabber.c:1234
-#: ../src/protocols/jabber/jabber.c:1246
-#: ../src/protocols/novell/novell.c:2866
-#: ../src/protocols/novell/novell.c:2972
-#: ../src/protocols/novell/novell.c:2978
-#: ../src/protocols/novell/novell.c:2984
-#: ../src/protocols/oscar/oscar.c:5388
-#: ../src/protocols/oscar/oscar.c:5403
-#: ../src/protocols/oscar/oscar.c:5408
-#: ../src/protocols/oscar/oscar.c:5616
-#: ../src/protocols/oscar/oscar.c:5628
-#: ../src/protocols/sametime/sametime.c:3266
-#: ../src/protocols/sametime/sametime.c:3272
-#: ../src/protocols/sametime/sametime.c:3278
-#: ../src/protocols/sametime/sametime.c:3357
-#: ../src/protocols/silc/buddy.c:1544
-#: ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3308
-#: ../src/protocols/yahoo/yahoo.c:3314
-#: ../src/protocols/zephyr/zephyr.c:2281
-msgid "Message"
-msgstr "訊息"
-
-#: ../src/gtksavedstatuses.c:526
-msgid "Saved Statuses"
-msgstr "儲存狀態"
-
 #. Use button
-#: ../src/gtksavedstatuses.c:549
-#: ../src/gtksavedstatuses.c:1183
+#: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: ../src/gtksavedstatuses.c:695
+#: ../gtk/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
 msgstr "目前標題正在使用中。您必須選取一個唯一的標題。"
 
-#: ../src/gtksavedstatuses.c:883
+#: ../gtk/gtksavedstatuses.c:883
 msgid "Different"
 msgstr "差異"
 
-#: ../src/gtksavedstatuses.c:912
-#: ../src/gtksavedstatuses.c:1059
-#: ../src/protocols/gg/gg.c:1024
-#: ../src/protocols/gg/gg.c:1574
-#: ../src/protocols/gg/gg.c:1578
-#: ../src/protocols/jabber/buddy.c:629
-#: ../src/protocols/jabber/buddy.c:636
-#: ../src/protocols/jabber/buddy.c:662
-#: ../src/protocols/jabber/jabber.c:1165
-#: ../src/protocols/msn/msn.c:546
-#: ../src/protocols/novell/novell.c:2865
-#: ../src/protocols/novell/novell.c:2869
-#: ../src/protocols/oscar/oscar.c:784
-#: ../src/protocols/oscar/oscar.c:790
-#: ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/yahoo/yahoo.c:2888
-msgid "Status"
-msgstr "狀態"
-
-#: ../src/gtksavedstatuses.c:1076
+#: ../gtk/gtksavedstatuses.c:1076
 msgid "_Title:"
 msgstr "標題(_T):"
 
-#: ../src/gtksavedstatuses.c:1095
-#: ../src/gtksavedstatuses.c:1416
+#: ../gtk/gtksavedstatuses.c:1095 ../gtk/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "狀態(_S):"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1127
+#: ../gtk/gtksavedstatuses.c:1127
 msgid "Use a _different status for some accounts"
 msgstr "為部份帳號設定不同的狀態(_D)"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1191
+#: ../gtk/gtksavedstatuses.c:1191
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../src/gtksavedstatuses.c:1397
+#: ../gtk/gtksavedstatuses.c:1397
 #, c-format
 msgid "Status for %s"
 msgstr "狀態:%s"
 
-#: ../src/gtksound.c:59
+#: ../gtk/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: ../src/gtksound.c:60
+#: ../gtk/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: ../src/gtksound.c:61
+#: ../gtk/gtksound.c:65
 msgid "Message received"
 msgstr "收到訊息"
 
-#: ../src/gtksound.c:62
+#: ../gtk/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "訊息收到,開始進行交談"
 
-#: ../src/gtksound.c:63
+#: ../gtk/gtksound.c:67
 msgid "Message sent"
 msgstr "訊息送出"
 
-#: ../src/gtksound.c:64
+#: ../gtk/gtksound.c:68
 msgid "Person enters chat"
 msgstr "有人進入聊天室"
 
-#: ../src/gtksound.c:65
+#: ../gtk/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "有人離開聊天室"
 
-#: ../src/gtksound.c:66
+#: ../gtk/gtksound.c:70
 msgid "You talk in chat"
 msgstr "您在聊天室說話"
 
-#: ../src/gtksound.c:67
+#: ../gtk/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "其他人進入聊天室"
 
-#: ../src/gtksound.c:70
+#: ../gtk/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
+#: ../gtk/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer 錯誤"
+
+#: ../gtk/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer 初始化失敗。"
+
 #. connect to the server
-#: ../src/gtkstatusbox.c:368
-#: ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:992
-#: ../src/protocols/msn/session.c:344
-#: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2181
-#: ../src/protocols/oscar/oscar.c:1259
-#: ../src/protocols/sametime/sametime.c:3685
-#: ../src/protocols/simple/simple.c:1615
-#: ../src/protocols/yahoo/yahoo.c:2580
-#: ../src/protocols/zephyr/zephyr.c:1565
+#: ../gtk/gtkstatusbox.c:543 ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1000
+#: ../libgaim/protocols/msn/session.c:344
+#: ../libgaim/protocols/novell/novell.c:2185
+#: ../libgaim/protocols/oscar/oscar.c:1224 ../libgaim/protocols/qq/qq.c:134
+#: ../libgaim/protocols/sametime/sametime.c:3678
+#: ../libgaim/protocols/simple/simple.c:1669
+#: ../libgaim/protocols/yahoo/yahoo.c:2715
+#: ../libgaim/protocols/zephyr/zephyr.c:1617
 msgid "Connecting"
 msgstr "連線中"
 
-#: ../src/gtkstock.c:138
-msgid "_Alias"
-msgstr "別名(_A)"
-
-#: ../src/gtkstock.c:140
-msgid "Close _tabs"
-msgstr "關閉分頁(_T)"
-
-#: ../src/gtkstock.c:142
-msgid "_Get Info"
-msgstr "取得資訊"
-
-#: ../src/gtkstock.c:143
-msgid "_Invite"
-msgstr "邀請(_I)"
-
-#: ../src/gtkstock.c:144
-msgid "_Modify"
-msgstr "修改(_M)"
-
-#: ../src/gtkstock.c:145
-msgid "_Open Mail"
-msgstr "開啟郵件(_O)"
-
-#: ../src/gtkutils.c:1306
-#: ../src/gtkutils.c:1331
+#: ../gtk/gtkstatusbox.c:545
+msgid "Waiting for network connection"
+msgstr "等待網路連線..."
+
+#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1335
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤:%s"
 
-#: ../src/gtkutils.c:1308
-#: ../src/gtkutils.c:1333
+#: ../gtk/gtkutils.c:1312 ../gtk/gtkutils.c:1337
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../src/gtkutils.c:1408
+#: ../gtk/gtkutils.c:1412
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../src/gtkutils.c:1410
-msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
+#: ../gtk/gtkutils.c:1414
+msgid ""
+"Gaim cannot transfer a folder. You will need to send the files within "
+"individually"
 msgstr "Gaim 沒有辦法傳送目錄。您需要個別傳送檔案"
 
-#: ../src/gtkutils.c:1438
-#: ../src/gtkutils.c:1447
-#: ../src/gtkutils.c:1452
+#: ../gtk/gtkutils.c:1442 ../gtk/gtkutils.c:1451 ../gtk/gtkutils.c:1456
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../src/gtkutils.c:1439
-msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
-msgstr "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔給這個使用者。"
-
-#: ../src/gtkutils.c:1443
-#: ../src/gtkutils.c:1458
+#: ../gtk/gtkutils.c:1443
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
+"給這個使用者。"
+
+#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1462
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../src/gtkutils.c:1444
-#: ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1448 ../gtk/gtkutils.c:1463
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../src/gtkutils.c:1445
-#: ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1463
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../src/gtkutils.c:1448
+#: ../gtk/gtkutils.c:1452
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎?"
 
-#: ../src/gtkutils.c:1453
-msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
-msgstr "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔給這個使用者。"
-
-#: ../src/gtkutils.c:1455
-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
-msgstr "您可以透過插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔給這個使用者。"
+#: ../gtk/gtkutils.c:1457
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
+"給這個使用者。"
+
+#: ../gtk/gtkutils.c:1459
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"您可以透過插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔給這個使用"
+"者。"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../src/gtkutils.c:1509
-#, fuzzy
+#: ../gtk/gtkutils.c:1513
 msgid "Cannot send launcher"
-msgstr "無法傳送檔案"
-
-#: ../src/gtkutils.c:1509
-msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
-msgstr ""
-
-#: ../src/gtkwhiteboard.c:756
-#: ../src/gtkwhiteboard.c:775
+msgstr "無法傳送啟動器"
+
+#: ../gtk/gtkutils.c:1513
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr "您拖曳了一個啟動器;您大概想傳送啟動器要啟動的檔案,而不是啟動器本身。"
+
+#: ../gtk/gtkutils.c:2342
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>檔名:</b> %s\n"
+"<b>檔案大小:</b> %s\n"
+"<b>圖像尺寸:</b> %d×%d"
+
+#. Label
+#: ../gtk/gtkutils.c:2386 ../gtk/gtkutils.c:2408
+#: ../gtk/plugins/gevolution/new_person_dialog.c:338
+#: ../libgaim/protocols/oscar/oscar.c:600
+msgid "Buddy Icon"
+msgstr "好友圖示"
+
+#: ../gtk/gtkutils.c:2735
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "無法開啟檔案「%s」:%s"
+
+#: ../gtk/gtkutils.c:2784
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "無法載入影像「%s」,原因不明,大概是影像檔已損壞"
+
+#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
 msgid "Save File"
 msgstr "儲存檔案"
 
-#: ../src/gtkwhiteboard.c:863
+#: ../gtk/gtkwhiteboard.c:863
 msgid "Select color"
 msgstr "選擇顏色"
 
-#: ../src/log.c:181
+#: ../gtk/plugins/cap/cap.c:446
+msgid "Display Statistics"
+msgstr "顯示統計資料"
+
+#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
+msgid "Response Probability:"
+msgstr "「回答」或然率:"
+
+#: ../gtk/plugins/cap/cap.c:807
+msgid "Statistics Configuration"
+msgstr "統計設定"
+
+#  NOTE 參閱 gtk/plugins/cap/README
+#. msg_difference spinner
+#: ../gtk/plugins/cap/cap.c:810
+msgid "Maximum response timeout:"
+msgstr "好友作出回覆的時間上限:"
+
+#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
+#: ../gtk/plugins/cap/cap.c:827
+msgid "minutes"
+msgstr "分鐘"
+
+#. last_seen spinner
+#: ../gtk/plugins/cap/cap.c:817
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#  NOTE 參閱 gtk/plugins/cap/README
+#  FIXME 但這只能是暫譯,譯文絕對有待改進
+#. threshold spinner
+#: ../gtk/plugins/cap/cap.c:824
+msgid "Threshold:"
+msgstr "精密度:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/cap/cap.c:933
+msgid "Contact Availability Prediction plugin."
+msgstr "好友在線狀態預測模組"
+
+#. *  summary
+#: ../gtk/plugins/cap/cap.c:934
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+"好友在線狀態預測模組 (contact availability plugin, 或稱 cap) 提供有關好友清單內好友的統計資料。"
+
+#: ../gtk/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "好友閒置"
+
+#: ../gtk/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "好友離開"
+
+#: ../gtk/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "好友離開"
+
+#. Not used yet.
+#: ../gtk/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "好友使用行動裝置"
+
+#: ../gtk/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "好友離線"
+
+#: ../gtk/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "個別好友狀態的得分值:"
+
+# NOTE 每行不可太長,並要人手用「\n」分隔,否則視窗會過闊
+#: ../gtk/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"若果一個好友其實概括了好幾個好友帳號,通訊時便根據這裏\n"
+"所給定的得分值計分,積分最多者為「優先」,成為當時實際\n"
+"使用的好友帳號。\n"
+
+# NOTE 舊版 (1.x) Gaim 中此譯文經 Etan Reisner (開發者之一) 核實,新版 (2.0) Gaim 譯文要重新核實
+#: ../gtk/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "得分相同時,使用最後(而非最先)一個匹配的好友帳號"
+
+# NOTE 怪怪的,不知道指的是什麼?!
+#: ../gtk/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "個別帳號的得分值"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "好友優先次序"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../gtk/plugins/contact_priority.c:185
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr "讓你自定各個好友狀態的得分值。"
+
+#. *< description
+#: ../gtk/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"讓你自定「閒置」、「離開」及「離線」狀態的得分值,以便計算好友帳號的優先次"
+"序。"
+
+#: ../gtk/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "依交談個數"
+
+#: ../gtk/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "交談位置"
+
+#: ../gtk/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "視窗內之交談個數上限"
+
+#  XXX 要核實譯文!
+#: ../gtk/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "依交談個數放置新交談時,以不同的視窗顯示即時訊息和聊天"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "視窗位置額外選項"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "交談視窗位置額外選項。"
+
+#  XXX 譯得很差,請改良 :-(
+#. *< summary
+#. *  description
+#: ../gtk/plugins/extplacement.c:139
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr "限制視窗可容之交談數目,亦可選擇以不同的視窗顯示即時訊息和聊天"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gaiminc.c:91
+msgid "Gaim Demonstration Plugin"
+msgstr "Gaim 範例模組"
+
+# FIXME 破折號
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "一個 Gaim 的範例模組____請看介紹。"
+
+# NOTE 譯文更動 by Ambrose
+#. *  description
+#: ../gtk/plugins/gaiminc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"這是一個很有趣的模組,它具有下列的功能:\n"
+"- 它可以在您登入的時候,告訴您是誰寫了這個程式\n"
+"- 它會將所有收到的訊息左右掉轉\n"
+"- 它會在您的好友登入時,立刻送出一個訊息給他們"
+
+#: ../gtk/plugins/gaimrc.c:41
+msgid "Cursor Color"
+msgstr "游標顏色"
+
+#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
+#: ../gtk/plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "第二游標顏色"
+
+#: ../gtk/plugins/gaimrc.c:43
+msgid "Hyperlink Color"
+msgstr "超連結顏色"
+
+#: ../gtk/plugins/gaimrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "GtkTreeView 展開器大小"
+
+#: ../gtk/plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView 水平間隔距離"
+
+#: ../gtk/plugins/gaimrc.c:76
+msgid "Conversation Entry"
+msgstr "交談視窗的輸入欄位"
+
+#: ../gtk/plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "交談歷史"
+
+#: ../gtk/plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "日誌檢視器"
+
+#: ../gtk/plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr ""
+
+#: ../gtk/plugins/gaimrc.c:80
+msgid "Notify Dialog"
+msgstr ""
+
+#: ../gtk/plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "GtkTreeView展開器"
+
+#: ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "為%s選擇顏色"
+
+#: ../gtk/plugins/gaimrc.c:322
+msgid "Select Color"
+msgstr "選擇顏色"
+
+#: ../gtk/plugins/gaimrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "為%s選擇字型"
+
+#: ../gtk/plugins/gaimrc.c:398
+msgid "Select Interface Font"
+msgstr "選擇介面字型"
+
+#: ../gtk/plugins/gaimrc.c:448
+msgid "General"
+msgstr "一般"
+
+#: ../gtk/plugins/gaimrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+介面字型"
+
+#: ../gtk/plugins/gaimrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+#: ../gtk/plugins/gaimrc.c:508
+msgid "Interface colors"
+msgstr "介面顏色"
+
+#: ../gtk/plugins/gaimrc.c:532
+msgid "Widget Sizes"
+msgstr "Widget 大小"
+
+#: ../gtk/plugins/gaimrc.c:553
+msgid "Fonts"
+msgstr "字型"
+
+#: ../gtk/plugins/gaimrc.c:576
+msgid "Tools"
+msgstr "工具"
+
+#: ../gtk/plugins/gaimrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "將設定寫入%s%sgtkrc-2.0"
+
+#: ../gtk/plugins/gaimrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "重新讀取gtkrc檔案"
+
+#: ../gtk/plugins/gaimrc.c:616
+msgid "Gaim GTK+ Theme Control"
+msgstr "Gaim GTK+ 佈景主題設定"
+
+#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "提供一般 gtkrc 設定的存取"
+
+#. Configuration frame
+#: ../gtk/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "滑鼠動作設定"
+
+#: ../gtk/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "滑鼠中鍵"
+
+#: ../gtk/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "滑鼠右鍵"
+
+#. "Visual gesture display" checkbox
+#: ../gtk/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "顯示動作路徑(_V)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "滑鼠動作"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "提供滑鼠動作的支援"
+
+#. *  description
+#: ../gtk/plugins/gestures/gestures.c:294
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"支援交談視窗中的滑鼠動作。\n"
+"按下滑鼠中間鍵並拖曳滑鼠以執行實際動作:\n"
+"\n"
+"往下後向右拖曳為關閉一個交談。\n"
+"往上後向左拖曳為切換到前一個交談。\n"
+"往上後向右拖曳為切換到下一個交談。"
+
+#  NOTE 原始碼指這個解「(即時訊息系統的)帳別」,我覺得有點離譜
+#  NOTE 譯文更動 by Ambrose
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "即時傳訊帳號"
+
+#  Add the label.
+#. Add the label.
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr "請在下面從目錄服務選擇連絡人,或新增一個連絡人。"
+
+#. "Search"
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
+#: ../gtk/plugins/gevolution/assoc-buddy.c:358
+#: ../libgaim/protocols/jabber/buddy.c:1724
+#: ../libgaim/protocols/oscar/oscar.c:6085 ../libgaim/protocols/qq/group.c:121
+#: ../libgaim/protocols/qq/group_im.c:137
+#: ../libgaim/protocols/qq/sys_msg.c:160 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libgaim/protocols/qq/sys_msg.c:248
+#: ../libgaim/protocols/sametime/sametime.c:5523
+msgid "Search"
+msgstr "搜尋"
+
+#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
+#. "New Person" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
+#: ../gtk/plugins/gevolution/assoc-buddy.c:469
+#: ../gtk/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "新增連絡人"
+
+#. "Select Buddy" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "選擇好友"
+
+#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
+#. Add the label.
+#: ../gtk/plugins/gevolution/assoc-buddy.c:345
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"請從你的目錄服務選擇一個連絡人,好把這個好友加進去;你亦可以選擇新增一個連絡"
+"人。"
+
+# XXX 暫譯
+#. Add the expander
+#: ../gtk/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "使用者細節 (_D)"
+
+# XXX 暫譯
+#. "Associate Buddy" button
+#: ../gtk/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "聯結好友 (_A)"
+
+#: ../gtk/plugins/gevolution/eds-utils.c:73
+#: ../gtk/plugins/gevolution/eds-utils.c:86
+#: ../libgaim/protocols/jabber/jabber.c:1145
+msgid "None"
+msgstr "無"
+
+#: ../gtk/plugins/gevolution/gevolution.c:263
+#: ../gtk/plugins/gevolution/gevolution.c:269
+msgid "Unable to send e-mail"
+msgstr "無法送出電子郵件"
+
+#: ../gtk/plugins/gevolution/gevolution.c:264
+msgid "The evolution executable was not found in the PATH."
+msgstr "在 PATH 裡找不到可執行的 Evolution 程式。"
+
+#: ../gtk/plugins/gevolution/gevolution.c:270
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr "指定的好友不在 Evolution 聯絡人清單中。"
+
+#  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
+#: ../gtk/plugins/gevolution/gevolution.c:287
+msgid "Add to Address Book"
+msgstr "增加到通訊錄"
+
+#: ../gtk/plugins/gevolution/gevolution.c:291
+msgid "Send E-Mail"
+msgstr "傳送電子郵件"
+
+#. Configuration frame
+#: ../gtk/plugins/gevolution/gevolution.c:418
+msgid "Evolution Integration Configuration"
+msgstr "Evolution 整合設定"
+
+# NOTE (00:38:50) LSchiere: wing: the statement quotes only makes sense in terms of the realization that there is no inherent correlation between im of any type and email
+# NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
+# NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
+#. Label
+#: ../gtk/plugins/gevolution/gevolution.c:421
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "請選擇新增好友至那幾個帳號。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gevolution/gevolution.c:528
+msgid "Evolution Integration"
+msgstr "Evolution 整合"
+
+#  *< name
+#  *< version
+#  *  summary
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gevolution/gevolution.c:531
+#: ../gtk/plugins/gevolution/gevolution.c:533
+msgid "Provides integration with Evolution."
+msgstr "提供和 Evolution 的整合。"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "請在下面輸入這個使用者的資訊。"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "請在下面輸入好友的帳號及其類別。"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "帳號類型:"
+
+#  NOTE 選擇性資訊
+#. Optional Information section
+#: ../gtk/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "其他資訊:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "名:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "姓:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "電子郵件:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK信號測試"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "檢查使用者介面的各種信號是否都能正常運作。"
+
+#: ../gtk/plugins/history.c:188
+msgid "History"
+msgstr "歷史記錄"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "離開時最小化"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "在您離開時,最小化好友清單及各交談視窗。"
+
+#: ../gtk/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "郵件檢查"
+
+#: ../gtk/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "檢查本地端的新郵件。"
+
+#: ../gtk/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "在好友清單內加一小格,用來顯示您有沒有新郵件。"
+
+# FIXME 暫譯 - 20061028
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr "您收到一個音樂訊息工作階段的要求,請按MM圖示開始交談。"
+
+# FIXME 暫譯 - 20061028
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "成功確定音樂訊息工作階段。"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
+msgid "Music Messaging"
+msgstr "音樂訊息"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "執行下列指令時發生衝突:"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
+msgid "Error Running Editor"
+msgstr "執行編輯器途中發生錯誤"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+msgid "The following error has occurred:"
+msgstr "發生了下列錯誤:"
+
+#. Configuration frame
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
+msgid "Music Messaging Configuration"
+msgstr "音樂訊息設定"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr "樂譜編輯器路徑"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
+msgid "_Apply"
+msgstr "套用(_A)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "音樂訊息模組"
+
+#. *  summary
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"音樂訊息模組為音樂編寫提供即時傳訊功能,讓多個使用者能同時編輯同一份樂譜。"
+
+#. ---------- "Notify For" ----------
+#: ../gtk/plugins/notify.c:687
+msgid "Notify For"
+msgstr "通知種類"
+
+#: ../gtk/plugins/notify.c:691
+msgid "_IM windows"
+msgstr "即時訊息視窗(_I)"
+
+#: ../gtk/plugins/notify.c:698
+msgid "C_hat windows"
+msgstr "聊天視窗(_H)"
+
+#: ../gtk/plugins/notify.c:706
+msgid "\t_Only when someone says your screen name"
+msgstr "\t只當有人提到您的名字(_O)"
+
+#: ../gtk/plugins/notify.c:716
+msgid "_Focused windows"
+msgstr "焦點視窗(_F)"
+
+#. ---------- "Notification Methods" ----------
+#: ../gtk/plugins/notify.c:724
+msgid "Notification Methods"
+msgstr "通知方式"
+
+#: ../gtk/plugins/notify.c:731
+msgid "Prepend _string into window title:"
+msgstr "加入字串到視窗標題之前(_S):"
+
+#. Count method button
+#: ../gtk/plugins/notify.c:750
+msgid "Insert c_ount of new messages into window title"
+msgstr "加入新訊息數目到視窗標題中(_O)"
+
+#  TODO 要覆查 - 20061029
+#. Count xprop method button
+#: ../gtk/plugins/notify.c:759
+msgid "Insert count of new message into _X property"
+msgstr "加入新訊息數目到 X 屬性中(_X)"
+
+# NOTE 有關「_URGENT」的資料可參閱 http://tronche.com/gui/x/icccm/sec-4.html
+# NOTE「URGENT」一字大概應該保留,因為絕大多數的視窗管理員都不支援,而且會引致奇怪的後果
+# NOTE 譯文更動 by Ambrose
+#. Urgent method button
+#: ../gtk/plugins/notify.c:767
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "設定視窗的「URGENT」(緊急資訊)提示(_U)"
+
+#. Raise window method button
+#: ../gtk/plugins/notify.c:776
+msgid "R_aise conversation window"
+msgstr "浮現交談視窗(_A)"
+
+#. ---------- "Notification Removals" ----------
+#: ../gtk/plugins/notify.c:784
+msgid "Notification Removal"
+msgstr "通知移除"
+
+#. Remove on focus button
+#: ../gtk/plugins/notify.c:789
+msgid "Remove when conversation window _gains focus"
+msgstr "當交談取得輸入焦點時移除通知(_G)"
+
+#. Remove on click button
+#: ../gtk/plugins/notify.c:796
+msgid "Remove when conversation window _receives click"
+msgstr "當交談視窗被點選時移除通知(_R)"
+
+#. Remove on type button
+#: ../gtk/plugins/notify.c:804
+msgid "Remove when _typing in conversation window"
+msgstr "當在交談視窗中輸入時移除通知(_T)"
+
+#. Remove on message send button
+#: ../gtk/plugins/notify.c:812
+msgid "Remove when a _message gets sent"
+msgstr "送出訊息後移除通知(_M)"
+
+#. Remove on conversation switch button
+#: ../gtk/plugins/notify.c:821
+msgid "Remove on switch to conversation ta_b"
+msgstr "當視窗標籤被點選後移除通知(_B)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/notify.c:910
+msgid "Message Notification"
+msgstr "訊息通知"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/notify.c:913 ../gtk/plugins/notify.c:915
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "提供多種方式來通知您有未讀取的訊息。"
+
+# TODO Untranslated
+# TODO 微軟視窗的Adobe印表機驅動程式可以找到一個「Raw」的譯法 (但我忘了)
+#: ../gtk/plugins/raw.c:175
+msgid "Raw"
+msgstr ""
+
+# NOTE: 舊的譯文不清楚,而且唸起來怪怪的。
+#: ../gtk/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "讓您直接輸入指令對各種文字模式的通訊協定進行操作。"
+
+#: ../gtk/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"讓您直接輸入指令對各種文字模式的通訊協定(例如 Jabber、MSN、IRC 及 TOC)進行"
+"操作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
+
+# XXX 暫譯
+#: ../gtk/plugins/relnot.c:69
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr "您目前使用的 Gaim 版本為 %s ,最新的版本是 %s。<hr>"
+
+#: ../gtk/plugins/relnot.c:75
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>功能說明:</b>\n"
+"%s<br><br>"
+
+#: ../gtk/plugins/relnot.c:80
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+"您可以由下列網址,取得最新的 Gaim %s 版:<br><a href=\"http://gaim."
+"sourceforge.net/\">http://gaim.sourceforge.net</a>."
+
+#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
+msgid "New Version Available"
+msgstr "有新版本"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "新版本通知"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "不時查看有沒有新版本。"
+
+#. *  description
+#: ../gtk/plugins/relnot.c:148
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"不時查看有沒有新版本。一發現有,就隨即連同該版本的功能說明一併通知使用者。"
+
+# FIXME 譯文有譯改進 - 20061027
+#: ../gtk/plugins/spellchk.c:1963
+msgid "Duplicate Correction"
+msgstr "重覆的改正"
+
+# FIXME 譯文有譯改進 - 20061027
+#: ../gtk/plugins/spellchk.c:1964
+msgid "The specified word already exists in the correction list."
+msgstr "改正列表內經已存有您所指定的字詞。"
+
+#: ../gtk/plugins/spellchk.c:2172
+msgid "Text Replacements"
+msgstr "文字取代"
+
+#: ../gtk/plugins/spellchk.c:2195
+msgid "You type"
+msgstr "當您輸入"
+
+#: ../gtk/plugins/spellchk.c:2209
+msgid "You send"
+msgstr "將會送出"
+
+# XXX 譯文有待改進 - 20061027
+#: ../gtk/plugins/spellchk.c:2223
+msgid "Whole words only"
+msgstr "只匹配完整字詞"
+
+#: ../gtk/plugins/spellchk.c:2235
+msgid "Case sensitive"
+msgstr "區分大小寫"
+
+#: ../gtk/plugins/spellchk.c:2261
+msgid "Add a new text replacement"
+msgstr "加入一個新的文字取代規則"
+
+#: ../gtk/plugins/spellchk.c:2277
+msgid "You _type:"
+msgstr "當您輸入(_T):"
+
+#: ../gtk/plugins/spellchk.c:2294
+msgid "You _send:"
+msgstr "將會送出(_S):"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../gtk/plugins/spellchk.c:2306
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "大小寫完全相同(不選取為自動大小寫處理)"
+
+#: ../gtk/plugins/spellchk.c:2308
+msgid "Only replace _whole words"
+msgstr "只取代完整的字(_W)"
+
+#: ../gtk/plugins/spellchk.c:2333
+msgid "General Text Replacement Options"
+msgstr "一般文字取代選項"
+
+#: ../gtk/plugins/spellchk.c:2334
+msgid "Enable replacement of last word on send"
+msgstr ""
+
+#: ../gtk/plugins/spellchk.c:2359
+msgid "Text replacement"
+msgstr "文字取代"
+
+#: ../gtk/plugins/spellchk.c:2361 ../gtk/plugins/spellchk.c:2362
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "好友跑馬燈"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "好友清單的水平捲動版本"
+
+#: ../gtk/plugins/timestamp.c:186
+msgid "iChat Timestamp"
+msgstr "iChat 式時間戳記"
+
+#: ../gtk/plugins/timestamp.c:193
+msgid "Delay"
+msgstr "延遲"
+
+#: ../gtk/plugins/timestamp.c:200
+msgid "minutes."
+msgstr "分鐘。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp.c:256
+msgid "Timestamp"
+msgstr "時間戳記"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
+msgid "Adds iChat-style timestamps to conversations every N minutes."
+msgstr "每隔 N 分鐘加入 iChat 風格的時間戳記到交談中。"
+
+#: ../gtk/plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "時間戳記格式選項"
+
+#: ../gtk/plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "強制24小時時間格式(傳統Gaim)(_F)"
+
+#: ../gtk/plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "顯示日期於..."
+
+#: ../gtk/plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "交談(_N):"
+
+#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "未讀訊息"
+
+#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr ""
+
+#: ../gtk/plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "訊息日誌(_M):"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "訊息時間戳記格式"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "使用者自定的訊息時間戳記格式。"
+
+#. *  description
+#: ../gtk/plugins/timestamp_format.c:154
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr "這個模組允許使用者自行設定交談與日誌的訊息時間戳記格式。"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "不透明度:"
+
+#. IM Convo trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "即時訊息交談視窗"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "即時訊息視窗透明度(_I)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "在即時訊息視窗取得焦點時移除透明度"
+
+# XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "總是在最上層"
+
+#. Buddy List trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "好友清單視窗"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "好友清單視窗透明度(_B)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "取得輸入焦點時移除好友清單視窗透明度"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "透明度"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "交談視窗及好友清單產生的半透明效果。"
+
+#. *  description
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"這個模組可以讓交談視窗及好友清單產生半透明的效果。\n"
+"\n"
+"* 請注意:這個模組需要至少 Win2000 的 Windows 板本才能產生效果。"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:306
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ Runtime 版本"
+
+#. Autostart
+#: ../gtk/plugins/win32/winprefs/winprefs.c:314
+msgid "Startup"
+msgstr "啟動"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:315
+msgid "_Start Gaim on Windows startup"
+msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:328
+msgid "_Dockable Buddy List"
+msgstr "可停駐的好友清單(_D)"
+
+#. Blist On Top
+#: ../gtk/plugins/win32/winprefs/winprefs.c:332
+msgid "_Keep Buddy List window on top:"
+msgstr "好友清單視窗保持在桌面最上層(_K);"
+
+#. XXX: Did this ever work?
+#: ../gtk/plugins/win32/winprefs/winprefs.c:337
+msgid "Only when docked"
+msgstr "只在停駐時生效"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:342
+msgid "_Flash window when chat messages are received"
+msgstr "收到聊天訊息後閃動視窗(_F)"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:366
+msgid "WinGaim Options"
+msgstr "WinGaim 選項"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:368
+msgid "Options specific to Windows Gaim."
+msgstr "Windows Gaim 的相關選項。"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:369
+msgid "Provides options specific to Windows Gaim, such as buddy list docking."
+msgstr "提供 Windows Gaim 的相關選項,例如好友清單的停駐功能。"
+
+#: ../libgaim/account.c:774
+msgid "accounts"
+msgstr "帳號清單"
+
+#: ../libgaim/account.c:918
+msgid "Password is required to sign on."
+msgstr "登入時需要密碼。"
+
+#: ../libgaim/account.c:943
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "輸入 %s (%s) 的密碼"
+
+#: ../libgaim/account.c:950
+msgid "Enter Password"
+msgstr "輸入密碼"
+
+#: ../libgaim/account.c:955
+msgid "Save password"
+msgstr "儲存密碼"
+
+#: ../libgaim/account.c:989 ../libgaim/connection.c:104
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "找不到 %s 的協定模組"
+
+#: ../libgaim/account.c:1071 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1295
+msgid "New passwords do not match."
+msgstr "新密碼並不相符。"
+
+# NOTE 譯文更動 by Ambrose
+#: ../libgaim/account.c:1080
+msgid "Fill out all fields completely."
+msgstr "請填妥整份表格所有的欄位。"
+
+#: ../libgaim/account.c:1103
+msgid "Original password"
+msgstr "舊密碼"
+
+#: ../libgaim/account.c:1110
+msgid "New password"
+msgstr "新密碼"
+
+#: ../libgaim/account.c:1117
+msgid "New password (again)"
+msgstr "新密碼(再次確認)"
+
+#: ../libgaim/account.c:1123
+#, c-format
+msgid "Change password for %s"
+msgstr "修改 %s 的密碼"
+
+#: ../libgaim/account.c:1131
+msgid "Please enter your current password and your new password."
+msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
+
+#: ../libgaim/account.c:1161
+#, c-format
+msgid "Change user information for %s"
+msgstr "更改 %s 的個人資訊"
+
+#: ../libgaim/account.c:1164 ../libgaim/protocols/toc/toc.c:1690
+msgid "Set User Info"
+msgstr "設定使用者資訊"
+
+#: ../libgaim/blist.c:548
+msgid "buddy list"
+msgstr "好友清單"
+
+#: ../libgaim/blist.c:1919
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
+msgstr[0] ""
+"%d 個在 %s 群組的好友並沒有被移除,因為他(她)所對應的帳號被停用或已離線。這"
+"個好友及群組沒有被移除。\n"
+msgstr[1] ""
+"%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號被停用或已離線。這些好"
+"友及這個群組沒有被移除。\n"
+
+#: ../libgaim/blist.c:1929
+msgid "Group not removed"
+msgstr "群組未被移除"
+
+#: ../libgaim/connection.c:106
+msgid "Registration Error"
+msgstr "註冊錯誤"
+
+#: ../libgaim/connection.c:292
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s 登入"
+
+#: ../libgaim/connection.c:325
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s 登出"
+
+#: ../libgaim/conversation.c:165
+msgid "Unable to send message: The message is too large."
+msgstr "無法送出訊息:這個訊息太大了。"
+
+#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "無法送出訊息給 %s。"
+
+#: ../libgaim/conversation.c:169
+msgid "The message is too large."
+msgstr "這個訊息太大了。"
+
+#: ../libgaim/conversation.c:178
+msgid "Unable to send message."
+msgstr "無法送出訊息。"
+
+#: ../libgaim/conversation.c:1162
+msgid "Send Message"
+msgstr "送出訊息"
+
+#: ../libgaim/conversation.c:1163
+msgid "_Send Message"
+msgstr "送出訊息(_S)"
+
+#: ../libgaim/conversation.c:1566
+#, c-format
+msgid "%s entered the room."
+msgstr "%s 進入聊天室。"
+
+#: ../libgaim/conversation.c:1569
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] 進入聊天室。"
+
+#: ../libgaim/conversation.c:1674
+#, c-format
+msgid "You are now known as %s"
+msgstr "你改變暱稱為 %s"
+
+#: ../libgaim/conversation.c:1694
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s 改變暱稱為 %s"
+
+#: ../libgaim/conversation.c:1767
+#, c-format
+msgid "%s left the room."
+msgstr "%s 離開聊天室。"
+
+#: ../libgaim/conversation.c:1770
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s 離開聊天室 (%s)。"
+
+# NOTE 暫譯,或許有其他意義
+#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
+msgid "No name"
+msgstr "未命名"
+
+#: ../libgaim/dbus-server.c:577
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "無法建立連結:%s"
+
+# TODO 覆查譯文 - 20061028
+#: ../libgaim/dbus-server.c:585
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "無法取得名稱:%s"
+
+# TODO 覆查譯文 - 20061028
+#: ../libgaim/dbus-server.c:598
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "無法取得伺服器名稱:%s"
+
+#: ../libgaim/dnsquery.c:490
+msgid "Unable to create new resolver process\n"
+msgstr "無法建立解析程序\n"
+
+#: ../libgaim/dnsquery.c:495
+msgid "Unable to send request to resolver process\n"
+msgstr "無法送出訊息給解析程序\n"
+
+#: ../libgaim/dnsquery.c:528 ../libgaim/dnsquery.c:676
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"解析 %s 途中發生了錯誤:\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:531 ../libgaim/dnsquery.c:690
+#: ../libgaim/dnsquery.c:798
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "解析 %s 途中發生了錯誤:%d"
+
+#: ../libgaim/dnsquery.c:553
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"由解析程序讀取時發生錯誤:\n"
+"%s"
+
+#: ../libgaim/dnsquery.c:557
+msgid "EOF while reading from resolver process"
+msgstr "由解析程序讀取時碰到檔案結尾"
+
+#: ../libgaim/dnsquery.c:734
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "無法建立執行緒:%s"
+
+#: ../libgaim/dnsquery.c:735
+msgid "Unknown reason"
+msgstr "原因不明"
+
+#: ../libgaim/ft.c:189 ../libgaim/protocols/msn/msn.c:410
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"讀取 %s 途中發生了錯誤:\n"
+"%s。\n"
+
+#: ../libgaim/ft.c:193
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"寫入 %s 途中發生了錯誤:\n"
+"%s。\n"
+
+#: ../libgaim/ft.c:197
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"存取 %s 途中發生了錯誤:\n"
+"%s。\n"
+
+#: ../libgaim/ft.c:230
+msgid "Cannot send a file of 0 bytes."
+msgstr "無法傳送空的檔案。"
+
+#: ../libgaim/ft.c:240
+msgid "Cannot send a directory."
+msgstr "無法傳送目錄。"
+
+#: ../libgaim/ft.c:249
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s 不是一般檔案,因此不會覆蓋它。\n"
+
+#: ../libgaim/ft.c:307
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s 想要送 %s (%s) 給您"
+
+#: ../libgaim/ft.c:314
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s 想要傳送個檔案給您"
+
+#: ../libgaim/ft.c:355
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
+
+#  XXX 暫譯
+#: ../libgaim/ft.c:359
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"有檔案可以下載:\n"
+"遠端主機 :%s\n"
+"遠端通訊埠:%d"
+
+#: ../libgaim/ft.c:392
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s 提出傳送檔案「%s」"
+
+#: ../libgaim/ft.c:444
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "「%s」不是一個有效的檔案名稱。\n"
+
+#: ../libgaim/ft.c:465
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "向 %2$s 提出傳送 %1$s 中"
+
+#: ../libgaim/ft.c:477
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "開始自 %2$s 傳送 %1$s"
+
+#: ../libgaim/ft.c:631
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "檔案 %s 傳送完畢"
+
+#: ../libgaim/ft.c:634
+msgid "File transfer complete"
+msgstr "檔案傳輸完畢"
+
+#: ../libgaim/ft.c:1023
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "你取消了 %s 的傳送"
+
+#: ../libgaim/ft.c:1028
+msgid "File transfer cancelled"
+msgstr "檔案傳輸已取消"
+
+#: ../libgaim/ft.c:1086
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s 取消了 %s 的傳送"
+
+#: ../libgaim/ft.c:1091
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s 取消了檔案傳輸"
+
+#: ../libgaim/ft.c:1148
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "傳送檔案到 %s 失敗。"
+
+#: ../libgaim/ft.c:1150
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "自 %s 傳送檔案失敗。"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:1
+msgid "Run the command in a terminal"
+msgstr "在終端機執行指令"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:2
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "處理「aim」網址的指令(如有啟用)"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:3
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "處理「gg」網址的指令(如有啟用)"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:4
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "處理「icq」網址的指令(如有啟用)"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:5
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "處理「irc」網址的指令(如有啟用)"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:6
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "處理「msnim」網址的指令(如有啟用)"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:7
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "處理「sip」網址的指令(如有啟用)"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:8
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "處理「xmpp」網址的指令(如有啟用)"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:9
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "處理「ymsgr」網址的指令(如有啟用)"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:10
+msgid "The handler for \"aim\" URLs"
+msgstr "處理「aim」網址的指令"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:11
+msgid "The handler for \"gg\" URLs"
+msgstr "處理「gg」網址的指令"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:12
+msgid "The handler for \"icq\" URLs"
+msgstr "處理「icq」網址的指令"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:13
+msgid "The handler for \"irc\" URLs"
+msgstr "處理「irc」網址的指令"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:14
+msgid "The handler for \"msnim\" URLs"
+msgstr "處理「msnim」網址的指令"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:15
+msgid "The handler for \"sip\" URLs"
+msgstr "處理「sip」網址的指令"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:16
+msgid "The handler for \"xmpp\" URLs"
+msgstr "處理「xmpp」網址的指令"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:17
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "處理「ymsgr」網址的指令"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:18
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr "如數值為「真」,則表示「command」欄的指令應處理「aim」網址。"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:19
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr "如數值為「真」,則表示「command」欄的指令應處理「gg」網址。"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:20
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr "如數值為「真」,則表示「command」欄的指令應處理「icq」網址。"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:21
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr "如數值為「真」,則表示「command」欄的指令應處理「irc」網址。"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:22
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr "如數值為「真」,則表示「command」欄的指令應處理「msnim」網址。"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:23
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr "如數值為「真」,則表示「command」欄的指令應處理「sip」網址。"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:24
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr "如數值為「真」,則表示「command」欄的指令應處理「xmpp」網址。"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:25
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr "如數值為「真」,則表示「command」欄的指令應處理「ymsgr」網址。"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:26
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr "如數值為「真」,則表示處理這種網址的指令須在終端機執行。"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:27
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "指令是否應處理「aim」網址"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:28
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "指令是否應處理「gg」網址"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:29
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "指令是否應處理「icq」網址"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:30
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "指令是否應處理「irc」網址"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:31
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "指令是否應處理「msnim」網址"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:32
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "指令是否應處理「sip」網址"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:33
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "指令是否應處理「xmpp」網址"
+
+#: ../libgaim/gconf/gaim.schemas.in.h:34
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "指令是否應處理「ymsgr」網址"
+
+#: ../libgaim/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">這個日誌模組沒有定義「讀取」函數</font></b>"
 
-#: ../src/log.c:562
+#: ../libgaim/log.c:562
 msgid "HTML"
 msgstr "HTML"
 
 # NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
 # ANS 直譯「純文字」
-#: ../src/log.c:573
+#: ../libgaim/log.c:573
 msgid "Plain text"
 msgstr "純文字"
 
-#: ../src/log.c:584
+#: ../libgaim/log.c:584
 msgid "Old Gaim"
 msgstr "舊版 Gaim"
 
-#: ../src/log.c:691
+#: ../libgaim/log.c:691
 msgid "Logging of this conversation failed."
 msgstr "無法記錄這個交談。"
 
-#: ../src/log.c:1041
+#: ../libgaim/log.c:1041
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1115
-#, c-format
-msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:</b></font> %s<br/>\n"
-
-#: ../src/log.c:1117
-#, c-format
-msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:</b></font> %s<br/>\n"
+#: ../libgaim/log.c:1115
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
+"</b></font> %s<br/>\n"
+
+#: ../libgaim/log.c:1117
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
+"</b></font> %s<br/>\n"
 
 # XXX 暫譯
-#: ../src/log.c:1175
-#: ../src/log.c:1307
+#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案!</b></font>"
 
-#: ../src/log.c:1187
-#: ../src/log.c:1321
+#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>無法讀取檔案:%s</b></font>"
 
-#: ../src/log.c:1249
+#: ../libgaim/log.c:1249
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回應>:%s\n"
 
-#: ../src/plugin.c:281
-#: ../src/protocols/jabber/buddy.c:1645
-#: ../src/protocols/msn/servconn.c:141
-#: ../src/protocols/msn/session.c:321
-#: ../src/protocols/oscar/oscar.c:2702
+#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1649
+#: ../libgaim/protocols/msn/servconn.c:139
+#: ../libgaim/protocols/msn/session.c:321
+#: ../libgaim/protocols/oscar/oscar.c:2677
 msgid "Unknown error"
 msgstr "未知錯誤"
 
-#: ../src/plugin.c:424
+#: ../libgaim/plugin.c:434
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "模組不符 %d (需要 %d)"
 
-#: ../src/plugin.c:441
+#: ../libgaim/plugin.c:451
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI 版本不符 %d.%d.x (需要%d.%d.x)"
 
-#: ../src/plugin.c:458
+#: ../libgaim/plugin.c:468
 msgid "Plugin does not implement all required functions"
 msgstr "模組並未實作所有必要的功能"
 
-#: ../src/plugin.c:523
-#, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
+#: ../libgaim/plugin.c:533
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
 msgstr "找不到需要的模組「%s」。請重新安裝這個模組之後重試。"
 
-#: ../src/plugin.c:528
+#: ../libgaim/plugin.c:538
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Gaim 讀入模組時發生錯誤。"
 
-#: ../src/plugin.c:551
+#: ../libgaim/plugin.c:560
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "無法載入需要的模組「%s」。"
 
-#: ../src/plugin.c:555
+#: ../libgaim/plugin.c:564
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 無法讀入您所提供的模組。"
 
-#: ../src/plugin.c:657
+#: ../libgaim/plugin.c:664
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "關聯模組 %s 卸載失敗。"
 
-#: ../src/plugin.c:662
+#: ../libgaim/plugin.c:669
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Gaim 遭遇錯誤並卸載相關模組。"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "DBus範例"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "DBus模組範例"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/filectl.c:248
+msgid "Gaim File Control"
+msgstr "Gaim 檔案控制"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
+msgid "Allows you to control Gaim by entering commands in a file."
+msgstr "允許您在檔案中輸入指令以控制 Gaim。"
+
+#  NOTE 這是是輸入欄位左邊的標籤,「幾多分鐘」、「分鐘數」的意思
+#  FIXME 譯文有待改進
+#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+msgid "Minutes"
+msgstr "分鐘數"
+
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
+#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+msgid "I'dle Mak'er"
+msgstr "I'dle Mak'er"
+
+#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+msgid "Set Account Idle Time"
+msgstr "自定個別帳號的閒置時間"
+
+#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+msgid "_Set"
+msgstr "設定(_S)"
+
+#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../libgaim/plugins/idle.c:183
+msgid "None of your accounts are idle."
+msgstr "您的帳號都不是閒置狀態。"
+
+#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+msgid "Unset Account Idle Time"
+msgstr "取消帳號閒置時間設定"
+
+#: ../libgaim/plugins/idle.c:202
+msgid "_Unset"
+msgstr "取消設定(_U)"
+
+#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+msgid "Set Idle Time for All Accounts"
+msgstr "設定所有帳號的閒置時間"
+
+#: ../libgaim/plugins/idle.c:268
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "取消所有已閒置帳號的閒置時間"
+
+#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "允許您手動設定您已閒置了多久時間"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "IPC 測試用戶端"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr "以用戶端身份測試插件系統的 IPC 支援。"
+
+# FIXME 務必要覆核這段譯文!!!
+# NOTE 譯文更動 by Paladin
+# NOTE Patch by Kevin Leung
+#. *  description
+#: ../libgaim/plugins/ipc-test-client.c:92
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"以用戶端身份測試模組系統的 IPC 支援,即是找尋伺服器模組後呼叫事先掛載的指令。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "IPC 測試伺服器"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libgaim/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "以伺服器身份測試插件系統的 IPC 支援。"
+
+# FIXME 務必要覆核這段譯文!!!
+# NOTE 譯文更動 by Paladin
+# NOTE Patch by Kevin Leung
+#. *  description
+#: ../libgaim/plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "以伺服器身份測試模組系統的 IPC 支援,即是掛載測試用的 IPC 指令。"
+
+#: ../libgaim/plugins/log_reader.c:1412
+msgid "User is offline."
+msgstr "使用者是離線的。"
+
+#: ../libgaim/plugins/log_reader.c:1418
+msgid "Auto-response sent:"
+msgstr "自動回應送出:"
+
+#: ../libgaim/plugins/log_reader.c:1428 ../libgaim/plugins/log_reader.c:1431
+#: ../libgaim/plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "%s 已經登出。"
+
+#: ../libgaim/plugins/log_reader.c:1445
+msgid "One or more messages may have been undeliverable."
+msgstr "一個或多個訊息可能傳送失敗。"
+
+#: ../libgaim/plugins/log_reader.c:1455
+msgid "You were disconnected from the server."
+msgstr "您已經停止與伺服器的連線。"
+
+#: ../libgaim/plugins/log_reader.c:1463
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr "您目前是離線狀態。在您重新登入前,將無法收到任何訊息。"
+
+#: ../libgaim/plugins/log_reader.c:1478
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "由於達到長度上限,所以訊息無法送出。"
+
+#: ../libgaim/plugins/log_reader.c:1483
+msgid "Message could not be sent."
+msgstr "訊息無法送出。"
+
+# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1831 ../libgaim/plugins/log_reader.c:1940
+msgid "Adium"
+msgstr "Adium"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1844 ../libgaim/plugins/log_reader.c:1945
+msgid "Fire"
+msgstr "Fire"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1856 ../libgaim/plugins/log_reader.c:1949
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1869 ../libgaim/plugins/log_reader.c:1954
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1881 ../libgaim/plugins/log_reader.c:1958
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../libgaim/plugins/log_reader.c:1922
+msgid "General Log Reading Configuration"
+msgstr "基本的日誌讀取設定"
+
+#: ../libgaim/plugins/log_reader.c:1926
+msgid "Fast size calculations"
+msgstr "快速計算日誌大小"
+
+#: ../libgaim/plugins/log_reader.c:1930
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+#: ../libgaim/plugins/log_reader.c:1936
+msgid "Log Directory"
+msgstr "日誌目錄"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/log_reader.c:1981
+msgid "Log Reader"
+msgstr "日誌檢視器"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/log_reader.c:1985
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
+
+# XXX 譯文有待改進(第二段) - 20061025
+#. * description
+#: ../libgaim/plugins/log_reader.c:1989
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+"當瀏覽日誌時,這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 "
+"Adium、Fire、Messenger Plus!、MSN Messenger,以及 Trillian。\n"
+"\n"
+"注意:這個模組仍處於開發初期,因此可能經常當掉。如果使用,後果自負!"
+
+#: ../libgaim/plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Mono 模組載入器"
+
+#: ../libgaim/plugins/mono/loader/mono.c:215
+#: ../libgaim/plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "使用Mono讀取.NET模組"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/perl/perl.c:588
+msgid "Perl Plugin Loader"
+msgstr "Perl 模組載入器"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+msgid "Provides support for loading perl plugins."
+msgstr "提供讀入 Perl 模組的支援。"
+
+#: ../libgaim/plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr "未卜先知"
+
+#: ../libgaim/plugins/psychic.c:20
+msgid "Psychic mode for incoming conversation"
+msgstr "「未卜先知」將要開始的交談"
+
+#: ../libgaim/plugins/psychic.c:21
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"對方一開始與您交談,就立即打開交談視窗。適用於 AIM、ICQ、Jabber、Sametime 及 "
+"Yahoo。"
+
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../libgaim/plugins/psychic.c:63
+msgid "You feel a disturbance in the force..."
+msgstr "您感受到了原力的擾動..."
+
+#: ../libgaim/plugins/psychic.c:82
+msgid "Only enable for users on the buddy list"
+msgstr "只用於好友清單中的使用者"
+
+#: ../libgaim/plugins/psychic.c:87
+msgid "Disable when away"
+msgstr "離開時停用"
+
+# FIXME 譯文有待改進 - 20061027
+#: ../libgaim/plugins/psychic.c:91
+msgid "Display notification message in conversations"
+msgstr "在交談內顯示通知訊息"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/signals-test.c:684
+msgid "Signals Test"
+msgstr "信號測試"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+msgid "Test to see that all signals are working properly."
+msgstr "檢查各種信號是否都能正常運作。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr "簡易模組"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr "用來測試是否大部份的東西都能正常運作。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+msgid "Provides SSL support through GNUTLS."
+msgstr "透過 GNUTLS 提供 SSL 的支援。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-nss.c:409
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
+
+#: ../libgaim/plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s 由離開返回。"
+
+#: ../libgaim/plugins/statenotify.c:52
+#, c-format
+msgid "%s has gone away."
+msgstr "%s 已經離開。"
+
+#: ../libgaim/plugins/statenotify.c:62
+#, c-format
+msgid "%s has become idle."
+msgstr "%s 變更狀態為閒置。"
+
+#: ../libgaim/plugins/statenotify.c:64
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s 由閒置返回。"
+
+#: ../libgaim/plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s 已經登入。"
+
+#: ../libgaim/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "何時通知"
+
+#: ../libgaim/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "好友離開(_A)"
+
+#: ../libgaim/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "好友閒置(_I)"
+
+#: ../libgaim/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "好友登入/登出 (_S)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/statenotify.c:142
+msgid "Buddy State Notification"
+msgstr "好友狀態通知"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr "在交談視窗中顯示好友離開或是由離開(閒置)返回的通知訊息。"
+
+#: ../libgaim/plugins/tcl/tcl.c:413
+msgid "Tcl Plugin Loader"
+msgstr "Tcl 模組載入器"
+
+#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+msgid "Provides support for loading Tcl plugins"
+msgstr "提供讀入 Tcl 模組的支援"
+
 #. Send a message about the connection error
-#: ../src/protocols/bonjour/bonjour.c:111
+#: ../libgaim/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "無法接收連入的即時訊息連線\n"
 
-#: ../src/protocols/bonjour/bonjour.c:146
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+#: ../libgaim/protocols/bonjour/bonjour.c:146
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎?"
 
-#: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3243
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/sametime/sametime.c:3236
 #, c-format
 msgid ""
 "\n"
@@ -5789,7 +6553,7 @@
 "\n"
 "<b>狀態:</b>%s"
 
-#: ../src/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/bonjour/bonjour.c:339
 #, c-format
 msgid ""
 "\n"
@@ -5808,431 +6572,400 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/bonjour/bonjour.c:434
-#: ../src/protocols/bonjour/bonjour.c:436
+#: ../libgaim/protocols/bonjour/bonjour.c:435
+#: ../libgaim/protocols/bonjour/bonjour.c:437
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
-#: ../src/protocols/bonjour/bonjour.c:472
-#: ../src/protocols/bonjour/bonjour.c:480
-#: ../src/protocols/bonjour/bonjour.c:538
-#: ../src/protocols/silc/silc.c:307
+#: ../libgaim/protocols/bonjour/bonjour.c:473
+#: ../libgaim/protocols/bonjour/bonjour.c:481
+#: ../libgaim/protocols/bonjour/bonjour.c:539
+#: ../libgaim/protocols/silc/silc.c:300
 msgid "Gaim User"
 msgstr "Gaim 使用者"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:576
-#: ../src/protocols/silc/silc.c:937
+#: ../libgaim/protocols/bonjour/bonjour.c:577
+#: ../libgaim/protocols/silc/silc.c:931
 msgid "Hostname"
 msgstr "主機名稱"
 
 #. Creating the options for the protocol
-#: ../src/protocols/bonjour/bonjour.c:580
-#: ../src/protocols/gg/gg.c:622
-#: ../src/protocols/jabber/jabber.c:786
+#: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:796
 msgid "First name"
 msgstr "名"
 
-#: ../src/protocols/bonjour/bonjour.c:583
-#: ../src/protocols/gg/gg.c:617
-#: ../src/protocols/jabber/jabber.c:791
+#: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:801
 msgid "Last name"
 msgstr "姓"
 
-#: ../src/protocols/bonjour/bonjour.c:586
-#: ../src/protocols/gg/gg.c:468
-#: ../src/protocols/jabber/jabber.c:776
-#: ../src/protocols/silc/silc.c:701
-#: ../src/protocols/silc/silc.c:941
+#: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:786
+#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
 msgid "E-mail"
 msgstr "電子郵件"
 
-#: ../src/protocols/bonjour/bonjour.c:589
+#: ../libgaim/protocols/bonjour/bonjour.c:590
 msgid "AIM Account"
 msgstr "AIM 帳號"
 
-#: ../src/protocols/bonjour/bonjour.c:592
+#: ../libgaim/protocols/bonjour/bonjour.c:593
 msgid "Jabber Account"
 msgstr "Jabber 帳號"
 
-# NOTE 法文「日安」
-#: ../src/protocols/bonjour/bonjour.h:35
+# NOTE 這是通訊協定名稱,不是問候語
+#: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
-msgstr "您好"
-
-#: ../src/protocols/bonjour/jabber.c:374
+msgstr "Bonjour"
+
+#: ../libgaim/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 已經關閉這個交談。"
 
-#: ../src/protocols/bonjour/jabber.c:461
+#: ../libgaim/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-#: ../src/protocols/bonjour/jabber.c:469
+#: ../libgaim/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "設定 Socket 選項時錯誤"
 
-#: ../src/protocols/bonjour/jabber.c:493
-#, fuzzy
+#: ../libgaim/protocols/bonjour/jabber.c:493
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket 到通訊埠"
 
-#: ../src/protocols/bonjour/jabber.c:501
-#, fuzzy
+#: ../libgaim/protocols/bonjour/jabber.c:501
 msgid "Could not listen on socket"
 msgstr "無法監聽 Socket"
 
-#: ../src/protocols/bonjour/jabber.c:594
+#: ../libgaim/protocols/bonjour/jabber.c:594
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息,交談無法開始。"
 
-#: ../src/protocols/gg/gg.c:76
-#: ../src/proxy.c:2350
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1774
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: ../src/protocols/gg/gg.c:77
-#: ../src/proxy.c:2350
-msgid "Either the host name or port number specified for your given proxy type is invalid."
-msgstr "對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
-
-#: ../src/protocols/gg/gg.c:115
-#: ../src/protocols/gg/gg.c:137
-#: ../src/protocols/gg/gg.c:180
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1774
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
+
+#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Token 錯誤"
 
-#: ../src/protocols/gg/gg.c:116
-#: ../src/protocols/gg/gg.c:138
-#: ../src/protocols/gg/gg.c:181
+#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "無法取得 Token。\n"
 
-#: ../src/protocols/gg/gg.c:269
-#: ../src/protocols/gg/gg.c:288
+#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "儲存好友清單..."
 
-#: ../src/protocols/gg/gg.c:270
+#: ../libgaim/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "您的好友清單是空的,所以沒有資料被寫入檔案中。"
 
-#: ../src/protocols/gg/gg.c:276
-#: ../src/protocols/gg/gg.c:278
+#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "無法開啟檔案"
 
-#: ../src/protocols/gg/gg.c:289
+#: ../libgaim/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "好友清單儲存成功!"
 
-#: ../src/protocols/gg/gg.c:307
-#: ../src/protocols/gg/gg.c:308
+#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "無法讀入好友清單"
 
-#: ../src/protocols/gg/gg.c:324
+#: ../libgaim/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "讀取好友清單..."
 
-#: ../src/protocols/gg/gg.c:325
+#: ../libgaim/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "好友清單讀取成功!"
 
-#: ../src/protocols/gg/gg.c:336
+#: ../libgaim/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "儲存好友清單..."
 
-#: ../src/protocols/gg/gg.c:380
+#: ../libgaim/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "填寫註冊資料欄位。"
 
-#: ../src/protocols/gg/gg.c:385
+#: ../libgaim/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "新密碼並不相符。"
 
-#: ../src/protocols/gg/gg.c:394
+#: ../libgaim/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "無法註冊新帳號。錯誤發生。\n"
 
-#: ../src/protocols/gg/gg.c:407
+#: ../libgaim/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
 
-#: ../src/protocols/gg/gg.c:408
+#: ../libgaim/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "註冊成功!"
 
-#: ../src/protocols/gg/gg.c:473
-#: ../src/protocols/gg/gg.c:764
-#: ../src/protocols/jabber/jabber.c:765
-#: ../src/protocols/jabber/jabber.c:1319
+#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
+#: ../libgaim/protocols/jabber/jabber.c:775
+#: ../libgaim/protocols/jabber/jabber.c:1330
 msgid "Password"
 msgstr "密碼"
 
-#: ../src/protocols/gg/gg.c:478
-#: ../src/protocols/gg/gg.c:769
+#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "密碼(再次輸入)"
 
-#: ../src/protocols/gg/gg.c:483
-#: ../src/protocols/gg/gg.c:774
+#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "輸入目前的密碼"
 
-#: ../src/protocols/gg/gg.c:489
-#: ../src/protocols/gg/gg.c:780
+#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "目前密碼"
 
-#: ../src/protocols/gg/gg.c:493
-#: ../src/protocols/gg/gg.c:494
+#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
 
-#: ../src/protocols/gg/gg.c:495
+#: ../libgaim/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "請輸入以下的欄位"
 
 #. General
-#: ../src/protocols/gg/gg.c:627
-#: ../src/protocols/gg/gg.c:1038
-#: ../src/protocols/gg/gg.c:1104
-#: ../src/protocols/gg/gg.c:2175
-#: ../src/protocols/jabber/buddy.c:271
-#: ../src/protocols/jabber/buddy.c:803
-#: ../src/protocols/jabber/buddy.c:1522
-#: ../src/protocols/jabber/buddy.c:1704
-#: ../src/protocols/jabber/jabber.c:781
-#: ../src/protocols/msn/msn.c:1370
-#: ../src/protocols/msn/msn.c:1532
-#: ../src/protocols/silc/buddy.c:1528
-#: ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179
-#: ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1041
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
+#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2182
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:800
+#: ../libgaim/protocols/jabber/buddy.c:1526
+#: ../libgaim/protocols/jabber/buddy.c:1708
+#: ../libgaim/protocols/jabber/jabber.c:791
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
+#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1055
 msgid "Nickname"
 msgstr "暱稱"
 
-#: ../src/protocols/gg/gg.c:632
-#: ../src/protocols/gg/gg.c:1043
-#: ../src/protocols/gg/gg.c:1107
-#: ../src/protocols/jabber/jabber.c:801
-#: ../src/protocols/oscar/oscar.c:3708
-#: ../src/protocols/oscar/oscar.c:3716
+#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
+#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:811
+#: ../libgaim/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/oscar/oscar.c:3691
+#: ../libgaim/protocols/qq/buddy_info.c:47
 msgid "City"
 msgstr "城市"
 
-#: ../src/protocols/gg/gg.c:637
+#: ../libgaim/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../src/protocols/gg/gg.c:640
-#: ../src/protocols/msn/msn.c:1534
-#: ../src/protocols/oscar/oscar.c:3672
-#: ../src/protocols/yahoo/yahoo_profile.c:1066
+#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:44
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
 msgid "Gender"
 msgstr "性別"
 
-#: ../src/protocols/gg/gg.c:641
+#: ../libgaim/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "男性或女性"
 
-#: ../src/protocols/gg/gg.c:642
-#: ../src/protocols/oscar/oscar.c:3672
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:81
 msgid "Male"
 msgstr "男"
 
-#: ../src/protocols/gg/gg.c:643
-#: ../src/protocols/oscar/oscar.c:3672
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3647
+#: ../libgaim/protocols/qq/buddy_info.c:82
 msgid "Female"
 msgstr "女"
 
-#: ../src/protocols/gg/gg.c:647
+#: ../libgaim/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "只有上線"
 
-#: ../src/protocols/gg/gg.c:651
-#: ../src/protocols/gg/gg.c:652
+#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "搜尋好友"
 
-#: ../src/protocols/gg/gg.c:653
+#: ../libgaim/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "請在下方輸入您的搜尋條件"
 
-#: ../src/protocols/gg/gg.c:690
+#: ../libgaim/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "填到欄位中。"
 
-#: ../src/protocols/gg/gg.c:702
+#: ../libgaim/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr "您目前所提供的密碼與指定的帳號不符。"
 
-#: ../src/protocols/gg/gg.c:716
-msgid "Unable to change password. Error occured.\n"
+#: ../libgaim/protocols/gg/gg.c:716
+msgid "Unable to change password. Error occurred.\n"
 msgstr "無法修改密碼。錯誤發生。\n"
 
-#: ../src/protocols/gg/gg.c:725
+#: ../libgaim/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "變更 Gadu-Gadu 帳號的密碼"
 
-#: ../src/protocols/gg/gg.c:726
+#: ../libgaim/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "密碼修改成功!"
 
-#: ../src/protocols/gg/gg.c:759
+#: ../libgaim/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "舊密碼"
 
-#: ../src/protocols/gg/gg.c:784
+#: ../libgaim/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸您的舊密碼及你的新密碼:"
 
-#: ../src/protocols/gg/gg.c:788
-#: ../src/protocols/gg/gg.c:789
+#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "變更 Gadu-Gadu 密碼"
 
-#: ../src/protocols/gg/gg.c:863
+#: ../libgaim/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "選取一個聊天室給好友;%s"
 
-#: ../src/protocols/gg/gg.c:866
-#: ../src/protocols/gg/gg.c:867
+#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
-#: ../src/protocols/gg/gg.c:1029
-#: ../src/protocols/gg/gg.c:1098
-#: ../src/protocols/oscar/oscar.c:3644
+#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/oscar/oscar.c:3619
 msgid "UIN"
 msgstr "帳號"
 
-#: ../src/protocols/gg/gg.c:1033
-#: ../src/protocols/gg/gg.c:1101
-#: ../src/protocols/jabber/buddy.c:1518
-#: ../src/protocols/jabber/buddy.c:1694
-#: ../src/protocols/oscar/oscar.c:3655
-#: ../src/protocols/silc/ops.c:1024
+#: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
+#: ../libgaim/protocols/jabber/buddy.c:1522
+#: ../libgaim/protocols/jabber/buddy.c:1698
+#: ../libgaim/protocols/oscar/oscar.c:3630
+#: ../libgaim/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: ../src/protocols/gg/gg.c:1052
-#: ../src/protocols/gg/gg.c:1110
+#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
 msgid "Birth Year"
 msgstr "出生年"
 
-#: ../src/protocols/gg/gg.c:1092
-#: ../src/protocols/gg/gg.c:1161
-#: ../src/protocols/oscar/oscar.c:3819
+#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
+#: ../libgaim/protocols/oscar/oscar.c:3794
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
-#: ../src/protocols/gg/gg.c:1152
+# FIXME 這不像對,要覆查 - 20061028
+#: ../libgaim/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 公共字典"
 
-#: ../src/protocols/gg/gg.c:1153
+#: ../libgaim/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../src/protocols/gg/gg.c:1197
+#: ../libgaim/protocols/gg/gg.c:1196
 msgid "No matching users found"
 msgstr "找不到符合的使用者"
 
-#: ../src/protocols/gg/gg.c:1198
+#: ../libgaim/protocols/gg/gg.c:1197
 msgid "There are no users matching your search criteria."
 msgstr "無法依照搜尋條件找到相符的使用者。"
 
-#: ../src/protocols/gg/gg.c:1292
-#: ../src/protocols/gg/gg.c:1439
+#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1440
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: ../src/protocols/gg/gg.c:1375
+#: ../libgaim/protocols/gg/gg.c:1376
 msgid "Buddy list downloaded"
 msgstr "下載好友清單"
 
-#: ../src/protocols/gg/gg.c:1376
+#: ../libgaim/protocols/gg/gg.c:1377
 msgid "Your buddy list was downloaded from the server."
 msgstr "您已從伺服器下載好友清單。"
 
-#: ../src/protocols/gg/gg.c:1383
+#: ../libgaim/protocols/gg/gg.c:1384
 msgid "Buddy list uploaded"
 msgstr "上傳好友清單"
 
-#: ../src/protocols/gg/gg.c:1384
+#: ../libgaim/protocols/gg/gg.c:1385
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友清單已被存放於伺服器上。"
 
-#: ../src/protocols/gg/gg.c:1485
-#: ../src/protocols/gg/gg.c:1709
+#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../src/protocols/gg/gg.c:1615
-#: ../src/protocols/msn/msn.c:562
+#: ../libgaim/protocols/gg/gg.c:1616 ../libgaim/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "封鎖"
 
-#: ../src/protocols/gg/gg.c:1638
+#: ../libgaim/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "新增到聊天室"
 
-#: ../src/protocols/gg/gg.c:1647
+#: ../libgaim/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "解除封鎖"
 
-#: ../src/protocols/gg/gg.c:1651
+#: ../libgaim/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "封鎖"
 
-#: ../src/protocols/gg/gg.c:1668
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1669
 msgid "Chat _name:"
-msgstr "姓:"
-
-#: ../src/protocols/gg/gg.c:1896
-#, fuzzy
+msgstr "聊天室名稱(_N):"
+
+#: ../libgaim/protocols/gg/gg.c:1902
 msgid "Chat error"
-msgstr "讀取錯誤"
-
-#: ../src/protocols/gg/gg.c:1897
+msgstr "聊天錯誤"
+
+#: ../libgaim/protocols/gg/gg.c:1903
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#: ../src/protocols/gg/gg.c:1980
+#: ../libgaim/protocols/gg/gg.c:1986
 msgid "Not connected to the server."
 msgstr "尚未連線到伺服器。"
 
-#: ../src/protocols/gg/gg.c:2003
+#: ../libgaim/protocols/gg/gg.c:2009
 msgid "Find buddies..."
 msgstr "尋找好友..."
 
-#: ../src/protocols/gg/gg.c:2009
+#: ../libgaim/protocols/gg/gg.c:2015
 msgid "Change password..."
 msgstr "修改密碼..."
 
-#: ../src/protocols/gg/gg.c:2015
+#: ../libgaim/protocols/gg/gg.c:2021
 msgid "Upload buddylist to Server"
 msgstr "上傳好友清單到伺服器"
 
-#: ../src/protocols/gg/gg.c:2019
+#: ../libgaim/protocols/gg/gg.c:2025
 msgid "Download buddylist from Server"
 msgstr "自伺服器下載好友清單"
 
-#: ../src/protocols/gg/gg.c:2023
+#: ../libgaim/protocols/gg/gg.c:2029
 msgid "Delete buddylist from Server"
 msgstr "將伺服器上的好友清單刪除"
 
-#: ../src/protocols/gg/gg.c:2027
+#: ../libgaim/protocols/gg/gg.c:2033
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-#: ../src/protocols/gg/gg.c:2031
+#: ../libgaim/protocols/gg/gg.c:2037
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
@@ -6247,142 +6980,128 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:2127
+#: ../libgaim/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
 #. summary
-#: ../src/protocols/gg/gg.c:2128
+#: ../libgaim/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "波蘭廣受歡迎的即時通訊程式"
 
-#: ../src/protocols/gg/gg.c:2176
+#: ../libgaim/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
-#: ../src/protocols/irc/cmds.c:43
-#: ../src/protocols/silc/silc.c:1587
+#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
-#: ../src/protocols/irc/cmds.c:501
-#: ../src/protocols/jabber/chat.c:590
-#: ../src/protocols/silc/silc.c:1295
+#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:591
+#: ../libgaim/protocols/silc/silc.c:1289
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
-#: ../src/protocols/irc/cmds.c:505
-#: ../src/protocols/jabber/chat.c:594
-#: ../src/protocols/silc/silc.c:1299
+#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
+#: ../libgaim/protocols/silc/silc.c:1293
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
-#: ../src/protocols/irc/dcc_send.c:287
-#: ../src/protocols/irc/dcc_send.c:326
-#: ../src/protocols/yahoo/yahoo_filexfer.c:252
-#: ../src/protocols/yahoo/yahoo_filexfer.c:261
-#: ../src/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libgaim/protocols/irc/dcc_send.c:293
+#: ../libgaim/protocols/irc/dcc_send.c:334
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "檔案傳輸失敗"
 
-#: ../src/protocols/irc/dcc_send.c:288
-#: ../src/protocols/irc/dcc_send.c:327
+#: ../libgaim/protocols/irc/dcc_send.c:294
+#: ../libgaim/protocols/irc/dcc_send.c:335
 msgid "Gaim could not open a listening port."
 msgstr "Gaim 無法開啟監聽埠。"
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "Error displaying MOTD"
 msgstr "顯示是日訊息時發生了錯誤"
 
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:80
 msgid "No MOTD available"
 msgstr "沒有是日訊息"
 
-#: ../src/protocols/irc/irc.c:79
+#: ../libgaim/protocols/irc/irc.c:81
 msgid "There is no MOTD associated with this connection."
 msgstr "這個連結沒有相關的是日訊息。"
 
-#: ../src/protocols/irc/irc.c:82
+#: ../libgaim/protocols/irc/irc.c:84
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-#: ../src/protocols/irc/irc.c:119
-#: ../src/protocols/irc/irc.c:149
-#: ../src/protocols/irc/irc.c:604
-#: ../src/protocols/irc/irc.c:629
+#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
+#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
-#: ../src/protocols/irc/irc.c:242
+#: ../libgaim/protocols/irc/irc.c:259
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../src/protocols/irc/irc.c:254
-#: ../src/protocols/silc/chat.c:33
+#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
-#: ../src/protocols/irc/irc.c:260
-#: ../src/protocols/jabber/chat.c:59
+#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: ../src/protocols/irc/irc.c:292
+#: ../libgaim/protocols/irc/irc.c:308
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
 # XXX 暫譯
-#: ../src/protocols/irc/irc.c:321
-#: ../src/protocols/jabber/jabber.c:566
-#: ../src/protocols/jabber/jabber.c:905
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:571
+#: ../libgaim/protocols/jabber/jabber.c:916
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
-#: ../src/protocols/irc/irc.c:333
-#: ../src/protocols/simple/simple.c:452
-#: ../src/protocols/simple/simple.c:1527
+#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
+#: ../libgaim/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: ../src/protocols/irc/irc.c:404
-#: ../src/protocols/jabber/jabber.c:427
-#: ../src/protocols/oscar/oscar.c:1255
+#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:449
+#: ../libgaim/protocols/oscar/oscar.c:1220
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
+# FIXME ambiguous - 20061025
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
-#: ../src/protocols/irc/irc.c:429
-#: ../src/protocols/jabber/jabber.c:454
+#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:473
 msgid "Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-#: ../src/protocols/irc/irc.c:432
-#: ../src/protocols/jabber/jabber.c:457
+#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:476
 msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../src/protocols/irc/irc.c:601
-#: ../src/protocols/irc/irc.c:626
+#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: ../src/protocols/irc/irc.c:765
-#: ../src/protocols/silc/chat.c:1421
-#: ../src/protocols/yahoo/yahoochat.c:1431
+#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "使用者"
 
-#: ../src/protocols/irc/irc.c:768
-#: ../src/protocols/sametime/sametime.c:3354
-#: ../src/protocols/silc/chat.c:1424
-#: ../src/protocols/silc/ops.c:1380
-#: ../src/protocols/yahoo/yahoochat.c:1440
+#: ../libgaim/protocols/irc/irc.c:772
+#: ../libgaim/protocols/sametime/sametime.c:3347
+#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "主題"
 
@@ -6394,60 +7113,49 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/irc/irc.c:877
+#: ../libgaim/protocols/irc/irc.c:902
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../src/protocols/irc/irc.c:878
+#: ../libgaim/protocols/irc/irc.c:903
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897
-#: ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/jabber/jabber.c:1917
-#: ../src/protocols/msn/msn.c:2046
-#: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/oscar/oscar.c:6511
-#: ../src/protocols/sametime/sametime.c:5635
-#: ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344
-#: ../src/protocols/simple/simple.c:1775
-#: ../src/protocols/toc/toc.c:2340
+#: ../libgaim/protocols/irc/irc.c:922 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/jabber/jabber.c:1961
+#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6531
+#: ../libgaim/protocols/qq/qq.c:1031
+#: ../libgaim/protocols/sametime/sametime.c:5629
+#: ../libgaim/protocols/silc/ops.c:1242 ../libgaim/protocols/silc/ops.c:1344
+#: ../libgaim/protocols/simple/simple.c:1835
+#: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2051
-#: ../src/protocols/napster/napster.c:724
-#: ../src/protocols/oscar/oscar.c:6514
-#: ../src/protocols/sametime/sametime.c:5640
-#: ../src/protocols/silc/silc.c:1860
-#: ../src/protocols/toc/toc.c:2344
+#: ../libgaim/protocols/irc/irc.c:925 ../libgaim/protocols/msn/msn.c:2059
+#: ../libgaim/protocols/oscar/oscar.c:6534 ../libgaim/protocols/qq/qq.c:1034
+#: ../libgaim/protocols/sametime/sametime.c:5634
+#: ../libgaim/protocols/silc/silc.c:1855 ../libgaim/protocols/toc/toc.c:2351
 msgid "Port"
 msgstr "通訊埠"
 
-#: ../src/protocols/irc/irc.c:903
+#: ../libgaim/protocols/irc/irc.c:928
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../src/protocols/irc/irc.c:906
-#: ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/jabber/jabber.c:761
-#: ../src/protocols/silc/buddy.c:1531
-#: ../src/protocols/silc/ops.c:1189
-#: ../src/protocols/silc/ops.c:1191
-#: ../src/protocols/silc/ops.c:1338
-#: ../src/protocols/silc/ops.c:1340
-#: ../src/protocols/silc/silc.c:935
+#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/jabber/jabber.c:771
+#: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1189
+#: ../libgaim/protocols/silc/ops.c:1191 ../libgaim/protocols/silc/ops.c:1338
+#: ../libgaim/protocols/silc/ops.c:1340 ../libgaim/protocols/silc/silc.c:929
 msgid "Username"
 msgstr "使用者"
 
-#: ../src/protocols/irc/irc.c:909
-#: ../src/protocols/irc/msgs.c:230
-#: ../src/protocols/silc/silc.c:939
+#: ../libgaim/protocols/irc/irc.c:934 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/silc/silc.c:933
 msgid "Real name"
 msgstr "姓名"
 
@@ -6455,551 +7163,609 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../src/protocols/irc/irc.c:917
+#: ../libgaim/protocols/irc/irc.c:942
 msgid "Use SSL"
 msgstr "使用 SSL"
 
-#: ../src/protocols/irc/msgs.c:107
+#: ../libgaim/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "模式無效"
 
 # FIXME 這是暫譯
-#: ../src/protocols/irc/msgs.c:118
+#: ../libgaim/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被禁於 %s 了。"
 
 # FIXME 這是暫譯
 # NOTE 譯文更動 by Paladin
-#: ../src/protocols/irc/msgs.c:119
+#: ../libgaim/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "被禁止"
 
-#: ../src/protocols/irc/msgs.c:136
+#: ../libgaim/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "無法禁止 %s:禁止清單已滿"
 
-#: ../src/protocols/irc/msgs.c:215
-#: ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b>%s"
 
-#: ../src/protocols/irc/msgs.c:215
-#: ../src/protocols/oscar/oscar.c:3645
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3620
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "暱稱"
 
-#: ../src/protocols/irc/msgs.c:218
+#: ../libgaim/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 操作者)</i>"
 
-#: ../src/protocols/irc/msgs.c:219
+#: ../libgaim/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/irc/msgs.c:230
-#: ../src/protocols/irc/msgs.c:241
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../libgaim/protocols/irc/msgs.c:223 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/irc/msgs.c:230 ../libgaim/protocols/irc/msgs.c:241
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b>%s<br>"
 
-#: ../src/protocols/irc/msgs.c:241
-#: ../src/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "所在頻道"
 
-#: ../src/protocols/irc/msgs.c:246
+#: ../libgaim/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>閒置了:</b>%s<br>"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "上線自"
 
-#: ../src/protocols/irc/msgs.c:252
+#: ../libgaim/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>描述:</b>光宗耀祖<br>"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: ../src/protocols/irc/msgs.c:329
+#: ../libgaim/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: ../src/protocols/irc/msgs.c:331
+#: ../libgaim/protocols/irc/msgs.c:331
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 已經把主題清除。"
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../libgaim/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為:%s"
 
-#: ../src/protocols/irc/msgs.c:357
+#: ../libgaim/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: ../src/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: ../src/protocols/irc/msgs.c:358
+#: ../libgaim/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 傳送了一個 IRC 伺服器不明白的訊息。"
 
-#: ../src/protocols/irc/msgs.c:381
+#: ../libgaim/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者:%s"
 
 #  XXX
-#: ../src/protocols/irc/msgs.c:509
+#: ../libgaim/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "時間回應"
 
 #  XXX
-#: ../src/protocols/irc/msgs.c:510
+#: ../libgaim/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "IRC 伺服器端之時間為:"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../libgaim/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:532
+#: ../libgaim/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: ../src/protocols/irc/msgs.c:535
+#: ../libgaim/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: ../src/protocols/irc/msgs.c:540
+#: ../libgaim/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: ../src/protocols/irc/msgs.c:560
+#: ../libgaim/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "無法送出"
 
-#: ../src/protocols/irc/msgs.c:616
+#: ../libgaim/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: ../src/protocols/irc/msgs.c:617
+#: ../libgaim/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../src/protocols/irc/msgs.c:726
+#: ../libgaim/protocols/irc/msgs.c:726
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:731
-#: ../src/protocols/silc/ops.c:721
+#: ../libgaim/protocols/irc/msgs.c:731 ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: ../src/protocols/irc/msgs.c:754
+#: ../libgaim/protocols/irc/msgs.c:754
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: ../src/protocols/irc/msgs.c:839
-#: ../src/protocols/irc/msgs.c:840
+#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
 msgid "Invalid nickname"
 msgstr "無效的暱稱"
 
-#: ../src/protocols/irc/msgs.c:841
-#, fuzzy
-msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+#: ../libgaim/protocols/irc/msgs.c:841
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr "伺服器拒絕了您所指定的暱稱,暱稱中大概含有無效字元。"
+
+#: ../libgaim/protocols/irc/msgs.c:846
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
 msgstr "伺服器拒絕了您所指定的帳號名稱,名稱中大概含有無效字元。"
 
-#: ../src/protocols/irc/msgs.c:845
-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
-msgstr "伺服器拒絕了您所指定的帳號名稱,名稱中大概含有無效字元。"
-
-#: ../src/protocols/irc/msgs.c:884
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: ../src/protocols/irc/msgs.c:884
+#: ../libgaim/protocols/irc/msgs.c:885
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: ../src/protocols/irc/msgs.c:905
+#: ../libgaim/protocols/irc/msgs.c:906
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: ../src/protocols/irc/msgs.c:947
+#: ../libgaim/protocols/irc/msgs.c:948
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: ../src/protocols/irc/msgs.c:949
+#: ../libgaim/protocols/irc/msgs.c:950
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: ../src/protocols/irc/msgs.c:1030
+#: ../libgaim/protocols/irc/msgs.c:1031
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s:"
 
-#: ../src/protocols/irc/msgs.c:1031
-#: ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1032 ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#: ../src/protocols/irc/msgs.c:1065
-#, fuzzy
+#: ../libgaim/protocols/irc/msgs.c:1066
 msgid "Nick or channel is temporarily unavailable."
-msgstr "暫時無法使用該項服務。"
-
-#: ../src/protocols/irc/msgs.c:1077
+msgstr "暫時無法使用該個暱稱或頻道。"
+
+#: ../libgaim/protocols/irc/msgs.c:1078
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: ../src/protocols/irc/parse.c:114
+#: ../libgaim/protocols/irc/parse.c:116
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要執行的動作&gt;:執行一個動作。"
 
-#: ../src/protocols/irc/parse.c:115
-msgid "away [message]:  Set an away message, or use no message to return from being away."
+#: ../libgaim/protocols/irc/parse.c:117
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
 msgstr "away [訊息]:設定一個離開訊息,或者在離開時不指定任何訊息。"
 
-#: ../src/protocols/irc/parse.c:116
+#: ../libgaim/protocols/irc/parse.c:118
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv:送出一個指令到 chanserv"
 
 # XXX 暫譯
-#: ../src/protocols/irc/parse.c:117
-msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
-msgstr "deop &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「頻道管理者」權限。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
-
-#: ../src/protocols/irc/parse.c:118
-msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
-msgstr "devoice &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「發言」權限。禁止某些人在頻道中發表不當的言論。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
-
-#: ../src/protocols/irc/parse.c:119
-msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
-msgstr "invite &lt暱稱&gt; [聊天室]:邀請某個人來加入您所指定的頻道,或是目前您所在的頻道。"
-
-#: ../src/protocols/irc/parse.c:120
-msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如有給予並有需要)加入所指定的聊天室。"
-
-#: ../src/protocols/irc/parse.c:121
-msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "join &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如有給予並有需要)加入所指定的聊天室。"
-
-#: ../src/protocols/irc/parse.c:122
-msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
-msgstr "kick &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必需具有「頻道管理者」權限才能夠執行這個動作。"
-
-#: ../src/protocols/irc/parse.c:123
-msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
-msgstr "list:列出目前在網絡上的聊天室清單。<i>請注意,有些伺服器會在您執行了這個動作之後,強行中止您的連線。</i>"
-
-#: ../src/protocols/irc/parse.c:124
+#: ../libgaim/protocols/irc/parse.c:119
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「頻道管理者」權限。您必須具有"
+"「頻道管理者」的權限才能夠執行這個動作。"
+
+#: ../libgaim/protocols/irc/parse.c:120
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+"devoice &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「發言」權限。禁止某些人在頻道"
+"中發表不當的言論。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
+
+#: ../libgaim/protocols/irc/parse.c:121
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt暱稱&gt; [聊天室]:邀請某個人來加入您所指定的頻道,或是目前您所在的"
+"頻道。"
+
+#: ../libgaim/protocols/irc/parse.c:122
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如有給"
+"予並有需要)加入所指定的聊天室。"
+
+#: ../libgaim/protocols/irc/parse.c:123
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如"
+"有給予並有需要)加入所指定的聊天室。"
+
+#: ../libgaim/protocols/irc/parse.c:124
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必需具有「頻道管理者」權限"
+"才能夠執行這個動作。"
+
+#: ../libgaim/protocols/irc/parse.c:125
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:列出目前在網絡上的聊天室清單。<i>請注意,有些伺服器會在您執行了這個動作"
+"之後,強行中止您的連線。</i>"
+
+#: ../libgaim/protocols/irc/parse.c:126
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要執行的動作&gt;:執行一個動作。"
 
-#: ../src/protocols/irc/parse.c:125
+#: ../libgaim/protocols/irc/parse.c:127
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv:送出一個指令到 memoserv"
 
-#: ../src/protocols/irc/parse.c:126
-msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
-msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;暱稱|頻道&gt;:設定或解除頻道╱使用者模式。"
-
-#: ../src/protocols/irc/parse.c:127
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免傳送到公眾頻道中)。"
-
-#: ../src/protocols/irc/parse.c:128
+#: ../libgaim/protocols/irc/parse.c:128
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;暱稱|頻道&gt;:設定或解除頻道╱使用者模式。"
+
+#: ../libgaim/protocols/irc/parse.c:129
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免傳送到公眾"
+"頻道中)。"
+
+#: ../libgaim/protocols/irc/parse.c:130
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
 
-#: ../src/protocols/irc/parse.c:129
-#: ../src/protocols/jabber/jabber.c:1755
+#: ../libgaim/protocols/irc/parse.c:131
+#: ../libgaim/protocols/jabber/jabber.c:1766
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱。"
 
-#: ../src/protocols/irc/parse.c:130
+#: ../libgaim/protocols/irc/parse.c:132
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv:送出一個指令到 nickserv"
 
-#: ../src/protocols/irc/parse.c:131
-msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
-msgstr "op &lt;暱稱&gt; [暱稱] ...:賦與某個使用者「頻道管理者」權限。您必須具有「頻道管理者」權限才能執行這個動作。"
-
-#: ../src/protocols/irc/parse.c:132
-msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "operwall &lt;訊息&gt;:如果您不知道這是幹什麼用的,您可能沒有辦法使用這個指令。"
-
-#: ../src/protocols/irc/parse.c:133
+#: ../libgaim/protocols/irc/parse.c:133
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;暱稱&gt; [暱稱] ...:賦與某個使用者「頻道管理者」權限。您必須具有「頻"
+"道管理者」權限才能執行這個動作。"
+
+#: ../libgaim/protocols/irc/parse.c:134
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;訊息&gt;:如果您不知道這是幹什麼用的,您可能沒有辦法使用這個指"
+"令。"
+
+#: ../libgaim/protocols/irc/parse.c:135
 msgid "operserv: Send a command to operserv"
 msgstr "operserv:送出一個指令到 operserv"
 
-#: ../src/protocols/irc/parse.c:134
-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
-msgstr "part [頻道] [訊息]:離開目前的頻道或指定的頻道。指定頻道時可同時指定送出的訊息。"
-
-#: ../src/protocols/irc/parse.c:135
-msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
-msgstr "ping [暱稱]:查詢某一個使用者的網路回應速度(或在沒有指定使用者時,查詢伺服器的回應速度)。"
-
-#: ../src/protocols/irc/parse.c:136
-msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "query &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免發送到公眾頻道)。"
-
-#: ../src/protocols/irc/parse.c:137
+#: ../libgaim/protocols/irc/parse.c:136
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [頻道] [訊息]:離開目前的頻道或指定的頻道。指定頻道時可同時指定送出的訊"
+"息。"
+
+#: ../libgaim/protocols/irc/parse.c:137
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [暱稱]:查詢某一個使用者的網路回應速度(或在沒有指定使用者時,查詢伺服器"
+"的回應速度)。"
+
+#: ../libgaim/protocols/irc/parse.c:138
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免發送到公"
+"眾頻道)。"
+
+#: ../libgaim/protocols/irc/parse.c:139
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [訊息]:自伺服器離線,並送出指定的訊息。"
 
 # XXX 暫譯
-#: ../src/protocols/irc/parse.c:138
+#: ../libgaim/protocols/irc/parse.c:140
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:送出一個 RAW 指令到伺服器。"
 
-#: ../src/protocols/irc/parse.c:139
-msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
-msgstr "remove &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
-
-#: ../src/protocols/irc/parse.c:140
+#: ../libgaim/protocols/irc/parse.c:141
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必須具有「頻道管理者」的"
+"權限才能夠執行這個動作。"
+
+#: ../libgaim/protocols/irc/parse.c:142
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time:顯示 IRC 伺服器所在地之本地時間。"
 
-#: ../src/protocols/irc/parse.c:141
+#: ../libgaim/protocols/irc/parse.c:143
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新主題]:檢視或修改頻道主題"
 
-#: ../src/protocols/irc/parse.c:142
+#: ../libgaim/protocols/irc/parse.c:144
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:設定或解除使用者模式。"
 
-#: ../src/protocols/irc/parse.c:143
+#: ../libgaim/protocols/irc/parse.c:145
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [暱稱]:送出 CTCP VERSION 要求給使用者"
 
-#: ../src/protocols/irc/parse.c:144
-msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
-msgstr "voice &lt;暱稱&gt; [暱稱] ...:賦與使用者的「發言」權限。您必須具有「頻道管理者」的權限才能執行這個動作。"
-
-#: ../src/protocols/irc/parse.c:145
-msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "wallops &lt;message&gt;:如果您不知道這是幹什麼用的,您可能就沒有辦法使用它了。"
-
-#: ../src/protocols/irc/parse.c:146
+#: ../libgaim/protocols/irc/parse.c:146
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;暱稱&gt; [暱稱] ...:賦與使用者的「發言」權限。您必須具有「頻道管理"
+"者」的權限才能執行這個動作。"
+
+#: ../libgaim/protocols/irc/parse.c:147
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;message&gt;:如果您不知道這是幹什麼用的,您可能就沒有辦法使用它"
+"了。"
+
+#: ../libgaim/protocols/irc/parse.c:148
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [伺服器名稱] &lt;暱稱&gt;:取得使用者資訊。"
 
-#: ../src/protocols/irc/parse.c:440
+#: ../libgaim/protocols/irc/parse.c:442
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時:%lu 秒"
 
-#: ../src/protocols/irc/parse.c:441
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "PONG"
 msgstr "PONG"
 
-#: ../src/protocols/irc/parse.c:441
+#: ../libgaim/protocols/irc/parse.c:443
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../src/protocols/irc/parse.c:543
-#: ../src/protocols/irc/parse.c:547
-#: ../src/protocols/toc/toc.c:190
-#: ../src/protocols/toc/toc.c:688
-#: ../src/protocols/toc/toc.c:704
-#: ../src/protocols/toc/toc.c:780
+#: ../libgaim/protocols/irc/parse.c:548 ../libgaim/protocols/irc/parse.c:552
+#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
+#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: ../src/protocols/jabber/auth.c:51
-msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
-msgstr "登入這個伺服器需要使用 TLS/SSL。請在帳號清單的「修改帳號」視窗點選「TLS 可用則用」選項。"
-
-#: ../src/protocols/jabber/auth.c:53
+#: ../libgaim/protocols/jabber/auth.c:49
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
 
-#: ../src/protocols/jabber/auth.c:114
+#: ../libgaim/protocols/jabber/auth.c:109
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
-#: ../src/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:229
 msgid "Server couldn't authenticate you without a password"
 msgstr "沒有提供密碼,伺服器無法為你進行認證"
 
-#: ../src/protocols/jabber/auth.c:237
-#: ../src/protocols/jabber/auth.c:238
-#: ../src/protocols/jabber/auth.c:398
-#: ../src/protocols/jabber/auth.c:399
-#: ../src/protocols/jabber/auth.c:480
-#: ../src/protocols/jabber/auth.c:481
+#: ../libgaim/protocols/jabber/auth.c:232
+#: ../libgaim/protocols/jabber/auth.c:233
+#: ../libgaim/protocols/jabber/auth.c:401
+#: ../libgaim/protocols/jabber/auth.c:402
+#: ../libgaim/protocols/jabber/auth.c:483
+#: ../libgaim/protocols/jabber/auth.c:484
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: ../src/protocols/jabber/auth.c:239
-#: ../src/protocols/jabber/auth.c:400
-#: ../src/protocols/jabber/auth.c:482
-msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+#: ../libgaim/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:403
+#: ../libgaim/protocols/jabber/auth.c:485
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
 
-#: ../src/protocols/jabber/auth.c:245
-#: ../src/protocols/jabber/auth.c:408
-#: ../src/protocols/jabber/auth.c:490
+#: ../libgaim/protocols/jabber/auth.c:240
+#: ../libgaim/protocols/jabber/auth.c:411
+#: ../libgaim/protocols/jabber/auth.c:493
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
 #. This should never happen!
-#: ../src/protocols/jabber/auth.c:321
-#: ../src/protocols/jabber/auth.c:443
-#: ../src/protocols/jabber/auth.c:611
-#: ../src/protocols/jabber/auth.c:744
-#: ../src/protocols/jabber/auth.c:756
-#: ../src/protocols/jabber/auth.c:775
-#: ../src/protocols/jabber/jabber.c:110
+#: ../libgaim/protocols/jabber/auth.c:324
+#: ../libgaim/protocols/jabber/auth.c:446
+#: ../libgaim/protocols/jabber/auth.c:614
+#: ../libgaim/protocols/jabber/auth.c:747
+#: ../libgaim/protocols/jabber/auth.c:759
+#: ../libgaim/protocols/jabber/auth.c:778
+#: ../libgaim/protocols/jabber/jabber.c:112
 msgid "Invalid response from server."
 msgstr "無效的伺服器回應。"
 
 # XXX 好像有些怪,譯文有待改進
-#: ../src/protocols/jabber/auth.c:632
+#: ../libgaim/protocols/jabber/auth.c:635
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../src/protocols/jabber/auth.c:719
+#: ../libgaim/protocols/jabber/auth.c:722
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
-#: ../src/protocols/jabber/buddy.c:268
-#: ../src/protocols/jabber/buddy.c:772
-#: ../src/protocols/silc/ops.c:1020
+#: ../libgaim/protocols/jabber/buddy.c:268
+#: ../libgaim/protocols/jabber/buddy.c:769
+#: ../libgaim/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
-#: ../src/protocols/jabber/buddy.c:269
-#: ../src/protocols/jabber/buddy.c:785
-#: ../src/protocols/silc/ops.c:1032
+#: ../libgaim/protocols/jabber/buddy.c:269
+#: ../libgaim/protocols/jabber/buddy.c:782
+#: ../libgaim/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
-#: ../src/protocols/jabber/buddy.c:270
-#: ../src/protocols/jabber/buddy.c:789
+#: ../libgaim/protocols/jabber/buddy.c:270
+#: ../libgaim/protocols/jabber/buddy.c:786
 msgid "Given Name"
 msgstr "名"
 
-#: ../src/protocols/jabber/buddy.c:272
-#: ../src/protocols/jabber/jabber.c:821
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/jabber.c:831
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:273
-#: ../src/protocols/jabber/buddy.c:841
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:838
 msgid "Street Address"
 msgstr "街道地址"
 
-#: ../src/protocols/jabber/buddy.c:274
-#: ../src/protocols/jabber/buddy.c:837
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:834
 msgid "Extended Address"
 msgstr "地址(續)"
 
-#: ../src/protocols/jabber/buddy.c:275
-#: ../src/protocols/jabber/buddy.c:845
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/buddy.c:842
 msgid "Locality"
 msgstr "市/村"
 
-#: ../src/protocols/jabber/buddy.c:276
-#: ../src/protocols/jabber/buddy.c:849
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:846
 msgid "Region"
 msgstr "省/州"
 
-#: ../src/protocols/jabber/buddy.c:277
-#: ../src/protocols/jabber/buddy.c:853
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:850
 msgid "Postal Code"
 msgstr "郵遞區號"
 
-#: ../src/protocols/jabber/buddy.c:278
-#: ../src/protocols/jabber/buddy.c:858
-#: ../src/protocols/silc/silc.c:945
+#: ../libgaim/protocols/jabber/buddy.c:278
+#: ../libgaim/protocols/jabber/buddy.c:855
+#: ../libgaim/protocols/silc/silc.c:939
 msgid "Country"
 msgstr "國家"
 
-#: ../src/protocols/jabber/buddy.c:279
-#: ../src/protocols/jabber/buddy.c:869
-#: ../src/protocols/jabber/buddy.c:876
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:866
+#: ../libgaim/protocols/jabber/buddy.c:873
 msgid "Telephone"
 msgstr "電話"
 
-#: ../src/protocols/jabber/buddy.c:280
-#: ../src/protocols/jabber/buddy.c:887
-#: ../src/protocols/jabber/buddy.c:895
-#: ../src/protocols/jabber/buddy.c:1524
-#: ../src/protocols/silc/ops.c:1075
-#: ../src/protocols/silc/util.c:526
-#: ../src/protocols/yahoo/yahoo_profile.c:1036
+#: ../libgaim/protocols/jabber/buddy.c:280
+#: ../libgaim/protocols/jabber/buddy.c:884
+#: ../libgaim/protocols/jabber/buddy.c:892
+#: ../libgaim/protocols/jabber/buddy.c:1528
+#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1050
 msgid "E-Mail"
 msgstr "電子郵件"
 
-#: ../src/protocols/jabber/buddy.c:281
-#: ../src/protocols/jabber/buddy.c:910
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:907
 msgid "Organization Name"
 msgstr "所屬機構"
 
-#: ../src/protocols/jabber/buddy.c:282
-#: ../src/protocols/jabber/buddy.c:914
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:911
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#: ../src/protocols/jabber/buddy.c:284
-#: ../src/protocols/jabber/buddy.c:923
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:920
 msgid "Role"
 msgstr "職責"
 
-#: ../src/protocols/jabber/buddy.c:285
-#: ../src/protocols/jabber/buddy.c:806
-#: ../src/protocols/msn/msn.c:1591
-#: ../src/protocols/oscar/oscar.c:3688
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/oscar/oscar.c:3663
 msgid "Birthday"
 msgstr "生日"
 
-#: ../src/protocols/jabber/buddy.c:588
-#: ../src/protocols/jabber/buddy.c:589
+#: ../libgaim/protocols/jabber/buddy.c:582
+#: ../libgaim/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
 msgstr "編輯 Jabber vCard"
 
-#: ../src/protocols/jabber/buddy.c:590
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
+#: ../libgaim/protocols/jabber/buddy.c:584
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
-#: ../src/protocols/jabber/buddy.c:646
-#: ../src/protocols/jabber/buddy.c:677
+# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式(例:gaim)
+#: ../libgaim/protocols/jabber/buddy.c:640
 msgid "Client:"
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:650
-#: ../src/protocols/jabber/buddy.c:681
+msgstr "用戶端:"
+
+#: ../libgaim/protocols/jabber/buddy.c:644
+#: ../libgaim/protocols/jabber/buddy.c:677
 msgid "Operating System"
 msgstr "作業系統"
 
@@ -7008,53 +7774,68 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: ../src/protocols/jabber/buddy.c:660
-#: ../src/protocols/jabber/jabber.c:1920
+#: ../libgaim/protocols/jabber/buddy.c:654
+#: ../libgaim/protocols/jabber/jabber.c:1964
 msgid "Resource"
 msgstr ""
 
+#: ../libgaim/protocols/jabber/buddy.c:656
+#: ../libgaim/protocols/jabber/jabber.c:1204
+#: ../libgaim/protocols/jabber/jabber.c:1214
+#: ../libgaim/protocols/jabber/jabber.c:1224
+#: ../libgaim/protocols/jabber/jabber.c:1234
+#: ../libgaim/protocols/jabber/jabber.c:1244
+msgid "Priority"
+msgstr "優先次序"
+
+# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式(例:gaim)
+#: ../libgaim/protocols/jabber/buddy.c:673
+msgid "Client"
+msgstr "用戶端"
+
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#: ../src/protocols/jabber/buddy.c:793
-#: ../src/protocols/silc/ops.c:1028
+#: ../libgaim/protocols/jabber/buddy.c:790
+#: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: ../src/protocols/jabber/buddy.c:826
-#: ../src/protocols/jabber/jabber.c:796
-#: ../src/protocols/oscar/oscar.c:3707
-#: ../src/protocols/oscar/oscar.c:3715
-#: ../src/protocols/silc/ops.c:1064
+#: ../libgaim/protocols/jabber/buddy.c:823
+#: ../libgaim/protocols/jabber/jabber.c:806
+#: ../libgaim/protocols/oscar/oscar.c:3682
+#: ../libgaim/protocols/oscar/oscar.c:3690
+#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
-#: ../src/protocols/jabber/buddy.c:833
+#: ../libgaim/protocols/jabber/buddy.c:830
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: ../src/protocols/jabber/buddy.c:947
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: ../src/protocols/jabber/buddy.c:947
+#: ../libgaim/protocols/jabber/buddy.c:944
 msgid "Logo"
 msgstr "標誌"
 
-#: ../src/protocols/jabber/buddy.c:1304
+#: ../libgaim/protocols/jabber/buddy.c:1308
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../src/protocols/jabber/buddy.c:1308
+#: ../libgaim/protocols/jabber/buddy.c:1312
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1316
+#: ../libgaim/protocols/jabber/buddy.c:1320
 msgid "Cancel Presence Notification"
-msgstr "取消出現通知"
-
-#: ../src/protocols/jabber/buddy.c:1323
+msgstr "取消上線狀態通知"
+
+#: ../libgaim/protocols/jabber/buddy.c:1327
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -7063,304 +7844,295 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1332
+#: ../libgaim/protocols/jabber/buddy.c:1336
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../src/protocols/jabber/buddy.c:1359
-#: ../src/protocols/jabber/chat.c:675
-#: ../src/protocols/jabber/chat.c:686
-#: ../src/protocols/jabber/jabber.c:1177
-#: ../src/protocols/silc/ops.c:1449
-msgid "Error"
-msgstr "錯誤"
-
-#: ../src/protocols/jabber/buddy.c:1365
-#: ../src/protocols/jabber/jabber.c:1202
+#: ../libgaim/protocols/jabber/buddy.c:1369
+#: ../libgaim/protocols/jabber/jabber.c:1213
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../src/protocols/jabber/buddy.c:1369
-#: ../src/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1373 ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../src/protocols/jabber/buddy.c:1371
-#: ../src/protocols/jabber/jabber.c:1232
-#: ../src/protocols/oscar/oscar.c:713
-#: ../src/protocols/oscar/oscar.c:5645
-#: ../src/protocols/sametime/sametime.c:3277
+#: ../libgaim/protocols/jabber/buddy.c:1375
+#: ../libgaim/protocols/jabber/jabber.c:1243
+#: ../libgaim/protocols/oscar/oscar.c:688
+#: ../libgaim/protocols/oscar/oscar.c:5654
+#: ../libgaim/protocols/sametime/sametime.c:3270
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../src/protocols/jabber/buddy.c:1516
+#: ../libgaim/protocols/jabber/buddy.c:1520
 msgid "JID"
 msgstr "JID"
 
-#: ../src/protocols/jabber/buddy.c:1520
-#: ../src/protocols/jabber/buddy.c:1699
-#: ../src/protocols/oscar/oscar.c:3656
+#: ../libgaim/protocols/jabber/buddy.c:1524
+#: ../libgaim/protocols/jabber/buddy.c:1703
+#: ../libgaim/protocols/oscar/oscar.c:3631
 msgid "Last Name"
 msgstr "姓"
 
-#: ../src/protocols/jabber/buddy.c:1552
+#: ../libgaim/protocols/jabber/buddy.c:1556
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../src/protocols/jabber/buddy.c:1627
-msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
-msgstr ""
-
-#: ../src/protocols/jabber/buddy.c:1647
-#, fuzzy
+#: ../libgaim/protocols/jabber/buddy.c:1631
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+"請在適用欄位填寫搜尋條件,以便搜尋想找的聯絡人。注意:所有欄位均支援以萬用字"
+"元 (%) 搜尋"
+
+#: ../libgaim/protocols/jabber/buddy.c:1651
 msgid "Directory Query Failed"
-msgstr "直接連線失敗"
-
-#: ../src/protocols/jabber/buddy.c:1648
-#, fuzzy
+msgstr "查詢目錄伺服器失敗"
+
+#: ../libgaim/protocols/jabber/buddy.c:1652
 msgid "Could not query the directory server."
-msgstr "無法開始檔案傳輸"
+msgstr "無法查詢目錄伺服器"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../src/protocols/jabber/buddy.c:1682
+#: ../libgaim/protocols/jabber/buddy.c:1686
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令:%s"
 
-#: ../src/protocols/jabber/buddy.c:1689
+#: ../libgaim/protocols/jabber/buddy.c:1693
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "填入一個或多個欄位,以搜尋Jabber使用者。"
 
-#: ../src/protocols/jabber/buddy.c:1709
-#: ../src/protocols/novell/novell.c:1488
-#: ../src/protocols/oscar/oscar.c:3658
-#: ../src/protocols/oscar/oscar.c:3665
+#: ../libgaim/protocols/jabber/buddy.c:1713
+#: ../libgaim/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/oscar/oscar.c:3633
+#: ../libgaim/protocols/oscar/oscar.c:3640
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../src/protocols/jabber/buddy.c:1718
-#: ../src/protocols/jabber/buddy.c:1719
+#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libgaim/protocols/jabber/buddy.c:1723
 msgid "Search for Jabber users"
 msgstr "搜尋Jabber使用者"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../src/protocols/jabber/buddy.c:1733
+#: ../libgaim/protocols/jabber/buddy.c:1737
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../src/protocols/jabber/buddy.c:1750
+#: ../libgaim/protocols/jabber/buddy.c:1754
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../src/protocols/jabber/buddy.c:1751
+#: ../libgaim/protocols/jabber/buddy.c:1755
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../src/protocols/jabber/buddy.c:1754
+#: ../libgaim/protocols/jabber/buddy.c:1758
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
-#: ../src/protocols/jabber/chat.c:41
-#: ../src/protocols/oscar/oscar.c:5130
-#: ../src/protocols/yahoo/yahoochat.c:999
+#: ../libgaim/protocols/jabber/chat.c:41
+#: ../libgaim/protocols/oscar/oscar.c:5137
+#: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "聊天室(_R):"
 
-#: ../src/protocols/jabber/chat.c:47
+#: ../libgaim/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "伺服器(_S):"
 
-#: ../src/protocols/jabber/chat.c:53
+#: ../libgaim/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "暱稱(_H):"
 
-#: ../src/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是一個有效的聊天室名稱"
 
-#: ../src/protocols/jabber/chat.c:224
+#: ../libgaim/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "聊天室名稱無效"
 
-#: ../src/protocols/jabber/chat.c:229
+#: ../libgaim/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是一個有效的伺服器名稱"
 
-#: ../src/protocols/jabber/chat.c:230
-#: ../src/protocols/jabber/chat.c:231
+#: ../libgaim/protocols/jabber/chat.c:230
+#: ../libgaim/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "伺服器名稱無效"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: ../src/protocols/jabber/chat.c:235
+#: ../libgaim/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是一個有效的暱稱"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: ../src/protocols/jabber/chat.c:236
-#: ../src/protocols/jabber/chat.c:237
+#: ../libgaim/protocols/jabber/chat.c:236
+#: ../libgaim/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "暱稱無效"
 
-#: ../src/protocols/jabber/chat.c:395
+#: ../libgaim/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "設定錯誤"
 
-#: ../src/protocols/jabber/chat.c:404
-#: ../src/protocols/jabber/chat.c:547
+#: ../libgaim/protocols/jabber/chat.c:405
+#: ../libgaim/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "無法設定"
 
-#: ../src/protocols/jabber/chat.c:419
+#: ../libgaim/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
 # XXX 暫譯,譯文有問題,要改善
-#: ../src/protocols/jabber/chat.c:420
+#: ../libgaim/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
 
-#: ../src/protocols/jabber/chat.c:469
-#: ../src/protocols/jabber/chat.c:538
+#: ../libgaim/protocols/jabber/chat.c:470
+#: ../libgaim/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "註冊錯誤"
 
 # XXX 暫譯
 # NOTE 據 faceprint (模組作者) 稱,MUC 是一種新的聊天室協定,
 # NOTE 較舊式的「Group Chat」有更多功能
-#: ../src/protocols/jabber/chat.c:626
+#: ../libgaim/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "在非 MUC 模式的聊天室內不支援修改暱稱"
 
-#: ../src/protocols/jabber/chat.c:676
-#: ../src/protocols/jabber/chat.c:687
-#: ../src/protocols/silc/ops.c:1449
+#: ../libgaim/protocols/jabber/chat.c:678
+#: ../libgaim/protocols/jabber/chat.c:689 ../libgaim/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
 
-#: ../src/protocols/jabber/chat.c:735
+#: ../libgaim/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "無效的伺服器名"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
-#: ../src/protocols/jabber/chat.c:773
+#: ../libgaim/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
 
-#: ../src/protocols/jabber/chat.c:774
+#: ../libgaim/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "選擇查詢的會議伺服器"
 
-#: ../src/protocols/jabber/chat.c:777
+#: ../libgaim/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
 # XXX 譯文有待改進
-#: ../src/protocols/jabber/jabber.c:79
+#: ../libgaim/protocols/jabber/jabber.c:81
 msgid "Error initializing session"
 msgstr "對工作階段進行初始化時發生了錯誤"
 
-#: ../src/protocols/jabber/jabber.c:232
-#: ../src/protocols/jabber/jabber.c:281
-#: ../src/protocols/jabber/jabber.c:309
+#: ../libgaim/protocols/jabber/jabber.c:240
+#: ../libgaim/protocols/jabber/jabber.c:291
+#: ../libgaim/protocols/jabber/jabber.c:319
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: ../src/protocols/jabber/jabber.c:362
-#: ../src/protocols/jabber/jabber.c:395
+#: ../libgaim/protocols/jabber/jabber.c:387
+#: ../libgaim/protocols/jabber/jabber.c:424
 msgid "Read Error"
 msgstr "讀取錯誤"
 
-#: ../src/protocols/jabber/jabber.c:480
-#: ../src/protocols/jabber/jabber.c:915
+#: ../libgaim/protocols/jabber/jabber.c:493
+#: ../libgaim/protocols/jabber/jabber.c:924
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../src/protocols/jabber/jabber.c:536
-#: ../src/protocols/jabber/jabber.c:873
+#: ../libgaim/protocols/jabber/jabber.c:541
+#: ../libgaim/protocols/jabber/jabber.c:884
 msgid "Invalid Jabber ID"
 msgstr "Jabber 帳號無效"
 
-#: ../src/protocols/jabber/jabber.c:606
+#: ../libgaim/protocols/jabber/jabber.c:612
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../src/protocols/jabber/jabber.c:608
-#: ../src/protocols/jabber/jabber.c:609
+#: ../libgaim/protocols/jabber/jabber.c:614
+#: ../libgaim/protocols/jabber/jabber.c:615
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../src/protocols/jabber/jabber.c:615
-#: ../src/protocols/jabber/jabber.c:1468
+#: ../libgaim/protocols/jabber/jabber.c:621
+#: ../libgaim/protocols/jabber/jabber.c:1479
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: ../src/protocols/jabber/jabber.c:617
-#: ../src/protocols/jabber/jabber.c:618
+#: ../libgaim/protocols/jabber/jabber.c:623
+#: ../libgaim/protocols/jabber/jabber.c:624
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../src/protocols/jabber/jabber.c:729
-#: ../src/protocols/jabber/jabber.c:730
+#: ../libgaim/protocols/jabber/jabber.c:739
+#: ../libgaim/protocols/jabber/jabber.c:740
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../src/protocols/jabber/jabber.c:806
-#: ../src/protocols/oscar/oscar.c:3709
-#: ../src/protocols/oscar/oscar.c:3717
+#: ../libgaim/protocols/jabber/jabber.c:816
+#: ../libgaim/protocols/oscar/oscar.c:3684
+#: ../libgaim/protocols/oscar/oscar.c:3692
 msgid "State"
 msgstr "省/州"
 
-#: ../src/protocols/jabber/jabber.c:811
+#: ../libgaim/protocols/jabber/jabber.c:821
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../src/protocols/jabber/jabber.c:816
-#: ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:703
-#: ../src/protocols/silc/util.c:528
+#: ../libgaim/protocols/jabber/jabber.c:826
+#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "電話"
 
-#: ../src/protocols/jabber/jabber.c:826
+#: ../libgaim/protocols/jabber/jabber.c:836
 msgid "Date"
 msgstr "日期"
 
-#: ../src/protocols/jabber/jabber.c:834
+#: ../libgaim/protocols/jabber/jabber.c:844
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊,請填寫下列資料:"
 
-#: ../src/protocols/jabber/jabber.c:837
-#: ../src/protocols/jabber/jabber.c:838
+#: ../libgaim/protocols/jabber/jabber.c:847
+#: ../libgaim/protocols/jabber/jabber.c:848
 msgid "Register New Jabber Account"
 msgstr "註冊新的 Jabber 帳戶"
 
-#: ../src/protocols/jabber/jabber.c:996
+#: ../libgaim/protocols/jabber/jabber.c:1004
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../src/protocols/jabber/jabber.c:1001
-#: ../src/protocols/msn/session.c:350
+#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../src/protocols/jabber/jabber.c:1010
+#: ../libgaim/protocols/jabber/jabber.c:1018
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../src/protocols/jabber/jabber.c:1081
-#: ../src/protocols/jabber/jabber.c:1446
-#: ../src/protocols/jabber/jabber.c:1487
-#: ../src/protocols/jabber/jabber.c:1521
-#: ../src/protocols/oscar/oscar.c:791
-#: ../src/protocols/oscar/oscar.c:5436
+#: ../libgaim/protocols/jabber/jabber.c:1092
+#: ../libgaim/protocols/jabber/jabber.c:1457
+#: ../libgaim/protocols/jabber/jabber.c:1498
+#: ../libgaim/protocols/jabber/jabber.c:1532
+#: ../libgaim/protocols/oscar/oscar.c:766
+#: ../libgaim/protocols/oscar/oscar.c:5443
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -7369,84 +8141,76 @@
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../src/protocols/jabber/jabber.c:1123
+#: ../libgaim/protocols/jabber/jabber.c:1134
 msgid "Both"
 msgstr "已互相認證"
 
 #  NOTE Jabber 術語,見上
-#: ../src/protocols/jabber/jabber.c:1125
+#: ../libgaim/protocols/jabber/jabber.c:1136
 msgid "From (To pending)"
 msgstr "已認證對方(但仍等待對方認證您)"
 
 #  NOTE Jabber 術語,見上
-#: ../src/protocols/jabber/jabber.c:1130
+#: ../libgaim/protocols/jabber/jabber.c:1141
 msgid "To"
 msgstr "已獲對方認證"
 
 #  NOTE Jabber 術語,見上
-#: ../src/protocols/jabber/jabber.c:1132
+#: ../libgaim/protocols/jabber/jabber.c:1143
 msgid "None (To pending)"
 msgstr "無(但正等待對方認證您)"
 
 #  NOTE Jabber 術語,見上
-#: ../src/protocols/jabber/jabber.c:1136
+#: ../libgaim/protocols/jabber/jabber.c:1147
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../src/protocols/jabber/jabber.c:1193
-#: ../src/protocols/jabber/jabber.c:1203
-#: ../src/protocols/jabber/jabber.c:1213
-#: ../src/protocols/jabber/jabber.c:1223
-#: ../src/protocols/jabber/jabber.c:1233
-msgid "Priority"
-msgstr "優先次序"
-
-#: ../src/protocols/jabber/jabber.c:1262
+#: ../libgaim/protocols/jabber/jabber.c:1273
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../src/protocols/jabber/jabber.c:1263
+#: ../libgaim/protocols/jabber/jabber.c:1274
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../src/protocols/jabber/jabber.c:1267
-#: ../src/protocols/jabber/jabber.c:1268
+#: ../libgaim/protocols/jabber/jabber.c:1278
+#: ../libgaim/protocols/jabber/jabber.c:1279
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../src/protocols/jabber/jabber.c:1324
+#: ../libgaim/protocols/jabber/jabber.c:1335
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: ../src/protocols/jabber/jabber.c:1329
-#: ../src/protocols/jabber/jabber.c:1330
+#: ../libgaim/protocols/jabber/jabber.c:1340
+#: ../libgaim/protocols/jabber/jabber.c:1341
 msgid "Change Jabber Password"
 msgstr "修改 Jabber 密碼"
 
-#: ../src/protocols/jabber/jabber.c:1330
+#: ../libgaim/protocols/jabber/jabber.c:1341
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../src/protocols/jabber/jabber.c:1340
-#: ../src/protocols/oscar/oscar.c:6228
-#: ../src/protocols/silc/silc.c:1025
+#: ../libgaim/protocols/jabber/jabber.c:1351
+#: ../libgaim/protocols/oscar/oscar.c:6245
+#: ../libgaim/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1345
-#: ../src/protocols/oscar/oscar.c:6239
-#: ../src/protocols/silc/silc.c:1021
+#: ../libgaim/protocols/jabber/jabber.c:1356
+#: ../libgaim/protocols/oscar/oscar.c:6256
+#: ../libgaim/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1350
+#: ../libgaim/protocols/jabber/jabber.c:1361
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../src/protocols/jabber/jabber.c:1426
+#: ../libgaim/protocols/jabber/jabber.c:1437
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -7454,51 +8218,51 @@
 #  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../src/protocols/jabber/jabber.c:1428
+#: ../libgaim/protocols/jabber/jabber.c:1439
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../src/protocols/jabber/jabber.c:1430
+#: ../libgaim/protocols/jabber/jabber.c:1441
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 #  NOTE Jabber 錯誤 <forbidden/>,意思正常(表示權限不夠)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../src/protocols/jabber/jabber.c:1432
+#: ../libgaim/protocols/jabber/jabber.c:1443
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../src/protocols/jabber/jabber.c:1434
+#: ../libgaim/protocols/jabber/jabber.c:1445
 msgid "Gone"
 msgstr "已離線"
 
-#: ../src/protocols/jabber/jabber.c:1436
-#: ../src/protocols/jabber/jabber.c:1511
+#: ../libgaim/protocols/jabber/jabber.c:1447
+#: ../libgaim/protocols/jabber/jabber.c:1522
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../src/protocols/jabber/jabber.c:1438
+#: ../libgaim/protocols/jabber/jabber.c:1449
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-#: ../src/protocols/jabber/jabber.c:1440
+#: ../libgaim/protocols/jabber/jabber.c:1451
 msgid "Malformed Jabber ID"
 msgstr "畸型的 Jabber ID"
 
 #  NOTE Jabber 錯誤 <not-acceptable/>,表示所送出的要求未能達到伺服器或收件人所訂下的
 #  NOTE 條件(例如訊息中含有禁字),以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../src/protocols/jabber/jabber.c:1442
+#: ../libgaim/protocols/jabber/jabber.c:1453
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../src/protocols/jabber/jabber.c:1444
+#: ../libgaim/protocols/jabber/jabber.c:1455
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../src/protocols/jabber/jabber.c:1448
+#: ../libgaim/protocols/jabber/jabber.c:1459
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -7506,78 +8270,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../src/protocols/jabber/jabber.c:1450
+#: ../libgaim/protocols/jabber/jabber.c:1461
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../src/protocols/jabber/jabber.c:1454
+#: ../libgaim/protocols/jabber/jabber.c:1465
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../src/protocols/jabber/jabber.c:1456
+#: ../libgaim/protocols/jabber/jabber.c:1467
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../src/protocols/jabber/jabber.c:1458
+#: ../libgaim/protocols/jabber/jabber.c:1469
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../src/protocols/jabber/jabber.c:1460
+#: ../libgaim/protocols/jabber/jabber.c:1471
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
 #  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../src/protocols/jabber/jabber.c:1462
+#: ../libgaim/protocols/jabber/jabber.c:1473
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
 #  NOTE Jabber 錯誤 <subscription-required/>,表示使用「服務」前
 #  NOTE 必須事先取得「Subscription」(認證)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../src/protocols/jabber/jabber.c:1464
+#: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../src/protocols/jabber/jabber.c:1466
+#: ../libgaim/protocols/jabber/jabber.c:1477
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../src/protocols/jabber/jabber.c:1473
+#: ../libgaim/protocols/jabber/jabber.c:1484
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../src/protocols/jabber/jabber.c:1475
+#: ../libgaim/protocols/jabber/jabber.c:1486
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../src/protocols/jabber/jabber.c:1478
+#: ../libgaim/protocols/jabber/jabber.c:1489
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../src/protocols/jabber/jabber.c:1481
+#: ../libgaim/protocols/jabber/jabber.c:1492
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../src/protocols/jabber/jabber.c:1484
+#: ../libgaim/protocols/jabber/jabber.c:1495
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../libgaim/protocols/jabber/jabber.c:1500
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../src/protocols/jabber/jabber.c:1492
+#: ../libgaim/protocols/jabber/jabber.c:1503
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../src/protocols/jabber/jabber.c:1496
+#: ../libgaim/protocols/jabber/jabber.c:1507
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../src/protocols/jabber/jabber.c:1498
+#: ../libgaim/protocols/jabber/jabber.c:1509
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -7587,200 +8351,200 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../src/protocols/jabber/jabber.c:1501
+#: ../libgaim/protocols/jabber/jabber.c:1512
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../src/protocols/jabber/jabber.c:1503
-#: ../src/protocols/silc/ops.c:1728
+#: ../libgaim/protocols/jabber/jabber.c:1514
+#: ../libgaim/protocols/silc/ops.c:1727
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../src/protocols/jabber/jabber.c:1505
+#: ../libgaim/protocols/jabber/jabber.c:1516
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../src/protocols/jabber/jabber.c:1507
+#: ../libgaim/protocols/jabber/jabber.c:1518
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../src/protocols/jabber/jabber.c:1509
+#: ../libgaim/protocols/jabber/jabber.c:1520
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../src/protocols/jabber/jabber.c:1513
+#: ../libgaim/protocols/jabber/jabber.c:1524
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../src/protocols/jabber/jabber.c:1515
+#: ../libgaim/protocols/jabber/jabber.c:1526
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../libgaim/protocols/jabber/jabber.c:1528
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯,譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../src/protocols/jabber/jabber.c:1519
+#: ../libgaim/protocols/jabber/jabber.c:1530
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯,譯文有待改進。不過好像真的有人這樣寫,大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../src/protocols/jabber/jabber.c:1523
+#: ../libgaim/protocols/jabber/jabber.c:1534
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../src/protocols/jabber/jabber.c:1525
+#: ../libgaim/protocols/jabber/jabber.c:1536
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../src/protocols/jabber/jabber.c:1527
+#: ../libgaim/protocols/jabber/jabber.c:1538
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../src/protocols/jabber/jabber.c:1529
+#: ../libgaim/protocols/jabber/jabber.c:1540
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../src/protocols/jabber/jabber.c:1531
+#: ../libgaim/protocols/jabber/jabber.c:1542
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../src/protocols/jabber/jabber.c:1533
+#: ../libgaim/protocols/jabber/jabber.c:1544
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../src/protocols/jabber/jabber.c:1535
+#: ../libgaim/protocols/jabber/jabber.c:1546
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../src/protocols/jabber/jabber.c:1537
+#: ../libgaim/protocols/jabber/jabber.c:1548
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../src/protocols/jabber/jabber.c:1539
+#: ../libgaim/protocols/jabber/jabber.c:1550
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../src/protocols/jabber/jabber.c:1541
+#: ../libgaim/protocols/jabber/jabber.c:1552
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: ../src/protocols/jabber/jabber.c:1543
+#: ../libgaim/protocols/jabber/jabber.c:1554
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../src/protocols/jabber/jabber.c:1545
+#: ../libgaim/protocols/jabber/jabber.c:1556
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../src/protocols/jabber/jabber.c:1612
+#: ../libgaim/protocols/jabber/jabber.c:1623
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#: ../src/protocols/jabber/jabber.c:1632
+#: ../libgaim/protocols/jabber/jabber.c:1643
 #, fuzzy, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "未知的指令:%s"
 
-#: ../src/protocols/jabber/jabber.c:1637
+#: ../libgaim/protocols/jabber/jabber.c:1648
 #, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法邀請使用者 (%s)。"
 
-#: ../src/protocols/jabber/jabber.c:1656
+#: ../libgaim/protocols/jabber/jabber.c:1667
 #, fuzzy, c-format
 msgid "Unknown role: \"%s\""
 msgstr "未知的指令:%s"
 
-#: ../src/protocols/jabber/jabber.c:1663
+#: ../libgaim/protocols/jabber/jabber.c:1674
 #, fuzzy, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法送出訊息:%s"
 
-#: ../src/protocols/jabber/jabber.c:1716
+#: ../libgaim/protocols/jabber/jabber.c:1727
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../src/protocols/jabber/jabber.c:1747
+#: ../libgaim/protocols/jabber/jabber.c:1758
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
 
-#: ../src/protocols/jabber/jabber.c:1751
+#: ../libgaim/protocols/jabber/jabber.c:1762
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
-# #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
-# #: src/buddy_chat.c:1544
-# #, c-format
-# msgid "%d %s in room"
-# msgstr "聊天室有 %d 家伙"
-#: ../src/protocols/jabber/jabber.c:1760
+#: ../libgaim/protocols/jabber/jabber.c:1771
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]:離開聊天室。"
 
-#: ../src/protocols/jabber/jabber.c:1765
+#: ../libgaim/protocols/jabber/jabber.c:1776
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
 
-#: ../src/protocols/jabber/jabber.c:1771
+#: ../libgaim/protocols/jabber/jabber.c:1782
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]:檢視或修改聊天主題"
 
-#: ../src/protocols/jabber/jabber.c:1777
+#: ../libgaim/protocols/jabber/jabber.c:1788
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [聊天室]:禁止某使用者進入聊天室"
 
-#: ../src/protocols/jabber/jabber.c:1783
-msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
-msgstr ""
-
-#: ../src/protocols/jabber/jabber.c:1789
-msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
-msgstr ""
-
-#: ../src/protocols/jabber/jabber.c:1795
+#: ../libgaim/protocols/jabber/jabber.c:1794
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1800
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+
+#: ../libgaim/protocols/jabber/jabber.c:1806
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt使用者&gt; [訊息]:邀請使用者進入聊天室"
 
-#: ../src/protocols/jabber/jabber.c:1801
+#: ../libgaim/protocols/jabber/jabber.c:1812
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
-#: ../src/protocols/jabber/jabber.c:1807
+#: ../libgaim/protocols/jabber/jabber.c:1818
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
-#: ../src/protocols/jabber/jabber.c:1812
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: ../libgaim/protocols/jabber/jabber.c:1823
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者"
 
 #. *< type
@@ -7793,453 +8557,452 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1895
-#: ../src/protocols/jabber/jabber.c:1897
+#: ../libgaim/protocols/jabber/jabber.c:1939
+#: ../libgaim/protocols/jabber/jabber.c:1941
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
-# XXX 暫譯
-#: ../src/protocols/jabber/jabber.c:1923
-msgid "Use TLS if available"
-msgstr "TLS 可用則用"
-
-#: ../src/protocols/jabber/jabber.c:1928
-msgid "Require TLS"
-msgstr "需要TLS"
-
-#: ../src/protocols/jabber/jabber.c:1931
+#: ../libgaim/protocols/jabber/jabber.c:1967
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../src/protocols/jabber/jabber.c:1936
+#: ../libgaim/protocols/jabber/jabber.c:1972
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
-#: ../src/protocols/jabber/jabber.c:1941
-#: ../src/protocols/simple/simple.c:1781
+#: ../libgaim/protocols/jabber/jabber.c:1977
+#: ../libgaim/protocols/simple/simple.c:1841
 msgid "Connect port"
 msgstr "連線埠"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1945
-#: ../src/protocols/silc/silc.c:1856
+#: ../libgaim/protocols/jabber/jabber.c:1981
+#: ../libgaim/protocols/silc/silc.c:1851
 msgid "Connect server"
 msgstr "連結伺服器"
 
-#: ../src/protocols/jabber/message.c:117
+#: ../libgaim/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: ../src/protocols/jabber/message.c:181
+#: ../libgaim/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為:%s"
 
-#: ../src/protocols/jabber/message.c:183
+#: ../libgaim/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題:%s"
 
-#: ../src/protocols/jabber/message.c:233
+#: ../libgaim/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s:%s"
 
-#: ../src/protocols/jabber/message.c:236
+#: ../libgaim/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Jabber 訊息錯誤"
 
-#: ../src/protocols/jabber/message.c:316
+#: ../libgaim/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
 
-#: ../src/protocols/jabber/parser.c:279
-#: ../src/protocols/jabber/parser.c:288
+#: ../libgaim/protocols/jabber/parser.c:179
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../src/protocols/jabber/presence.c:305
+#: ../libgaim/protocols/jabber/presence.c:304
 msgid "Unknown Error in presence"
-msgstr "在確定好友的連線狀態時,發生了未知的錯誤"
-
-#: ../src/protocols/jabber/presence.c:310
-#: ../src/protocols/msn/userlist.c:98
+msgstr "不明的上線狀態錯誤"
+
+#: ../libgaim/protocols/jabber/presence.c:309
+#: ../libgaim/protocols/msn/userlist.c:98
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "使用者 %s 想要將 %s 加入他(她)的好友清單。"
 
-#: ../src/protocols/jabber/presence.c:319
-#: ../src/protocols/oscar/oscar.c:2382
-#: ../src/protocols/oscar/oscar.c:5061
+#: ../libgaim/protocols/jabber/presence.c:318
+#: ../libgaim/protocols/oscar/oscar.c:2357
+#: ../libgaim/protocols/oscar/oscar.c:5068
 msgid "_Authorize"
 msgstr "給予認證(_A)"
 
-#: ../src/protocols/jabber/presence.c:320
-#: ../src/protocols/oscar/oscar.c:2384
-#: ../src/protocols/oscar/oscar.c:5062
+#: ../libgaim/protocols/jabber/presence.c:319
+#: ../libgaim/protocols/oscar/oscar.c:2359
+#: ../libgaim/protocols/oscar/oscar.c:5069
 msgid "_Deny"
 msgstr "拒絕(_D)"
 
-#: ../src/protocols/jabber/presence.c:377
-#: ../src/protocols/jabber/presence.c:378
+#: ../libgaim/protocols/jabber/presence.c:376
+#: ../libgaim/protocols/jabber/presence.c:377
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../src/protocols/jabber/presence.c:379
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+#: ../libgaim/protocols/jabber/presence.c:378
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
 msgstr "您正要建立一個新的聊天室,您要設定它,還是使用預設值?"
 
-#: ../src/protocols/jabber/presence.c:382
+#: ../libgaim/protocols/jabber/presence.c:381
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../src/protocols/jabber/presence.c:384
+#: ../libgaim/protocols/jabber/presence.c:383
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#: ../src/protocols/jabber/presence.c:422
+#: ../libgaim/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: ../src/protocols/jabber/presence.c:425
+#: ../libgaim/protocols/jabber/presence.c:424
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
 
-#: ../src/protocols/jabber/si.c:728
+#: ../libgaim/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "無法傳送檔案至 %s,因為對方不支援檔案傳輸"
 
-#: ../src/protocols/jabber/si.c:729
-#: ../src/protocols/jabber/si.c:730
+#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "傳送檔案失敗"
 
 # XXX 暫譯
-#: ../src/protocols/msn/dialog.c:110
+#: ../libgaim/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "為 %s (%s) 的好友清單進行同步化途中出現問題"
 
 # XXX 暫譯
-#: ../src/protocols/msn/dialog.c:116
-#, c-format
-msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
-msgstr "%s 在本地端的好友清單的「%s」群組裏,卻不在伺服器上;您要新增這個好友至伺服器的好友清單嗎?"
+#: ../libgaim/protocols/msn/dialog.c:116
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s 在本地端的好友清單的「%s」群組裏,卻不在伺服器上;您要新增這個好友至伺服器"
+"的好友清單嗎?"
 
 # XXX 暫譯
-#: ../src/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 在本地端的好友清單,郤不在伺服器上;您要新增這個好友至伺服器的好友清單嗎?"
-
-#: ../src/protocols/msn/error.c:35
+#: ../libgaim/protocols/msn/dialog.c:124
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s 在本地端的好友清單,郤不在伺服器上;您要新增這個好友至伺服器的好友清單嗎?"
+
+#: ../libgaim/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "無法解析訊息"
 
 # NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
-#: ../src/protocols/msn/error.c:38
+#: ../libgaim/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "語法錯誤(可能是 Gaim 的 Bug)"
 
-#: ../src/protocols/msn/error.c:42
+#: ../libgaim/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
 msgstr "無效的電子郵件位址"
 
-#: ../src/protocols/msn/error.c:45
+#: ../libgaim/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "使用者不存在"
 
-#: ../src/protocols/msn/error.c:49
+#: ../libgaim/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "沒給予完整領域名稱 (FQDN)"
 
-#: ../src/protocols/msn/error.c:52
+#: ../libgaim/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "已經登入"
 
-#: ../src/protocols/msn/error.c:55
+#: ../libgaim/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "使用者名稱無效"
 
-#: ../src/protocols/msn/error.c:58
+#: ../libgaim/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "暱稱無效"
 
-#: ../src/protocols/msn/error.c:61
+#: ../libgaim/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "好友清單已滿"
 
-#: ../src/protocols/msn/error.c:64
+#: ../libgaim/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "已經在清單裡"
 
-#: ../src/protocols/msn/error.c:67
+#: ../libgaim/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "不在清單中"
 
-#: ../src/protocols/msn/error.c:70
-#: ../src/protocols/zephyr/zephyr.c:705
+#: ../libgaim/protocols/msn/error.c:70
+#: ../libgaim/protocols/zephyr/zephyr.c:757
 msgid "User is offline"
 msgstr "使用者是離線的"
 
-#: ../src/protocols/msn/error.c:73
+#: ../libgaim/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "已經在這個模式中"
 
-#: ../src/protocols/msn/error.c:76
+#: ../libgaim/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "已經在相對的清單中"
 
-#: ../src/protocols/msn/error.c:79
+#: ../libgaim/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "太多群組"
 
-#: ../src/protocols/msn/error.c:82
+#: ../libgaim/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "無效的群組"
 
-#: ../src/protocols/msn/error.c:85
+#: ../libgaim/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "使用者不在群組內"
 
-#: ../src/protocols/msn/error.c:88
+#: ../libgaim/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "群組名稱過長"
 
-#: ../src/protocols/msn/error.c:91
+#: ../libgaim/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "無法移除「零」號群組"
 
-#: ../src/protocols/msn/error.c:95
+#: ../libgaim/protocols/msn/error.c:95
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "嚐試將一個使用者加入不存在的群組"
 
-#: ../src/protocols/msn/error.c:99
+#: ../libgaim/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Switchboard 失敗"
 
-#: ../src/protocols/msn/error.c:102
+#: ../libgaim/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "傳送通知失敗"
 
-#: ../src/protocols/msn/error.c:106
+#: ../libgaim/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "找不到所需要的欄位"
 
-#: ../src/protocols/msn/error.c:109
+#: ../libgaim/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
-#: ../src/protocols/msn/error.c:112
-#: ../src/protocols/oscar/oscar.c:148
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:123
 msgid "Not logged in"
 msgstr "尚未登入"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../src/protocols/msn/error.c:116
+#: ../libgaim/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "暫時無法使用服務"
 
-#: ../src/protocols/msn/error.c:119
+#: ../libgaim/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
 #  XXX 暫譯
-#: ../src/protocols/msn/error.c:122
+#: ../libgaim/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "指令被停用"
 
-#: ../src/protocols/msn/error.c:125
+#: ../libgaim/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "檔案操作錯誤"
 
-#: ../src/protocols/msn/error.c:128
+#: ../libgaim/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
-#: ../src/protocols/msn/error.c:131
+#: ../libgaim/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "錯誤的 CHL 值傳送到了伺服器"
 
-#: ../src/protocols/msn/error.c:135
+#: ../libgaim/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
-#: ../src/protocols/msn/error.c:138
-#: ../src/protocols/msn/error.c:151
-#: ../src/protocols/msn/error.c:206
+#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
+#: ../libgaim/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "伺服器目前不提供服務"
 
-#: ../src/protocols/msn/error.c:141
+#: ../libgaim/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "點對點通知伺服器暫停服務"
 
-#: ../src/protocols/msn/error.c:144
+#: ../libgaim/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "資料庫連結錯誤"
 
-#: ../src/protocols/msn/error.c:148
+#: ../libgaim/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "伺服器將暫停服務"
 
-#: ../src/protocols/msn/error.c:155
+#: ../libgaim/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "連線開啟錯誤"
 
-#: ../src/protocols/msn/error.c:159
+#: ../libgaim/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
-#: ../src/protocols/msn/error.c:162
+#: ../libgaim/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "無法寫入"
 
-#: ../src/protocols/msn/error.c:165
+#: ../libgaim/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "工作階段超載"
 
-#: ../src/protocols/msn/error.c:168
+#: ../libgaim/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "使用者太過活躍"
 
-#: ../src/protocols/msn/error.c:171
+#: ../libgaim/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
-#: ../src/protocols/msn/error.c:174
+#: ../libgaim/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "護照帳號尚未經過驗證"
 
-#: ../src/protocols/msn/error.c:177
+#: ../libgaim/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "好友檔案無效"
 
 # NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
-#: ../src/protocols/msn/error.c:180
+#: ../libgaim/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "沒有預期的無效參數"
 
-#: ../src/protocols/msn/error.c:185
+#: ../libgaim/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "暱稱的變更過於急速"
 
-#: ../src/protocols/msn/error.c:194
+#: ../libgaim/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: ../src/protocols/msn/error.c:198
-#: ../src/protocols/oscar/oscar.c:1340
-#: ../src/protocols/silc/ops.c:1717
-#: ../src/protocols/toc/toc.c:722
+#: ../libgaim/protocols/msn/error.c:198
+#: ../libgaim/protocols/oscar/oscar.c:1310
+#: ../libgaim/protocols/silc/ops.c:1716 ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/proxy.c:1340
 msgid "Authentication failed"
 msgstr "認證失敗"
 
-#: ../src/protocols/msn/error.c:201
+#: ../libgaim/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "在離線時不允許這個指令"
 
-#: ../src/protocols/msn/error.c:209
+#: ../libgaim/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "不接受新的使用者"
 
-#: ../src/protocols/msn/error.c:213
+#: ../libgaim/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "未經家長同意下使用兒童護照"
 
-#: ../src/protocols/msn/error.c:217
+#: ../libgaim/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "護照帳號尚未經過驗證"
 
 #  FIXME「ticket」暫無譯文,也許可譯「通行證」或「許可證」?
 #  NOTE MSN 錯誤代號 928
 #  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
-#: ../src/protocols/msn/error.c:220
+#: ../libgaim/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "無效的 ticket"
 
-#: ../src/protocols/msn/error.c:224
+#: ../libgaim/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "未知的錯誤代碼 %d"
 
-#: ../src/protocols/msn/error.c:236
+#: ../libgaim/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤:%s\n"
 
-#: ../src/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr "您剛送出了一個呼叫!"
 
-#: ../src/protocols/msn/msn.c:138
+#: ../libgaim/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: ../src/protocols/msn/msn.c:246
+#: ../libgaim/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
 # NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
 # XXX 這看來是一個鈙述句,事實上是對使用者發出的請求/問題
-#: ../src/protocols/msn/msn.c:247
+#: ../libgaim/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: ../src/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: ../src/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: ../src/protocols/msn/msn.c:293
+#: ../libgaim/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: ../src/protocols/msn/msn.c:306
+#: ../libgaim/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼?"
 
-#: ../src/protocols/msn/msn.c:307
-msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
-msgstr "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話,或是其他的行動裝置上呢?"
-
-#: ../src/protocols/msn/msn.c:311
+#: ../libgaim/protocols/msn/msn.c:307
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+"您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話,或是其他的行動"
+"裝置上呢?"
+
+#: ../libgaim/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "允許"
 
-#: ../src/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../src/protocols/msn/msn.c:328
+#: ../libgaim/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../src/protocols/msn/msn.c:354
+#: ../libgaim/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../src/protocols/msn/msn.c:356
+#: ../libgaim/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "傳呼"
 
-#: ../src/protocols/msn/msn.c:546
-#: ../src/protocols/msn/msn.c:553
-#: ../src/protocols/msn/msn.c:562
-#: ../src/protocols/sametime/sametime.c:3239
-#: ../src/protocols/yahoo/yahoo.c:2888
-#: ../src/protocols/yahoo/yahoo.c:2894
+#: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
+#: ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/sametime/sametime.c:3232
+#: ../libgaim/protocols/yahoo/yahoo.c:3032
+#: ../libgaim/protocols/yahoo/yahoo.c:3038
 #, c-format
 msgid ""
 "\n"
@@ -8248,347 +9011,340 @@
 "\n"
 "<b>%s:</b>%s"
 
-#: ../src/protocols/msn/msn.c:553
+#: ../libgaim/protocols/msn/msn.c:553
 msgid "Has you"
 msgstr "你在他(她)的好友清單裏"
 
-#: ../src/protocols/msn/msn.c:583
-#: ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2717
-#: ../src/protocols/yahoo/yahoo.c:3318
+#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
+#: ../libgaim/protocols/yahoo/yahoo.c:2861
+#: ../libgaim/protocols/yahoo/yahoo.c:3466
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../src/protocols/msn/msn.c:587
-#: ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2849
-#: ../src/protocols/novell/novell.c:2983
-#: ../src/protocols/silc/buddy.c:1473
-#: ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2719
-#: ../src/protocols/yahoo/yahoo.c:3321
+#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
+#: ../libgaim/protocols/novell/novell.c:2859
+#: ../libgaim/protocols/novell/novell.c:2993
+#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
+#: ../libgaim/protocols/yahoo/yahoo.c:2863
+#: ../libgaim/protocols/yahoo/yahoo.c:3469
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/protocols/msn/msn.c:591
-#: ../src/protocols/yahoo/yahoo.c:2727
-#: ../src/protocols/yahoo/yahoo.c:3333
+#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2871
+#: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../src/protocols/msn/msn.c:595
-#: ../src/protocols/yahoo/yahoo.c:2731
-#: ../src/protocols/yahoo/yahoo.c:3339
+#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2875
+#: ../libgaim/protocols/yahoo/yahoo.c:3487
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../src/protocols/msn/msn.c:619
+#: ../libgaim/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "設定暱稱..."
 
-#: ../src/protocols/msn/msn.c:624
+#: ../libgaim/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "設定住家電話號碼..."
 
-#: ../src/protocols/msn/msn.c:628
+#: ../libgaim/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../src/protocols/msn/msn.c:632
+#: ../libgaim/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "設定行動電話號碼..."
 
-#: ../src/protocols/msn/msn.c:638
+#: ../libgaim/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "開啟 / 關閉行動裝置..."
 
-#: ../src/protocols/msn/msn.c:643
+#: ../libgaim/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../src/protocols/msn/msn.c:653
+#: ../libgaim/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../src/protocols/msn/msn.c:677
+#: ../libgaim/protocols/msn/msn.c:677
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: ../src/protocols/msn/msn.c:687
-#: ../src/protocols/novell/novell.c:3439
+#: ../libgaim/protocols/msn/msn.c:687
+#: ../libgaim/protocols/novell/novell.c:3449
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
 # XXX 暫譯
-#: ../src/protocols/msn/msn.c:725
-msgid "SSL support is needed for MSN. Please install a supported SSL library. See http://gaim.sf.net/faq-ssl.php for more information."
-msgstr "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。詳情請閱 http://gaim.sf.net/faq-ssl.php。"
-
-#: ../src/protocols/msn/msn.c:752
+#: ../libgaim/protocols/msn/msn.c:725
+msgid ""
+"SSL support is needed for MSN. Please install a supported SSL library. See "
+"http://gaim.sf.net/faq-ssl.php for more information."
+msgstr ""
+"MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。詳情請閱 http://"
+"gaim.sf.net/faq-ssl.php。"
+
+#: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../src/protocols/msn/msn.c:1363
-#: ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:736
-#: ../src/protocols/zephyr/zephyr.c:1153
+#: ../libgaim/protocols/msn/msn.c:1363
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:685
+#: ../libgaim/protocols/zephyr/zephyr.c:788
+#: ../libgaim/protocols/zephyr/zephyr.c:1205
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>別名:</b>%s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1370
-#: ../src/protocols/yahoo/yahoo_profile.c:1208
-#: ../src/util.c:1061
+#: ../libgaim/protocols/msn/msn.c:1370
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223 ../libgaim/util.c:1109
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: ../src/protocols/msn/msn.c:1460
+#: ../libgaim/protocols/msn/msn.c:1462
 msgid "MSN Profile"
 msgstr "MSN 個人資料"
 
-#: ../src/protocols/msn/msn.c:1465
-#: ../src/protocols/msn/msn.c:1791
-#: ../src/protocols/yahoo/yahoo_profile.c:795
+#: ../libgaim/protocols/msn/msn.c:1467 ../libgaim/protocols/msn/msn.c:1796
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:794
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../src/protocols/msn/msn.c:1533
-#: ../src/protocols/oscar/oscar.c:3694
-#: ../src/protocols/yahoo/yahoo_profile.c:1056
+#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3669
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
 msgid "Age"
 msgstr "年齡"
 
-#: ../src/protocols/msn/msn.c:1535
-#: ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
 msgid "Occupation"
 msgstr "職業"
 
-#: ../src/protocols/msn/msn.c:1536
-#: ../src/protocols/novell/novell.c:1478
-#: ../src/protocols/yahoo/yahoo_profile.c:1051
+#: ../libgaim/protocols/msn/msn.c:1540
+#: ../libgaim/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1065
 msgid "Location"
 msgstr "所在位置"
 
-#: ../src/protocols/msn/msn.c:1541
-#: ../src/protocols/msn/msn.c:1720
-#: ../src/protocols/msn/msn.c:1726
-#: ../src/protocols/msn/msn.c:1733
+#: ../libgaim/protocols/msn/msn.c:1545 ../libgaim/protocols/msn/msn.c:1725
+#: ../libgaim/protocols/msn/msn.c:1731 ../libgaim/protocols/msn/msn.c:1738
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../src/protocols/msn/msn.c:1547
-#: ../src/protocols/msn/msn.c:1654
-#: ../src/protocols/msn/msn.c:1660
-#: ../src/protocols/msn/msn.c:1667
-#: ../src/protocols/msn/msn.c:1675
-#: ../src/protocols/msn/msn.c:1682
+#: ../libgaim/protocols/msn/msn.c:1551 ../libgaim/protocols/msn/msn.c:1659
+#: ../libgaim/protocols/msn/msn.c:1665 ../libgaim/protocols/msn/msn.c:1672
+#: ../libgaim/protocols/msn/msn.c:1680 ../libgaim/protocols/msn/msn.c:1687
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../src/protocols/msn/msn.c:1553
-#, fuzzy, c-format
+#: ../libgaim/protocols/msn/msn.c:1557
+#, c-format
 msgid "%s<b>General</b><br>%s"
-msgstr "<b>外部使用者</b><br>"
+msgstr "%s<b>簡介</b><br>%s"
 
 #. Social
-#: ../src/protocols/msn/msn.c:1562
-#: ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../libgaim/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1075
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-# NOTE 可能是指「反向選取」
-#: ../src/protocols/msn/msn.c:1563
+#: ../libgaim/protocols/msn/msn.c:1567
 msgid "Interests"
 msgstr "興趣"
 
-#: ../src/protocols/msn/msn.c:1564
+#: ../libgaim/protocols/msn/msn.c:1568
 msgid "Pets"
 msgstr "寵物"
 
-#: ../src/protocols/msn/msn.c:1565
+#: ../libgaim/protocols/msn/msn.c:1569
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../src/protocols/msn/msn.c:1566
+#: ../libgaim/protocols/msn/msn.c:1570
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../src/protocols/msn/msn.c:1567
+#: ../libgaim/protocols/msn/msn.c:1571
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../src/protocols/msn/msn.c:1568
+#: ../libgaim/protocols/msn/msn.c:1572
 msgid "Humor"
 msgstr "幽默"
 
-#: ../src/protocols/msn/msn.c:1569
+#: ../libgaim/protocols/msn/msn.c:1573
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../src/protocols/msn/msn.c:1570
-#: ../src/protocols/msn/msn.c:1742
-#: ../src/protocols/msn/msn.c:1748
-#: ../src/protocols/yahoo/yahoo_profile.c:1113
+#: ../libgaim/protocols/msn/msn.c:1574 ../libgaim/protocols/msn/msn.c:1747
+#: ../libgaim/protocols/msn/msn.c:1753
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1127
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../src/protocols/msn/msn.c:1574
-#, fuzzy, c-format
+# XXX - 20061028
+#: ../libgaim/protocols/msn/msn.c:1578
+#, c-format
 msgid "%s<b>Social</b><br>%s"
-msgstr "<b>別名:</b>%s<br>"
-
-#: ../src/protocols/msn/msn.c:1583
+msgstr "%s<b>社交方面</b><br>%s"
+
+#: ../libgaim/protocols/msn/msn.c:1587
 msgid "Significant Other"
-msgstr ""
-
-#: ../src/protocols/msn/msn.c:1584
+msgstr "另一半"
+
+#: ../libgaim/protocols/msn/msn.c:1588
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../src/protocols/msn/msn.c:1585
+#: ../libgaim/protocols/msn/msn.c:1589
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../src/protocols/msn/msn.c:1586
-#: ../src/protocols/oscar/oscar.c:3706
+#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3681
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../src/protocols/msn/msn.c:1587
+#: ../libgaim/protocols/msn/msn.c:1591
 msgid "Personal Mobile"
 msgstr "個人行動電話"
 
-#: ../src/protocols/msn/msn.c:1588
+#: ../libgaim/protocols/msn/msn.c:1592
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../src/protocols/msn/msn.c:1589
+#: ../libgaim/protocols/msn/msn.c:1593
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../src/protocols/msn/msn.c:1590
+#: ../libgaim/protocols/msn/msn.c:1594
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../src/protocols/msn/msn.c:1592
+#: ../libgaim/protocols/msn/msn.c:1596
 msgid "Anniversary"
-msgstr ""
-
-#: ../src/protocols/msn/msn.c:1593
-#: ../src/protocols/msn/msn.c:1617
+msgstr "週年紀念日"
+
+#: ../libgaim/protocols/msn/msn.c:1597 ../libgaim/protocols/msn/msn.c:1622
 msgid "Notes"
 msgstr "備註"
 
-#: ../src/protocols/msn/msn.c:1597
-#, fuzzy, c-format
+#: ../libgaim/protocols/msn/msn.c:1601
+#, c-format
 msgid "<br><b>Personal</b><br>%s"
-msgstr "<br><b>頻道主題:</b><br>%s"
-
-#: ../src/protocols/msn/msn.c:1604
-#: ../src/protocols/silc/ops.c:1044
+msgstr "<br><b>個人方面</b><br>%s"
+
+#: ../libgaim/protocols/msn/msn.c:1609 ../libgaim/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../src/protocols/msn/msn.c:1605
-#: ../src/protocols/oscar/oscar.c:3723
+#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3698
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../src/protocols/msn/msn.c:1606
-#: ../src/protocols/novell/novell.c:1480
+#: ../libgaim/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../src/protocols/msn/msn.c:1607
+#: ../libgaim/protocols/msn/msn.c:1612
 msgid "Profession"
 msgstr "專業"
 
-#: ../src/protocols/msn/msn.c:1608
+#: ../libgaim/protocols/msn/msn.c:1613
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../src/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/msn/msn.c:1614
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../src/protocols/msn/msn.c:1610
-#: ../src/protocols/oscar/oscar.c:3714
+#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3689
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../src/protocols/msn/msn.c:1611
+#: ../libgaim/protocols/msn/msn.c:1616
 msgid "Work Mobile"
 msgstr "商務行動電話"
 
-#: ../src/protocols/msn/msn.c:1612
+#: ../libgaim/protocols/msn/msn.c:1617
 msgid "Work Pager"
 msgstr "商務呼叫器"
 
-#: ../src/protocols/msn/msn.c:1613
+#: ../libgaim/protocols/msn/msn.c:1618
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../src/protocols/msn/msn.c:1614
+#: ../libgaim/protocols/msn/msn.c:1619
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../src/protocols/msn/msn.c:1615
+#: ../libgaim/protocols/msn/msn.c:1620
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../src/protocols/msn/msn.c:1616
+#: ../libgaim/protocols/msn/msn.c:1621
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../src/protocols/msn/msn.c:1621
-#, fuzzy, c-format
+#: ../libgaim/protocols/msn/msn.c:1626
+#, c-format
 msgid "<br><b>Business</b><br>%s"
-msgstr "<br><b>頻道主題:</b><br>%s"
-
-#: ../src/protocols/msn/msn.c:1632
+msgstr "<br><b>工作方面</b><br>%s"
+
+#: ../libgaim/protocols/msn/msn.c:1637
 #, c-format
 msgid "<hr><b>Contact Info</b>%s%s"
 msgstr "<hr><b>聯絡資訊</b>%s%s"
 
-#: ../src/protocols/msn/msn.c:1691
-#: ../src/protocols/msn/msn.c:1697
-#: ../src/protocols/msn/msn.c:1704
-#: ../src/protocols/msn/msn.c:1711
+#: ../libgaim/protocols/msn/msn.c:1696 ../libgaim/protocols/msn/msn.c:1702
+#: ../libgaim/protocols/msn/msn.c:1709 ../libgaim/protocols/msn/msn.c:1716
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../src/protocols/msn/msn.c:1756
+#: ../libgaim/protocols/msn/msn.c:1761
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../src/protocols/msn/msn.c:1768
-#: ../src/protocols/silc/ops.c:1060
+#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libgaim/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: ../src/protocols/msn/msn.c:1793
+#: ../libgaim/protocols/msn/msn.c:1798
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../src/protocols/msn/msn.c:1794
-msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
-msgstr "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在;亦有可能使用者存在,但沒有建立公開的個人資料。"
-
-#: ../src/protocols/msn/msn.c:1798
-msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
-msgstr "Gaim 在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
+#: ../libgaim/protocols/msn/msn.c:1799
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在;亦有可能使"
+"用者存在,但沒有建立公開的個人資料。"
+
+#: ../libgaim/protocols/msn/msn.c:1803
+msgid ""
+"Gaim could not find any information in the user's profile. The user most "
+"likely does not exist."
+msgstr ""
+"Gaim 在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存"
+"在。"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1803
+#: ../libgaim/protocols/msn/msn.c:1808
 #, c-format
 msgid "<hr><b>%s:</b> "
 msgstr "<hr><b>%s:</b>"
 
-#: ../src/protocols/msn/msn.c:1803
-#: ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223
 msgid "Profile URL"
 msgstr "個人資料網址"
 
@@ -8602,122 +9358,142 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2025
-#: ../src/protocols/msn/msn.c:2027
+#: ../libgaim/protocols/msn/msn.c:2033 ../libgaim/protocols/msn/msn.c:2035
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: ../src/protocols/msn/msn.c:2055
+#: ../libgaim/protocols/msn/msn.c:2063
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../src/protocols/msn/msn.c:2060
+#: ../libgaim/protocols/msn/msn.c:2068
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../src/protocols/msn/msn.c:2068
+#: ../libgaim/protocols/msn/msn.c:2076
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:呼叫使用者,引起他們的注意"
 
-#: ../src/protocols/msn/nexus.c:141
-#: ../src/protocols/msn/servconn.c:135
-#: ../src/protocols/yahoo/yahoochat.c:1346
-#: ../src/protocols/yahoo/yahoochat.c:1373
+#: ../libgaim/protocols/msn/nexus.c:146
+#: ../libgaim/protocols/msn/servconn.c:133
+#: ../libgaim/protocols/qq/qq_proxy.c:242
+#: ../libgaim/protocols/qq/qq_proxy.c:321
+#: ../libgaim/protocols/qq/qq_proxy.c:366
+#: ../libgaim/protocols/qq/qq_proxy.c:399
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:62
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:162
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:186
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:199
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:228
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:242
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:267
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:301
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:331
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "無法連線"
 
-#: ../src/protocols/msn/notification.c:178
+#: ../libgaim/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 不是一個有效的群組。"
 
-#: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532
-#: ../src/protocols/msn/session.c:329
+#: ../libgaim/protocols/msn/notification.c:184
+#: ../libgaim/protocols/msn/notification.c:532
+#: ../libgaim/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "未知錯誤。"
 
 # NOTE: 第二個 %s 為使用者名稱,第三個 %s 為通訊協定名稱
 # NOTE: 第一個 %s 似乎係錯誤訊息摘要(整個字串為視窗標題)
-#: ../src/protocols/msn/notification.c:187
+#: ../libgaim/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s (%3$s):%1$s"
 
 #  TODO 請覆查,譯文有待改進
-#: ../src/protocols/msn/notification.c:498
+#: ../libgaim/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "%s (%s) 新增使用者失敗"
 
 #  TODO 請覆查,譯文有待改進
-#: ../src/protocols/msn/notification.c:502
+#: ../libgaim/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "%s (%s) 拒絕使用者失敗"
 
 #  TODO 請覆查,譯文有待改進
-#: ../src/protocols/msn/notification.c:506
+#: ../libgaim/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "%s (%s) 允許使用者失敗"
 
-#: ../src/protocols/msn/notification.c:514
+#: ../libgaim/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "因為好友清單已滿,以致無法新增 %s"
 
-#: ../src/protocols/msn/notification.c:523
+#: ../libgaim/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 不是一個有效的 Passport 帳號"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../src/protocols/msn/notification.c:528
+#: ../libgaim/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
-#: ../src/protocols/msn/notification.c:820
+#: ../libgaim/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
-#: ../src/protocols/msn/notification.c:875
+#: ../libgaim/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "無法移除群組"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: ../src/protocols/msn/notification.c:1308
-#, c-format
-msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+#: ../libgaim/protocols/msn/notification.c:1314
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgstr[0] ""
-"MSN 伺服器將要在 %d 分鐘內關閉以進行維護,屆時您將會由伺服器上自動登出。請儘快結束您目前的交談。\n"
+"MSN 伺服器將要在 %d 分鐘內關閉以進行維護,屆時您將會由伺服器上自動登出。請儘"
+"快結束您目前的交談。\n"
 "\n"
 "當維護工作結束,您將可以再度登入。"
 msgstr[1] ""
-"MSN 伺服器將要在 %d 分鐘內關閉以進行維護,屆時您將會由伺服器上自動登出。請儘快結束您目前的交談。\n"
+"MSN 伺服器將要在 %d 分鐘內關閉以進行維護,屆時您將會由伺服器上自動登出。請儘"
+"快結束您目前的交談。\n"
 "\n"
 "當維護工作結束,您將可以再度登入。"
 
-#: ../src/protocols/msn/servconn.c:137
+#: ../libgaim/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "寫入錯誤"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../src/protocols/msn/servconn.c:139
+#: ../libgaim/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "讀取錯誤"
 
 #  NOTE 首個 %s 為「Notification」或「Switchboard」其一,次為伺服器名稱,末者為錯誤訊息
-#: ../src/protocols/msn/servconn.c:146
+#: ../libgaim/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -8726,444 +9502,381 @@
 "%s 伺服器傳來一個連線錯誤:\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:299
+#: ../libgaim/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "這個伺服器不支援我們使用的通訊協定。"
 
-#: ../src/protocols/msn/session.c:303
+#: ../libgaim/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "解析 HTTP 途中發生錯誤。"
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:307
-#: ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:3431
-#: ../src/protocols/yahoo/yahoo.c:191
+#: ../libgaim/protocols/msn/session.c:307
+#: ../libgaim/protocols/oscar/oscar.c:3409
+#: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
 
 #  XXX
-#: ../src/protocols/msn/session.c:310
+#: ../libgaim/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "暫時無法使用 MSN 使服器,請過一會後重試。"
 
-#: ../src/protocols/msn/session.c:315
+#: ../libgaim/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 伺服器將暫時關閉。"
 
-#: ../src/protocols/msn/session.c:319
+#: ../libgaim/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "無法認證:%s"
 
-#: ../src/protocols/msn/session.c:324
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+#: ../libgaim/protocols/msn/session.c:324
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "暫時無法取得您的好友清單,請過一會後重試。"
 
-#: ../src/protocols/msn/session.c:345
-#: ../src/protocols/msn/session.c:347
+#: ../libgaim/protocols/msn/session.c:345
+#: ../libgaim/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "交談中"
 
-#: ../src/protocols/msn/session.c:346
+#: ../libgaim/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "傳輸中"
 
-#: ../src/protocols/msn/session.c:348
+#: ../libgaim/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "認證開始中"
 
-#: ../src/protocols/msn/session.c:349
+#: ../libgaim/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "取得 Cookie 中"
 
-#: ../src/protocols/msn/session.c:351
+#: ../libgaim/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "傳送 Cookie 中"
 
-#: ../src/protocols/msn/session.c:352
+#: ../libgaim/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
-#: ../src/protocols/msn/state.c:34
+#: ../libgaim/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: ../src/protocols/msn/state.c:35
+#: ../libgaim/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "電話中"
 
-#: ../src/protocols/msn/state.c:36
+#: ../libgaim/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: ../src/protocols/msn/switchboard.c:401
+#: ../libgaim/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "送出訊息逾時,可能沒有送出訊息:"
 
-#: ../src/protocols/msn/switchboard.c:409
+#: ../libgaim/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "隱身時無法送出訊息:"
 
-#: ../src/protocols/msn/switchboard.c:413
+#: ../libgaim/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "因為使用者目前離線,所以無法送出訊息:"
 
-#: ../src/protocols/msn/switchboard.c:417
+#: ../libgaim/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "因為連線發生錯誤,所以訊息無法送出:"
 
-#: ../src/protocols/msn/switchboard.c:421
+#: ../libgaim/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "因為我們傳送訊息的速度太快,所以訊息無法送出:"
 
-#: ../src/protocols/msn/switchboard.c:425
-msgid "Message could not be sent because an error with the switchboard occurred:"
+#: ../libgaim/protocols/msn/switchboard.c:424
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
 msgstr "因為 Switchboard 發生錯誤,所以訊息無法送出"
 
-#: ../src/protocols/msn/switchboard.c:433
+#: ../libgaim/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "因為發生不明的錯誤,訊息可能沒有送出:"
 
-#: ../src/protocols/msn/switchboard.c:953
+#: ../libgaim/protocols/msn/switchboard.c:952
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 在呼叫您!"
 
-#: ../src/protocols/msn/userlist.c:90
+#: ../libgaim/protocols/msn/userlist.c:90
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "使用者 %s(%s)想要將 %s 加入他(她)的好友清單。"
 
-#: ../src/protocols/msn/userlist.c:105
-#: ../src/protocols/yahoo/yahoo.c:920
+#: ../libgaim/protocols/msn/userlist.c:105
+#: ../libgaim/protocols/yahoo/yahoo.c:1002
 msgid "Authorize"
 msgstr "給予認證"
 
-#: ../src/protocols/msn/userlist.c:106
-#: ../src/protocols/yahoo/yahoo.c:922
+#: ../libgaim/protocols/msn/userlist.c:106
+#: ../libgaim/protocols/yahoo/yahoo.c:1004
 msgid "Deny"
 msgstr "拒絕"
 
-#: ../src/protocols/msn/userlist.c:280
+#: ../libgaim/protocols/msn/userlist.c:280
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s 將您加入他(她)的好友清單。"
 
-#: ../src/protocols/msn/userlist.c:349
+#: ../libgaim/protocols/msn/userlist.c:349
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 將您從他(她)的好友清單中移除。"
 
-#: ../src/protocols/msn/userlist.c:671
+#: ../libgaim/protocols/msn/userlist.c:671
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "無法新增「%s」。"
 
-#: ../src/protocols/msn/userlist.c:673
+#: ../libgaim/protocols/msn/userlist.c:673
 msgid "The screen name specified is invalid."
 msgstr "您所輸入的暱稱無效。"
 
-#: ../src/protocols/napster/napster.c:266
-msgid "Unable to read header from server"
-msgstr "無法由伺服器讀取標頭資訊"
-
-#: ../src/protocols/napster/napster.c:280
-#, c-format
-msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr "無法由伺服器讀取資訊:%s。指令為 %hd,長度為 %hd。"
-
-#: ../src/protocols/napster/napster.c:296
-msgid "Unknown server error."
-msgstr "未知伺服器錯誤。"
-
-#: ../src/protocols/napster/napster.c:345
-#, c-format
-msgid "users: %s, files: %s, size: %sGB"
-msgstr "使用者:%s,檔案:%s,大小:%sGB"
-
-#. MSG_SERVER_HOTLIST_ERROR
-#: ../src/protocols/napster/napster.c:356
-#, c-format
-msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr "無法將「%s」加入您的 Napster 熱門清單中"
-
-#. MSG_CLIENT_WHOIS
-#: ../src/protocols/napster/napster.c:420
-#, c-format
-msgid "%s requested your information"
-msgstr "%s 查詢您的使用者資訊"
-
-#. MSG_CLIENT_PING
-#: ../src/protocols/napster/napster.c:460
-#, c-format
-msgid "%s requested a PING"
-msgstr "%s 要求一個 PING"
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../src/protocols/napster/napster.c:507
-#: ../src/protocols/napster/napster.c:543
-#: ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2247
-#: ../src/protocols/yahoo/yahoo.c:2274
-#: ../src/protocols/yahoo/yahoo.c:2357
-#: ../src/protocols/yahoo/yahoo.c:2372
-#: ../src/protocols/yahoo/yahoo_filexfer.c:74
-#: ../src/protocols/yahoo/yahoo_filexfer.c:137
-#: ../src/protocols/yahoo/ycht.c:540
-msgid "Unable to connect."
-msgstr "無法連結。"
-
-#: ../src/protocols/napster/napster.c:599
-#: ../src/protocols/toc/toc.c:1367
-msgid "_Group:"
-msgstr "群組(_G):"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/napster/napster.c:699
-#: ../src/protocols/napster/napster.c:701
-msgid "NAPSTER Protocol Plugin"
-msgstr "NAPSTER 協定模組"
-
-#: ../src/protocols/novell/nmuser.c:1868
+#: ../libgaim/protocols/novell/nmuser.c:1879
 msgid "Required parameters not passed in"
 msgstr "沒有提供所需的參數"
 
-#: ../src/protocols/novell/nmuser.c:1871
+#: ../libgaim/protocols/novell/nmuser.c:1882
 msgid "Unable to write to network"
 msgstr "無法寫入網路"
 
-#: ../src/protocols/novell/nmuser.c:1874
+#: ../libgaim/protocols/novell/nmuser.c:1885
 msgid "Unable to read from network"
 msgstr "無法由網路讀取"
 
-#: ../src/protocols/novell/nmuser.c:1877
+#: ../libgaim/protocols/novell/nmuser.c:1888
 msgid "Error communicating with server"
 msgstr "和伺服器溝通時發生錯誤"
 
-#: ../src/protocols/novell/nmuser.c:1881
+#: ../libgaim/protocols/novell/nmuser.c:1892
 msgid "Conference not found"
 msgstr "找不到該會議"
 
-#: ../src/protocols/novell/nmuser.c:1884
+#: ../libgaim/protocols/novell/nmuser.c:1895
 msgid "Conference does not exist"
 msgstr "該會議並不存在"
 
-#: ../src/protocols/novell/nmuser.c:1888
+#: ../libgaim/protocols/novell/nmuser.c:1899
 msgid "A folder with that name already exists"
 msgstr "那個目錄已經存在"
 
 #  XXX 這個太奇怪了 (^^;)
-#: ../src/protocols/novell/nmuser.c:1891
+#: ../libgaim/protocols/novell/nmuser.c:1902
 msgid "Not supported"
 msgstr "不支援"
 
-#: ../src/protocols/novell/nmuser.c:1895
+#: ../libgaim/protocols/novell/nmuser.c:1906
 msgid "Password has expired"
 msgstr "密碼已過期"
 
-#: ../src/protocols/novell/nmuser.c:1898
+#: ../libgaim/protocols/novell/nmuser.c:1909
 msgid "Invalid password"
 msgstr "密碼無效"
 
-#: ../src/protocols/novell/nmuser.c:1901
+#: ../libgaim/protocols/novell/nmuser.c:1912
 msgid "User not found"
 msgstr "找不到該使用者"
 
-#: ../src/protocols/novell/nmuser.c:1904
+#: ../libgaim/protocols/novell/nmuser.c:1915
 msgid "Account has been disabled"
 msgstr "帳號已被停用"
 
-#: ../src/protocols/novell/nmuser.c:1907
+#: ../libgaim/protocols/novell/nmuser.c:1918
 msgid "The server could not access the directory"
 msgstr "伺服器無法存取目錄"
 
 #  XXX 要覆查譯文
-#: ../src/protocols/novell/nmuser.c:1910
+#: ../libgaim/protocols/novell/nmuser.c:1921
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系統管理員不容許這個動作"
 
-#: ../src/protocols/novell/nmuser.c:1913
+#: ../libgaim/protocols/novell/nmuser.c:1924
 msgid "The server is unavailable; try again later"
 msgstr "暫時無法使用伺服器;請稍後重試"
 
-#: ../src/protocols/novell/nmuser.c:1916
+#: ../libgaim/protocols/novell/nmuser.c:1927
 msgid "Cannot add a contact to the same folder twice"
 msgstr "無法在同一資料夾內新增同一好友兩次"
 
-#: ../src/protocols/novell/nmuser.c:1919
+#: ../libgaim/protocols/novell/nmuser.c:1930
 msgid "Cannot add yourself"
 msgstr "無法新增您自己至好友清單"
 
 #  TODO 不知「Master archive」有無正式譯文,也不知應如何譯
-#: ../src/protocols/novell/nmuser.c:1922
+#: ../libgaim/protocols/novell/nmuser.c:1933
 msgid "Master archive is misconfigured"
 msgstr "Master archive 設定錯誤"
 
-#: ../src/protocols/novell/nmuser.c:1926
+#: ../libgaim/protocols/novell/nmuser.c:1937
 msgid "Invalid username or password"
 msgstr "使用者名稱或密碼無效"
 
-#: ../src/protocols/novell/nmuser.c:1929
+#: ../libgaim/protocols/novell/nmuser.c:1940
 msgid "Could not recognize the host of the username you entered"
 msgstr "無法辦識您所輸入的主機或使用者名稱"
 
-#: ../src/protocols/novell/nmuser.c:1932
-msgid "Your account has been disabled because too many invalid passwords were entered"
+#: ../libgaim/protocols/novell/nmuser.c:1943
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
 msgstr "您的帳號已被停用,因為輸入了太多無效的密碼"
 
-#: ../src/protocols/novell/nmuser.c:1935
+#: ../libgaim/protocols/novell/nmuser.c:1946
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您不能在同一交談內新增同一個人兩次"
 
-#: ../src/protocols/novell/nmuser.c:1939
+#: ../libgaim/protocols/novell/nmuser.c:1950
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您的好友人數已達上限"
 
-#: ../src/protocols/novell/nmuser.c:1942
+#: ../libgaim/protocols/novell/nmuser.c:1953
 msgid "You have entered an invalid username"
 msgstr "您輸入了無效的使用者名稱"
 
-#: ../src/protocols/novell/nmuser.c:1945
+#: ../libgaim/protocols/novell/nmuser.c:1956
 msgid "An error occurred while updating the directory"
 msgstr "更新目錄途中發生錯誤"
 
-#: ../src/protocols/novell/nmuser.c:1948
+#: ../libgaim/protocols/novell/nmuser.c:1959
 msgid "Incompatible protocol version"
 msgstr "協定版本不相容"
 
-#: ../src/protocols/novell/nmuser.c:1951
+#: ../libgaim/protocols/novell/nmuser.c:1962
 msgid "The user has blocked you"
 msgstr "該使用者拒絕了您"
 
-#: ../src/protocols/novell/nmuser.c:1954
-msgid "This evaluation version does not allow more than ten users to log in at one time"
+#: ../libgaim/protocols/novell/nmuser.c:1965
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
 msgstr "試用版最多只容許十個使用者同時登入"
 
-#: ../src/protocols/novell/nmuser.c:1957
+#: ../libgaim/protocols/novell/nmuser.c:1968
 msgid "The user is either offline or you are blocked"
 msgstr "該使用者可能是離線,或者您已被他(她)拒絕"
 
-#: ../src/protocols/novell/nmuser.c:1960
+#: ../libgaim/protocols/novell/nmuser.c:1971
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤:0x%X"
 
-#: ../src/protocols/novell/novell.c:124
+#: ../libgaim/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "登入失敗 (%s)。"
 
 #  XXX 暫譯
-#: ../src/protocols/novell/novell.c:247
+#: ../libgaim/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "無法送出訊息。無法取得使用者的細節 (%s)。"
 
-#: ../src/protocols/novell/novell.c:396
+#: ../libgaim/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "無法把 %s 加至您的好友清單 (%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../src/protocols/novell/novell.c:422
+#: ../libgaim/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "無法送出訊息 (%s)。"
 
-#: ../src/protocols/novell/novell.c:493
-#: ../src/protocols/novell/novell.c:985
+#: ../libgaim/protocols/novell/novell.c:493
+#: ../libgaim/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "無法邀請使用者 (%s)。"
 
-#: ../src/protocols/novell/novell.c:532
+#: ../libgaim/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "無法送出訊息至 %s。無法建立會議 (%s)。"
 
-#: ../src/protocols/novell/novell.c:537
+#: ../libgaim/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "無法送出訊息。無法建立會議 (%s)。"
 
-#: ../src/protocols/novell/novell.c:584
-#, c-format
-msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+#: ../libgaim/protocols/novell/novell.c:584
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
 msgstr "無法在伺服器上的清單把使用者 %s 移至目錄 %s。建立目錄時發生錯誤 (%s)。"
 
-#: ../src/protocols/novell/novell.c:632
-#, c-format
-msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+#: ../libgaim/protocols/novell/novell.c:632
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
 msgstr "無法新增 %s 至好友清單。在伺服器上的清單建立目錄時發生錯誤 (%s)。"
 
-#: ../src/protocols/novell/novell.c:705
+#: ../libgaim/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "無法取得使用者 %s 的細節 (%s)。"
 
 #  FIXME 譯文有待改進
-#: ../src/protocols/novell/novell.c:751
-#: ../src/protocols/novell/novell.c:897
+#: ../libgaim/protocols/novell/novell.c:751
+#: ../libgaim/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "無法把使用者加至您的隱私清單 (%s)。"
 
-#: ../src/protocols/novell/novell.c:798
+#: ../libgaim/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "無法把 %s 加至您的拒絕清單 (%s)。"
 
-#: ../src/protocols/novell/novell.c:851
+#: ../libgaim/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "無法把 %s 加至您的允許清單 (%s)。"
 
-#: ../src/protocols/novell/novell.c:919
+#: ../libgaim/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "無法把 %s 移除自您的隱私清單 (%s)。"
 
-#: ../src/protocols/novell/novell.c:942
-#: ../src/protocols/novell/novell.c:1652
+#: ../libgaim/protocols/novell/novell.c:942
+#: ../libgaim/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改隱私設定 (%s)。"
 
-#: ../src/protocols/novell/novell.c:1012
+#: ../libgaim/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "無法建立會議 (%s)。"
 
-#: ../src/protocols/novell/novell.c:1121
-#: ../src/protocols/novell/novell.c:1691
+#: ../libgaim/protocols/novell/novell.c:1121
+#: ../libgaim/protocols/novell/novell.c:1697
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
-#: ../src/protocols/novell/novell.c:1476
+#: ../libgaim/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "電話號碼"
 
-#: ../src/protocols/novell/novell.c:1482
+#: ../libgaim/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "個人職銜"
 
 #  NOTE 似乎無中文譯文
-#: ../src/protocols/novell/novell.c:1486
+#: ../libgaim/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Mail Stop"
 
-#: ../src/protocols/novell/novell.c:1504
+#: ../libgaim/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "使用者ID"
 
@@ -9174,43 +9887,43 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1518
+#: ../libgaim/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "全名"
 
 #  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
-#: ../src/protocols/novell/novell.c:1642
+#: ../libgaim/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: ../src/protocols/novell/novell.c:1667
+#: ../libgaim/protocols/novell/novell.c:1673
 msgid "Unable to make SSL connection to server."
 msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#: ../src/protocols/novell/novell.c:1724
+#: ../libgaim/protocols/novell/novell.c:1725
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: ../src/protocols/novell/novell.c:1736
+#: ../libgaim/protocols/novell/novell.c:1737
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../src/protocols/novell/novell.c:1739
+#: ../libgaim/protocols/novell/novell.c:1740
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: ../src/protocols/novell/novell.c:1874
+#: ../libgaim/protocols/novell/novell.c:1875
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "邀請了 %s 加入這個交談。"
 
-#: ../src/protocols/novell/novell.c:1902
+#: ../libgaim/protocols/novell/novell.c:1903
 msgid "Invitation to Conversation"
 msgstr "邀請加入交談"
 
 #  NOTE「Sent」係指發出邀請時的時間
-#: ../src/protocols/novell/novell.c:1903
+#: ../libgaim/protocols/novell/novell.c:1904
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -9221,33 +9934,37 @@
 "\n"
 "時間:%s"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../libgaim/protocols/novell/novell.c:1906
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎?"
 
 # XXX 暫譯
-#: ../src/protocols/novell/novell.c:2012
+#. we don't want to reconnect in this case
+#: ../libgaim/protocols/novell/novell.c:2015
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已經被登出,因為您已在其他電腦上登入。"
 
-#: ../src/protocols/novell/novell.c:2068
-#, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+#: ../libgaim/protocols/novell/novell.c:2072
+#, 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!
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2166
-msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
+#: ../libgaim/protocols/novell/novell.c:2170
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: ../src/protocols/novell/novell.c:2188
+#: ../libgaim/protocols/novell/novell.c:2198
 msgid "Error. SSL support is not installed."
 msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#: ../src/protocols/novell/novell.c:2497
+#: ../libgaim/protocols/novell/novell.c:2507
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -9261,209 +9978,245 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3541
-#: ../src/protocols/novell/novell.c:3543
+#: ../libgaim/protocols/novell/novell.c:3552
+#: ../libgaim/protocols/novell/novell.c:3554
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: ../src/protocols/novell/novell.c:3562
+#: ../libgaim/protocols/novell/novell.c:3573
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: ../src/protocols/novell/novell.c:3566
+#: ../libgaim/protocols/novell/novell.c:3577
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
-#: ../src/protocols/oscar/flap_connection.c:221
+#: ../libgaim/protocols/oscar/flap_connection.c:237
+#: ../libgaim/protocols/yahoo/yahoo.c:2268
+#: ../libgaim/protocols/yahoo/yahoo.c:2426
+#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
+#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
+#: ../libgaim/proxy.c:1413
 msgid "Server closed the connection."
 msgstr "伺服器關閉連線。"
 
-#: ../src/protocols/oscar/flap_connection.c:223
-msgid "Lost connection with server for an unknown reason."
-msgstr "因為不明原因導致與伺服器連線中斷。"
-
-#: ../src/protocols/oscar/flap_connection.c:225
+#: ../libgaim/protocols/oscar/flap_connection.c:239
+#: ../libgaim/protocols/yahoo/yahoo.c:2262
+#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:578
+#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
+#: ../libgaim/proxy.c:1425
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%s"
+msgstr ""
+"與伺服器之間的連線突然中斷:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1103
+#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
+#: ../libgaim/proxy.c:1438
 msgid "Received invalid data on connection with server."
 msgstr "連線至伺服器時收到無效的資料。"
 
-#: ../src/protocols/oscar/flap_connection.c:227
-msgid "Could not establish a connection with the server."
-msgstr "無法與伺服器建立連線。"
-
-#: ../src/protocols/oscar/odc.c:40
+#: ../libgaim/protocols/oscar/flap_connection.c:244
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"無法與伺服器建立連線:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "遠端使用者關閉了連線。"
 
-#: ../src/protocols/oscar/odc.c:42
+#: ../libgaim/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "遠端使用者拒絕了您的要求。"
 
-#: ../src/protocols/oscar/odc.c:44
-msgid "Lost connection with the remote user for an unknown reason."
-msgstr "因為不明的原因導致與遠端使用者的連線中斷。"
-
-#: ../src/protocols/oscar/odc.c:46
+#: ../libgaim/protocols/oscar/odc.c:44
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "與遠端使用者的連線突然中斷:<br>%s"
+
+#: ../libgaim/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "在與遠端使用者的連線上收到無交的資料。"
 
-#: ../src/protocols/oscar/odc.c:48
+#: ../libgaim/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "無法與遠端使用者建立連線。"
 
-#: ../src/protocols/oscar/odc.c:557
+#: ../libgaim/protocols/oscar/odc.c:561
 msgid "Direct IM established"
 msgstr "即時訊息已經建立"
 
+#: ../libgaim/protocols/oscar/oft.c:457
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "檔案「%s」大小為 %s,超過了 %s 這個上限。"
+
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../src/protocols/oscar/oscar.c:144
+#: ../libgaim/protocols/oscar/oscar.c:119
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: ../src/protocols/oscar/oscar.c:145
+#: ../libgaim/protocols/oscar/oscar.c:120
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-#: ../src/protocols/oscar/oscar.c:146
+#: ../libgaim/protocols/oscar/oscar.c:121
 msgid "Rate to host"
 msgstr "到伺服器速率"
 
-#: ../src/protocols/oscar/oscar.c:147
+#: ../libgaim/protocols/oscar/oscar.c:122
 msgid "Rate to client"
 msgstr "到用戶端速率"
 
 #  XXX 可能是誤譯
-#: ../src/protocols/oscar/oscar.c:149
+#: ../libgaim/protocols/oscar/oscar.c:124
 msgid "Service unavailable"
 msgstr "伺服器不存在"
 
-#: ../src/protocols/oscar/oscar.c:150
+#: ../libgaim/protocols/oscar/oscar.c:125
 msgid "Service not defined"
 msgstr "沒有指定服務"
 
-#: ../src/protocols/oscar/oscar.c:151
+#: ../libgaim/protocols/oscar/oscar.c:126
 msgid "Obsolete SNAC"
 msgstr "過時的 SNAC"
 
-#: ../src/protocols/oscar/oscar.c:152
+#: ../libgaim/protocols/oscar/oscar.c:127
 msgid "Not supported by host"
 msgstr "伺服器不支援"
 
-#: ../src/protocols/oscar/oscar.c:153
+#: ../libgaim/protocols/oscar/oscar.c:128
 msgid "Not supported by client"
 msgstr "用戶端不支援"
 
-#: ../src/protocols/oscar/oscar.c:154
+#: ../libgaim/protocols/oscar/oscar.c:129
 msgid "Refused by client"
 msgstr "被用戶端拒絕"
 
-#: ../src/protocols/oscar/oscar.c:155
+#: ../libgaim/protocols/oscar/oscar.c:130
 msgid "Reply too big"
 msgstr "回覆太大了"
 
-#: ../src/protocols/oscar/oscar.c:156
+#: ../libgaim/protocols/oscar/oscar.c:131
 msgid "Responses lost"
 msgstr "遺失回應"
 
-#: ../src/protocols/oscar/oscar.c:157
+#: ../libgaim/protocols/oscar/oscar.c:132
 msgid "Request denied"
 msgstr "要求被拒"
 
 # NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-#: ../src/protocols/oscar/oscar.c:158
+#: ../libgaim/protocols/oscar/oscar.c:133
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
 
-#: ../src/protocols/oscar/oscar.c:159
+#: ../libgaim/protocols/oscar/oscar.c:134
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
 # NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
-#: ../src/protocols/oscar/oscar.c:160
+#: ../libgaim/protocols/oscar/oscar.c:135
 msgid "In local permit/deny"
 msgstr "本地端的允許/拒絕清單"
 
-#: ../src/protocols/oscar/oscar.c:161
+#: ../libgaim/protocols/oscar/oscar.c:136
 msgid "Too evil (sender)"
 msgstr "太邪惡了(寄件人)"
 
-#: ../src/protocols/oscar/oscar.c:162
+#: ../libgaim/protocols/oscar/oscar.c:137
 msgid "Too evil (receiver)"
 msgstr "太邪惡了(收件人)"
 
-#: ../src/protocols/oscar/oscar.c:163
+#: ../libgaim/protocols/oscar/oscar.c:138
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
 
-#: ../src/protocols/oscar/oscar.c:164
+#: ../libgaim/protocols/oscar/oscar.c:139
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: ../src/protocols/oscar/oscar.c:165
+#: ../libgaim/protocols/oscar/oscar.c:140
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: ../src/protocols/oscar/oscar.c:166
+#: ../libgaim/protocols/oscar/oscar.c:141
 msgid "Request ambiguous"
 msgstr "要求不明確"
 
-#: ../src/protocols/oscar/oscar.c:167
+#: ../libgaim/protocols/oscar/oscar.c:142
 msgid "Queue full"
 msgstr "佇列滿了"
 
-#: ../src/protocols/oscar/oscar.c:168
+#: ../libgaim/protocols/oscar/oscar.c:143
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: ../src/protocols/oscar/oscar.c:346
-msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:449
-msgid "(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"
-msgstr "(接收這個訊息時發生了錯誤。正在跟您交談的好友很可能是在使用有問題的用戶端程式。)"
-
-#: ../src/protocols/oscar/oscar.c:628
+#: ../libgaim/protocols/oscar/oscar.c:321
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+"(接收這個訊息時發生了錯誤。正在跟您交談的好友很可能在使用與您想像不乎的字元編碼;"
+"如果您知道那是什麼編碼,請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」欄位指定。)"
+
+#: ../libgaim/protocols/oscar/oscar.c:424
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr ""
+"(接收這個訊息時發生了錯誤。正在跟您交談的好友很可能是在使用有問題的用戶端程"
+"式。)"
+
+#: ../libgaim/protocols/oscar/oscar.c:603
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../src/protocols/oscar/oscar.c:631
+#: ../libgaim/protocols/oscar/oscar.c:606
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: ../src/protocols/oscar/oscar.c:634
-#: ../src/protocols/silc/silc.c:699
-#: ../src/protocols/silc/util.c:524
+#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:693
+#: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "聊天"
 
-#: ../src/protocols/oscar/oscar.c:637
-#: ../src/protocols/oscar/oscar.c:5837
+#: ../libgaim/protocols/oscar/oscar.c:612
+#: ../libgaim/protocols/oscar/oscar.c:5852
 msgid "Get File"
 msgstr "接收檔案"
 
-#: ../src/protocols/oscar/oscar.c:644
+#: ../libgaim/protocols/oscar/oscar.c:619
 msgid "Games"
 msgstr "遊戲"
 
-#: ../src/protocols/oscar/oscar.c:647
+#: ../libgaim/protocols/oscar/oscar.c:622
 msgid "Add-Ins"
 msgstr "模組"
 
-#: ../src/protocols/oscar/oscar.c:650
+#: ../libgaim/protocols/oscar/oscar.c:625
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: ../src/protocols/oscar/oscar.c:653
+#: ../libgaim/protocols/oscar/oscar.c:628
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: ../src/protocols/oscar/oscar.c:656
+#: ../libgaim/protocols/oscar/oscar.c:631
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: ../src/protocols/oscar/oscar.c:659
+#: ../libgaim/protocols/oscar/oscar.c:634
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -9474,221 +10227,254 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: ../src/protocols/oscar/oscar.c:662
+#: ../libgaim/protocols/oscar/oscar.c:637
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../src/protocols/oscar/oscar.c:665
+#: ../libgaim/protocols/oscar/oscar.c:640
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: ../src/protocols/oscar/oscar.c:668
+#: ../libgaim/protocols/oscar/oscar.c:643
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:671
+#: ../libgaim/protocols/oscar/oscar.c:646
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: ../src/protocols/oscar/oscar.c:674
+#: ../libgaim/protocols/oscar/oscar.c:649
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: ../src/protocols/oscar/oscar.c:677
+#: ../libgaim/protocols/oscar/oscar.c:652
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../src/protocols/oscar/oscar.c:680
+#: ../libgaim/protocols/oscar/oscar.c:655
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: ../src/protocols/oscar/oscar.c:683
+#: ../libgaim/protocols/oscar/oscar.c:658
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: ../src/protocols/oscar/oscar.c:687
+#: ../libgaim/protocols/oscar/oscar.c:662
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: ../src/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:665
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
-#: ../src/protocols/oscar/oscar.c:693
+#: ../libgaim/protocols/oscar/oscar.c:668
 msgid "Camera"
 msgstr "照相機"
 
-#: ../src/protocols/oscar/oscar.c:711
-#: ../src/protocols/oscar/oscar.c:5622
+#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libgaim/protocols/oscar/oscar.c:5629
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: ../src/protocols/oscar/oscar.c:715
-#: ../src/protocols/oscar/oscar.c:5650
+#: ../libgaim/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:5661
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: ../src/protocols/oscar/oscar.c:717
-#: ../src/protocols/oscar/oscar.c:5640
+#: ../libgaim/protocols/oscar/oscar.c:692
+#: ../libgaim/protocols/oscar/oscar.c:5647
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../src/protocols/oscar/oscar.c:721
+#: ../libgaim/protocols/oscar/oscar.c:696
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: ../src/protocols/oscar/oscar.c:725
+#: ../libgaim/protocols/oscar/oscar.c:700
 msgid "Online"
 msgstr "上線"
 
-#: ../src/protocols/oscar/oscar.c:811
-#: ../src/protocols/oscar/oscar.c:2829
+#: ../libgaim/protocols/oscar/oscar.c:786
+#: ../libgaim/protocols/oscar/oscar.c:2804
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: ../src/protocols/oscar/oscar.c:820
+#: ../libgaim/protocols/oscar/oscar.c:795
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: ../src/protocols/oscar/oscar.c:975
-msgid "Could not connect to authentication server"
-msgstr "無法連線至認證伺服器"
-
-#: ../src/protocols/oscar/oscar.c:977
-msgid "Could not connect to BOS server"
-msgstr "無法連線到 BOS 伺服器"
-
-#: ../src/protocols/oscar/oscar.c:1007
+#: ../libgaim/protocols/oscar/oscar.c:931
+#, c-format
+msgid ""
+"Could not connect to authentication server:\n"
+"%s"
+msgstr ""
+"無法連線至認證伺服器:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:939
+#, c-format
+msgid ""
+"Could not connect to BOS server:\n"
+"%s"
+msgstr ""
+"無法連線到 BOS 伺服器:\n"
+"%s"
+
+#: ../libgaim/protocols/oscar/oscar.c:979
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: ../src/protocols/oscar/oscar.c:1012
+#: ../libgaim/protocols/oscar/oscar.c:984
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:1043
+#: ../libgaim/protocols/oscar/oscar.c:1013
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../src/protocols/oscar/oscar.c:1227
-#, c-format
-msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
-
-#: ../src/protocols/oscar/oscar.c:1317
-#: ../src/protocols/toc/toc.c:543
-msgid "Incorrect nickname or password."
-msgstr "錯誤的暱稱或密碼"
-
-#: ../src/protocols/oscar/oscar.c:1322
+#: ../libgaim/protocols/oscar/oscar.c:1197
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must either start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
+"並只含英文字母、數字及空白;或者只由數字組成。"
+
+#: ../libgaim/protocols/oscar/oscar.c:1282
+msgid "Invalid screen name."
+msgstr "帳號無效。"
+
+#: ../libgaim/protocols/oscar/oscar.c:1287
+#: ../libgaim/protocols/yahoo/yahoo.c:1928
+msgid "Incorrect password."
+msgstr "錯誤的密碼。"
+
+#: ../libgaim/protocols/oscar/oscar.c:1292
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:1326
+#: ../libgaim/protocols/oscar/oscar.c:1296
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../src/protocols/oscar/oscar.c:1331
-msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
-msgstr "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連線,那麼您的等待時間將會更加的延長。"
-
-#: ../src/protocols/oscar/oscar.c:1336
+#: ../libgaim/protocols/oscar/oscar.c:1301
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+"線,那麼您的等待時間將會更加的延長。"
+
+#: ../libgaim/protocols/oscar/oscar.c:1306
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: ../src/protocols/oscar/oscar.c:1372
+#: ../libgaim/protocols/oscar/oscar.c:1341
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../src/protocols/oscar/oscar.c:1377
+#: ../libgaim/protocols/oscar/oscar.c:1346
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../src/protocols/oscar/oscar.c:1400
+#: ../libgaim/protocols/oscar/oscar.c:1369
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: ../src/protocols/oscar/oscar.c:1414
+#: ../libgaim/protocols/oscar/oscar.c:1383
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../src/protocols/oscar/oscar.c:1415
+#: ../libgaim/protocols/oscar/oscar.c:1384
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
-#: ../src/protocols/oscar/oscar.c:1455
-#: ../src/protocols/oscar/oscar.c:1489
-#, c-format
-msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
-msgstr "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有沒有更新。"
-
-#: ../src/protocols/oscar/oscar.c:1458
-#: ../src/protocols/oscar/oscar.c:1492
+#: ../libgaim/protocols/oscar/oscar.c:1424
+#: ../libgaim/protocols/oscar/oscar.c:1467
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+"您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
+"沒有更新。"
+
+#: ../libgaim/protocols/oscar/oscar.c:1427
+#: ../libgaim/protocols/oscar/oscar.c:1470
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: ../src/protocols/oscar/oscar.c:1578
+#: ../libgaim/protocols/oscar/oscar.c:1556
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../src/protocols/oscar/oscar.c:1581
+#: ../libgaim/protocols/oscar/oscar.c:1559
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: ../src/protocols/oscar/oscar.c:1607
+#: ../libgaim/protocols/oscar/oscar.c:1585
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../src/protocols/oscar/oscar.c:2165
+#: ../libgaim/protocols/oscar/oscar.c:1641
+msgid "Unable to initialize connection"
+msgstr "無法初始化連結"
+
+#: ../libgaim/protocols/oscar/oscar.c:2139
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: ../src/protocols/oscar/oscar.c:2174
+#: ../libgaim/protocols/oscar/oscar.c:2148
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: ../src/protocols/oscar/oscar.c:2175
+#: ../libgaim/protocols/oscar/oscar.c:2149
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: ../src/protocols/oscar/oscar.c:2207
-#, c-format
-msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
+#: ../libgaim/protocols/oscar/oscar.c:2181
+#, c-format
+msgid ""
+"The user %s requires authorization before being added to a buddy list.  Do "
+"you want to send an authorization request?"
 msgstr "使用者 %s 要求在加入好友清單前先取得他的認證。您要送出您的認證要求嗎?"
 
-#: ../src/protocols/oscar/oscar.c:2212
+#: ../libgaim/protocols/oscar/oscar.c:2186
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: ../src/protocols/oscar/oscar.c:2214
+#: ../libgaim/protocols/oscar/oscar.c:2188
 msgid "_Request Authorization"
 msgstr "要求認證(_R)"
 
-#: ../src/protocols/oscar/oscar.c:2255
-#: ../src/protocols/oscar/oscar.c:2262
-#: ../src/protocols/oscar/oscar.c:2368
-#: ../src/protocols/oscar/oscar.c:2392
-#: ../src/protocols/oscar/oscar.c:5047
-#: ../src/protocols/oscar/oscar.c:5099
+#: ../libgaim/protocols/oscar/oscar.c:2229
+#: ../libgaim/protocols/oscar/oscar.c:2236
+#: ../libgaim/protocols/oscar/oscar.c:2343
+#: ../libgaim/protocols/oscar/oscar.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:5054
+#: ../libgaim/protocols/oscar/oscar.c:5106
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../src/protocols/oscar/oscar.c:2261
+#: ../libgaim/protocols/oscar/oscar.c:2235
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: ../src/protocols/oscar/oscar.c:2370
+#: ../libgaim/protocols/oscar/oscar.c:2345
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -9697,31 +10483,32 @@
 "使用者 %u 因為下列原因,想要將 %s 加入他(她)的好友清單中:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2380
-#: ../src/protocols/oscar/oscar.c:5059
+#: ../libgaim/protocols/oscar/oscar.c:2355
+#: ../libgaim/protocols/oscar/oscar.c:5066
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: ../src/protocols/oscar/oscar.c:2392
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+#: ../libgaim/protocols/oscar/oscar.c:2367
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2393
+#: ../libgaim/protocols/oscar/oscar.c:2368
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:2400
+#: ../libgaim/protocols/oscar/oscar.c:2375
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../src/protocols/oscar/oscar.c:2408
+#: ../libgaim/protocols/oscar/oscar.c:2383
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9734,7 +10521,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2416
+#: ../libgaim/protocols/oscar/oscar.c:2391
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9747,7 +10534,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2424
+#: ../libgaim/protocols/oscar/oscar.c:2399
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9760,253 +10547,272 @@
 "訊息為:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2445
+#: ../libgaim/protocols/oscar/oscar.c:2420
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: ../src/protocols/oscar/oscar.c:2451
+#: ../libgaim/protocols/oscar/oscar.c:2426
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: ../src/protocols/oscar/oscar.c:2455
+#: ../libgaim/protocols/oscar/oscar.c:2430
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../src/protocols/oscar/oscar.c:2539
+#: ../libgaim/protocols/oscar/oscar.c:2514
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們是無效的。"
 
-#: ../src/protocols/oscar/oscar.c:2548
+#: ../libgaim/protocols/oscar/oscar.c:2523
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們太大了。"
 
-#: ../src/protocols/oscar/oscar.c:2557
-#, 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."
+#: ../libgaim/protocols/oscar/oscar.c:2532
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它傳送的速度太快。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
-# XXX 跟芬蘭文的譯者有同感,直譯「邪惡」好像行不通,下同
-#: ../src/protocols/oscar/oscar.c:2566
+# XXX 跟芬蘭文的前譯者 (Arto) 有同感,直譯「邪惡」好像行不通,下同
+#: ../libgaim/protocols/oscar/oscar.c:2541
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 
-#: ../src/protocols/oscar/oscar.c:2575
+#: ../libgaim/protocols/oscar/oscar.c:2550
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: ../src/protocols/oscar/oscar.c:2584
+#: ../libgaim/protocols/oscar/oscar.c:2559
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
-#: ../src/protocols/oscar/oscar.c:2640
+#: ../libgaim/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:2701
+#: ../libgaim/protocols/oscar/oscar.c:2676
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:2737
+#: ../libgaim/protocols/oscar/oscar.c:2712
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息:%s"
 
-#: ../src/protocols/oscar/oscar.c:2737
-#: ../src/protocols/oscar/oscar.c:2742
-#: ../src/protocols/oscar/oscar.c:2804
-#: ../src/protocols/oscar/oscar.c:2808
+#: ../libgaim/protocols/oscar/oscar.c:2712
+#: ../libgaim/protocols/oscar/oscar.c:2717
+#: ../libgaim/protocols/oscar/oscar.c:2779
+#: ../libgaim/protocols/oscar/oscar.c:2783
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../src/protocols/oscar/oscar.c:2740
-#: ../src/protocols/sametime/sametime.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:2715
+#: ../libgaim/protocols/sametime/sametime.c:2360
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s:"
 
-#: ../src/protocols/oscar/oscar.c:2804
+#: ../libgaim/protocols/oscar/oscar.c:2779
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊:%s"
 
 # NOTE 譯文更動 by Ambrose
-#: ../src/protocols/oscar/oscar.c:2807
+#: ../libgaim/protocols/oscar/oscar.c:2782
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: ../src/protocols/oscar/oscar.c:2833
+#: ../libgaim/protocols/oscar/oscar.c:2808
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: ../src/protocols/oscar/oscar.c:2838
-#: ../src/protocols/yahoo/yahoo_profile.c:1159
+#: ../libgaim/protocols/oscar/oscar.c:2813
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1174
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../src/protocols/oscar/oscar.c:2843
+#: ../libgaim/protocols/oscar/oscar.c:2818
 msgid "Capabilities"
 msgstr "相容性"
 
-#: ../src/protocols/oscar/oscar.c:2861
+#: ../libgaim/protocols/oscar/oscar.c:2836
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../src/protocols/oscar/oscar.c:2958
+#: ../libgaim/protocols/oscar/oscar.c:2936
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:3139
-msgid "[Unable to display a message from this user because it contained invalid characters.]"
+#: ../libgaim/protocols/oscar/oscar.c:3117
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: ../src/protocols/oscar/oscar.c:3360
+#: ../libgaim/protocols/oscar/oscar.c:3338
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: ../src/protocols/oscar/oscar.c:3361
-msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
-msgstr "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再試一次。"
-
-#: ../src/protocols/oscar/oscar.c:3433
+#: ../libgaim/protocols/oscar/oscar.c:3339
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
+msgstr ""
+"您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
+"試一次。"
+
+#: ../libgaim/protocols/oscar/oscar.c:3411
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: ../src/protocols/oscar/oscar.c:3446
-#: ../src/protocols/toc/toc.c:971
+#: ../libgaim/protocols/oscar/oscar.c:3424 ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../src/protocols/oscar/oscar.c:3670
-#: ../src/protocols/silc/util.c:556
+#: ../libgaim/protocols/oscar/oscar.c:3645
+#: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../src/protocols/oscar/oscar.c:3697
+#: ../libgaim/protocols/oscar/oscar.c:3672
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../src/protocols/oscar/oscar.c:3701
+#: ../libgaim/protocols/oscar/oscar.c:3676
+#: ../libgaim/protocols/qq/buddy_info.c:38
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../src/protocols/oscar/oscar.c:3710
-#: ../src/protocols/oscar/oscar.c:3718
+#: ../libgaim/protocols/oscar/oscar.c:3685
+#: ../libgaim/protocols/oscar/oscar.c:3693
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../src/protocols/oscar/oscar.c:3722
+#: ../libgaim/protocols/oscar/oscar.c:3697
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: ../src/protocols/oscar/oscar.c:3724
+#: ../libgaim/protocols/oscar/oscar.c:3699
 msgid "Division"
 msgstr "部門"
 
-#: ../src/protocols/oscar/oscar.c:3725
+#: ../libgaim/protocols/oscar/oscar.c:3700
 msgid "Position"
 msgstr "職位"
 
-#: ../src/protocols/oscar/oscar.c:3727
+#: ../libgaim/protocols/oscar/oscar.c:3702
 msgid "Web Page"
 msgstr "網頁"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: ../src/protocols/oscar/oscar.c:3785
+#: ../libgaim/protocols/oscar/oscar.c:3760
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../src/protocols/oscar/oscar.c:3825
+#: ../libgaim/protocols/oscar/oscar.c:3800
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列是 %s 的帳號"
 msgstr[1] "下列是 %s 的帳號"
 
-#: ../src/protocols/oscar/oscar.c:3830
+#: ../libgaim/protocols/oscar/oscar.c:3805
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../src/protocols/oscar/oscar.c:3856
+#: ../libgaim/protocols/oscar/oscar.c:3831
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../src/protocols/oscar/oscar.c:3877
+#: ../libgaim/protocols/oscar/oscar.c:3852
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../src/protocols/oscar/oscar.c:3879
+#: ../libgaim/protocols/oscar/oscar.c:3854
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../src/protocols/oscar/oscar.c:3910
+#: ../libgaim/protocols/oscar/oscar.c:3885
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../src/protocols/oscar/oscar.c:3913
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
+#: ../libgaim/protocols/oscar/oscar.c:3888
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號與原本的不同。"
 
-#: ../src/protocols/oscar/oscar.c:3916
+#: ../libgaim/protocols/oscar/oscar.c:3891
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為它是無效的。"
 
-#: ../src/protocols/oscar/oscar.c:3919
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
+#: ../libgaim/protocols/oscar/oscar.c:3894
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號太長。"
 
-#: ../src/protocols/oscar/oscar.c:3922
-#, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+#: ../libgaim/protocols/oscar/oscar.c:3897
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because there is already a "
+"request pending for this screen name."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個帳號尚有要求等待處理。"
 
-#: ../src/protocols/oscar/oscar.c:3925
-#, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
-msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
-
-#: ../src/protocols/oscar/oscar.c:3928
-#, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+#: ../libgaim/protocols/oscar/oscar.c:3900
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+"錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
+
+#: ../libgaim/protocols/oscar/oscar.c:3903
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address is "
+"invalid."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址是無效的。"
 
-#: ../src/protocols/oscar/oscar.c:3931
+#: ../libgaim/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: ../src/protocols/oscar/oscar.c:3941
+#: ../libgaim/protocols/oscar/oscar.c:3916
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -10015,104 +10821,142 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:3942
-#: ../src/protocols/oscar/oscar.c:3949
+#: ../libgaim/protocols/oscar/oscar.c:3917
+#: ../libgaim/protocols/oscar/oscar.c:3924
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../src/protocols/oscar/oscar.c:3947
+#: ../libgaim/protocols/oscar/oscar.c:3922
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../src/protocols/oscar/oscar.c:4122
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+#: ../libgaim/protocols/oscar/oscar.c:4097
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: ../src/protocols/oscar/oscar.c:4367
+#: ../libgaim/protocols/oscar/oscar.c:4349
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../src/protocols/oscar/oscar.c:4368
-msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
-msgstr "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後再重新進行設定。"
-
-#: ../src/protocols/oscar/oscar.c:4382
-#, c-format
-msgid "The maximum profile length of %d byte has been exceeded.  Gaim has truncated it for you."
-msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
+#: ../libgaim/protocols/oscar/oscar.c:4350
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+"您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
+"再重新進行設定。"
+
+#: ../libgaim/protocols/oscar/oscar.c:4364
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
+"it for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated it for you."
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: ../src/protocols/oscar/oscar.c:4387
+#: ../libgaim/protocols/oscar/oscar.c:4369
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../src/protocols/oscar/oscar.c:4430
-#, c-format
-msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
-msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
+#: ../libgaim/protocols/oscar/oscar.c:4413
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  Gaim has "
+"truncated it for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  Gaim has "
+"truncated it for you."
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: ../src/protocols/oscar/oscar.c:4435
+#: ../libgaim/protocols/oscar/oscar.c:4418
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../src/protocols/oscar/oscar.c:4504
-#, c-format
-msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "因為這個帳號不是一個有效的帳號,所以無法將好友「%s」加入清單中。帳號必須以英文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數字」組成。"
-
-#: ../src/protocols/oscar/oscar.c:4506
-#: ../src/protocols/oscar/oscar.c:4905
-#: ../src/protocols/oscar/oscar.c:4919
+#: ../libgaim/protocols/oscar/oscar.c:4487
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must either start with a letter and contain only letters, numbers and "
+"spaces, or contain only numbers."
+msgstr ""
+"因為這個帳號不是一個有效的帳號,所以無法將好友「%s」加入清單中。帳號必須以英"
+"文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
+"字」組成。"
+
+#: ../libgaim/protocols/oscar/oscar.c:4489
+#: ../libgaim/protocols/oscar/oscar.c:4902
+#: ../libgaim/protocols/oscar/oscar.c:4916
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../src/protocols/oscar/oscar.c:4610
+#: ../libgaim/protocols/oscar/oscar.c:4593
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../src/protocols/oscar/oscar.c:4611
-msgid "Gaim was temporarily unable to retrieve your buddy list from the AIM servers.  Your buddy list is not lost, and will probably become available in a few hours."
-msgstr "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺失,可能可以在幾個小時後取得。"
-
-#: ../src/protocols/oscar/oscar.c:4803
-#: ../src/protocols/oscar/oscar.c:4804
-#: ../src/protocols/oscar/oscar.c:4809
-#: ../src/protocols/oscar/oscar.c:4963
-#: ../src/protocols/oscar/oscar.c:4964
-#: ../src/protocols/oscar/oscar.c:4969
+#: ../libgaim/protocols/oscar/oscar.c:4594
+msgid ""
+"Gaim was temporarily unable to retrieve your buddy list from the AIM "
+"servers.  Your buddy list is not lost, and will probably become available in "
+"a few hours."
+msgstr ""
+"Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
+"失,可能可以在幾個小時後取得。"
+
+#: ../libgaim/protocols/oscar/oscar.c:4797
+#: ../libgaim/protocols/oscar/oscar.c:4798
+#: ../libgaim/protocols/oscar/oscar.c:4803
+#: ../libgaim/protocols/oscar/oscar.c:4970
+#: ../libgaim/protocols/oscar/oscar.c:4971
+#: ../libgaim/protocols/oscar/oscar.c:4976
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../src/protocols/oscar/oscar.c:4903
-#, c-format
-msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
-msgstr "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重試。"
-
-#: ../src/protocols/oscar/oscar.c:4903
-#: ../src/protocols/oscar/oscar.c:4917
+#: ../libgaim/protocols/oscar/oscar.c:4900
+#, c-format
+msgid ""
+"Could not add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+"因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
+"試。"
+
+#: ../libgaim/protocols/oscar/oscar.c:4900
+#: ../libgaim/protocols/oscar/oscar.c:4914
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../src/protocols/oscar/oscar.c:4917
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
-msgstr "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超過所系統允許的上限。"
-
-#: ../src/protocols/oscar/oscar.c:5000
-#, c-format
-msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
-msgstr "使用者 %s 已經允許您加入到他(她)的好友清單中。您是不是也要將他(她)加入呢?"
+#: ../libgaim/protocols/oscar/oscar.c:4914
+#, c-format
+msgid ""
+"Could not add the buddy %s for an unknown reason.  The most common reason "
+"for this is that you have the maximum number of allowed buddies in your "
+"buddy list."
+msgstr ""
+"因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
+"過所系統允許的上限。"
+
+#: ../libgaim/protocols/oscar/oscar.c:5007
+#, c-format
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr ""
+"使用者 %s 已經允許您加入到他(她)的好友清單中。您是不是也要將他(她)加入"
+"呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../src/protocols/oscar/oscar.c:5006
+#: ../libgaim/protocols/oscar/oscar.c:5013
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: ../src/protocols/oscar/oscar.c:5050
+#: ../libgaim/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -10122,198 +10966,205 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:5095
+#: ../libgaim/protocols/oscar/oscar.c:5102
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他(她)加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../src/protocols/oscar/oscar.c:5096
+#: ../libgaim/protocols/oscar/oscar.c:5103
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:5099
-#, c-format
-msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+#: ../libgaim/protocols/oscar/oscar.c:5106
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:5100
+#: ../libgaim/protocols/oscar/oscar.c:5107
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: ../src/protocols/oscar/oscar.c:5136
-#: ../src/protocols/toc/toc.c:1372
+#: ../libgaim/protocols/oscar/oscar.c:5143 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: ../src/protocols/oscar/oscar.c:5176
+#: ../libgaim/protocols/oscar/oscar.c:5183
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../src/protocols/oscar/oscar.c:5246
+#: ../libgaim/protocols/oscar/oscar.c:5253
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../src/protocols/oscar/oscar.c:5408
+# XXX 好像不對,又好像沒問題
+#: ../libgaim/protocols/oscar/oscar.c:5415
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
-#: ../src/protocols/oscar/oscar.c:5713
+#: ../libgaim/protocols/oscar/oscar.c:5728
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../src/protocols/oscar/oscar.c:5714
+#: ../libgaim/protocols/oscar/oscar.c:5729
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: ../src/protocols/oscar/oscar.c:5760
+#: ../libgaim/protocols/oscar/oscar.c:5775
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../src/protocols/oscar/oscar.c:5764
-#, fuzzy
-msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+#: ../libgaim/protocols/oscar/oscar.c:5779
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
 
-#: ../src/protocols/oscar/oscar.c:5768
-#: ../src/protocols/oscar/peer.c:941
+#: ../libgaim/protocols/oscar/oscar.c:5783
+#: ../libgaim/protocols/oscar/peer.c:990
 msgid "_Connect"
 msgstr "連線(_C)"
 
-#: ../src/protocols/oscar/oscar.c:5802
+#: ../libgaim/protocols/oscar/oscar.c:5817
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../src/protocols/oscar/oscar.c:5808
+#: ../libgaim/protocols/oscar/oscar.c:5823
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../src/protocols/oscar/oscar.c:5816
+#: ../libgaim/protocols/oscar/oscar.c:5831
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../src/protocols/oscar/oscar.c:5829
+#: ../libgaim/protocols/oscar/oscar.c:5844
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../src/protocols/oscar/oscar.c:5851
+#: ../libgaim/protocols/oscar/oscar.c:5866
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: ../src/protocols/oscar/oscar.c:5908
+# NOTE Require意為「需要」,不是「要求」
+#: ../libgaim/protocols/oscar/oscar.c:5925
 msgid "Require authorization"
-msgstr "要求認證"
-
-#: ../src/protocols/oscar/oscar.c:5911
+msgstr "需要認證"
+
+#: ../libgaim/protocols/oscar/oscar.c:5928
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:5916
+msgstr "允許其他使用者在網路上查看您目前的狀態(會導致您收到垃圾訊息!)"
+
+#: ../libgaim/protocols/oscar/oscar.c:5933
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../src/protocols/oscar/oscar.c:5933
+#: ../libgaim/protocols/oscar/oscar.c:5950
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../src/protocols/oscar/oscar.c:5934
+#: ../libgaim/protocols/oscar/oscar.c:5951
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../src/protocols/oscar/oscar.c:5941
+#: ../libgaim/protocols/oscar/oscar.c:5958
 msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: ../src/protocols/oscar/oscar.c:5997
+#: ../libgaim/protocols/oscar/oscar.c:6014
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: ../src/protocols/oscar/oscar.c:6042
+#: ../libgaim/protocols/oscar/oscar.c:6059
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../src/protocols/oscar/oscar.c:6045
+#: ../libgaim/protocols/oscar/oscar.c:6062
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../src/protocols/oscar/oscar.c:6046
-msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
-msgstr "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇「要求重新認證」。"
-
-#: ../src/protocols/oscar/oscar.c:6063
+#: ../libgaim/protocols/oscar/oscar.c:6063
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
+"「要求重新認證」。"
+
+#: ../libgaim/protocols/oscar/oscar.c:6080
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../src/protocols/oscar/oscar.c:6064
+#: ../libgaim/protocols/oscar/oscar.c:6081
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../src/protocols/oscar/oscar.c:6065
+#: ../libgaim/protocols/oscar/oscar.c:6082
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../src/protocols/oscar/oscar.c:6234
+#: ../libgaim/protocols/oscar/oscar.c:6251
 msgid "Set User Info (URL)..."
-msgstr "設定使用者資訊 (URL)..."
-
-#: ../src/protocols/oscar/oscar.c:6245
+msgstr "設定使用者資訊 (透過網頁)..."
+
+#: ../libgaim/protocols/oscar/oscar.c:6262
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../src/protocols/oscar/oscar.c:6249
+#: ../libgaim/protocols/oscar/oscar.c:6266
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:6259
+#: ../libgaim/protocols/oscar/oscar.c:6276
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:6266
+#: ../libgaim/protocols/oscar/oscar.c:6283
 msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: ../src/protocols/oscar/oscar.c:6270
+#: ../libgaim/protocols/oscar/oscar.c:6287
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../src/protocols/oscar/oscar.c:6274
+#: ../libgaim/protocols/oscar/oscar.c:6291
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../src/protocols/oscar/oscar.c:6278
+#: ../libgaim/protocols/oscar/oscar.c:6295
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../src/protocols/oscar/oscar.c:6285
+#: ../libgaim/protocols/oscar/oscar.c:6302
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../src/protocols/oscar/oscar.c:6291
+#: ../libgaim/protocols/oscar/oscar.c:6308
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../src/protocols/oscar/oscar.c:6296
+#: ../libgaim/protocols/oscar/oscar.c:6313
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../src/protocols/oscar/oscar.c:6362
+#: ../libgaim/protocols/oscar/oscar.c:6381
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../src/protocols/oscar/oscar.c:6365
+#: ../libgaim/protocols/oscar/oscar.c:6384
 msgid "Show how long you have been idle"
 msgstr "顯示你閒置多久時間"
 
@@ -10327,175 +11178,895 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:6490
-#: ../src/protocols/oscar/oscar.c:6492
+#: ../libgaim/protocols/oscar/oscar.c:6510
+#: ../libgaim/protocols/oscar/oscar.c:6512
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: ../src/protocols/oscar/oscar.c:6517
-#: ../src/protocols/zephyr/zephyr.c:2927
+#: ../libgaim/protocols/oscar/oscar.c:6537
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libgaim/protocols/zephyr/zephyr.c:2980
 msgid "Encoding"
 msgstr "編碼"
 
-#: ../src/protocols/oscar/oscar.c:6521
-msgid ""
-"Always use AIM/ICQ proxy server\n"
+#: ../libgaim/protocols/oscar/oscar.c:6541
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
 msgstr ""
-
-#: ../src/protocols/oscar/peer.c:613
+"務必使用 AIM/ICQ 的代理伺服器來進行檔案傳輸\n"
+"(較慢,但不會暴露您的 IP 位址)"
+
+#: ../libgaim/protocols/oscar/peer.c:623
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu),以便建立即時訊息。"
 
-#: ../src/protocols/oscar/peer.c:662
-#: ../src/protocols/oscar/peer.c:693
+#: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在嘗試連線至 %s;%hu。"
 
-#: ../src/protocols/oscar/peer.c:753
+#: ../libgaim/protocols/oscar/peer.c:803
 msgid "Attempting to connect via proxy server."
 msgstr "正在嘗試透過 Proxy 伺服器連線。"
 
-#: ../src/protocols/oscar/peer.c:931
+#: ../libgaim/protocols/oscar/peer.c:980
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: ../src/protocols/oscar/peer.c:935
-msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
-msgstr "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
-
-#: ../src/protocols/sametime/sametime.c:415
+#: ../libgaim/protocols/oscar/peer.c:984
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+"這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
+"這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
+
+#: ../libgaim/protocols/qq/buddy_info.c:37
+msgid "Primary Information"
+msgstr "基本資訊"
+
+#: ../libgaim/protocols/qq/buddy_info.c:39
+msgid "Personal Introduction"
+msgstr "個人簡介"
+
+#: ../libgaim/protocols/qq/buddy_info.c:40
+msgid "QQ Number"
+msgstr "QQ 號碼"
+
+#: ../libgaim/protocols/qq/buddy_info.c:45
+msgid "Country/Region"
+msgstr "國家/地區"
+
+#: ../libgaim/protocols/qq/buddy_info.c:46
+msgid "Province/State"
+msgstr "省/州"
+
+# XXX
+#: ../libgaim/protocols/qq/buddy_info.c:48
+msgid "Horoscope Symbol"
+msgstr "星座"
+
+# XXX
+#: ../libgaim/protocols/qq/buddy_info.c:50
+msgid "Zodiac Sign"
+msgstr "生肖"
+
+#: ../libgaim/protocols/qq/buddy_info.c:51
+msgid "Blood Type"
+msgstr "血型"
+
+#: ../libgaim/protocols/qq/buddy_info.c:52
+msgid "College"
+msgstr "大學/大專"
+
+#: ../libgaim/protocols/qq/buddy_info.c:53
+msgid "Email"
+msgstr "電子郵件"
+
+#: ../libgaim/protocols/qq/buddy_info.c:55
+msgid "Zipcode"
+msgstr "郵遞區號"
+
+#: ../libgaim/protocols/qq/buddy_info.c:56
+msgid "Cellphone Number"
+msgstr "行動電話號碼"
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+msgid "Phone Number"
+msgstr "電話號碼"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aquarius"
+msgstr "水秤座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Pisces"
+msgstr "雙魚座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Aries"
+msgstr "白羊座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:62
+msgid "Taurus"
+msgstr "金牛座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Gemini"
+msgstr "雙子座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Cancer"
+msgstr "巨蟹座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Leo"
+msgstr "獅子座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Virgo"
+msgstr "處女座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:63
+msgid "Libra"
+msgstr "天秤座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Scorpio"
+msgstr "天蠍座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Sagittarius"
+msgstr "人馬座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Capricorn"
+msgstr "魔羯座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rat"
+msgstr "鼠"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Ox"
+msgstr "牛"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Tiger"
+msgstr "虎"
+
+#: ../libgaim/protocols/qq/buddy_info.c:69
+msgid "Rabbit"
+msgstr "兔"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Dragon"
+msgstr "龍"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Snake"
+msgstr "蛇"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Horse"
+msgstr "馬"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Goat"
+msgstr "羊"
+
+#: ../libgaim/protocols/qq/buddy_info.c:70
+msgid "Monkey"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Rooster"
+msgstr "雞"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Dog"
+msgstr "狗"
+
+#: ../libgaim/protocols/qq/buddy_info.c:71
+msgid "Pig"
+msgstr "豬"
+
+#: ../libgaim/protocols/qq/buddy_info.c:76
+msgid "Other"
+msgstr "其他"
+
+#: ../libgaim/protocols/qq/buddy_info.c:477
+#: ../libgaim/protocols/qq/buddy_info.c:478
+msgid "Modify my information"
+msgstr "修改好友資訊"
+
+#: ../libgaim/protocols/qq/buddy_info.c:479
+msgid "Update my information"
+msgstr "更新好友資訊"
+
+#: ../libgaim/protocols/qq/buddy_info.c:502
+msgid "Your information has been updated"
+msgstr "成功修改了您的好友資訊。"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:205
+#: ../libgaim/protocols/qq/group_opt.c:133
+#, c-format
+msgid "You rejected %d's request"
+msgstr "您拒絕了 %d 的要求"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:206
+#: ../libgaim/protocols/qq/group_opt.c:134
+msgid "Input your reason:"
+msgstr "請輸入原因:"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+msgid "Reject request"
+msgstr "拒絕"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:209
+#: ../libgaim/protocols/qq/group_opt.c:137
+msgid "Sorry, you are not my type..."
+msgstr "對不起,我和你合不來……"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/group_im.c:134
+#: ../libgaim/protocols/qq/group_opt.c:123
+#: ../libgaim/protocols/qq/sys_msg.c:83 ../libgaim/protocols/qq/sys_msg.c:226
+msgid "Reject"
+msgstr "拒絕"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:270
+#, fuzzy
+msgid "Add buddy with auth request fails"
+msgstr "連同認證要求的新增好友失敗"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:301
+msgid "You have successfully removed a buddy"
+msgstr "您成功移除了一個好友"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:329
+msgid "You have successfully removed yourself from a buddy"
+msgstr "您成功從一個好友的好友清單中移除了您自己"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:393
+#, c-format
+msgid "User %d needs authentication"
+msgstr "使用者 %d 需要認證"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libgaim/protocols/qq/group_join.c:132
+msgid "Input request here"
+msgstr "請輸入要求"
+
+# XXX - 20061026
+#: ../libgaim/protocols/qq/buddy_opt.c:396
+#: ../libgaim/protocols/qq/group_join.c:133
+msgid "Would you be my friend?"
+msgstr "想同我交個朋友嗎?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libgaim/protocols/qq/group_opt.c:138
+#: ../libgaim/protocols/qq/sendqueue.c:198
+msgid "Send"
+msgstr "送出"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:404
+#, c-format
+msgid "You have added %d in buddy list"
+msgstr "成功將 %d 加入好友清單"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:501
+msgid "QQid Error"
+msgstr "QQid 錯誤"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:502
+msgid "Invalid QQid"
+msgstr "無效的 QQid"
+
+#: ../libgaim/protocols/qq/group.c:63
+msgid "ID: "
+msgstr "ID:"
+
+#: ../libgaim/protocols/qq/group.c:96
+msgid "Group ID"
+msgstr "群組 ID:"
+
+#: ../libgaim/protocols/qq/group.c:98
+msgid "Creator"
+msgstr "創立者"
+
+#: ../libgaim/protocols/qq/group.c:101
+msgid "Group Description"
+msgstr "群組描述"
+
+#: ../libgaim/protocols/qq/group.c:107
+msgid "Auth"
+msgstr "認證"
+
+#: ../libgaim/protocols/qq/group.c:117
+msgid "QQ Qun"
+msgstr "QQ 群"
+
+#: ../libgaim/protocols/qq/group.c:118
+msgid "Please input external group ID"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group.c:119
+msgid "You can only search for permanent QQ groups\n"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:120
+#, c-format
+msgid "User %d applied to join group %d"
+msgstr "使用者 %d 要求加入群組 %d"
+
+#: ../libgaim/protocols/qq/group_im.c:121
+#: ../libgaim/protocols/qq/group_im.c:170
+#: ../libgaim/protocols/qq/sys_msg.c:178
+#, c-format
+msgid "Reason: %s"
+msgstr "原因:%s"
+
+#: ../libgaim/protocols/qq/group_im.c:128
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libgaim/protocols/qq/group_im.c:247
+#: ../libgaim/protocols/qq/group_im.c:281
+#: ../libgaim/protocols/qq/group_join.c:227
+#: ../libgaim/protocols/qq/group_join.c:353
+#: ../libgaim/protocols/qq/group_opt.c:228
+#: ../libgaim/protocols/qq/group_opt.c:298
+#: ../libgaim/protocols/qq/group_opt.c:384
+msgid "QQ Qun Operation"
+msgstr "QQ 群組操作"
+
+#: ../libgaim/protocols/qq/group_im.c:131
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+msgid "Approve"
+msgstr "允許"
+
+#: ../libgaim/protocols/qq/group_im.c:169
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr "管理人 %d 拒絕了您加入群組 %d"
+
+#: ../libgaim/protocols/qq/group_im.c:210
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr "管理人 %d 允許了您加入群組 %d"
+
+#: ../libgaim/protocols/qq/group_im.c:246
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr "您 [%d] 退出了群組「%d」"
+
+#: ../libgaim/protocols/qq/group_im.c:280
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr "群組「%2$d」新增了您 [%1$d]"
+
+#: ../libgaim/protocols/qq/group_im.c:281
+msgid "This group has been added to your buddy list"
+msgstr "群組已新增至好友清單。"
+
+#: ../libgaim/protocols/qq/group_internal.c:39
+msgid "I am not member"
+msgstr "我不是成員"
+
+#: ../libgaim/protocols/qq/group_internal.c:42
+msgid "I am a member"
+msgstr "我是成員"
+
+#: ../libgaim/protocols/qq/group_internal.c:45
+msgid "I am applying to join"
+msgstr "我正在要求加入"
+
+#: ../libgaim/protocols/qq/group_internal.c:48
+msgid "I am the admin"
+msgstr "我是管理人"
+
+#: ../libgaim/protocols/qq/group_internal.c:51
+msgid "Unknown status"
+msgstr "狀態不明"
+
+#: ../libgaim/protocols/qq/group_join.c:78
+msgid "This group does not allow others to join"
+msgstr "這群組不容許外人加入"
+
+#: ../libgaim/protocols/qq/group_join.c:227
+msgid "You have successfully exited the group"
+msgstr "您成功離開群組"
+
+#: ../libgaim/protocols/qq/group_join.c:251
+msgid "QQ Group Auth"
+msgstr "QQ 群組認證"
+
+#: ../libgaim/protocols/qq/group_join.c:252
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr "QQ 伺服器接受了您的認證"
+
+#: ../libgaim/protocols/qq/group_join.c:323
+msgid "You inputted a group id outside the acceptable range"
+msgstr "指定的群組 ID 在有效範圍之外"
+
+#: ../libgaim/protocols/qq/group_join.c:354
+msgid "Are you sure to exit this Qun?"
+msgstr "您確定要離開這個群 (Qun) 嗎?"
+
+#: ../libgaim/protocols/qq/group_join.c:356
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr "請注意,假如您是創立者,這最終會把這個群 (Qun) 移除。"
+
+#: ../libgaim/protocols/qq/group_join.c:359
+msgid "Go ahead"
+msgstr "確定"
+
+#: ../libgaim/protocols/qq/group_network.c:88
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr "代碼 0x%02X:%s"
+
+#: ../libgaim/protocols/qq/group_network.c:89
+msgid "Group Operation Error"
+msgstr "群組操作錯誤"
+
+#: ../libgaim/protocols/qq/group_opt.c:122
+#: ../libgaim/protocols/qq/sys_msg.c:82
+msgid "Do you wanna approve the request?"
+msgstr "允許這個要求?"
+
+#: ../libgaim/protocols/qq/group_opt.c:228
+msgid "You have successfully modify Qun member"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:298
+msgid "You have successfully modify Qun information"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:385
+msgid "You have successfully created a Qun"
+msgstr "成功建立了一個群 (Qun)"
+
+#: ../libgaim/protocols/qq/group_opt.c:387
+msgid "Would you like to set up the Qun details now?"
+msgstr "要立刻設定該群 (Qun) 的詳情嗎?"
+
+#: ../libgaim/protocols/qq/group_opt.c:388
+msgid "Setup"
+msgstr "設定"
+
+#: ../libgaim/protocols/qq/im.c:421
+msgid "System Message"
+msgstr "系統訊息"
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Server ACK"
+msgstr "伺服器回應"
+
+#: ../libgaim/protocols/qq/im.c:565
+msgid "Send IM fail\n"
+msgstr "送出即時訊息失敗\n"
+
+#: ../libgaim/protocols/qq/keep_alive.c:81
+msgid "Keep alive error, seems connection lost!"
+msgstr "Keep alive 發生錯誤,連線似乎已突然中斷!"
+
+#: ../libgaim/protocols/qq/login_logout.c:404
+msgid "Request login token error!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:479
+msgid "Wrong password!"
+msgstr "密碼錯誤!"
+
+#: ../libgaim/protocols/qq/login_logout.c:482
+msgid "Unable to login, check debug log"
+msgstr "無法登入,請檢查除錯記錄"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2356
+#: ../libgaim/protocols/yahoo/yahoo.c:2383
+#: ../libgaim/protocols/yahoo/yahoo.c:2490
+#: ../libgaim/protocols/yahoo/yahoo.c:2511
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "無法連結。"
+
+#: ../libgaim/protocols/qq/qq.c:283
+msgid "QQ: Available"
+msgstr "QQ: 上線"
+
+#: ../libgaim/protocols/qq/qq.c:287
+msgid "QQ: Away"
+msgstr "QQ: 離開"
+
+#: ../libgaim/protocols/qq/qq.c:291
+msgid "QQ: Invisible"
+msgstr "QQ: 隱身"
+
+#: ../libgaim/protocols/qq/qq.c:295
+msgid "QQ: Offline"
+msgstr "QQ: 離線"
+
+#: ../libgaim/protocols/qq/qq.c:372
+msgid "Invalid name"
+msgstr "名稱無效"
+
+#  XXX 要覆查
+#: ../libgaim/protocols/qq/qq.c:442
+msgid "Selection"
+msgstr "選擇"
+
+#  XXX 要覆查
+#: ../libgaim/protocols/qq/qq.c:445
+msgid "Select a number"
+msgstr "選擇一個編號"
+
+#  XXX 要覆查
+#: ../libgaim/protocols/qq/qq.c:451
+msgid "Faces"
+msgstr "好友圖示"
+
+#  XXX 要覆查
+#: ../libgaim/protocols/qq/qq.c:456
+msgid "Change Your QQ Face"
+msgstr "更改您的 QQ 好友圖示"
+
+#  XXX 要覆查
+#: ../libgaim/protocols/qq/qq.c:457
+msgid "Change Face"
+msgstr "更改好友圖示"
+
+#: ../libgaim/protocols/qq/qq.c:458
+msgid "Update"
+msgstr "更新"
+
+#  NOTE 參見 qq.h
+#: ../libgaim/protocols/qq/qq.c:512
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>目前上線好友</b>: %d 人<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:513
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>最近更新時間:</b>%s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:517
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>連線模式</b>:%s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:518
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>伺服器位址:</b>%s:%d<br>\n"
+
+# XXX - 20061027
+#: ../libgaim/protocols/qq/qq.c:519
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>自己位址:</b>%s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:524
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>登入時間:</b>%s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:525
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>上次登入位址:</b>%s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:526
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>上次登入時間:</b>%s\n"
+
+# XXX - 20061027
+#: ../libgaim/protocols/qq/qq.c:530
+msgid "Login Information"
+msgstr "登入資訊"
+
+#: ../libgaim/protocols/qq/qq.c:802
+msgid "Modify My Information"
+msgstr "修改資訊"
+
+#: ../libgaim/protocols/qq/qq.c:805
+msgid "Change My Face"
+msgstr "修改好友圖示"
+
+#: ../libgaim/protocols/qq/qq.c:808 ../libgaim/protocols/toc/toc.c:1700
+msgid "Change Password"
+msgstr "修改密碼"
+
+#: ../libgaim/protocols/qq/qq.c:811
+msgid "Show Login Information"
+msgstr "顯示登入資訊"
+
+#: ../libgaim/protocols/qq/qq.c:837
+msgid "Exit this QQ Qun"
+msgstr "離開這個 QQ 群 (Qun)"
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "This function has not be implemented yet"
+msgstr "這項功能尚未實作"
+
+#: ../libgaim/protocols/qq/qq.c:922
+msgid "Please wait for new version"
+msgstr "請等待新版本推出"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libgaim/protocols/qq/qq.c:1004 ../libgaim/protocols/qq/qq.c:1006
+msgid "QQ Protocol\tPlugin"
+msgstr "QQ 協定模組"
+
+#: ../libgaim/protocols/qq/qq.c:1025
+msgid "Login in TCP"
+msgstr "以 TCP 登入"
+
+#: ../libgaim/protocols/qq/qq.c:1028
+msgid "Login Hidden"
+msgstr "以隱藏狀態登入"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:493
+msgid "Socket send error"
+msgstr "寫入 Socket 途中發生錯誤"
+
+# XXX - 20061027
+#: ../libgaim/protocols/qq/qq_proxy.c:496
+msgid "Connection refused"
+msgstr "連線被拒"
+
+#: ../libgaim/protocols/qq/recv_core.c:304
+msgid "Socket error"
+msgstr "Socket 錯誤"
+
+#: ../libgaim/protocols/qq/recv_core.c:314
+msgid "Unable to read from socket"
+msgstr "無法讀取 Socket"
+
+#: ../libgaim/protocols/qq/send_file.c:706
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d 拒絕了檔案「%s」"
+
+#: ../libgaim/protocols/qq/send_file.c:709
+#: ../libgaim/protocols/qq/send_file.c:738
+msgid "File Send"
+msgstr "傳送檔案"
+
+#: ../libgaim/protocols/qq/send_file.c:735
+#, c-format
+msgid "%d canceled the transfer of %s"
+msgstr "%d 取消了「%s」的傳送"
+
+#: ../libgaim/protocols/qq/sendqueue.c:167
+msgid "Connection lost!"
+msgstr "連線突然中斷!"
+
+#. cancel logging progress
+#: ../libgaim/protocols/qq/sendqueue.c:174
+msgid "Login failed, no reply!"
+msgstr "登入失敗:沒有回應!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "Connection timeout!"
+msgstr "連線已逾時!"
+
+# TODO 譯文有待改進 - 20061028
+#: ../libgaim/protocols/qq/sendqueue.c:179
+msgid "User info is not updated"
+msgstr "無法更新使用者資訊"
+
+#: ../libgaim/protocols/qq/sendqueue.c:194
+msgid "Send packet"
+msgstr "傳送封包中"
+
+#: ../libgaim/protocols/qq/sendqueue.c:196
+msgid "Packets lost, send again?"
+msgstr "封包已遺失,重新送出?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:101
+msgid "Do you wanna add this buddy?"
+msgstr "您想將這個使用者加入到您的好友名單中嗎?"
+
+#. only need to get value
+#: ../libgaim/protocols/qq/sys_msg.c:153
+#, c-format
+msgid "You have been added by %s"
+msgstr "%s 已將您加入到他(她)的好友清單"
+
+#: ../libgaim/protocols/qq/sys_msg.c:156
+msgid "Would like to add him?"
+msgstr "您想將他(她)加入到您的好友清單嗎?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:162
+#, c-format
+msgid "%s has added you [%s]"
+msgstr "%s 已將您 [%s] 加入到他(她)的好友清單"
+
+#: ../libgaim/protocols/qq/sys_msg.c:177
+#, c-format
+msgid "User %s rejected your request"
+msgstr "使用者「%s」拒絕了您的要求"
+
+#: ../libgaim/protocols/qq/sys_msg.c:197
+#, c-format
+msgid "User %s has approved your request"
+msgstr "使用者「%s」允許了您的要求"
+
+#: ../libgaim/protocols/qq/sys_msg.c:220
+#, c-format
+msgid "%s wanna add you [%s] as friends"
+msgstr "%s 想要將您(%s)加入他(她)的好友清單"
+
+#: ../libgaim/protocols/qq/sys_msg.c:221
+#, c-format
+msgid "Message: %s"
+msgstr "訊息:%s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:242
+#, c-format
+msgid "%s is not in your buddy list"
+msgstr "%s 不在您的好友清單內"
+
+# FIXME fix the original string :P
+#: ../libgaim/protocols/qq/sys_msg.c:244
+msgid "Would you like to add him?"
+msgstr "您要將他(她)加入您的好友清單嗎?"
+
+#: ../libgaim/protocols/sametime/sametime.c:414
 msgid "Connection closed (writing)"
 msgstr "連線關閉(寫入)"
 
-#: ../src/protocols/sametime/sametime.c:1261
+#: ../libgaim/protocols/sametime/sametime.c:1260
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>群組名稱:</b>%s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1262
+#: ../libgaim/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes 群組 ID:</b>%s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1264
+#: ../libgaim/protocols/sametime/sametime.c:1263
 #, c-format
 msgid "Info for Group %s"
 msgstr "關於群組 %s 的資訊"
 
-#: ../src/protocols/sametime/sametime.c:1266
+#: ../libgaim/protocols/sametime/sametime.c:1265
 msgid "Notes Address Book Information"
 msgstr "Notes 通訊錄資訊"
 
-#: ../src/protocols/sametime/sametime.c:1298
+#: ../libgaim/protocols/sametime/sametime.c:1297
 msgid "Invite Group to Conference..."
 msgstr "邀請整個群組進入會議室..."
 
-#  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: ../src/protocols/sametime/sametime.c:1308
+#: ../libgaim/protocols/sametime/sametime.c:1307
 msgid "Get Notes Address Book Info"
 msgstr "取得 Notes 通訊錄資訊"
 
-#: ../src/protocols/sametime/sametime.c:1461
+#: ../libgaim/protocols/sametime/sametime.c:1460
 msgid "Sending Handshake"
 msgstr "傳送 Handshake"
 
-#: ../src/protocols/sametime/sametime.c:1466
+#: ../libgaim/protocols/sametime/sametime.c:1465
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "等待 Handshake 回應"
 
-#: ../src/protocols/sametime/sametime.c:1471
+#: ../libgaim/protocols/sametime/sametime.c:1470
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Handshake收到回應,送出登入要求"
 
-#: ../src/protocols/sametime/sametime.c:1476
+#: ../libgaim/protocols/sametime/sametime.c:1475
 msgid "Waiting for Login Acknowledgement"
 msgstr "等待登入要求的回應"
 
-#: ../src/protocols/sametime/sametime.c:1481
+#: ../libgaim/protocols/sametime/sametime.c:1480
 msgid "Login Redirected"
 msgstr "重新導向登入"
 
-#: ../src/protocols/sametime/sametime.c:1487
+#: ../libgaim/protocols/sametime/sametime.c:1486
 msgid "Forcing Login"
 msgstr "強行登入"
 
-#: ../src/protocols/sametime/sametime.c:1491
+#: ../libgaim/protocols/sametime/sametime.c:1490
 msgid "Login Acknowledged"
 msgstr "登入要求收到回應"
 
 #  XXX 暫譯
-#: ../src/protocols/sametime/sametime.c:1496
+#: ../libgaim/protocols/sametime/sametime.c:1495
 msgid "Starting Services"
 msgstr "啟動服務"
 
-#: ../src/protocols/sametime/sametime.c:1501
+# TODO 要覆查 - 20061027
+#: ../libgaim/protocols/sametime/sametime.c:1500
 msgid "Connected"
 msgstr "已連結"
 
-#: ../src/protocols/sametime/sametime.c:1599
-#, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:1604
+#: ../libgaim/protocols/sametime/sametime.c:1598
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr "在伺服器「%s」上,有 Sametime 管理人發出了下列通告"
+
+# FIXME 這好像不通順 - 20061025
+#: ../libgaim/protocols/sametime/sametime.c:1603
 msgid "Sametime Administrator Announcement"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:1656
+msgstr "Sametime 管理人通告"
+
+#: ../libgaim/protocols/sametime/sametime.c:1655
 msgid "Connection reset"
 msgstr "連線重置"
 
-#: ../src/protocols/sametime/sametime.c:1663
+#: ../libgaim/protocols/sametime/sametime.c:1662
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "讀取 Socket 時發生錯誤;%s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1692
-#: ../src/protocols/sametime/sametime.c:3688
+#: ../libgaim/protocols/sametime/sametime.c:1685
+#: ../libgaim/protocols/sametime/sametime.c:3681
 msgid "Unable to connect to host"
 msgstr "無法連線到主機"
 
-#: ../src/protocols/sametime/sametime.c:1730
+#: ../libgaim/protocols/sametime/sametime.c:1723
 #, c-format
 msgid "Announcement from %s"
-msgstr "自 %s 發怖"
-
-#: ../src/protocols/sametime/sametime.c:1904
+msgstr "自 %s 發佈"
+
+#: ../libgaim/protocols/sametime/sametime.c:1897
 msgid "Conference Closed"
 msgstr "會議室關閉"
 
-#: ../src/protocols/sametime/sametime.c:2361
+#: ../libgaim/protocols/sametime/sametime.c:2354
 msgid "Unable to send message: "
 msgstr "無法送出訊息:"
 
-#: ../src/protocols/sametime/sametime.c:2918
+#: ../libgaim/protocols/sametime/sametime.c:2911
 #, fuzzy
 msgid "Place Closed"
-msgstr "已取消"
-
-#: ../src/protocols/sametime/sametime.c:3209
+msgstr "Place 已關閉"
+
+#: ../libgaim/protocols/sametime/sametime.c:3202
 msgid "Microphone"
 msgstr "麥克風"
 
-#: ../src/protocols/sametime/sametime.c:3210
+#: ../libgaim/protocols/sametime/sametime.c:3203
 msgid "Speakers"
 msgstr "喇叭"
 
 # XXX 暫譯
-#: ../src/protocols/sametime/sametime.c:3211
+#: ../libgaim/protocols/sametime/sametime.c:3204
 msgid "Video Camera"
 msgstr "視訊"
 
-#: ../src/protocols/sametime/sametime.c:3215
+#: ../libgaim/protocols/sametime/sametime.c:3208
 msgid "File Transfer"
 msgstr "檔案傳輸"
 
-#: ../src/protocols/sametime/sametime.c:3249
+#: ../libgaim/protocols/sametime/sametime.c:3242
 #, c-format
 msgid ""
 "\n"
@@ -10504,7 +12075,7 @@
 "\n"
 "<b>支援:</b>%s"
 
-#: ../src/protocols/sametime/sametime.c:3254
+#: ../libgaim/protocols/sametime/sametime.c:3247
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -10512,146 +12083,164 @@
 "\n"
 "<b>外部使用者<b>"
 
-#: ../src/protocols/sametime/sametime.c:3360
+#: ../libgaim/protocols/sametime/sametime.c:3353
 msgid "Create conference with user"
 msgstr "與使用者建立會議室"
 
-#: ../src/protocols/sametime/sametime.c:3361
-#, c-format
-msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+#: ../libgaim/protocols/sametime/sametime.c:3354
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
 msgstr "請為新的會議室輸入一個主題,同時發出一個邀請訊息給%s"
 
-#: ../src/protocols/sametime/sametime.c:3365
+#: ../libgaim/protocols/sametime/sametime.c:3358
 msgid "New Conference"
 msgstr "新會議室"
 
-#: ../src/protocols/sametime/sametime.c:3367
+#: ../libgaim/protocols/sametime/sametime.c:3360
 msgid "Create"
 msgstr "建立"
 
-#: ../src/protocols/sametime/sametime.c:3431
+#: ../libgaim/protocols/sametime/sametime.c:3424
 msgid "Available Conferences"
 msgstr "現有會議室"
 
-#: ../src/protocols/sametime/sametime.c:3437
+#: ../libgaim/protocols/sametime/sametime.c:3430
 msgid "Create New Conference..."
 msgstr "開啟新會議室..."
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../src/protocols/sametime/sametime.c:3444
+#: ../libgaim/protocols/sametime/sametime.c:3437
 msgid "Invite user to a conference"
 msgstr "邀請使用者進入會議室"
 
-#: ../src/protocols/sametime/sametime.c:3445
-#, c-format
-msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
-msgstr "從下方的清單中選取一個會議室,同時發出邀請給使用者%s。如果您想開啟一個新的會議室,並且邀請這個使用者加入,您可以選擇「開啟新會議室」選項。"
+#: ../libgaim/protocols/sametime/sametime.c:3438
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+"從下方的清單中選取一個會議室,同時發出邀請給使用者%s。如果您想開啟一個新的會"
+"議室,並且邀請這個使用者加入,您可以選擇「開啟新會議室」選項。"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../src/protocols/sametime/sametime.c:3450
+#: ../libgaim/protocols/sametime/sametime.c:3443
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
-#: ../src/protocols/sametime/sametime.c:3452
-msgid "Invite"
-msgstr "邀請"
-
-#: ../src/protocols/sametime/sametime.c:3540
+#: ../libgaim/protocols/sametime/sametime.c:3533
 msgid "Invite to Conference..."
 msgstr "邀請進入會議室"
 
-#: ../src/protocols/sametime/sametime.c:3545
+#  XXX 要覆查 - 20061029
+#: ../libgaim/protocols/sametime/sametime.c:3538
 msgid "Send TEST Announcement"
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:3592
+msgstr "送出測試通告"
+
+#: ../libgaim/protocols/sametime/sametime.c:3585
 msgid "No Sametime Community Server specified"
 msgstr "未指定 Sametime 社群伺服器"
 
-#: ../src/protocols/sametime/sametime.c:3614
-#, c-format
-msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
-msgstr ""
-
-#: ../src/protocols/sametime/sametime.c:3619
+# NOTE「Meanwhile」指實作「Sametime」協定的一個軟體,不是連接詞
+#: ../libgaim/protocols/sametime/sametime.c:3607
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"Meanwhile 帳號「%s」尚未設定主機名稱或 IP 位址,請在下面輸入其一,以便繼續登"
+"入。"
+
+# NOTE「Meanwhile」指實作「Sametime」協定的一個軟體,不是連接詞
+#: ../libgaim/protocols/sametime/sametime.c:3612
 msgid "Meanwhile Connection Setup"
-msgstr "正在進行連線設定"
-
-#: ../src/protocols/sametime/sametime.c:3620
+msgstr "Meanwhile 連線設定"
+
+#: ../libgaim/protocols/sametime/sametime.c:3613
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
-#: ../src/protocols/sametime/sametime.c:4082
+#: ../libgaim/protocols/sametime/sametime.c:4075
 msgid "<b>External User</b><br>"
 msgstr "<b>外部使用者</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4085
+#: ../libgaim/protocols/sametime/sametime.c:4078
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>使用者帳號:</b>%s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4091
+#: ../libgaim/protocols/sametime/sametime.c:4084
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>全名:</b>%s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4097
+#: ../libgaim/protocols/sametime/sametime.c:4090
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>上次已知用戶端:</b>"
 
-#: ../src/protocols/sametime/sametime.c:4105
+#: ../libgaim/protocols/sametime/sametime.c:4098
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知(0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4112
+#: ../libgaim/protocols/sametime/sametime.c:4105
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>支援:</b>%s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4118
+#: ../libgaim/protocols/sametime/sametime.c:4111
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>狀態:</b>%s"
 
-#: ../src/protocols/sametime/sametime.c:4261
-#: ../src/protocols/sametime/sametime.c:5424
+#: ../libgaim/protocols/sametime/sametime.c:4254
+#: ../libgaim/protocols/sametime/sametime.c:5418
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../src/protocols/sametime/sametime.c:4264
-#: ../src/protocols/sametime/sametime.c:5427
+#: ../libgaim/protocols/sametime/sametime.c:4257
+#: ../libgaim/protocols/sametime/sametime.c:5421
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../src/protocols/sametime/sametime.c:4288
+#: ../libgaim/protocols/sametime/sametime.c:4281
 msgid "An ambiguous user ID was entered"
 msgstr "輸入了一個不明的使用者 ID"
 
-#: ../src/protocols/sametime/sametime.c:4289
-#, fuzzy, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
-msgstr "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
-
-#: ../src/protocols/sametime/sametime.c:4294
+#: ../libgaim/protocols/sametime/sametime.c:4282
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"「%s」可能指下列任何一個使用者。請從清單選擇正確的使用者,以便新增至好友清單"
+"內。"
+
+#: ../libgaim/protocols/sametime/sametime.c:4287
 msgid "Select User"
 msgstr "選擇使用者"
 
 #  TODO 請覆查,譯文有待改進
-#: ../src/protocols/sametime/sametime.c:4364
+#: ../libgaim/protocols/sametime/sametime.c:4357
 msgid "Unable to add user: user not found"
 msgstr "無法新增使用者:找不到使用者"
 
-#: ../src/protocols/sametime/sametime.c:4366
-#, c-format
-msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
-msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。它將從您的好友清單中被移除。"
-
-#: ../src/protocols/sametime/sametime.c:4371
+#: ../libgaim/protocols/sametime/sametime.c:4359
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"「%s」與您在 Sametime 社群中的任何使用者帳號不符。它將從您的好友清單中被移"
+"除。"
+
+#: ../libgaim/protocols/sametime/sametime.c:4364
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
-#: ../src/protocols/sametime/sametime.c:4943
+#: ../libgaim/protocols/sametime/sametime.c:4936
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10660,208 +12249,221 @@
 "讀取檔案 %s 發生錯誤;\n"
 "%s\n"
 
-#: ../src/protocols/sametime/sametime.c:5074
+#: ../libgaim/protocols/sametime/sametime.c:5068
 msgid "Remotely Stored Buddy List"
 msgstr "好友清單存放於遠端"
 
-#: ../src/protocols/sametime/sametime.c:5079
+#: ../libgaim/protocols/sametime/sametime.c:5073
 msgid "Buddy List Storage Mode"
 msgstr "好友清單儲存模式"
 
-#: ../src/protocols/sametime/sametime.c:5082
+#: ../libgaim/protocols/sametime/sametime.c:5076
 msgid "Local Buddy List Only"
 msgstr "好友清單只存放於本機"
 
-#: ../src/protocols/sametime/sametime.c:5084
+#: ../libgaim/protocols/sametime/sametime.c:5078
 msgid "Merge List from Server"
 msgstr "合併伺服器上的好友清單至本機"
 
-#: ../src/protocols/sametime/sametime.c:5086
+#: ../libgaim/protocols/sametime/sametime.c:5080
 msgid "Merge and Save List to Server"
 msgstr "合併並存放好友清單至伺服器"
 
-#: ../src/protocols/sametime/sametime.c:5088
+#: ../libgaim/protocols/sametime/sametime.c:5082
 msgid "Synchronize List with Server"
 msgstr "與伺服器同步清單"
 
-#: ../src/protocols/sametime/sametime.c:5137
+#: ../libgaim/protocols/sametime/sametime.c:5131
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "匯入 Sametime 清單給帳號「%s」"
 
-#: ../src/protocols/sametime/sametime.c:5176
+#: ../libgaim/protocols/sametime/sametime.c:5170
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "匯出 Sametime 清單給帳號「%s」"
 
-#: ../src/protocols/sametime/sametime.c:5229
+#: ../libgaim/protocols/sametime/sametime.c:5223
 msgid "Unable to add group: group exists"
 msgstr "無法新增群組:群組已存在"
 
-#: ../src/protocols/sametime/sametime.c:5230
+#: ../libgaim/protocols/sametime/sametime.c:5224
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "群組名稱「%s」已經存在於您的好友清單中。"
 
-#: ../src/protocols/sametime/sametime.c:5233
-#: ../src/protocols/sametime/sametime.c:5362
+#: ../libgaim/protocols/sametime/sametime.c:5227
+#: ../libgaim/protocols/sametime/sametime.c:5356
 msgid "Unable to add group"
 msgstr "無法新增群組"
 
-#: ../src/protocols/sametime/sametime.c:5292
+#: ../libgaim/protocols/sametime/sametime.c:5286
 msgid "Possible Matches"
 msgstr "可能相符的項目"
 
-#: ../src/protocols/sametime/sametime.c:5308
+#: ../libgaim/protocols/sametime/sametime.c:5302
 msgid "Notes Address Book group results"
 msgstr "Notes 通訊錄結果"
 
-#: ../src/protocols/sametime/sametime.c:5309
-#, c-format
-msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
-msgstr "「%s」可能參考到下列的 Notes 通訊錄群組。請自下方選取正確的群組,以加入您的好友清單。"
-
-#: ../src/protocols/sametime/sametime.c:5314
+#: ../libgaim/protocols/sametime/sametime.c:5303
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+"「%s」可能參考到下列的 Notes 通訊錄群組。請自下方選取正確的群組,以加入您的好"
+"友清單。"
+
+#: ../libgaim/protocols/sametime/sametime.c:5308
 msgid "Select Notes Address Book"
 msgstr "選擇 Notes 通訊錄"
 
-#: ../src/protocols/sametime/sametime.c:5356
+#: ../libgaim/protocols/sametime/sametime.c:5350
 msgid "Unable to add group: group not found"
 msgstr "無法新增群組:找不到群組"
 
-#: ../src/protocols/sametime/sametime.c:5358
-#, c-format
-msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+#: ../libgaim/protocols/sametime/sametime.c:5352
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
 msgstr "在您的 Sametime 社群中,並沒有任何與「%s」相符的 Notes 通訊錄群組。"
 
-#: ../src/protocols/sametime/sametime.c:5399
+#: ../libgaim/protocols/sametime/sametime.c:5393
 msgid "Notes Address Book Group"
 msgstr "Notes 通訊錄群組"
 
-#: ../src/protocols/sametime/sametime.c:5400
-msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
-msgstr "輸入 Notes 通訊錄群組名稱於欄位中,以新增這個群組及它所屬的成員到您的好友清單中。"
-
-#: ../src/protocols/sametime/sametime.c:5448
+#: ../libgaim/protocols/sametime/sametime.c:5394
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+"輸入 Notes 通訊錄群組名稱於欄位中,以新增這個群組及它所屬的成員到您的好友清單"
+"中。"
+
+#: ../libgaim/protocols/sametime/sametime.c:5442
 #, c-format
 msgid "Search results for '%s'"
-msgstr "對 '%s' 的搜尋結果"
-
-#: ../src/protocols/sametime/sametime.c:5449
-#, fuzzy, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
-msgstr "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
-
-#: ../src/protocols/sametime/sametime.c:5481
+msgstr "對「%s」的搜尋結果"
+
+#: ../libgaim/protocols/sametime/sametime.c:5443
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+"「%s」可能指下列任何一個使用者。您可使用下面的按紐,把他(她)們新增至好友清"
+"單內,或向他(她)們發出訊息。"
+
+#: ../libgaim/protocols/sametime/sametime.c:5475
 msgid "No matches"
 msgstr "沒有相符合的"
 
-#: ../src/protocols/sametime/sametime.c:5482
-#, fuzzy, c-format
+#: ../libgaim/protocols/sametime/sametime.c:5476
+#, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。它將從您的好友清單中被移除。"
-
-#: ../src/protocols/sametime/sametime.c:5486
+msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。"
+
+#: ../libgaim/protocols/sametime/sametime.c:5480
 msgid "No Matches"
 msgstr "沒有相符合的"
 
-#: ../src/protocols/sametime/sametime.c:5523
+#: ../libgaim/protocols/sametime/sametime.c:5517
 msgid "Search for a user"
 msgstr "搜尋一個使用者"
 
-#: ../src/protocols/sametime/sametime.c:5524
-msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+#: ../libgaim/protocols/sametime/sametime.c:5518
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
 msgstr "輸入姓名或部份 ID 於下方的欄位,來查詢您 Sametime 社群中符合的使用者。"
 
-#: ../src/protocols/sametime/sametime.c:5527
+#: ../libgaim/protocols/sametime/sametime.c:5521
 msgid "User Search"
 msgstr "使用者搜尋"
 
-#: ../src/protocols/sametime/sametime.c:5539
+#: ../libgaim/protocols/sametime/sametime.c:5533
 msgid "Import Sametime List..."
 msgstr "匯入 Sametime 清單..."
 
-#: ../src/protocols/sametime/sametime.c:5543
+#: ../libgaim/protocols/sametime/sametime.c:5537
 msgid "Export Sametime List..."
 msgstr "匯出 Sametime 清單..."
 
-#: ../src/protocols/sametime/sametime.c:5547
+#: ../libgaim/protocols/sametime/sametime.c:5541
 msgid "Add Notes Address Book Group..."
 msgstr "新增 Notes 通訊錄群組"
 
-#: ../src/protocols/sametime/sametime.c:5551
+#: ../libgaim/protocols/sametime/sametime.c:5545
 msgid "User Search..."
 msgstr "使用者搜尋..."
 
-#: ../src/protocols/sametime/sametime.c:5648
+#: ../libgaim/protocols/sametime/sametime.c:5642
 msgid "Force login (ignore server redirects)"
-msgstr "強行登入(忽略伺服器重新導向)"
+msgstr "強行登入(忽略伺服器重新導向)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5658
+#: ../libgaim/protocols/sametime/sametime.c:5652
 msgid "Hide client identity"
 msgstr "隱藏客戶端識別"
 
-#: ../src/protocols/silc/buddy.c:52
-#: ../src/protocols/silc/buddy.c:420
-#: ../src/protocols/silc/buddy.c:545
-#: ../src/protocols/silc/buddy.c:711
-#: ../src/protocols/silc/ft.c:338
+#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
+#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
+#: ../libgaim/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "使用者 %s 不在網路上"
 
-#: ../src/protocols/silc/buddy.c:53
-#: ../src/protocols/silc/buddy.c:115
-#: ../src/protocols/silc/buddy.c:120
-#: ../src/protocols/silc/buddy.c:124
-#: ../src/protocols/silc/buddy.c:129
-#: ../src/protocols/silc/buddy.c:134
-#: ../src/protocols/silc/buddy.c:139
-#: ../src/protocols/silc/buddy.c:257
+#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
+#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
+#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
+#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "交換密鑰"
 
-#: ../src/protocols/silc/buddy.c:54
+#: ../libgaim/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "無法交換密鑰"
 
-#: ../src/protocols/silc/buddy.c:116
+#: ../libgaim/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "交換密鑰中出現錯誤"
 
-#: ../src/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "交換密鑰失敗"
 
-#: ../src/protocols/silc/buddy.c:125
+#: ../libgaim/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "交換密鑰逾時"
 
-#: ../src/protocols/silc/buddy.c:130
+#: ../libgaim/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "交換密鑰被中止"
 
-#: ../src/protocols/silc/buddy.c:135
+#: ../libgaim/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "交換密鑰己開始"
 
-#: ../src/protocols/silc/buddy.c:140
+#: ../libgaim/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "不可與自己交換密鑰"
 
-#: ../src/protocols/silc/buddy.c:258
-#: ../src/protocols/silc/buddy.c:388
-#: ../src/protocols/silc/buddy.c:513
+#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
+#: ../libgaim/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "遠端使用者已不在網路上"
 
-#: ../src/protocols/silc/buddy.c:294
-#, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+#: ../libgaim/protocols/silc/buddy.c:294
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
 msgstr "由 %s 收到一個交換密鑰要求,您想交換密鑰嗎?"
 
-#: ../src/protocols/silc/buddy.c:298
+#: ../libgaim/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10872,688 +12474,647 @@
 "遠端主機 :%s\n"
 "遠端通訊埠:%d"
 
-#: ../src/protocols/silc/buddy.c:311
+#: ../libgaim/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "交換密鑰要求"
 
-#: ../src/protocols/silc/buddy.c:387
-#: ../src/protocols/silc/buddy.c:422
-#: ../src/protocols/silc/buddy.c:464
+#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
+#: ../libgaim/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "有密碼之即時訊息"
 
-#: ../src/protocols/silc/buddy.c:423
+#: ../libgaim/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "無法設定即時訊息密鑰"
 
-#: ../src/protocols/silc/buddy.c:465
+#: ../libgaim/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "設定即時訊息密碼"
 
-#: ../src/protocols/silc/buddy.c:512
-#: ../src/protocols/silc/buddy.c:547
-#: ../src/protocols/silc/ops.c:1492
-#: ../src/protocols/silc/ops.c:1503
+#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
+#: ../libgaim/protocols/silc/ops.c:1492 ../libgaim/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "取得公鑰"
 
-#: ../src/protocols/silc/buddy.c:548
-#: ../src/protocols/silc/ops.c:1493
-#: ../src/protocols/silc/ops.c:1504
+#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1493
+#: ../libgaim/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "無法取得公鑰"
 
-#: ../src/protocols/silc/buddy.c:634
-#: ../src/protocols/silc/buddy.c:1647
+#: ../libgaim/protocols/silc/buddy.c:634
+#: ../libgaim/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "顯示公鑰"
 
-#: ../src/protocols/silc/buddy.c:635
-#: ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:237
+#: ../libgaim/protocols/silc/buddy.c:635
+#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "無法載入公鑰"
 
-#: ../src/protocols/silc/buddy.c:712
-#: ../src/protocols/silc/ops.c:1087
-#: ../src/protocols/silc/ops.c:1159
-#: ../src/protocols/silc/ops.c:1294
-#: ../src/protocols/silc/ops.c:1295
-#: ../src/protocols/silc/ops.c:1313
+#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
+#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
+#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: ../src/protocols/silc/buddy.c:713
-#: ../src/protocols/silc/ops.c:1160
-#: ../src/protocols/silc/ops.c:1314
+#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
+#: ../libgaim/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
-#: ../src/protocols/silc/buddy.c:734
+#: ../libgaim/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "好友 %s 不被信任"
 
-#: ../src/protocols/silc/buddy.c:737
-msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
-msgstr "直至您匯入好友的公鑰,您將無法收到該好友的好友通知。要取得公鑰,用「取得公鑰」指令即可。"
+#: ../libgaim/protocols/silc/buddy.c:737
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"直至您匯入好友的公鑰,您將無法收到該好友的好友通知。要取得公鑰,用「取得公"
+"鑰」指令即可。"
 
 #. Open file selector to select the public key.
-#: ../src/protocols/silc/buddy.c:1064
+#: ../libgaim/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "開啟..."
 
-#: ../src/protocols/silc/buddy.c:1073
+#: ../libgaim/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "好友 %s 不在網路上"
 
-#: ../src/protocols/silc/buddy.c:1076
-msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+#: ../libgaim/protocols/silc/buddy.c:1076
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
 msgstr "要新增好友,必須匯入他(她)的公鑰。要匯入公鑰,請按「匯入」。"
 
-#: ../src/protocols/silc/buddy.c:1079
+#: ../libgaim/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr "匯入(_I)..."
 
-#: ../src/protocols/silc/buddy.c:1175
+#: ../libgaim/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "選擇正確的使用者"
 
-#: ../src/protocols/silc/buddy.c:1177
-msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
-msgstr "超過一個使用者使用同一公鑰。請從清單選擇正確的使用者,以便新增至好友清單內。"
-
-#: ../src/protocols/silc/buddy.c:1179
-msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
-msgstr "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
-
-#: ../src/protocols/silc/buddy.c:1467
+#: ../libgaim/protocols/silc/buddy.c:1177
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"超過一個使用者使用同一公鑰。請從清單選擇正確的使用者,以便新增至好友清單內。"
+
+#: ../libgaim/protocols/silc/buddy.c:1179
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+"超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
+
+#: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "暫停連線"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: ../src/protocols/silc/buddy.c:1471
-#: ../src/protocols/silc/silc.c:55
+#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "不適"
 
 #  XXX
-#: ../src/protocols/silc/buddy.c:1475
-#: ../src/protocols/silc/silc.c:57
+#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "叫醒我!"
 
 #  XXX
-#: ../src/protocols/silc/buddy.c:1477
-#: ../src/protocols/silc/silc.c:49
+#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "極度活躍"
 
-#: ../src/protocols/silc/buddy.c:1479
+#: ../libgaim/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "機械人"
 
-#: ../src/protocols/silc/buddy.c:1486
-#: ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:487
+#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
 msgstr "開心"
 
-#: ../src/protocols/silc/buddy.c:1488
-#: ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:489
+#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
+#: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
 msgstr "憂愁"
 
-#: ../src/protocols/silc/buddy.c:1490
-#: ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:491
+#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr "憤怒"
 
-#: ../src/protocols/silc/buddy.c:1492
-#: ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:493
+#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr "嫉妒"
 
-#: ../src/protocols/silc/buddy.c:1494
-#: ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:495
+#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr "慚愧"
 
-#: ../src/protocols/silc/buddy.c:1496
-#: ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:497
+#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr "無敵"
 
-#: ../src/protocols/silc/buddy.c:1498
-#: ../src/protocols/silc/util.c:499
+#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
 msgstr "戀愛中"
 
-#: ../src/protocols/silc/buddy.c:1500
-#: ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:501
+#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr "想睡"
 
-#: ../src/protocols/silc/buddy.c:1502
-#: ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:503
+#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr "發悶"
 
-#: ../src/protocols/silc/buddy.c:1504
-#: ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:505
+#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr "興奮"
 
-#: ../src/protocols/silc/buddy.c:1506
-#: ../src/protocols/silc/silc.c:694
-#: ../src/protocols/silc/util.c:507
+#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr "憂慮"
 
-#: ../src/protocols/silc/buddy.c:1534
-#: ../src/protocols/silc/ops.c:1196
+#: ../libgaim/protocols/silc/buddy.c:1534 ../libgaim/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "使用者模式"
 
-#: ../src/protocols/silc/buddy.c:1550
-#: ../src/protocols/silc/ops.c:1205
+#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "心情"
 
-#: ../src/protocols/silc/buddy.c:1555
-#: ../src/protocols/silc/ops.c:1217
+#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
-#: ../src/protocols/silc/buddy.c:1560
-#: ../src/protocols/silc/ops.c:1222
+#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "選用語文"
 
-#: ../src/protocols/silc/buddy.c:1565
-#: ../src/protocols/silc/ops.c:1227
+#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "所用裝置"
 
-#: ../src/protocols/silc/buddy.c:1570
-#: ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:742
-#: ../src/protocols/silc/silc.c:744
+#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1232
+#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
 msgid "Timezone"
 msgstr "時區"
 
-#: ../src/protocols/silc/buddy.c:1575
-#: ../src/protocols/silc/ops.c:1237
+#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "所在位置"
 
-#: ../src/protocols/silc/buddy.c:1629
+#: ../libgaim/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "清除即時訊息密鑰"
 
-#: ../src/protocols/silc/buddy.c:1635
+#: ../libgaim/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "要交換密鑰之即時訊息"
 
-#: ../src/protocols/silc/buddy.c:1640
+#: ../libgaim/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: ../src/protocols/silc/buddy.c:1653
+#: ../libgaim/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "取得公鑰..."
 
-#: ../src/protocols/silc/buddy.c:1660
-#: ../src/protocols/silc/ops.c:1623
+#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1622
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
-#: ../src/protocols/silc/buddy.c:1670
-#: ../src/protocols/silc/chat.c:972
+#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "在白板上繪圖"
 
-#: ../src/protocols/silc/chat.c:39
+#: ../libgaim/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "密碼(_P):"
 
-#: ../src/protocols/silc/chat.c:80
+#: ../libgaim/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "頻道 %s 不在網路上"
 
-#: ../src/protocols/silc/chat.c:81
-#: ../src/protocols/silc/chat.c:174
+#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "頻道資訊"
 
-#: ../src/protocols/silc/chat.c:82
+#: ../libgaim/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "無法取得頻道資訊"
 
-#: ../src/protocols/silc/chat.c:119
+#: ../libgaim/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>頻道名稱:</b>%s"
 
-#: ../src/protocols/silc/chat.c:122
+#: ../libgaim/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>使用者人數:</b>%d"
 
-#: ../src/protocols/silc/chat.c:129
+#: ../libgaim/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>頻道創立者:</b>%s"
 
-#: ../src/protocols/silc/chat.c:138
+#: ../libgaim/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>頻道加密方式 (Cipher):</b>%s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../src/protocols/silc/chat.c:142
+#: ../libgaim/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>頻道身份驗證代碼 (HMAC):</b>%s"
 
-#: ../src/protocols/silc/chat.c:147
+#: ../libgaim/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>頻道主題:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:152
+#: ../libgaim/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>頻道模式:</b>"
 
-#: ../src/protocols/silc/chat.c:165
+#: ../libgaim/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>創立者之公鑰指紋:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:166
+#: ../libgaim/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>創立者之公鑰指紋可讀版本 (Babbleprint):</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:236
+#: ../libgaim/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "新增頻道公鑰"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:291
+#: ../libgaim/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "開啟公鑰..."
 
-#: ../src/protocols/silc/chat.c:400
+#: ../libgaim/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: ../src/protocols/silc/chat.c:407
+#: ../libgaim/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "頻道公鑰清單"
 
-#: ../src/protocols/silc/chat.c:412
-msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
-msgstr "頻道認證是用來防止頻道未經授權而被存取,認證的方法可以是透過密碼或者透過數位簽章。如果設定了密碼,加入頻道就必須事先輸入密碼;如果設定了頻道公鑰,加入頻道就必須擁有所列公鑰內之其一。"
+#: ../libgaim/protocols/silc/chat.c:412
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"頻道認證是用來防止頻道未經授權而被存取,認證的方法可以是透過密碼或者透過數位"
+"簽章。如果設定了密碼,加入頻道就必須事先輸入密碼;如果設定了頻道公鑰,加入頻"
+"道就必須擁有所列公鑰內之其一。"
 
 #  XXX 暫譯
-#: ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:422
-#: ../src/protocols/silc/chat.c:459
-#: ../src/protocols/silc/chat.c:460
-#: ../src/protocols/silc/chat.c:906
+#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
+#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
-#: ../src/protocols/silc/chat.c:423
-#: ../src/protocols/silc/chat.c:461
+#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "新增/移除"
 
 # XXX may be wrong
-#: ../src/protocols/silc/chat.c:578
+#: ../libgaim/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: ../src/protocols/silc/chat.c:582
-#: ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:950
+#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1907
+#: ../libgaim/protocols/silc/silc.c:944
 msgid "Passphrase"
 msgstr "密碼"
 
-#: ../src/protocols/silc/chat.c:593
+#: ../libgaim/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: ../src/protocols/silc/chat.c:595
+#: ../libgaim/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: ../src/protocols/silc/chat.c:722
+#: ../libgaim/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: ../src/protocols/silc/chat.c:723
+#: ../libgaim/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限;要清除使用者數目上限,輸入零即可。"
 
-#: ../src/protocols/silc/chat.c:878
-msgid "Get Info"
-msgstr "取得資訊"
-
-#: ../src/protocols/silc/chat.c:886
+#: ../libgaim/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "邀請清單"
 
 #  XXX 暫譯
-#: ../src/protocols/silc/chat.c:891
+#: ../libgaim/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: ../src/protocols/silc/chat.c:899
+#: ../libgaim/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: ../src/protocols/silc/chat.c:912
+#: ../libgaim/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: ../src/protocols/silc/chat.c:917
+#: ../libgaim/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: ../src/protocols/silc/chat.c:925
+#: ../libgaim/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: ../src/protocols/silc/chat.c:931
+#: ../libgaim/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: ../src/protocols/silc/chat.c:936
+#: ../libgaim/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: ../src/protocols/silc/chat.c:943
+#: ../libgaim/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: ../src/protocols/silc/chat.c:948
+#: ../libgaim/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: ../src/protocols/silc/chat.c:955
+#: ../libgaim/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: ../src/protocols/silc/chat.c:960
+#: ../libgaim/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
 #  XXX 暫譯
-#: ../src/protocols/silc/chat.c:1034
+#: ../libgaim/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的頻道創立者"
 
-#: ../src/protocols/silc/chat.c:1038
+#: ../libgaim/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1097
-#, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+#: ../libgaim/protocols/silc/chat.c:1097
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr "加入小圈子前,您必須首先加入頻道 %s"
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../libgaim/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: ../src/protocols/silc/chat.c:1100
+#: ../libgaim/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: ../src/protocols/silc/chat.c:1294
-#: ../src/protocols/silc/silc.c:1158
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
 msgid "Call Command"
 msgstr "呼叫指令"
 
-#: ../src/protocols/silc/chat.c:1294
-#: ../src/protocols/silc/silc.c:1158
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: ../src/protocols/silc/chat.c:1295
-#: ../src/protocols/silc/silc.c:1159
+#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
 msgid "Unknown command"
 msgstr "未知的指令"
 
 #  NOTE 這些都是視窗標題
-#: ../src/protocols/silc/ft.c:89
-#: ../src/protocols/silc/ft.c:92
-#: ../src/protocols/silc/ft.c:96
-#: ../src/protocols/silc/ft.c:100
-#: ../src/protocols/silc/ft.c:104
-#: ../src/protocols/silc/ft.c:205
-#: ../src/protocols/silc/ft.c:210
-#: ../src/protocols/silc/ft.c:215
-#: ../src/protocols/silc/ft.c:221
-#: ../src/protocols/silc/ft.c:340
+#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
+#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
+#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
+#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
+#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "安全的檔案傳輸"
 
-#: ../src/protocols/silc/ft.c:90
-#: ../src/protocols/silc/ft.c:93
-#: ../src/protocols/silc/ft.c:97
-#: ../src/protocols/silc/ft.c:101
-#: ../src/protocols/silc/ft.c:105
+#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
+#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
+#: ../libgaim/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "檔案傳輸時發生錯誤"
 
-#: ../src/protocols/silc/ft.c:94
+#: ../libgaim/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "拒絕不符權限的操作"
 
-#: ../src/protocols/silc/ft.c:98
+#: ../libgaim/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "交換密鑰失敗"
 
-#: ../src/protocols/silc/ft.c:102
+#: ../libgaim/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "檔案傳輸工作階段不存在"
 
-#: ../src/protocols/silc/ft.c:206
+#: ../libgaim/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "沒有進行中的檔案傳輸工作階段"
 
-#: ../src/protocols/silc/ft.c:211
+#: ../libgaim/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "檔案傳輸已開始"
 
-#: ../src/protocols/silc/ft.c:216
+#: ../libgaim/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "無法交換密鑰以供傳輸"
 
-#: ../src/protocols/silc/ft.c:222
+#: ../libgaim/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "無法開始檔案傳輸"
 
-#: ../src/protocols/silc/ft.c:341
+#: ../libgaim/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "無法傳送檔案"
 
-#: ../src/protocols/silc/ops.c:555
-#: ../src/protocols/silc/ops.c:564
-#: ../src/protocols/silc/ops.c:573
+#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
+#: ../libgaim/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 把 <I>%s</I> 的聊天主題修改為:%s"
 
-#: ../src/protocols/silc/ops.c:639
+#: ../libgaim/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 設定頻道 <I>%s</I> 的模式為:%s"
 
-#: ../src/protocols/silc/ops.c:643
+#: ../libgaim/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 清除了頻道 <I>%s</I> 所有的模式"
 
-#: ../src/protocols/silc/ops.c:676
+#: ../libgaim/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 設定 <I>%s</I> 的使用者模式為:%s"
 
-#: ../src/protocols/silc/ops.c:684
+#: ../libgaim/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 清除了 <I>%s's</I> 所有的模式"
 
-#: ../src/protocols/silc/ops.c:713
+#: ../libgaim/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "您被 <I>%2$s</I> 由 <I>%1$s</I> 踢出 (%3$s)"
 
-#: ../src/protocols/silc/ops.c:743
-#: ../src/protocols/silc/ops.c:748
-#: ../src/protocols/silc/ops.c:753
+#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
+#: ../libgaim/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s 從網路上移除 (%s)"
 
-#: ../src/protocols/silc/ops.c:774
-#: ../src/protocols/silc/ops.c:779
-#: ../src/protocols/silc/ops.c:784
+#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
+#: ../libgaim/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s 從網路上移除 (%s)"
 
 #  XXX 要核實
-#: ../src/protocols/silc/ops.c:830
+#: ../libgaim/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "從伺服器登出"
 
-#: ../src/protocols/silc/ops.c:1017
+#: ../libgaim/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: ../src/protocols/silc/ops.c:1040
+#: ../libgaim/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "生日"
 
-#: ../src/protocols/silc/ops.c:1048
+#: ../libgaim/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "職責"
 
-#: ../src/protocols/silc/ops.c:1052
-#: ../src/protocols/silc/silc.c:943
+#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
 msgid "Organization"
 msgstr "所屬機構"
 
-#: ../src/protocols/silc/ops.c:1056
+#: ../libgaim/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "部門"
 
-#: ../src/protocols/silc/ops.c:1080
+#: ../libgaim/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "備註"
 
-#: ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "加入聊天室"
 
-#: ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1046
+#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
 msgid "Real Name"
 msgstr "姓名"
 
-#: ../src/protocols/silc/ops.c:1211
+#: ../libgaim/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "狀態訊息"
 
-#: ../src/protocols/silc/ops.c:1284
-#: ../src/protocols/silc/ops.c:1354
+#: ../libgaim/protocols/silc/ops.c:1284 ../libgaim/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "公鑰指紋"
 
-#: ../src/protocols/silc/ops.c:1285
-#: ../src/protocols/silc/ops.c:1355
+#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "公鑰指紋可讀版本 (Babbleprint)"
 
-#: ../src/protocols/silc/ops.c:1298
+#: ../libgaim/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "更多(_M)..."
 
-#: ../src/protocols/silc/ops.c:1369
-#: ../src/protocols/silc/silc.c:1009
+#: ../libgaim/protocols/silc/ops.c:1369 ../libgaim/protocols/silc/silc.c:1003
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
-#: ../src/protocols/silc/ops.c:1369
+#: ../libgaim/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "無法暫停連線"
 
-#: ../src/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "無法設定主題"
 
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "無法更改暱稱"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "聊天室清單"
 
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "無法取得聊天室清單"
 
-#: ../src/protocols/silc/ops.c:1505
+#: ../libgaim/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "沒有收到公鑰"
 
-#: ../src/protocols/silc/ops.c:1518
-#: ../src/protocols/silc/ops.c:1531
+#: ../libgaim/protocols/silc/ops.c:1517 ../libgaim/protocols/silc/ops.c:1530
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../src/protocols/silc/ops.c:1519
+#: ../libgaim/protocols/silc/ops.c:1518
 msgid "Cannot get server information"
 msgstr "無法取得伺服器資訊"
 
-#: ../src/protocols/silc/ops.c:1548
-#: ../src/protocols/silc/ops.c:1557
+#: ../libgaim/protocols/silc/ops.c:1547 ../libgaim/protocols/silc/ops.c:1556
 msgid "Server Statistics"
 msgstr "伺服器統計資料"
 
-#: ../src/protocols/silc/ops.c:1549
+#: ../libgaim/protocols/silc/ops.c:1548
 msgid "Cannot get server statistics"
 msgstr "無法取得伺服器的統計資料"
 
-#: ../src/protocols/silc/ops.c:1558
+#: ../libgaim/protocols/silc/ops.c:1557
 msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
-#: ../src/protocols/silc/ops.c:1580
+#: ../libgaim/protocols/silc/ops.c:1579
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11588,114 +13149,115 @@
 "伺服器管理者總數:%d 人\n"
 "路由器管理者總數:%d 人\n"
 
-#: ../src/protocols/silc/ops.c:1603
+#: ../libgaim/protocols/silc/ops.c:1602
 msgid "Network Statistics"
 msgstr "網路統計資料"
 
-#: ../src/protocols/silc/ops.c:1611
-#: ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1610 ../libgaim/protocols/silc/ops.c:1615
 msgid "Ping"
 msgstr "Ping"
 
-#: ../src/protocols/silc/ops.c:1611
+#: ../libgaim/protocols/silc/ops.c:1610
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
-#: ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1615
 msgid "Ping reply received from server"
 msgstr "由伺服器收到 Ping 回應"
 
-#: ../src/protocols/silc/ops.c:1624
+#: ../libgaim/protocols/silc/ops.c:1623
 msgid "Could not kill user"
 msgstr "無法傱網路上移除使用者"
 
-#: ../src/protocols/silc/ops.c:1708
+#: ../libgaim/protocols/silc/ops.c:1707
 msgid "Error during connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
-#: ../src/protocols/silc/ops.c:1713
+#: ../libgaim/protocols/silc/ops.c:1712
 msgid "Key Exchange failed"
 msgstr "密鑰交換失敗"
 
-#: ../src/protocols/silc/ops.c:1722
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
+#: ../libgaim/protocols/silc/ops.c:1721
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
 
-#: ../src/protocols/silc/ops.c:1757
+#: ../libgaim/protocols/silc/ops.c:1756
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#: ../src/protocols/silc/ops.c:1819
-#: ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:195
+#: ../libgaim/protocols/silc/ops.c:1818 ../libgaim/protocols/silc/ops.c:1865
+#: ../libgaim/protocols/silc/silc.c:188
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
-#: ../src/protocols/silc/ops.c:1821
+#: ../libgaim/protocols/silc/ops.c:1820
 msgid "Authenticating connection"
 msgstr "為連線進行驗證中"
 
-#: ../src/protocols/silc/ops.c:1868
+#: ../libgaim/protocols/silc/ops.c:1867
 msgid "Verifying server public key"
 msgstr "核實伺服器的公鑰中"
 
-#: ../src/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/ops.c:1908
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: ../src/protocols/silc/ops.c:1938
+#: ../libgaim/protocols/silc/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗:版本不符,請更新您的用戶端程式"
 
-#: ../src/protocols/silc/ops.c:1941
+#: ../libgaim/protocols/silc/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失敗:遠端不信任/不支援您的公鑰"
 
-#: ../src/protocols/silc/ops.c:1944
+#: ../libgaim/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
 
-#: ../src/protocols/silc/ops.c:1947
+#: ../libgaim/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗:遠端不支援建議中的加密方式 (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
-#: ../src/protocols/silc/ops.c:1950
+#: ../libgaim/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
 
-#: ../src/protocols/silc/ops.c:1953
+#: ../libgaim/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗:遠端不支援建議中的雜湊函數 (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
-#: ../src/protocols/silc/ops.c:1956
+#: ../libgaim/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
 
-#: ../src/protocols/silc/ops.c:1958
+#: ../libgaim/protocols/silc/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "失敗:錯誤的簽章"
 
-#: ../src/protocols/silc/ops.c:1960
+#: ../libgaim/protocols/silc/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "失敗:無效的 Cookie"
 
-#: ../src/protocols/silc/ops.c:1971
+#: ../libgaim/protocols/silc/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
-#: ../src/protocols/silc/pk.c:103
-#, c-format
-msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
+#: ../libgaim/protocols/silc/pk.c:103
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
 msgstr "收到 %s 的公鑰,但收到的公鑰跟您現有的不同。仍然接受這個公鑰嗎?"
 
-#: ../src/protocols/silc/pk.c:108
+#: ../libgaim/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "收到 %s 的公鑰,接受這個公鑰嗎?"
 
-#: ../src/protocols/silc/pk.c:112
+#: ../libgaim/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11708,66 +13270,65 @@
 "%s\n"
 "%s\n"
 
-#: ../src/protocols/silc/pk.c:115
-#: ../src/protocols/silc/pk.c:140
+#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "核實公鑰"
 
-#: ../src/protocols/silc/pk.c:119
+#: ../libgaim/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "檢視(_V)..."
 
-#: ../src/protocols/silc/pk.c:141
+#: ../libgaim/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "不支援的公鑰類型"
 
-#: ../src/protocols/silc/silc.c:162
+#: ../libgaim/protocols/silc/silc.c:159
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: ../src/protocols/silc/silc.c:187
+#: ../libgaim/protocols/silc/silc.c:180
 msgid "Cannot initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
-#: ../src/protocols/silc/silc.c:198
+#: ../libgaim/protocols/silc/silc.c:191
 msgid "Performing key exchange"
 msgstr "交換密鑰中"
 
-#: ../src/protocols/silc/silc.c:284
+#: ../libgaim/protocols/silc/silc.c:277
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-#: ../src/protocols/silc/silc.c:330
+#: ../libgaim/protocols/silc/silc.c:323
 msgid "Cannot initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
-#: ../src/protocols/silc/silc.c:337
+#: ../libgaim/protocols/silc/silc.c:330
 msgid "Cannot find/access ~/.silc directory"
 msgstr "無法找到或存取 ~/.silc 目錄"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:342
+#: ../libgaim/protocols/silc/silc.c:335
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
-#: ../src/protocols/silc/silc.c:351
+#: ../libgaim/protocols/silc/silc.c:344
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "無法讀取 SILC 密鑰對:%s"
 
-#: ../src/protocols/silc/silc.c:371
+#: ../libgaim/protocols/silc/silc.c:365
 msgid "Unable to create connection"
 msgstr "無法建立連結"
 
-#: ../src/protocols/silc/silc.c:670
+#: ../libgaim/protocols/silc/silc.c:664
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: ../src/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/silc.c:680
 msgid "In love"
 msgstr "戀愛中"
 
-#: ../src/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/silc.c:691
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11775,266 +13336,278 @@
 "\n"
 "聯絡方法"
 
-#: ../src/protocols/silc/silc.c:705
-#: ../src/protocols/silc/util.c:532
+#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:707
-#: ../src/protocols/silc/util.c:534
+#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:709
+#: ../libgaim/protocols/silc/silc.c:703
 msgid "Video conferencing"
 msgstr "視訊會議中"
 
-#: ../src/protocols/silc/silc.c:714
+#: ../libgaim/protocols/silc/silc.c:708
 msgid "Your Current Status"
 msgstr "目前狀態"
 
 #  XXX 暫譯
-#: ../src/protocols/silc/silc.c:721
+#: ../libgaim/protocols/silc/silc.c:715
 msgid "Online Services"
 msgstr "所用之線上服務"
 
-#: ../src/protocols/silc/silc.c:724
+#: ../libgaim/protocols/silc/silc.c:718
 msgid "Let others see what services you are using"
 msgstr "讓他人可以得知您使用那些線上服務"
 
 #  NOTE XXX 原始碼顯示這個其實不是電腦類型,而是操作系統版本 :-/
-#: ../src/protocols/silc/silc.c:730
+#: ../libgaim/protocols/silc/silc.c:724
 msgid "Let others see what computer you are using"
 msgstr "容許別人查看您用的是什麼電腦"
 
-#: ../src/protocols/silc/silc.c:737
+#: ../libgaim/protocols/silc/silc.c:731
 msgid "Your VCard File"
 msgstr "您的 VCard 檔案"
 
 #  XXX 好像很怪
-#: ../src/protocols/silc/silc.c:749
-#: ../src/protocols/silc/silc.c:750
+#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
 msgid "User Online Status Attributes"
 msgstr "使用者上線狀態屬性"
 
-#: ../src/protocols/silc/silc.c:751
-msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
-msgstr "您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊,只須輸入您希望別人看得見的各項。"
-
-#: ../src/protocols/silc/silc.c:791
-#: ../src/protocols/silc/silc.c:797
-#: ../src/protocols/silc/silc.c:1436
+#: ../libgaim/protocols/silc/silc.c:745
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+"您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊,只須輸入您希望別"
+"人看得見的各項。"
+
+#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
+#: ../libgaim/protocols/silc/silc.c:1430
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: ../src/protocols/silc/silc.c:791
+#: ../libgaim/protocols/silc/silc.c:785
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: ../src/protocols/silc/silc.c:792
-#: ../src/protocols/silc/silc.c:1431
+#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: ../src/protocols/silc/silc.c:843
-#: ../src/protocols/silc/silc.c:887
-#: ../src/protocols/silc/silc.c:958
-#: ../src/protocols/silc/silc.c:959
+#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
+#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
 msgid "Create New SILC Key Pair"
 msgstr "產生新的 SILC 密錀對"
 
-#: ../src/protocols/silc/silc.c:843
+#: ../libgaim/protocols/silc/silc.c:837
 msgid "Passphrases do not match"
 msgstr "密碼不符"
 
-#: ../src/protocols/silc/silc.c:887
+#: ../libgaim/protocols/silc/silc.c:881
 msgid "Key Pair Generation failed"
 msgstr "密鑰對產生失敗"
 
-#: ../src/protocols/silc/silc.c:926
+#: ../libgaim/protocols/silc/silc.c:920
 msgid "Key length"
 msgstr "密鑰長度"
 
-#: ../src/protocols/silc/silc.c:928
+#: ../libgaim/protocols/silc/silc.c:922
 msgid "Public key file"
 msgstr "公鑰檔案"
 
-#: ../src/protocols/silc/silc.c:930
+#: ../libgaim/protocols/silc/silc.c:924
 msgid "Private key file"
 msgstr "私鑰檔案"
 
-#: ../src/protocols/silc/silc.c:953
+#: ../libgaim/protocols/silc/silc.c:947
 msgid "Passphrase (retype)"
 msgstr "密碼(再次輸入)"
 
-#: ../src/protocols/silc/silc.c:960
+#: ../libgaim/protocols/silc/silc.c:954
 msgid "Generate Key Pair"
 msgstr "產生密鑰對"
 
-#: ../src/protocols/silc/silc.c:1004
+#: ../libgaim/protocols/silc/silc.c:998
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: ../src/protocols/silc/silc.c:1013
+#: ../libgaim/protocols/silc/silc.c:1007
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../src/protocols/silc/silc.c:1017
+#: ../libgaim/protocols/silc/silc.c:1011
 msgid "Create SILC Key Pair..."
 msgstr "產生 SILC 密鑰對..."
 
-#: ../src/protocols/silc/silc.c:1116
+#: ../libgaim/protocols/silc/silc.c:1110
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
-#: ../src/protocols/silc/silc.c:1307
+#: ../libgaim/protocols/silc/silc.c:1301
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
-#: ../src/protocols/silc/silc.c:1388
+#: ../libgaim/protocols/silc/silc.c:1382
 msgid "You must specify a nick"
 msgstr "必須指定暱稱"
 
-#: ../src/protocols/silc/silc.c:1490
+#: ../libgaim/protocols/silc/silc.c:1484
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
-#: ../src/protocols/silc/silc.c:1495
+#: ../libgaim/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的頻道模式為:%s"
 
-#: ../src/protocols/silc/silc.c:1497
+#: ../libgaim/protocols/silc/silc.c:1491
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 沒有設定頻道模式"
 
-#: ../src/protocols/silc/silc.c:1510
+#: ../libgaim/protocols/silc/silc.c:1504
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s 設定頻道模式"
 
-#: ../src/protocols/silc/silc.c:1540
+#: ../libgaim/protocols/silc/silc.c:1534
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "未知的指令:%s(可能是 Gaim 的錯誤)"
 
-#: ../src/protocols/silc/silc.c:1603
+#: ../libgaim/protocols/silc/silc.c:1597
 msgid "part [channel]:  Leave the chat"
 msgstr "part [頻道]:離開聊天室"
 
-#: ../src/protocols/silc/silc.c:1607
+#: ../libgaim/protocols/silc/silc.c:1601
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [頻道]:離開聊天室"
 
-#: ../src/protocols/silc/silc.c:1611
+#: ../libgaim/protocols/silc/silc.c:1605
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]:檢視或修改聊天主題"
 
-#: ../src/protocols/silc/silc.c:1616
+#: ../libgaim/protocols/silc/silc.c:1610
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;頻道&gt; [&lt;密碼&gt;]:加入一個在網路上的聊天室"
 
-#: ../src/protocols/silc/silc.c:1620
+#: ../libgaim/protocols/silc/silc.c:1614
 msgid "list:  List channels on this network"
 msgstr "list:列出目前在網絡上的聊天室清單"
 
-#: ../src/protocols/silc/silc.c:1624
+#: ../libgaim/protocols/silc/silc.c:1618
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看這個暱稱的相關資訊"
 
-#: ../src/protocols/silc/silc.c:1628
-#: ../src/protocols/zephyr/zephyr.c:2629
+#: ../libgaim/protocols/silc/silc.c:1622
+#: ../libgaim/protocols/zephyr/zephyr.c:2681
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者"
 
-#: ../src/protocols/silc/silc.c:1632
+#: ../libgaim/protocols/silc/silc.c:1626
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;暱稱&gt; [&lt;訊息&gt;]:送出一個私人訊息給指定的使用者"
 
-#: ../src/protocols/silc/silc.c:1636
+#: ../libgaim/protocols/silc/silc.c:1630
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:顯示伺服器的是日訊息 (MOTD)"
 
-#: ../src/protocols/silc/silc.c:1640
+#: ../libgaim/protocols/silc/silc.c:1634
 msgid "detach:  Detach this session"
 msgstr "detach:暫停連線這個工作階段"
 
-#: ../src/protocols/silc/silc.c:1644
+#: ../libgaim/protocols/silc/silc.c:1638
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]:自伺服器離線,並可選擇送出指定的訊息"
 
-#: ../src/protocols/silc/silc.c:1648
+#: ../libgaim/protocols/silc/silc.c:1642
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;:執行 SILC 指定的用戶端指令"
 
-#: ../src/protocols/silc/silc.c:1654
+#: ../libgaim/protocols/silc/silc.c:1648
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]:從網路上移除暱稱"
 
-#: ../src/protocols/silc/silc.c:1658
+#: ../libgaim/protocols/silc/silc.c:1652
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱"
 
-#: ../src/protocols/silc/silc.c:1662
+#: ../libgaim/protocols/silc/silc.c:1656
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看暱稱的相關資訊"
 
-#: ../src/protocols/silc/silc.c:1666
-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+#: ../libgaim/protocols/silc/silc.c:1660
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
 msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt;]; [參數]:設定或顯示頻道模式"
 
-#: ../src/protocols/silc/silc.c:1670
-msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
-msgstr "cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;:在指定頻道修改指定的暱稱的模式"
-
-#: ../src/protocols/silc/silc.c:1674
+#: ../libgaim/protocols/silc/silc.c:1664
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;:在指定頻道修改指定的暱稱的"
+"模式"
+
+#: ../libgaim/protocols/silc/silc.c:1668
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;:設定您在網路上的模式"
 
-#: ../src/protocols/silc/silc.c:1678
+#: ../libgaim/protocols/silc/silc.c:1672
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;暱稱&gt; [-pubkey]:取得伺服器管理者的權限"
 
-#: ../src/protocols/silc/silc.c:1682
-msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
-msgstr "invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;:邀請指定的暱稱、新增指定的暱稱到頻道的被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
-
-#: ../src/protocols/silc/silc.c:1686
+#: ../libgaim/protocols/silc/silc.c:1676
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;:邀請指定的暱稱、新增指定的暱稱到頻道的"
+"被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
+
+#: ../libgaim/protocols/silc/silc.c:1680
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;頻道&gt; &lt;暱稱&gt; [備註]:把指定的暱稱從頻道中踢出"
 
 #  XXX 暫譯
-#: ../src/protocols/silc/silc.c:1690
+#: ../libgaim/protocols/silc/silc.c:1684
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]:觀看伺服器的管理細節"
 
 #  XXX 暫譯
-#: ../src/protocols/silc/silc.c:1694
+#: ../libgaim/protocols/silc/silc.c:1688
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;頻道&gt; +|-&lt;暱稱&gt;]:於指定的頻道禁止指定的用戶端"
 
-#: ../src/protocols/silc/silc.c:1698
+#: ../libgaim/protocols/silc/silc.c:1692
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;暱稱|伺服器&gt;:取得用戶端或伺服器的公鑰"
 
-#: ../src/protocols/silc/silc.c:1702
+#: ../libgaim/protocols/silc/silc.c:1696
 msgid "stats:  View server and network statistics"
 msgstr "stats:觀看伺服器及網路的統計資料"
 
-#: ../src/protocols/silc/silc.c:1706
+#: ../libgaim/protocols/silc/silc.c:1700
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:向連結的伺服器送出 PING"
 
-#: ../src/protocols/silc/silc.c:1711
+#: ../libgaim/protocols/silc/silc.c:1705
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;頻道&gt;:列出頻道中的使用者"
 
-#: ../src/protocols/silc/silc.c:1715
-msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
-msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;頻道...&gt;:列出指定的一或多個頻道的使用者或某一類使用者"
+#: ../libgaim/protocols/silc/silc.c:1709
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;頻道...&gt;:列出指定的一或"
+"多個頻道的使用者或某一類使用者"
 
 #. *< type
 #. *< ui_requirement
@@ -12045,116 +13618,116 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1824
+#: ../libgaim/protocols/silc/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1826
+#: ../libgaim/protocols/silc/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
-#: ../src/protocols/silc/silc.c:1863
+#: ../libgaim/protocols/silc/silc.c:1858
 msgid "Public Key file"
 msgstr "公鑰檔案"
 
-#: ../src/protocols/silc/silc.c:1867
+#: ../libgaim/protocols/silc/silc.c:1862
 msgid "Private Key file"
 msgstr "私鑰檔案"
 
-#: ../src/protocols/silc/silc.c:1877
+# XXX 暫譯 - 20061025
+#: ../libgaim/protocols/silc/silc.c:1872
 msgid "Cipher"
-msgstr ""
-
-#: ../src/protocols/silc/silc.c:1887
+msgstr "加密方法"
+
+#: ../libgaim/protocols/silc/silc.c:1882
 msgid "HMAC"
 msgstr "HMAC"
 
 #  XXX
-#: ../src/protocols/silc/silc.c:1890
+#: ../libgaim/protocols/silc/silc.c:1885
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
 #  TODO 譯文有待改進,這是意譯
-#: ../src/protocols/silc/silc.c:1893
+#: ../libgaim/protocols/silc/silc.c:1888
 msgid "Reject watching by other users"
 msgstr "拒絕伺服器端的好友狀態捕捉"
 
-#: ../src/protocols/silc/silc.c:1896
+#: ../libgaim/protocols/silc/silc.c:1891
 msgid "Block invites"
 msgstr "拒絕邀請"
 
 #  XXX 好像聽來很怪
-#: ../src/protocols/silc/silc.c:1899
+#: ../libgaim/protocols/silc/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: ../src/protocols/silc/silc.c:1902
+#: ../libgaim/protocols/silc/silc.c:1897
 msgid "Reject online status attribute requests"
 msgstr "拒絕上線狀態屬性要求"
 
-#: ../src/protocols/silc/silc.c:1905
+#: ../libgaim/protocols/silc/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "禁止傳送訊息至白板"
 
 # XXX 暫譯
-#: ../src/protocols/silc/silc.c:1908
+#: ../libgaim/protocols/silc/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "自動打開白板"
 
-#: ../src/protocols/silc/silc.c:1911
+#: ../libgaim/protocols/silc/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "數位簽署所有即時訊息"
 
-#: ../src/protocols/silc/util.c:207
-#: ../src/protocols/silc/util.c:233
+#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "建立 SILC key pair 中..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../src/protocols/silc/util.c:328
+#: ../libgaim/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "姓名:   \t%s\n"
 
-#: ../src/protocols/silc/util.c:330
+#: ../libgaim/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "使用者名稱:\t%s\n"
 
-#: ../src/protocols/silc/util.c:332
+#: ../libgaim/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "電子郵件:\t\t%s\n"
 
-#: ../src/protocols/silc/util.c:334
+#: ../libgaim/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主機名稱: \t%s\n"
 
-#: ../src/protocols/silc/util.c:336
+#: ../libgaim/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "所屬機構: \t%s\n"
 
-#: ../src/protocols/silc/util.c:338
+#: ../libgaim/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "國家:   \t%s\n"
 
-#: ../src/protocols/silc/util.c:339
+#: ../libgaim/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "演算法:  \t%s\n"
 
-#: ../src/protocols/silc/util.c:340
+#: ../libgaim/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "密鑰長度: \t%d 個位元\n"
 
-#: ../src/protocols/silc/util.c:342
+#: ../libgaim/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12165,7 +13738,7 @@
 "%s\n"
 "\n"
 
-#: ../src/protocols/silc/util.c:343
+#: ../libgaim/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12174,71 +13747,76 @@
 "公鑰指紋可讀版本 (Babbleprint):\n"
 "%s"
 
-#: ../src/protocols/silc/util.c:347
-#: ../src/protocols/silc/util.c:348
+#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "公鑰資訊"
 
-#: ../src/protocols/silc/util.c:530
+#: ../libgaim/protocols/silc/util.c:557
 msgid "Paging"
 msgstr "傳呼"
 
-#: ../src/protocols/silc/util.c:536
+#: ../libgaim/protocols/silc/util.c:563
 msgid "Video Conferencing"
 msgstr "視像會議"
 
-#: ../src/protocols/silc/util.c:554
+#: ../libgaim/protocols/silc/util.c:581
 msgid "Computer"
 msgstr "電腦"
 
-#: ../src/protocols/silc/util.c:558
+#: ../libgaim/protocols/silc/util.c:585
 msgid "PDA"
 msgstr "電子手帳"
 
-#: ../src/protocols/silc/util.c:560
+#: ../libgaim/protocols/silc/util.c:587
 msgid "Terminal"
 msgstr "終端機"
 
-#: ../src/protocols/silc/wb.c:284
+#: ../libgaim/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s 傳送訊息到白板。您要開啟白板嗎?"
 
-#: ../src/protocols/silc/wb.c:288
-#, c-format
-msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+#: ../libgaim/protocols/silc/wb.c:288
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
 msgstr "%s 傳送訊息到 %s 頻道的白板。您要開啟白板嗎?"
 
-#: ../src/protocols/silc/wb.c:302
+#: ../libgaim/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr "白板"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:411
+#: ../libgaim/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "無法寫入"
 
-#: ../src/protocols/simple/simple.c:426
-#: ../src/protocols/simple/simple.c:1431
+#: ../libgaim/protocols/simple/simple.c:438
+#: ../libgaim/protocols/simple/simple.c:1482
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../src/protocols/simple/simple.c:997
+#: ../libgaim/protocols/simple/simple.c:1035
 msgid "Wrong Password"
 msgstr "錯誤的密碼"
 
-#: ../src/protocols/simple/simple.c:1462
-#: ../src/protocols/simple/simple.c:1501
-#: ../src/protocols/simple/simple.c:1513
-#: ../src/protocols/simple/simple.c:1571
+#: ../libgaim/protocols/simple/simple.c:1516
+#: ../libgaim/protocols/simple/simple.c:1558
+#: ../libgaim/protocols/simple/simple.c:1571
+#: ../libgaim/protocols/simple/simple.c:1622
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../src/protocols/simple/simple.c:1483
+#: ../libgaim/protocols/simple/simple.c:1539
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../src/protocols/simple/simple.c:1593
+#: ../libgaim/protocols/simple/simple.c:1630
+msgid "Could not resolve hostname"
+msgstr "無法解析主機"
+
+#: ../libgaim/protocols/simple/simple.c:1647
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 使用者名稱不可含有空白字元或「@」符號"
 
@@ -12250,243 +13828,254 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1755
+#: ../libgaim/protocols/simple/simple.c:1815
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1756
+#: ../libgaim/protocols/simple/simple.c:1816
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../src/protocols/simple/simple.c:1778
+#: ../libgaim/protocols/simple/simple.c:1838
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態(請注意:任何人都能看到您)"
 
-#: ../src/protocols/simple/simple.c:1784
+#: ../libgaim/protocols/simple/simple.c:1844
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../src/protocols/simple/simple.c:1786
+#: ../libgaim/protocols/simple/simple.c:1846
 msgid "Use proxy"
 msgstr "使用 Proxy"
 
-#: ../src/protocols/simple/simple.c:1788
+#: ../libgaim/protocols/simple/simple.c:1848
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../src/protocols/simple/simple.c:1790
+#: ../libgaim/protocols/simple/simple.c:1850
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../src/protocols/simple/simple.c:1792
+#: ../libgaim/protocols/simple/simple.c:1852
 msgid "Auth Domain"
-msgstr ""
-
-#: ../src/protocols/toc/toc.c:139
+msgstr "認證域名"
+
+#: ../libgaim/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "找尋 %s 中"
 
-#: ../src/protocols/toc/toc.c:148
+#: ../libgaim/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
 
-#: ../src/protocols/toc/toc.c:200
+#: ../libgaim/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: ../src/protocols/toc/toc.c:482
+#: ../libgaim/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "無法寫入檔案 %s。"
 
-#: ../src/protocols/toc/toc.c:485
+#: ../libgaim/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "無法讀取檔案 %s。"
 
-#: ../src/protocols/toc/toc.c:488
+#: ../libgaim/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "訊息太長,最後的 %s 位元組被截去。"
 
-#: ../src/protocols/toc/toc.c:491
+#: ../libgaim/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../src/protocols/toc/toc.c:494
+#: ../libgaim/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允許對 %s 發出警告。"
 
-#: ../src/protocols/toc/toc.c:497
+#: ../libgaim/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄,因為您達到了伺服器所限制的發送速度。"
 
-#: ../src/protocols/toc/toc.c:500
+#: ../libgaim/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 不可以聊天。"
 
-#: ../src/protocols/toc/toc.c:503
+#: ../libgaim/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您送訊息給 %s 的速度太快了。"
 
-#: ../src/protocols/toc/toc.c:506
+#: ../libgaim/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它太大了。"
 
-#: ../src/protocols/toc/toc.c:509
+#: ../libgaim/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
 
-#: ../src/protocols/toc/toc.c:512
+#: ../libgaim/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "失敗。"
 
-#: ../src/protocols/toc/toc.c:515
+#: ../libgaim/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: ../src/protocols/toc/toc.c:518
+#: ../libgaim/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../src/protocols/toc/toc.c:521
+#: ../libgaim/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "暫時無法使用目錄服務。"
 
-#: ../src/protocols/toc/toc.c:524
+#: ../libgaim/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "禁止 E-Mail 檢查。"
 
-#: ../src/protocols/toc/toc.c:527
+#: ../libgaim/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
-#: ../src/protocols/toc/toc.c:530
+#: ../libgaim/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
-#: ../src/protocols/toc/toc.c:533
+#: ../libgaim/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
-#: ../src/protocols/toc/toc.c:537
+#: ../libgaim/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
-#: ../src/protocols/toc/toc.c:540
+#: ../libgaim/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知的失敗原因:%s。"
 
+#: ../libgaim/protocols/toc/toc.c:549
+msgid "Incorrect nickname or password."
+msgstr "錯誤的暱稱或密碼"
+
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../src/protocols/toc/toc.c:546
+#: ../libgaim/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "暫時無法使用該項服務。"
 
-#: ../src/protocols/toc/toc.c:549
+#: ../libgaim/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "您目前登入系統的警告等級太高,以致無法登入。"
 
-#: ../src/protocols/toc/toc.c:552
-msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
-msgstr "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連線,那麼您的等待時間將會更加的延長。"
-
-#: ../src/protocols/toc/toc.c:554
+#: ../libgaim/protocols/toc/toc.c:558
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
+msgstr ""
+"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+"線,那麼您的等待時間將會更加的延長。"
+
+#: ../libgaim/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "發生了一個未知的登入錯誤:%s。"
 
-#: ../src/protocols/toc/toc.c:557
+#: ../libgaim/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "一個未知的錯誤 %d 發生。資訊:%s"
 
-#: ../src/protocols/toc/toc.c:584
+#: ../libgaim/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: ../src/protocols/toc/toc.c:668
+#: ../libgaim/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "連線關閉"
 
-#: ../src/protocols/toc/toc.c:708
+#: ../libgaim/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "等待回覆中..."
 
-#: ../src/protocols/toc/toc.c:786
+#: ../libgaim/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
-#: ../src/protocols/toc/toc.c:989
+#: ../libgaim/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: ../src/protocols/toc/toc.c:993
+#: ../libgaim/protocols/toc/toc.c:999
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
 
-#: ../src/protocols/toc/toc.c:994
-msgid "When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
-msgstr "當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
-
-#: ../src/protocols/toc/toc.c:1549
+#: ../libgaim/protocols/toc/toc.c:1000
+msgid ""
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
+msgstr ""
+"當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系"
+"統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
+
+#: ../libgaim/protocols/toc/toc.c:1373
+msgid "_Group:"
+msgstr "群組(_G):"
+
+#: ../libgaim/protocols/toc/toc.c:1555
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: ../src/protocols/toc/toc.c:1689
+#: ../libgaim/protocols/toc/toc.c:1695
 msgid "Set Dir Info"
 msgstr "設定使用者個人資訊"
 
-#: ../src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "修改密碼"
-
-#: ../src/protocols/toc/toc.c:1811
+#: ../libgaim/protocols/toc/toc.c:1817
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s 以供寫入!"
 
-#: ../src/protocols/toc/toc.c:1847
+#: ../libgaim/protocols/toc/toc.c:1853
 msgid "File transfer failed; other side probably canceled."
 msgstr "檔案傳輸失敗;可能是對方取消傳輸。"
 
-#: ../src/protocols/toc/toc.c:1892
-#: ../src/protocols/toc/toc.c:1932
-#: ../src/protocols/toc/toc.c:2056
-#: ../src/protocols/toc/toc.c:2144
+#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
+#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
 msgid "Could not connect for transfer."
 msgstr "無法開啟連線以供傳輸。"
 
-#: ../src/protocols/toc/toc.c:2089
+#: ../libgaim/protocols/toc/toc.c:2095
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
-#: ../src/protocols/toc/toc.c:2189
+#: ../libgaim/protocols/toc/toc.c:2195
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
-#: ../src/protocols/toc/toc.c:2223
+#: ../libgaim/protocols/toc/toc.c:2229
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 msgstr[1] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 
-#: ../src/protocols/toc/toc.c:2230
+#: ../libgaim/protocols/toc/toc.c:2236
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他(她)。"
@@ -12501,23 +14090,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/toc/toc.c:2319
-#: ../src/protocols/toc/toc.c:2321
+#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
 # NOTE 譯文更動 by Ambrose
-#: ../src/protocols/yahoo/yahoo.c:711
+#: ../libgaim/protocols/yahoo/yahoo.c:793
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出您的 Yahoo! 訊息。"
 
-#: ../src/protocols/yahoo/yahoo.c:770
-#: ../src/protocols/yahoo/yahoo.c:3590
+#: ../libgaim/protocols/yahoo/yahoo.c:852
+#: ../libgaim/protocols/yahoo/yahoo.c:3738
 msgid "Buzz!!"
 msgstr "嗶!"
 
 # XXX 暫譯
-#: ../src/protocols/yahoo/yahoo.c:816
+#: ../libgaim/protocols/yahoo/yahoo.c:898
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息:"
@@ -12526,126 +14114,139 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:912
+#: ../libgaim/protocols/yahoo/yahoo.c:994
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "使用者 %s 想要將 %s 加入他(她)的好友清單%s%s。"
 
 #  XXX
-#: ../src/protocols/yahoo/yahoo.c:918
+#: ../libgaim/protocols/yahoo/yahoo.c:1000
 msgid "Message (optional) :"
 msgstr "訊息(可以不填):"
 
-#: ../src/protocols/yahoo/yahoo.c:960
+#: ../libgaim/protocols/yahoo/yahoo.c:1042
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他(她)新增至您的好友清單的要求。"
 
-#: ../src/protocols/yahoo/yahoo.c:963
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
-msgstr "使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%s"
-
-#: ../src/protocols/yahoo/yahoo.c:966
+#: ../libgaim/protocols/yahoo/yahoo.c:1045
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+"使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%"
+"s"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../src/protocols/yahoo/yahoo.c:1709
-#, c-format
-msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
-msgstr "Yahoo 伺服器要求了使用一種不明的認證方式,因此這個版本的 Gaim 很可能不會成功登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
-
-#: ../src/protocols/yahoo/yahoo.c:1712
+#: ../libgaim/protocols/yahoo/yahoo.c:1799
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  This version of Gaim will likely not be able to successfully sign "
+"on to Yahoo.  Check %s for updates."
+msgstr ""
+"Yahoo 伺服器要求了使用一種不明的認證方式,因此這個版本的 Gaim 很可能不會成功"
+"登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1802
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../src/protocols/yahoo/yahoo.c:1778
-#, c-format
-msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
-msgstr "您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並隨即忽略他(她),請按一下「是」。"
-
-#: ../src/protocols/yahoo/yahoo.c:1781
+#: ../libgaim/protocols/yahoo/yahoo.c:1868
+#, c-format
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+"您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並"
+"隨即忽略他(她),請按一下「是」。"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1871
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: ../src/protocols/yahoo/yahoo.c:1815
+#: ../libgaim/protocols/yahoo/yahoo.c:1905
 msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
-#: ../src/protocols/yahoo/yahoo.c:1826
+#: ../libgaim/protocols/yahoo/yahoo.c:1919
 msgid "Normal authentication failed!"
 msgstr "無法以正常程序認證!"
 
-#: ../src/protocols/yahoo/yahoo.c:1827
-msgid "The normal authentication method has failed. This means either your password is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now attempt to log in using Web Messenger authentication, which will result in reduced functionality and features."
-msgstr "無法以正常方法進行認證,這表示您輸入了錯誤的密碼,或者 Yahoo! 更改了認證方法。Gaim 隨即嘗試透過 Web Messenger 方法認證,這種認證方法只支援部分功能。"
-
-#: ../src/protocols/yahoo/yahoo.c:1835
-msgid "Incorrect password."
-msgstr "錯誤的密碼。"
-
-#: ../src/protocols/yahoo/yahoo.c:1838
+#: ../libgaim/protocols/yahoo/yahoo.c:1920
+msgid ""
+"The normal authentication method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authentication, which will result in "
+"reduced functionality and features."
+msgstr ""
+"無法以正常方法進行認證,這表示您輸入了錯誤的密碼,或者 Yahoo! 更改了認證方"
+"法。Gaim 隨即嘗試透過 Web Messenger 方法認證,這種認證方法只支援部分功能。"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:1931
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: ../src/protocols/yahoo/yahoo.c:1841
+#: ../libgaim/protocols/yahoo/yahoo.c:1934
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
 
-#: ../src/protocols/yahoo/yahoo.c:1895
+#: ../libgaim/protocols/yahoo/yahoo.c:1988
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: ../src/protocols/yahoo/yahoo.c:1898
+#: ../libgaim/protocols/yahoo/yahoo.c:1991
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../src/protocols/yahoo/yahoo.c:2017
+#: ../libgaim/protocols/yahoo/yahoo.c:2110
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../src/protocols/yahoo/yahoo.c:2159
-#: ../src/protocols/yahoo/yahoo.c:2306
-#: ../src/protocols/yahoo/yahoo.c:2321
-#: ../src/protocols/yahoo/ycht.c:472
-msgid "Unable to read"
-msgstr "無法讀取"
-
-#: ../src/protocols/yahoo/yahoo.c:2345
-#: ../src/protocols/yahoo/yahoo.c:2502
-#: ../src/protocols/yahoo/yahoo.c:2605
-#: ../src/protocols/yahoo/yahoo.c:2615
-#: ../src/protocols/yahoo/yahoochat.c:1448
-#: ../src/protocols/yahoo/yahoochat.c:1518
-#: ../src/protocols/yahoo/ycht.c:576
+# XXX 暫譯 - 20061025
+#: ../libgaim/protocols/yahoo/yahoo.c:2441
+msgid "Received unexpected HTTP response from server."
+msgstr "伺服器發出了奇怪的 HTTP 回應。"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:2465
+#: ../libgaim/protocols/yahoo/yahoo.c:2637
+#: ../libgaim/protocols/yahoo/yahoo.c:2740
+#: ../libgaim/protocols/yahoo/yahoo.c:2750
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libgaim/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../src/protocols/yahoo/yahoo.c:2721
-#: ../src/protocols/yahoo/yahoo.c:3324
+#: ../libgaim/protocols/yahoo/yahoo.c:2865
+#: ../libgaim/protocols/yahoo/yahoo.c:3472
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../src/protocols/yahoo/yahoo.c:2723
-#: ../src/protocols/yahoo/yahoo.c:3327
+#: ../libgaim/protocols/yahoo/yahoo.c:2867
+#: ../libgaim/protocols/yahoo/yahoo.c:3475
 msgid "Not at Desk"
 msgstr "不在座位"
 
-#: ../src/protocols/yahoo/yahoo.c:2725
-#: ../src/protocols/yahoo/yahoo.c:3330
+#: ../libgaim/protocols/yahoo/yahoo.c:2869
+#: ../libgaim/protocols/yahoo/yahoo.c:3478
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../src/protocols/yahoo/yahoo.c:2729
-#: ../src/protocols/yahoo/yahoo.c:3336
+#: ../libgaim/protocols/yahoo/yahoo.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:3484
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../src/protocols/yahoo/yahoo.c:2733
-#: ../src/protocols/yahoo/yahoo.c:3342
+#: ../libgaim/protocols/yahoo/yahoo.c:2877
+#: ../libgaim/protocols/yahoo/yahoo.c:3490
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -12653,91 +14254,86 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../src/protocols/yahoo/yahoo.c:2826
-#: ../src/protocols/yahoo/yahoo.c:2856
+#: ../libgaim/protocols/yahoo/yahoo.c:2970
+#: ../libgaim/protocols/yahoo/yahoo.c:3000
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: ../src/protocols/yahoo/yahoo.c:2873
-#: ../src/protocols/yahoo/yahoo.c:2932
+#: ../libgaim/protocols/yahoo/yahoo.c:3017
+#: ../libgaim/protocols/yahoo/yahoo.c:3076
 msgid "Appear Online"
-msgstr "離線"
-
-#  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: ../src/protocols/yahoo/yahoo.c:2876
-#: ../src/protocols/yahoo/yahoo.c:2953
-#, fuzzy
+msgstr "報稱上線"
+
+# NOTE Yahoo 官方譯「永遠顯示離線」,說白一點其實即是(針對某人)「長期隠身」
+#: ../libgaim/protocols/yahoo/yahoo.c:3020
+#: ../libgaim/protocols/yahoo/yahoo.c:3097
 msgid "Appear Permanently Offline"
-msgstr "離線"
-
-#: ../src/protocols/yahoo/yahoo.c:2895
-#, fuzzy
+msgstr "長期報稱離線"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3039
 msgid "Presence"
-msgstr "偏好設定"
-
-#  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: ../src/protocols/yahoo/yahoo.c:2938
+msgstr "上線狀態"
+
+# NOTE 下次登入時不報稱離線,所以加「暫時」字眼
+#: ../libgaim/protocols/yahoo/yahoo.c:3082
 msgid "Appear Offline"
-msgstr "離線"
-
-#  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: ../src/protocols/yahoo/yahoo.c:2947
-#, fuzzy
+msgstr "暫時報稱離線"
+
+#  NOTE 這是清單內的一個指令
+#: ../libgaim/protocols/yahoo/yahoo.c:3091
 msgid "Don't Appear Permanently Offline"
-msgstr "離線"
+msgstr "停止長期報稱離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../src/protocols/yahoo/yahoo.c:2995
+#: ../libgaim/protocols/yahoo/yahoo.c:3139
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../src/protocols/yahoo/yahoo.c:3001
+#: ../libgaim/protocols/yahoo/yahoo.c:3145
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../src/protocols/yahoo/yahoo.c:3029
-#, fuzzy
+#: ../libgaim/protocols/yahoo/yahoo.c:3173
 msgid "Presence Settings"
-msgstr "使用環境變數設定"
-
-#: ../src/protocols/yahoo/yahoo.c:3035
+msgstr "上線狀態設定"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3179
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-#: ../src/protocols/yahoo/yahoo.c:3067
+#: ../libgaim/protocols/yahoo/yahoo.c:3211
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../src/protocols/yahoo/yahoo.c:3076
+#: ../libgaim/protocols/yahoo/yahoo.c:3220
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: ../src/protocols/yahoo/yahoo.c:3086
+#: ../libgaim/protocols/yahoo/yahoo.c:3230
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: ../src/protocols/yahoo/yahoo.c:3090
+#: ../libgaim/protocols/yahoo/yahoo.c:3234
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
-#: ../src/protocols/yahoo/yahoo.c:3649
+#: ../libgaim/protocols/yahoo/yahoo.c:3797
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;:加入位於 Yahoo! 網路的一個聊天室"
 
-#: ../src/protocols/yahoo/yahoo.c:3654
+#: ../libgaim/protocols/yahoo/yahoo.c:3802
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:列出Yahoo網路上的聊天室清單"
 
-#: ../src/protocols/yahoo/yahoo.c:3658
+#: ../libgaim/protocols/yahoo/yahoo.c:3806
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他(她)注意"
 
-#: ../src/protocols/yahoo/yahoo.c:3662
+#: ../libgaim/protocols/yahoo/yahoo.c:3810
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -12751,262 +14347,289 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3755
-#: ../src/protocols/yahoo/yahoo.c:3757
+#: ../libgaim/protocols/yahoo/yahoo.c:3904
+#: ../libgaim/protocols/yahoo/yahoo.c:3906
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../src/protocols/yahoo/yahoo.c:3774
+#: ../libgaim/protocols/yahoo/yahoo.c:3923
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../src/protocols/yahoo/yahoo.c:3777
+#: ../libgaim/protocols/yahoo/yahoo.c:3926
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../src/protocols/yahoo/yahoo.c:3780
+#: ../libgaim/protocols/yahoo/yahoo.c:3929
 msgid "Japan Pager server"
 msgstr "傳呼伺服器(日本地區)"
 
-#: ../src/protocols/yahoo/yahoo.c:3783
+#: ../libgaim/protocols/yahoo/yahoo.c:3932
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../src/protocols/yahoo/yahoo.c:3786
+#: ../libgaim/protocols/yahoo/yahoo.c:3935
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../src/protocols/yahoo/yahoo.c:3789
+#: ../libgaim/protocols/yahoo/yahoo.c:3938
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器(日本地區)"
 
-#: ../src/protocols/yahoo/yahoo.c:3792
+#: ../libgaim/protocols/yahoo/yahoo.c:3941
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
-#: ../src/protocols/yahoo/yahoo.c:3795
+#: ../libgaim/protocols/yahoo/yahoo.c:3944
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../src/protocols/yahoo/yahoo.c:3798
+#: ../libgaim/protocols/yahoo/yahoo.c:3947
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../src/protocols/yahoo/yahoo.c:3802
+#: ../libgaim/protocols/yahoo/yahoo.c:3955
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../src/protocols/yahoo/yahoo.c:3805
+#: ../libgaim/protocols/yahoo/yahoo.c:3958
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../src/protocols/yahoo/yahoo.c:3808
+#: ../libgaim/protocols/yahoo/yahoo.c:3961
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
-#.
-#: ../src/protocols/yahoo/yahoo_doodle.c:96
-msgid "Sent Doodle request."
-msgstr "送出 Doodle 要求。"
-
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
-msgid "Unable to establish file descriptor."
-msgstr "無法建立檔案介紹。"
-
-#. TODO: what to do here - do we really have to disconnect?
-#: ../src/protocols/yahoo/yahoo_packet.c:265
-msgid "Write Error"
-msgstr "寫入錯誤"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:707
-#, c-format
-msgid "<b>IP Address:</b> %s<br>"
-msgstr "<b>IP 位址:</b>%s<br>"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:783
-msgid "Yahoo! Japan Profile"
-msgstr "Yahoo! Japan 個人資料"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:784
-msgid "Yahoo! Profile"
-msgstr "Yahoo! 個人資料"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:828
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
-msgstr "對不起,暫時並不支援內容被列為兒童不宜的個人資訊。"
-
-# NOTE 注意:鏈結在譯文之下顯示,故譯成「以下」
-#: ../src/protocols/yahoo/yahoo_profile.c:830
-msgid "If you wish to view this profile, you will need to visit this link in your web browser"
-msgstr "您如果想看這則個人資訊,請用您的瀏覽器開啟以下連結"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1012
-msgid "Yahoo! ID"
-msgstr "Yahoo! 帳號"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1084
-#: ../src/protocols/yahoo/yahoo_profile.c:1088
-#: ../src/protocols/yahoo/yahoo_profile.c:1092
-msgid "Hobbies"
-msgstr "嗜好"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1102
-#: ../src/protocols/yahoo/yahoo_profile.c:1106
-msgid "Latest News"
-msgstr "最新消息"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1127
-msgid "Home Page"
-msgstr "網頁"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1142
-msgid "Cool Link 1"
-msgstr "酷連結(一)"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1147
-msgid "Cool Link 2"
-msgstr "酷連結(二)"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1151
-msgid "Cool Link 3"
-msgstr "酷連結(三)"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
-msgid "Last Update"
-msgstr "更新日期"
-
-# NOTE 譯文更動 by Ambrose
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "無法取得使用者 %s 的個人資訊"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1176
-#, fuzzy
-msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
-msgstr "對不起,這則個人資訊似乎是使用目前尚未被支援的語言。"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1192
-msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
-msgstr "無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題,請稍後重試。"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1195
-msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
-msgstr "無法取得使用者的個人資料。這很有可能表示這個使用者並不存在;然而,Yahoo! 會不時找不到使用者的個人資料。若果您知道使用者確實存在,請稍後重試。"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1203
-msgid "The user's profile is empty."
-msgstr "這個使用者的資訊是空白的。"
-
-#: ../src/protocols/yahoo/yahoochat.c:203
+#: ../libgaim/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
 
-#: ../src/protocols/yahoo/yahoochat.c:205
+#: ../libgaim/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "邀請被婉拒了"
 
-#: ../src/protocols/yahoo/yahoochat.c:361
+#: ../libgaim/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
 
 #. -6
-#: ../src/protocols/yahoo/yahoochat.c:364
+#: ../libgaim/protocols/yahoo/yahoochat.c:364
 msgid "Unknown room"
 msgstr "未知聊天室"
 
 #. -15
-#: ../src/protocols/yahoo/yahoochat.c:367
+#: ../libgaim/protocols/yahoo/yahoochat.c:367
 msgid "Maybe the room is full"
 msgstr "也許聊天室使用者已經到達上限"
 
 #. -35
-#: ../src/protocols/yahoo/yahoochat.c:370
+#: ../libgaim/protocols/yahoo/yahoochat.c:370
 msgid "Not available"
 msgstr "聊天室不存在"
 
-#: ../src/protocols/yahoo/yahoochat.c:374
-msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+#: ../libgaim/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
 msgstr "未知的錯誤。您或許需要登出並等待五分鐘,以重新進入聊天室"
 
-#: ../src/protocols/yahoo/yahoochat.c:452
+#: ../libgaim/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您現在進入「%s」進行聊天。"
 
-#: ../src/protocols/yahoo/yahoochat.c:627
+#: ../libgaim/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
 msgstr "無法加入好友目前所在的聊天室"
 
-#: ../src/protocols/yahoo/yahoochat.c:628
+#: ../libgaim/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
 msgstr "可能他(她)並不在聊天室內?"
 
-#: ../src/protocols/yahoo/yahoochat.c:1346
-#: ../src/protocols/yahoo/yahoochat.c:1373
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Fetching the room list failed."
 msgstr "讀取聊天室清單發生錯誤。"
 
 # NOTE 解「可語音聊天的使用者數目」(marv)
-#: ../src/protocols/yahoo/yahoochat.c:1434
+#: ../libgaim/protocols/yahoo/yahoochat.c:1441
 msgid "Voices"
 msgstr "可語音聊天"
 
 # NOTE 解「可視像聊天的使用者數目」(marv)
-#: ../src/protocols/yahoo/yahoochat.c:1437
+#: ../libgaim/protocols/yahoo/yahoochat.c:1444
 msgid "Webcams"
 msgstr "可視像聊天"
 
-#: ../src/protocols/yahoo/yahoochat.c:1448
-#: ../src/protocols/yahoo/yahoochat.c:1518
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
 msgid "Unable to fetch room list."
 msgstr "無法取得聊天室清單。"
 
 # NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
 # NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
 # NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
-#: ../src/protocols/yahoo/yahoochat.c:1511
+#: ../libgaim/protocols/yahoo/yahoochat.c:1518
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#: ../src/protocols/yahoo/ycht.c:456
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
+msgid "Sent Doodle request."
+msgstr "送出 Doodle 要求。"
+
+# TODO - 覆查譯文 - 20061028
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+msgid "Unable to establish file descriptor."
+msgstr "無法建立檔案介紹。"
+
+#. TODO: what to do here - do we really have to disconnect?
+#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
+msgid "Write Error"
+msgstr "寫入錯誤"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:707
+#, c-format
+msgid "<b>IP Address:</b> %s<br>"
+msgstr "<b>IP 位址:</b>%s<br>"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:782
+msgid "Yahoo! Japan Profile"
+msgstr "Yahoo! Japan 個人資料"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
+msgid "Yahoo! Profile"
+msgstr "Yahoo! 個人資料"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:827
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr "對不起,暫時並不支援內容被列為兒童不宜的個人資訊。"
+
+# NOTE 注意:鏈結在譯文之下顯示,故譯成「以下」
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:829
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser"
+msgstr "您如果想看這則個人資訊,請用您的瀏覽器開啟以下連結"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
+msgid "Yahoo! ID"
+msgstr "Yahoo! 帳號"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1098
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
+msgid "Hobbies"
+msgstr "嗜好"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1116
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1120
+msgid "Latest News"
+msgstr "最新消息"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1141
+msgid "Home Page"
+msgstr "網頁"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1156
+msgid "Cool Link 1"
+msgstr "酷連結(一)"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+msgid "Cool Link 2"
+msgstr "酷連結(二)"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1165
+msgid "Cool Link 3"
+msgstr "酷連結(三)"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1179
+msgid "Last Update"
+msgstr "更新日期"
+
+# NOTE 譯文更動 by Ambrose
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1186
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "無法取得使用者 %s 的個人資訊"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1192
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr "對不起,這則個人資訊似乎是使用目前尚未被支援的語言或格式。"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1208
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題,請稍後重試。"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1211
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"無法取得使用者的個人資料。這很有可能表示這個使用者並不存在;然而,Yahoo! 會不"
+"時找不到使用者的個人資料。若果您知道使用者確實存在,請稍後重試。"
+
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1218
+msgid "The user's profile is empty."
+msgstr "這個使用者的資訊是空白的。"
+
+#: ../libgaim/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
-#: ../src/protocols/zephyr/zephyr.c:346
-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+#: ../libgaim/protocols/yahoo/ycht.c:475
+#, c-format
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr ""
+"與伺服器之間的連線突然中斷\n"
+"%s"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:355
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
 msgstr "(為這個訊息轉換編碼時發生了錯誤。請檢查帳號清單中的「編碼」選項)"
 
-#: ../src/protocols/zephyr/zephyr.c:701
+#: ../libgaim/protocols/zephyr/zephyr.c:753
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "無法傳送至聊天室 %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:734
-#: ../src/protocols/zephyr/zephyr.c:1151
+#: ../libgaim/protocols/zephyr/zephyr.c:786
+#: ../libgaim/protocols/zephyr/zephyr.c:1203
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>使用者:</b>%s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:738
-#: ../src/protocols/zephyr/zephyr.c:1156
+#: ../libgaim/protocols/zephyr/zephyr.c:790
+#: ../libgaim/protocols/zephyr/zephyr.c:1208
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隱藏或未登入"
 
-#: ../src/protocols/zephyr/zephyr.c:743
-#: ../src/protocols/zephyr/zephyr.c:1158
+#: ../libgaim/protocols/zephyr/zephyr.c:795
+#: ../libgaim/protocols/zephyr/zephyr.c:1210
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: ../src/protocols/zephyr/zephyr.c:1490
-#: ../src/protocols/zephyr/zephyr.c:1491
+#: ../libgaim/protocols/zephyr/zephyr.c:1542
+#: ../libgaim/protocols/zephyr/zephyr.c:1543
 msgid "Anyone"
 msgstr "任何人"
 
@@ -13017,80 +14640,92 @@
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: ../src/protocols/zephyr/zephyr.c:2298
+#: ../libgaim/protocols/zephyr/zephyr.c:2350
 msgid "_Class:"
 msgstr "類別/聊天室(_C):"
 
 # XXX 暫譯
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: ../src/protocols/zephyr/zephyr.c:2304
+#: ../libgaim/protocols/zephyr/zephyr.c:2356
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: ../src/protocols/zephyr/zephyr.c:2310
+#: ../libgaim/protocols/zephyr/zephyr.c:2362
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
 #  FIXME 暫譯
-#: ../src/protocols/zephyr/zephyr.c:2321
+#: ../libgaim/protocols/zephyr/zephyr.c:2373
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "加人聊天室(交談) %s,%s,%s 失敗"
 
-#: ../src/protocols/zephyr/zephyr.c:2634
+#: ../libgaim/protocols/zephyr/zephyr.c:2686
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;暱稱&gt;:尋找使用者"
 
-#: ../src/protocols/zephyr/zephyr.c:2639
+#: ../libgaim/protocols/zephyr/zephyr.c:2691
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;暱稱&gt;:尋找使用者"
 
-#: ../src/protocols/zephyr/zephyr.c:2644
+#: ../libgaim/protocols/zephyr/zephyr.c:2696
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: ../src/protocols/zephyr/zephyr.c:2649
+#: ../libgaim/protocols/zephyr/zephyr.c:2701
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: ../src/protocols/zephyr/zephyr.c:2654
+#: ../libgaim/protocols/zephyr/zephyr.c:2706
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: ../src/protocols/zephyr/zephyr.c:2660
+#: ../libgaim/protocols/zephyr/zephyr.c:2712
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:加入聊天室"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: ../src/protocols/zephyr/zephyr.c:2665
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+#: ../libgaim/protocols/zephyr/zephyr.c:2717
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;實體&gt;:送出訊息至&lt;訊息,<i>實體</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2671
-msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
-msgstr "zi &lt;類別&gt; &lt;實體&gt:送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
-
-#: ../src/protocols/zephyr/zephyr.c:2677
-msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;<i>類別</i>,<i>實體</i>,<i>接受者</i>&gt;"
-
-#: ../src/protocols/zephyr/zephyr.c:2683
-msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr "zir &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者</i>&gt;"
-
-#: ../src/protocols/zephyr/zephyr.c:2688
+#: ../libgaim/protocols/zephyr/zephyr.c:2723
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;類別&gt; &lt;實體&gt:送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2729
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;<i>類別</i>,<i>"
+"實體</i>,<i>接受者</i>&gt;"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2735
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
+"</i>&gt;"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2740
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;類別&gt;:送出訊息至 &lt;<i>類別</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: ../src/protocols/zephyr/zephyr.c:2794
+#: ../libgaim/protocols/zephyr/zephyr.c:2846
 msgid "Resubscribe"
 msgstr "重新加入所有聊天室"
 
 #  FIXME 要覆查譯文
-#: ../src/protocols/zephyr/zephyr.c:2797
+#: ../libgaim/protocols/zephyr/zephyr.c:2849
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
 
@@ -13104,16 +14739,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2882
-#: ../src/protocols/zephyr/zephyr.c:2884
+#: ../libgaim/protocols/zephyr/zephyr.c:2935
+#: ../libgaim/protocols/zephyr/zephyr.c:2937
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
-#: ../src/protocols/zephyr/zephyr.c:2903
+#: ../libgaim/protocols/zephyr/zephyr.c:2956
 msgid "Use tzc"
 msgstr "使用 TZC"
 
-#: ../src/protocols/zephyr/zephyr.c:2906
+#: ../libgaim/protocols/zephyr/zephyr.c:2959
 msgid "tzc command"
 msgstr "TZC 指令"
 
@@ -13123,11 +14758,11 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../src/protocols/zephyr/zephyr.c:2909
+#: ../libgaim/protocols/zephyr/zephyr.c:2962
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: ../src/protocols/zephyr/zephyr.c:2912
+#: ../libgaim/protocols/zephyr/zephyr.c:2965
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
@@ -13137,64 +14772,86 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../src/protocols/zephyr/zephyr.c:2915
+#: ../libgaim/protocols/zephyr/zephyr.c:2968
 msgid "Import from .anyone"
 msgstr "自 .anyone 檔案中匯入"
 
-#: ../src/protocols/zephyr/zephyr.c:2918
+#: ../libgaim/protocols/zephyr/zephyr.c:2971
 msgid "Import from .zephyr.subs"
 msgstr "自 .zephyr.subs 檔中匯入"
 
-#: ../src/protocols/zephyr/zephyr.c:2921
+#: ../libgaim/protocols/zephyr/zephyr.c:2974
 #, fuzzy
 msgid "Realm"
-msgstr "姓名"
+msgstr "域名"
 
 # FIXME 暫譯;譯得很差,有待改進
 # NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: ../src/protocols/zephyr/zephyr.c:2924
+#: ../libgaim/protocols/zephyr/zephyr.c:2977
 msgid "Exposure"
 msgstr "現身程度"
 
-#: ../src/proxy.c:1215
-#: ../src/proxy.c:1271
-#: ../src/proxy.c:1319
-#: ../src/proxy.c:1346
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "代理伺服器連線錯誤 %d"
-
-#. Forbidden
-#: ../src/proxy.c:1335
-#, c-format
-msgid "Access denied: proxy server forbids port %d tunnelling."
-msgstr "拒絕存取:Proxy 伺服器禁止通訊埠 %d 的資料傳送。"
+#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
+#: ../libgaim/proxy.c:1579
+#, c-format
+msgid ""
+"Unable to create socket:\n"
+"%s"
+msgstr ""
+"無法建立 Socket:\n"
+"%s"
+
+#: ../libgaim/proxy.c:644
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr "無法解析 HTTP 代理伺服應的回應:%s\n"
+
+#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
+#: ../libgaim/proxy.c:768
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr "HTTP 代理伺服器連線錯誤 %d"
+
+#: ../libgaim/proxy.c:764
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgstr "拒絕存取:HTTP 代理伺服器禁止通訊埠 %d 的資料傳送。"
+
+#: ../libgaim/proxy.c:984
+#, c-format
+msgid "Error resolving %s"
+msgstr "解析 %s 途中發生了錯誤"
+
+#: ../libgaim/proxy.c:1673
+msgid "Could not resolve host name"
+msgstr "無法解析主機"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../src/request.h:1354
+#: ../libgaim/request.h:1354
 msgid "_Accept"
 msgstr "接受(_A)"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../src/savedstatuses.c:45
+#: ../libgaim/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "我現在不在位子上"
 
-#: ../src/savedstatuses.c:524
+# FIXME 這很明顯是誤譯,但想不到怎樣寫才對 - 20061025
+#: ../libgaim/savedstatuses.c:525
 msgid "saved statuses"
 msgstr "儲存狀態"
 
-#: ../src/server.c:225
+#: ../libgaim/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: ../src/server.c:689
+#: ../libgaim/server.c:686
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13203,189 +14860,376 @@
 "%s 邀請 %s 到聊天室「%s」:\n"
 "%s"
 
-#: ../src/server.c:694
+#: ../libgaim/server.c:691
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」:\n"
 
-#: ../src/server.c:698
+#: ../libgaim/server.c:695
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
-#: ../src/status.c:153
+#: ../libgaim/status.c:153
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../src/status.c:156
+#: ../libgaim/status.c:156
 msgid "Unavailable"
 msgstr "離線"
 
-#: ../src/status.c:160
+#: ../libgaim/status.c:160
 msgid "Mobile"
 msgstr "使用行動裝置"
 
-#: ../src/status.c:622
+#: ../libgaim/status.c:611
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 改變狀態從 %s 到 %s"
 
-#: ../src/status.c:632
+#: ../libgaim/status.c:621
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 目前為 %s"
 
-#: ../src/status.c:637
+#: ../libgaim/status.c:626
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再 %s"
 
-#: ../src/status.c:1311
+#: ../libgaim/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: ../src/status.c:1328
+#: ../libgaim/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 由閒置返回"
 
-#: ../src/status.c:1394
+#: ../libgaim/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 變更狀態為閒置"
 
-#: ../src/status.c:1396
+#: ../libgaim/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 由閒置返回"
 
-#: ../src/util.c:679
+#: ../libgaim/util.c:680
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2454
+#: ../libgaim/util.c:2429
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
-#: ../src/util.c:2455
-#, c-format
-msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
+#: ../libgaim/util.c:2430
+#, 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~。"
 
-#: ../src/util.c:2908
+#: ../libgaim/util.c:2893
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../src/util.c:2911
+#: ../libgaim/util.c:2896
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../src/util.c:2937
+#: ../libgaim/util.c:2922
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../src/util.c:2949
+#: ../libgaim/util.c:2934
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../src/util.c:2957
+#: ../libgaim/util.c:2942
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] "%s, %d 小時"
-msgstr[1] "%s, %d 小時"
-
-#: ../src/util.c:2963
+msgstr[0] "%s %d 小時"
+msgstr[1] "%s %d 小時"
+
+#: ../libgaim/util.c:2948
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../src/util.c:2971
+#: ../libgaim/util.c:2956
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "%s, %d 分"
-msgstr[1] "%s, %d 分"
-
-#: ../src/util.c:2977
+msgstr[0] "%s %d 分"
+msgstr[1] "%s %d 分"
+
+#: ../libgaim/util.c:2962
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../src/util.c:3446
-msgid "g003: Error opening connection.\n"
-msgstr "g003: 連線開啟錯誤。\n"
+#: ../libgaim/util.c:3161 ../libgaim/util.c:3460
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "無法連線到「%s」"
+
+#: ../libgaim/util.c:3287
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr "無法為讀入「%s」取得足夠的記憶體,網站的伺服器可能懷有惡意。"
+
+#: ../libgaim/util.c:3324
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "讀入 %s 途中發生錯誤:%s"
+
+#: ../libgaim/util.c:3355
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "寫入 %s 途中發生了錯誤:%s"
+
+#: ../libgaim/util.c:3380
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "無法連線到 %s:%s"
+
+#~ msgid "Away / Idle"
+#~ msgstr "離開 / 閒置"
+
+#~ msgid "gaim_proxy_connect() failed"
+#~ msgstr "gaim_proxy_connect() 失敗"
+
+#~ msgid "mysql"
+#~ msgstr "mysql"
+
+#~ msgid "_Configure"
+#~ msgstr "設定(_C)"
+
+#~ msgid "Username:"
+#~ msgstr "使用者:"
+
+#, fuzzy
+#~ msgid "Host:"
+#~ msgstr "主機位址(_H):"
+
+#~ msgid "Port:"
+#~ msgstr "通訊埠:"
+
+#~ msgid "Crazychat"
+#~ msgstr "Crazychat"
+
+#~ msgid "Network Configuration"
+#~ msgstr "網路設定"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP通訊埠"
+
+#~ msgid "UDP port"
+#~ msgstr "UDP通訊埠"
+
+#~ msgid "Disabled"
+#~ msgstr "停用"
+
+#~ msgid "Blink tray icon for unread..."
+#~ msgstr "有未讀取訊息時,閃爍工作匣圖示..."
+
+#~ msgid "_Instant Messages:"
+#~ msgstr "即時訊息(_I):"
+
+#~ msgid "In hidden conversations"
+#~ msgstr "在隱藏交談"
+
+#~ msgid "C_hat Messages:"
+#~ msgstr "聊天訊息(_H):"
+
+#~ msgid "When my nick is said"
+#~ msgstr "當我的暱稱被提到"
+
+#~ msgid "System Tray Icon"
+#~ msgstr "系統工作匣圖示"
+
+#~ msgid "Displays an icon for Gaim in the system tray."
+#~ msgstr "在系統工作匣中顯示 Gaim 的圖示。"
+
+# NOTE queuing semantics clarified by marv on #gaim
+#~ msgid ""
+#~ "Displays a system tray icon (in GNOME, KDE, or Windows for example) to "
+#~ "show the current status of Gaim, allow fast access to commonly used "
+#~ "functions, and to toggle display of the buddy list. Also provides options "
+#~ "to blink for unread messages."
+#~ msgstr ""
+#~ "將 Gaim 目前的狀態,顯示於系統工作匣圖示上(例如於 GNOME、KDE 或微軟視窗"
+#~ "等),同時提供對常用功能的快速操作,以及整合好友清單的顯示。它也提供在收到"
+#~ "未讀取訊息時,閃爍工作匣圖示的功能(可選)。"
+
+#~ msgid "Cipher Test"
+#~ msgstr "加密測試"
+
+#~ msgid ""
+#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+#~ "account properties"
+#~ msgstr ""
+#~ "登入這個伺服器需要使用 TLS/SSL。請在帳號清單的「修改帳號」視窗點選「TLS 可"
+#~ "用則用」選項。"
+
+# XXX 暫譯
+#~ msgid "Use TLS if available"
+#~ msgstr "TLS 可用則用"
+
+#~ msgid "Require TLS"
+#~ msgstr "需要TLS"
+
+#~ msgid "Lost connection with server for an unknown reason."
+#~ msgstr "因為不明原因導致與伺服器連線中斷。"
+
+#~ msgid "A"
+#~ msgstr "A型"
+
+#~ msgid "B"
+#~ msgstr "B型"
+
+#~ msgid "AB"
+#~ msgstr "AB型"
+
+#~ msgid "QQ Server"
+#~ msgstr "QQ 伺服器"
+
+#~ msgid "QQ Port"
+#~ msgstr "QQ 通訊埠"
+
+#~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
+#~ msgstr "好友「%2$d」拒絕了您傳送檔案「%1$s」的要求"
+
+#~ msgid "Unable to read"
+#~ msgstr "無法讀取"
+
+#~ msgid "g003: Error opening connection.\n"
+#~ msgstr "g003: 連線開啟錯誤。\n"
+
+#~ msgid "Buddy icon:"
+#~ msgstr "好友圖示:"
+
+#~ msgid "IM the user"
+#~ msgstr "送出即時訊息給使用者"
+
+#~ msgid "Ignore the user"
+#~ msgstr "忽略使用者"
+
+#~ msgid "Get the user's information"
+#~ msgstr "取得使用者資訊"
+
+#~ msgid "Unable to read header from server"
+#~ msgstr "無法由伺服器讀取標頭資訊"
+
+#~ msgid ""
+#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
+#~ msgstr "無法由伺服器讀取資訊:%s。指令為 %hd,長度為 %hd。"
+
+#~ msgid "Unknown server error."
+#~ msgstr "未知伺服器錯誤。"
+
+#~ msgid "users: %s, files: %s, size: %sGB"
+#~ msgstr "使用者:%s,檔案:%s,大小:%sGB"
+
+#~ msgid "Unable to add \"%s\" to your Napster hotlist"
+#~ msgstr "無法將「%s」加入您的 Napster 熱門清單中"
+
+#~ msgid "%s requested your information"
+#~ msgstr "%s 查詢您的使用者資訊"
+
+#~ msgid "%s requested a PING"
+#~ msgstr "%s 要求一個 PING"
+
+#~ msgid "NAPSTER Protocol Plugin"
+#~ msgstr "NAPSTER 協定模組"
 
 #~ msgid "Unable to play sound because the chosen file (%s) does not exist."
 #~ msgstr "無法播放音效,因為所選取的檔案 (%s) 不存在。"
+
 #~ msgid ""
 #~ "Unable to play sound because the 'Command' sound method has been chosen, "
 #~ "but no command has been set."
 #~ msgstr ""
 #~ "無法播放音效,因為選取了「指令」為播放模式,可是並沒有設定任何指令。"
+
 #~ msgid ""
 #~ "Unable to play sound because the configured sound command could not be "
 #~ "launched: %s"
 #~ msgstr "無法播放音效,因為無法執行所設定的音效指令:%s"
+
 #~ msgid "Unable to initiate a new search"
 #~ msgstr "無法啟始一個新的搜尋"
+
 #~ msgid "You have a pending search. Please wait for it to finish."
 #~ msgstr "您有一個處理中的搜尋。請等候它完成。"
+
 #~ msgid "Direct IM with %s closed"
 #~ msgstr "和 %s 的即時訊息關閉"
+
 #~ msgid "Direct IM with %s failed"
 #~ msgstr "和 %s 的即時訊息失敗"
+
 #~ msgid "Unable to open Direct IM"
 #~ msgstr "無法開啟直接的即時訊息"
+
 #~ msgid "You have lost your connection to chat room %s."
 #~ msgstr "您已經由聊天室 %s 停止連線。"
+
 #~ msgid "Chat is currently unavailable"
 #~ msgstr "目前無法使用聊天室"
-#~ msgid "Unable to login to AIM"
-#~ msgstr "無法登入到 AIM"
+
 #~ msgid "Unable to create new connection."
 #~ msgstr "無法開啟新連結。"
 
 #, fuzzy
-#~ msgid "Unable to log into file transfer proxy."
-#~ msgstr "無法登入到 Rendezvous"
-
-#, fuzzy
 #~ msgid ""
 #~ "Unable to establish listener socket or no AOL proxy connection present."
 #~ msgstr "無法建立監聽器 Socket。"
-#~ msgid "Internal Error"
-#~ msgstr "內部錯誤"
+
 #~ msgid "Auth host"
 #~ msgstr "認證伺服器"
+
 #~ msgid "Auth port"
 #~ msgstr "認證通訊埠"
+
 #~ msgid "TOC host"
 #~ msgstr "TOC 伺服器"
+
 #~ msgid "TOC port"
 #~ msgstr "TOC 通訊埠"
+
 #~ msgid "Pager host"
 #~ msgstr "傳呼系統伺服器"
+
 #~ msgid "YCHT host"
 #~ msgstr "YCHT 主機"
+
 #~ msgid "YCHT port"
 #~ msgstr "YCHT 通訊埠"
+
 #~ msgid "%s logged out."
 #~ msgstr "%s 登出。"
+
 #~ msgid "Start _Voice Chat"
 #~ msgstr "開啟語音聊天"
+
 #~ msgid "Screen Name:"
 #~ msgstr "帳號:"
 
@@ -13393,117 +15237,108 @@
 #~ msgid "Background color name"
 #~ msgstr "背景顏色"
 
-#, fuzzy
-#~ msgid "Background color as a string"
-#~ msgstr "背景顏色"
-
-#, fuzzy
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "背景顏色"
-
-#, fuzzy
-#~ msgid "Background set"
-#~ msgstr "背景顏色"
 #~ msgid "Whether this tag affects the background color"
 #~ msgstr "不管這個標籤是否影響背景顏色"
+
 #~ msgid "ComboBox model"
 #~ msgstr "ComboBox樣式"
+
 #~ msgid "The model for the combo box"
 #~ msgstr "Combo Box的樣式"
+
 #~ msgid "Wrap width"
 #~ msgstr "換行寬度"
+
 #~ msgid "Wrap width for layouting the items in a grid"
 #~ msgstr "控制項在 Grid 中顯示的換行寬度"
+
 #~ msgid "Row span column"
 #~ msgstr "橫向跨欄"
+
 #~ msgid "Column span column"
 #~ msgstr "縱向跨欄"
 
-#  XXX 這個有點怪,譯錯?
-#, fuzzy
-#~ msgid "Active item"
-#~ msgstr "啟動"
-
-#, fuzzy
-#~ msgid "The item which is currently active"
-#~ msgstr "目前無法使用聊天室"
-
-#  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#, fuzzy
-#~ msgid "Appears as list"
-#~ msgstr "離線"
 #~ msgid "me is using Gaim v%s."
 #~ msgstr "我在用 Gaim v%s。"
+
 #~ msgid "Call ended."
 #~ msgstr "結束呼叫。"
+
 #~ msgid "Calling %s"
 #~ msgstr "呼叫 %s"
+
 #~ msgid "End Call"
 #~ msgstr "結束呼叫"
+
 #~ msgid "Receiving call from %s"
 #~ msgstr "收到來息 %s 的呼叫"
+
 #~ msgid "Reject Call"
 #~ msgstr "拒絕呼叫"
+
 #~ msgid "Accept call"
 #~ msgstr "接受呼叫"
+
 #~ msgid "Connected to %s"
 #~ msgstr "已連結到 %s"
+
 #~ msgid "_Mute"
 #~ msgstr "靜音(_M)"
+
 #~ msgid "Error launching <b>%s</b>: %s"
 #~ msgstr "執行「%s」時發生了錯誤:%s"
-#~ msgid "Email"
-#~ msgstr "電子郵件"
+
 #~ msgid "e-Mail"
 #~ msgstr "電子郵件"
+
 #~ msgid "Realname"
 #~ msgstr "姓名"
+
 #~ msgid "Email Address"
 #~ msgstr "電子郵件"
+
 #~ msgid "EMail"
 #~ msgstr "電子郵件"
-#~ msgid "Public Key File"
-#~ msgstr "公鑰檔案"
+
 #~ msgid "Private Key File"
 #~ msgstr "私鑰檔案"
+
 #~ msgid "Re-type Passphrase"
 #~ msgstr "再次輸入密碼"
 
-#, fuzzy
-#~ msgid "%s signed on"
-#~ msgstr "+++ %s 登入"
 #~ msgid "%s came back"
 #~ msgstr "%s 回來了"
-#~ msgid "%s signed off"
-#~ msgstr "%s 登出"
+
 #~ msgid "%s went away"
 #~ msgstr "%s 已經離開"
+
 #~ msgid "New Status..."
 #~ msgstr "新狀態..."
+
 #~ msgid "Saved Status..."
 #~ msgstr "儲存狀態..."
+
 #~ msgid "Join A Chat..."
 #~ msgstr "加入聊天室..."
 
-#, fuzzy
-#~ msgid "GtkTreeView Expander Indentation"
-#~ msgstr "GtkTreeView展開器大小"
 #~ msgid "(+%d more)"
 #~ msgstr "(以及另外 %d 個)"
+
 #~ msgid " left the room (%s)."
 #~ msgstr " 離開聊天室 (%s)。"
+
 #~ msgid "Offline "
 #~ msgstr "離線 "
 
-#, fuzzy
-#~ msgid "Conversation in %s on %s"
-#~ msgstr "與 %s 的交談"
 #~ msgid "Default"
 #~ msgstr "預設"
+
 #~ msgid "<span weight=\"bold\">From:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">來自:</span> %s\n"
+
 #~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">主題:</span> %s\n"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
 #~ "\n"
@@ -13512,16 +15347,19 @@
 #~ "<span weight=\"bold\" size=\"larger\">您收到了郵件!</span>\n"
 #~ "\n"
 #~ "%s%s%s%s"
+
 #~ msgid "Pounce Action"
 #~ msgstr "捕捉動作"
+
 #~ msgid "Custom..."
 #~ msgstr "使用者自定..."
+
 #~ msgid "_Warn"
 #~ msgstr "警告(_W)"
+
 #~ msgid "Jabber ID"
 #~ msgstr "Jabber 帳號"
-#~ msgid "Hidden"
-#~ msgstr "隱藏"
+
 #~ msgid "Away Message"
 #~ msgstr "離開訊息"
 
@@ -13529,6 +15367,7 @@
 #, fuzzy
 #~ msgid "(pending)"
 #~ msgstr "無(但正等待對方認證您)"
+
 #~ msgid "Hide IP address"
 #~ msgstr "隱藏 IP 位址"
 
@@ -13537,71 +15376,58 @@
 #~ msgid "Web aware"
 #~ msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#, fuzzy
-#~ msgid "Connected to Sametime Community Server"
-#~ msgstr "連線至 SILC 伺服器中"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status</b>: %s"
-#~ msgstr "<b>狀態:</b>%s"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message</b>: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b>%s"
-
 #  XXX 這個有點怪,譯錯?
 #~ msgid "Active"
 #~ msgstr "啟動"
+
 #~ msgid "Add User"
 #~ msgstr "新增使用者"
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#, fuzzy
-#~ msgid "NotesBuddy encoding"
-#~ msgstr "伺服器不支援給定的字元編碼"
+
 #~ msgid "Write a gtkrc file with these settings to %s"
 #~ msgstr "將這些設定寫入到 %s 的 gtkrc 檔"
+
 #~ msgid "Screenname:"
 #~ msgstr "帳號:"
+
 #~ msgid "Host name"
 #~ msgstr "主機名稱"
 
-#, fuzzy
-#~ msgid "Active Message"
-#~ msgstr "送出訊息"
-
-#, fuzzy
-#~ msgid "Busy Message"
-#~ msgstr "離開訊息"
 #~ msgid "Default status messages"
 #~ msgstr "預設狀態訊息"
+
 #~ msgid "Edit Status Messages"
 #~ msgstr "修改狀態訊息"
+
 #~ msgid "Set Status Messages..."
 #~ msgstr "設定狀態訊息..."
+
 #~ msgid "Not At Home"
 #~ msgstr "不在家"
+
 #~ msgid "Not At Desk"
 #~ msgstr "不在座位"
+
 #~ msgid "Not In Office"
 #~ msgstr "不在辦公室"
+
 #~ msgid "Hello!"
 #~ msgstr "您好!"
+
 #~ msgid "Gaim"
 #~ msgstr "Gaim"
+
 #~ msgid "Gaim - Signed off"
 #~ msgstr "Gaim - 已登出"
+
 #~ msgid "Gaim - Away"
 #~ msgstr "Gaim - 離開"
+
 #~ msgid "Set account idle time"
 #~ msgstr "設定帳號閒置時間"
+
 #~ msgid "Unset account idle time"
 #~ msgstr "取消帳號閒置時間設定"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -13610,35 +15436,41 @@
 #~ "\n"
 #~ "\n"
 #~ "您想將他(她)加入到您的好友名單中嗎?"
+
 #~ msgid "_Alias Buddy..."
 #~ msgstr "為這個好友加上別名(_A)..."
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
 #~ msgid "Alias Contact..."
 #~ msgstr "為這組好友加上別名..."
+
 #~ msgid "/Tools/Account Ac_tions"
 #~ msgstr "/工具/帳號相關指令(_T)"
+
 #~ msgid "/Tools/A_ccounts"
 #~ msgstr "/工具/帳號清單(_C)"
+
 #~ msgid "Idle "
 #~ msgstr "閒置 "
+
 #~ msgid "/Tools/Account Actions"
 #~ msgstr "/工具/帳號相關指令"
+
 #~ msgid "Active Developers"
 #~ msgstr "現任開發者"
-#, fuzzy
-#~ msgid "_Keep this pounce after the first time it runs"
-#~ msgstr "儲存設定並啟動(_E)"
-
-#, fuzzy
+
 #~ msgid "Change password"
 #~ msgstr "修改密碼"
+
 #~ msgid "Error processing event or response (%s)."
 #~ msgstr "處理事件或回覆時發生錯誤 (%s)。"
+
 #~ msgid "Error Message Suppression"
 #~ msgstr "錯誤訊息抑遏"
+
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "不顯示中斷連線錯誤"
+
 #~ msgid "Hide Login Errors"
 #~ msgstr "不顯示登入錯誤"
 
@@ -13662,11 +15494,14 @@
 #  *< id
 #~ msgid "Auto-Reconnect"
 #~ msgstr "自動重新連線"
+
 #~ msgid "When you are kicked offline, this reconnects you."
 #~ msgstr "當你斷線時,系統會自動幫你重新連線。"
+
 # NOTE 譯文核實 by Etan Reisner (開發者之一)
 #~ msgid "Use last matching buddy"
 #~ msgstr "使用最後(而非最先)一個匹配的好友帳號"
+
 # NOTE 每行不可太長,並要人手用「\n」分隔,否則視窗會過闊
 #, fuzzy
 #~ msgid ""
@@ -13682,26 +15517,31 @@
 #~ "「離線」狀態預設得 4 分,「離開」兩分,「閒置」1 分。\n"
 #~ "要得出預設的優先次序「沒閒置→閒置→離開→離開兼閒置」,\n"
 #~ "使用上列的預設值即可。"
+
 #~ msgid "_Keep the dialog open"
 #~ msgstr "保持對話框開啟(_K)"
+
 #~ msgid "A_way"
 #~ msgstr "離開(_W)"
+
 #~ msgid "_Idle"
 #~ msgstr "閒置(_I)"
+
 #~ msgid "Retur_n from idle"
 #~ msgstr "由閒置返回(_N)"
+
 #~ msgid "Bro_wse..."
 #~ msgstr "瀏覽(_W)..."
+
 #~ msgid "Remove Buddy Pounce"
 #~ msgstr "移除好友狀態捕捉"
+
 #~ msgid "_Queue new messages when away"
 #~ msgstr "在離開時,將所有的新訊息置入佇列中(_Q)"
 
-#, fuzzy
-#~ msgid "Could't open file"
-#~ msgstr "無法傳送檔案"
 #~ msgid "Unable to set AIM away message."
 #~ msgstr "無法設定 AIM 離開訊息。"
+
 #~ msgid ""
 #~ "You have probably requested to set your away message before the login "
 #~ "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -13709,28 +15549,31 @@
 #~ msgstr ""
 #~ "您試著在登入程序完成前修改您的離開訊息,您的狀態將維持目前所設定的狀態。請"
 #~ "在完全登入後再設定一次。"
+
 #~ msgid "Verify all IM message signatures"
 #~ msgstr "核實所有即時訊息的簽章"
+
 #~ msgid "Digitally sign all channel messages"
 #~ msgstr "數位簽署所有頻道訊息"
+
 #~ msgid "Verify all channel message signatures"
 #~ msgstr "核實所有頻道訊息的簽章"
 
-#, fuzzy
-#~ msgid "Stealth"
-#~ msgstr "省/州"
 #~ msgid "(%d message)"
 #~ msgid_plural "(%d messages)"
 #~ msgstr[0] "(%d 個訊息)"
 #~ msgstr[1] "(%d 個訊息)"
+
 #~ msgid "(1 message)"
 #~ msgstr "(一個訊息)"
 
 #, fuzzy
 #~ msgid "Default auto-away"
 #~ msgstr "自動離開"
+
 #~ msgid "_Sorting:"
 #~ msgstr "排序方式(_S):"
+
 #~ msgid "Buddy Display"
 #~ msgstr "好友顯示"
 
@@ -13738,10 +15581,12 @@
 #, fuzzy
 #~ msgid "Show more buddy details"
 #~ msgstr "顯示使用者細節"
+
 #~ msgid "Gnome Default"
 #~ msgstr "GNOME預設值"
+
 #~ msgid "Away m_essage:"
 #~ msgstr "離開訊息(_M):"
+
 #~ msgid "IRC"
 #~ msgstr "IRC"
-