From: <lsc...@us...> - 2006-10-30 22:46:59
|
Revision: 17631 http://svn.sourceforge.net/gaim/?rev=17631&view=rev Author: lschiere Date: 2006-10-30 14:45:28 -0800 (Mon, 30 Oct 2006) Log Message: ----------- several translation updates Modified Paths: -------------- trunk/gtk/gtkdialogs.c trunk/po/ChangeLog trunk/po/fa.po trunk/po/sq.po trunk/po/zh_TW.po Modified: trunk/gtk/gtkdialogs.c =================================================================== --- trunk/gtk/gtkdialogs.c 2006-10-30 21:48:42 UTC (rev 17630) +++ trunk/gtk/gtkdialogs.c 2006-10-30 22:45:28 UTC (rev 17631) @@ -136,6 +136,7 @@ {N_("Euskera(Basque)"), "eu", "Iñaki Larrañaga Murgoitio", "do...@zu..."}, {N_("Persian"), "fa", "Elnaz Sarbar", "el...@fa..."}, {N_("Persian"), "fa", "Meelad Zakaria", "me...@fa..."}, + {N_("Persian"), "fa", "Roozbeh Pournader ", "ro...@fa..."}, {N_("Finnish"), "fi", "Timo Jyrinki", "tim...@ik..."}, {N_("French"), "fr", "Éric Boumaour", "zon...@us..."}, {N_("Galician"), "gl", "Ignacio Casal Quinteiro", "nac...@gm..."}, @@ -166,6 +167,7 @@ {N_("Serbian"), "sr", "Aleksandar Urosevic", "ur...@us..."}, {N_("Slovak"), "sk", "Richard Golier", "go...@gm..."}, {N_("Slovenian"), "sl", "Matjaz Horvat", "ma...@ow..."}, + {N_("Albanian"), "sq", "Programe Shqip", "an...@us..."}, {N_("Swedish"), "sv", "Tore Lundqvist", "tl...@mi..."}, {N_("Tamil"), "ta", "Viveka Nathan K", "viv...@us..."}, {N_("Telugu"), "te", "Mr. Subbaramaih", "inf...@cd..."}, Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-10-30 21:48:42 UTC (rev 17630) +++ trunk/po/ChangeLog 2006-10-30 22:45:28 UTC (rev 17631) @@ -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 Modified: trunk/po/fa.po =================================================================== --- trunk/po/fa.po 2006-10-30 21:48:42 UTC (rev 17630) +++ trunk/po/fa.po 2006-10-30 22:45:28 UTC (rev 17631) @@ -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 <el...@fa...>, 2005, 2006. +# Elnaz Sarbar <el...@fa...>, 2005, 2006. # Meelad Zakaria <me...@fa...>, 2006. +# Roozbeh Pournader <ro...@fa...>, 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 <el...@fa...>\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" +msgstr "برای دیدن بقیهٔ پیغامهای خوانده نشده کلیک راست کنید...\n" -#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3274 +#: ../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 "فهرست رفقا نمایش داده شود" +msgstr "نمایش فهرست رفقا" -#: ../plugins/docklet/docklet.c:489 +#: ../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 "انتخاب قلم واسط" +msgstr "انتخاب قلم برای واسط" -#: ../plugins/gaimrc.c:415 +#: ../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 "" +msgstr "تم میانبر متنی GTK+" -#: ../plugins/gaimrc.c:475 +#: ../plugins/gaimrc.c:480 msgid "Interface colors" msgstr "رنگهای واسط" -#: ../plugins/gaimrc.c:499 +#: ../plugins/gaimrc.c:504 msgid "Widget Sizes" -msgstr "اندازههای ویجت" +msgstr "اندازهٔ ویجتها" -#: ../plugins/gaimrc.c:520 +#: ../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 "" -"همهی حسابهایی را که رفقا باید به طور خودکار به آنها اضافه شوند انتخاب کنید." +msgstr "همهٔ حسابهایی که رفقا به طور خودکار به آنها اضافه شوند را انتخاب کنید." +"همهٔ حسابهایی را که رفقا باید به طور خودکار به آنها اضافه شوند انتخاب کنید." -#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147 -#: ../plugins/idle.c:183 ../src/gtknotify.c:371 ../src/gtkpounce.c:1260 +#: ../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 "بیکار آفرین" +msgstr "بیکار ساز" -#: ../plugins/idle.c:160 ../plugins/idle.c:249 +#: ../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 "پاک کردن زمان بیکار شدن حساب" +msgstr "لغو زمان بیکار شدن حساب" -#: ../plugins/idle.c:196 +#: ../plugins/idle.c:199 msgid "_Unset" -msgstr "_تنظیم نشده" +msgstr "ل_غو" -#: ../plugins/idle.c:218 ../plugins/idle.c:257 +#: ../plugins/idle.c:221 ../plugins/idle.c:260 msgid "Set Idle Time for All Accounts" -msgstr "تنظیم زمان بیکار شدن برای همهی حساب ها" +msgstr "تنظیم زمان بیکار شدن برای همهٔ حسابها" -#: ../plugins/idle.c:262 +#: ../plugins/idle.c:265 msgid "Unset Idle Time for All Idled Accounts" -msgstr "پاک کردن زمان بیکاری برای همهی حسابهای بیکار شده" +msgstr "لغو زمان بیکاری برای همهٔ حسابهای بیکار شده" -#: ../plugins/idle.c:308 ../plugins/idle.c:309 +#: ../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,114 +945,132 @@ #. * 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 را ثبت میکند." +msgstr "آزمایش متصلشوندهٔ IPC، به شکل کارگزار. فرمانهای IPC را ثبت میکند." -#: ../plugins/log_reader.c:1407 +#: ../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 "پاسخ خودکار فرستاده شد:" +msgstr "پاسخ خودکار ارسال شد:" -#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426 +#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424 +#: ../plugins/statenotify.c:80 #, c-format -msgid "%s logged out." -msgstr "%s از سیستم خارج شد." +msgid "%s has signed off." +msgstr "%s از سیستم خارج شد." -#: ../plugins/log_reader.c:1440 +#: ../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 "" +msgstr "اتصال شما در حال حاضر قطع شده است. تا زمانی که وارد سیستم نشوید پیغامی به شما نخواهد رسید." -#: ../plugins/log_reader.c:1473 +#: ../plugins/log_reader.c:1471 msgid "Message could not be sent because the maximum length was exceeded." -msgstr "نمیتوان پیغام را فرستاد چون طول پیغام از حداکثر طول مجاز بیشتر است:" +msgstr "نمیتوان پیغام را فرستاد چون طول آن از حداکثر مجاز بیشتر است." -#: ../plugins/log_reader.c:1478 +#: ../plugins/log_reader.c:1476 msgid "Message could not be sent." -msgstr "نمیتوان پیغام را فرستاد." +msgstr "فرستادن پیغام ممکن نیست." -#. Add general preferences. -#: ../plugins/log_reader.c:1912 -msgid "General Log Reading Configuration" -msgstr "پیکربندی عمومی خواندن تاریخچه" - -#: ../plugins/log_reader.c:1916 -msgid "Fast size calculations" -msgstr "محاسبات سریع اندازه" - -#: ../plugins/log_reader.c:1920 -msgid "Use name heuristics" -msgstr "" - -#. Add Log Directory preferences. -#: ../plugins/log_reader.c:1926 -msgid "Log Directory" -msgstr "شاخهی تاریخچه" - -#: ../plugins/log_reader.c:1930 +#. 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" -#: ../plugins/log_reader.c:1934 +#. 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 "فایر" +msgstr "Fire" -#: ../plugins/log_reader.c:1938 +#. 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 "پیغامرسان Plus!" +msgstr "Messenger Plus!" -#: ../plugins/log_reader.c:1942 +#. 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" -#: ../plugins/log_reader.c:1946 +#. 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: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 "برای بارکردن متصل شوندههای پرل پشتیبانی فراهم میکند" +msgstr "برای بار کردن متصل شوندههای پرل پشتیبانی فراهم میکند" -#: ../plugins/psychic.c:22 +#: ../plugins/psychic.c:19 msgid "Psychic Mode" -msgstr "" +msgstr "حالت غیبگویی" -#: ../plugins/psychic.c:23 +#: ../plugins/psychic.c:20 msgid "Psychic mode for incoming conversation" -msgstr "" +msgstr "حالت غیبگویی برای پیغامهای وارده" -#: ../plugins/psychic.c:24 +#: ../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 و یاهو کار میکند." -#: ../plugins/psychic.c:60 +#. 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 "" +msgstr "از دوردست صدایی به گوش میرسد..." -#: ../plugins/psychic.c:79 +#: ../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 "وقتی رفتهام از کار انداخته شود" +msgstr "هنگامی که رفتهام از کار انداخته شود" -#: ../plugins/psychic.c:88 +#: ../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 "آزمایشهایی برای اطمینان از این که اغلب چیزها کار میکنند." +msgstr "برای اطمینان از این که اغلب چیزها کار میکنند آزمایشهایی انجام میدهد." -#: ../plugins/spellchk.c:1917 +#: ../plugins/spellchk.c:1918 msgid "Duplicate Correction" -msgstr "" +msgstr "تصحیح مقادیر تکراری" -#: ../plugins/spellchk.c:1918 +#: ../plugins/spellchk.c:1919 msgid "The specified word already exists in the correction list." -msgstr "کلمهی مشخص شده از قبل در فهرست اصلاحات قرار دارد." +msgstr "کلمهٔ مشخص شده از قبل در فهرست اصلاحات قرار دارد." -#: ../plugins/spellchk.c:2127 +#: ../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 "فقط کل کلمه" +msgstr "فقط کلمههای کامل" -#: ../plugins/spellchk.c:2190 +#: ../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 "" +msgstr "مطابقت _دقیق بزرگی و کوچکی حروف (برای ادارهٔ خودکار بزرگی و کوچکی حروف، نشانه را بردارید)" -#: ../plugins/spellchk.c:2263 +#: ../plugins/spellchk.c:2264 msgid "Only replace _whole words" -msgstr "فقط جایگزینی _کل کلمه" +msgstr "فقط جایگزینی _کلمات کامل" -#: ../plugins/spellchk.c:2288 +#: ../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 برگشته است." +msgstr "%s برگشت." -#: ../plugins/statenotify.c:51 +#: ../plugins/statenotify.c:52 #, c-format msgid "%s has gone away." -msgstr "%s رفته است." +msgstr "%s رفت." -#: ../plugins/statenotify.c:61 +#: ../plugins/statenotify.c:62 #, c-format msgid "%s has become idle." -msgstr "%s بیکار شده است." +msgstr "%s بیکار شد." -#: ../plugins/statenotify.c:63 +#: ../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 وارد سیستم شده است." +msgstr "%s وارد سیستم شد." -#: ../plugins/statenotify.c:79 -#, c-format -msgid "%s has signed off." -msgstr "%s از سیستم خارج شده است." - -#: ../plugins/statenotify.c:90 +#: ../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" +msgstr "بارکنندهٔ متصل شوندهٔ tcl" -#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372 +#: ../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 "نسخهی افقی و لغزندهی فهرست رفقا." +msgstr "نسخهٔ افقی و لغزان فهرست رفقا." -#: ../plugins/timestamp.c:188 +#: ../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... [truncated message content] |
From: <dat...@us...> - 2006-10-31 04:40:43
|
Revision: 17636 http://svn.sourceforge.net/gaim/?rev=17636&view=rev Author: datallah Date: 2006-10-30 20:40:05 -0800 (Mon, 30 Oct 2006) Log Message: ----------- Fix default language selection to be your current Windows language. Commit language changes I forgot to commit. Modified Paths: -------------- trunk/gaim-installer.nsi trunk/gtk/win32/nsis/translations/albanian.nsh trunk/gtk/win32/nsis/translations/bulgarian.nsh trunk/gtk/win32/nsis/translations/catalan.nsh trunk/gtk/win32/nsis/translations/czech.nsh trunk/gtk/win32/nsis/translations/danish.nsh trunk/gtk/win32/nsis/translations/dutch.nsh trunk/gtk/win32/nsis/translations/english.nsh trunk/gtk/win32/nsis/translations/finnish.nsh trunk/gtk/win32/nsis/translations/french.nsh trunk/gtk/win32/nsis/translations/galician.nsh trunk/gtk/win32/nsis/translations/german.nsh trunk/gtk/win32/nsis/translations/hebrew.nsh trunk/gtk/win32/nsis/translations/hungarian.nsh trunk/gtk/win32/nsis/translations/italian.nsh trunk/gtk/win32/nsis/translations/japanese.nsh trunk/gtk/win32/nsis/translations/korean.nsh trunk/gtk/win32/nsis/translations/kurdish.nsh trunk/gtk/win32/nsis/translations/lithuanian.nsh trunk/gtk/win32/nsis/translations/norwegian.nsh trunk/gtk/win32/nsis/translations/polish.nsh trunk/gtk/win32/nsis/translations/portuguese-br.nsh trunk/gtk/win32/nsis/translations/portuguese.nsh trunk/gtk/win32/nsis/translations/romanian.nsh trunk/gtk/win32/nsis/translations/russian.nsh trunk/gtk/win32/nsis/translations/serbian-latin.nsh trunk/gtk/win32/nsis/translations/simp-chinese.nsh trunk/gtk/win32/nsis/translations/slovak.nsh trunk/gtk/win32/nsis/translations/slovenian.nsh trunk/gtk/win32/nsis/translations/spanish.nsh trunk/gtk/win32/nsis/translations/swedish.nsh trunk/gtk/win32/nsis/translations/trad-chinese.nsh trunk/gtk/win32/nsis/translations/valencian.nsh trunk/gtk/win32/nsis/translations/vietnamese.nsh Modified: trunk/gaim-installer.nsi =================================================================== --- trunk/gaim-installer.nsi 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gaim-installer.nsi 2006-10-31 04:40:05 UTC (rev 17636) @@ -1096,8 +1096,10 @@ ${GetParameters} $R0 ClearErrors - ${GetOptions} $R0 "/L=" $LANGUAGE - IfErrors 0 skip_lang + ${GetOptions} $R0 "/L=" $R0 + IfErrors +3 + StrCpy $LANGUAGE $R0 + Goto skip_lang ; Select Language ; Display Language selection dialog Modified: trunk/gtk/win32/nsis/translations/albanian.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/albanian.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/albanian.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "Ose mungon mjedisi GTK+ runtime ose lyp përditësim.$\rJu lutem instaloni GTK+ runtime v${GTK_VERSION} ose më të vonshëm" +!define GTK_INSTALLER_NEEDED "Ose mungon mjedisi GTK+ runtime ose lyp përditësim.$\rJu lutem instaloni GTK+ runtime v${GTK_MIN_VERSION} ose më të vonshëm" ; License Page !define GAIM_LICENSE_BUTTON "Më tej >" Modified: trunk/gtk/win32/nsis/translations/bulgarian.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/bulgarian.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/bulgarian.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "GTK+ runtime \xEB\xE8\xEF\xF1\xE2\xE0 \xE8\xEB\xE8 \xF2\xF0\xFF\xE1\xE2\xE0 \xE4\xE0 \xE1\xFA\xE4\xE5 \xEE\xE1\xED\xEE\xE2\xE5\xED\xE0.$\r\xCC\xEE\xEB\xFF \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xE9\xF2\xE5 \xE2\xE5\xF0\xF1\xE8\xFF v${GTK_VERSION} \xE8\xEB\xE8 \xEF\xEE-\xED\xEE\xE2\xE0" +!define GTK_INSTALLER_NEEDED "GTK+ runtime \xEB\xE8\xEF\xF1\xE2\xE0 \xE8\xEB\xE8 \xF2\xF0\xFF\xE1\xE2\xE0 \xE4\xE0 \xE1\xFA\xE4\xE5 \xEE\xE1\xED\xEE\xE2\xE5\xED\xE0.$\r\xCC\xEE\xEB\xFF \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xE9\xF2\xE5 \xE2\xE5\xF0\xF1\xE8\xFF v${GTK_MIN_VERSION} \xE8\xEB\xE8 \xEF\xEE-\xED\xEE\xE2\xE0" ; Components Page !define GAIM_SECTION_TITLE "Gaim \xCA\xEB\xE8\xE5\xED\xF2 \xE7\xE0 \xC1\xFA\xF0\xE7\xE8 \xD1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xFF (\xE8\xE7\xE8\xF1\xEA\xE2\xE0 \xF1\xE5)" Modified: trunk/gtk/win32/nsis/translations/catalan.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/catalan.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/catalan.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -12,7 +12,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "L'instal.lador encara est\xE0 executant-se." !define GAIM_IS_RUNNING "Hi ha una inst\xE0ncia del Gaim executant-se. Surt del Gaim i torna a intentar-ho." -!define GTK_INSTALLER_NEEDED "L'entorn d'execuci\xF3 GTK+ no existeix o necessita \xE9sser actualitzat.$\rSius plau instal.la la versi\xF3${GTK_VERSION} o superior de l'entonr GTK+" +!define GTK_INSTALLER_NEEDED "L'entorn d'execuci\xF3 GTK+ no existeix o necessita \xE9sser actualitzat.$\rSius plau instal.la la versi\xF3${GTK_MIN_VERSION} o superior de l'entonr GTK+" ; License Page !define GAIM_LICENSE_BUTTON "Seg\xFCent >" Modified: trunk/gtk/win32/nsis/translations/czech.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/czech.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/czech.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "GTK+ runtime bu\xEFto chyb\xED, nebo je pot\xF8eba prov\xE9st upgrade.$\rProve\xEFte instalaci verze${GTK_VERSION} nebo vy\x9A\x9A\xED." +!define GTK_INSTALLER_NEEDED "GTK+ runtime bu\xEFto chyb\xED, nebo je pot\xF8eba prov\xE9st upgrade.$\rProve\xEFte instalaci verze${GTK_MIN_VERSION} nebo vy\x9A\x9A\xED." ; License Page !define GAIM_LICENSE_BUTTON "Dal\x9A\xED >" Modified: trunk/gtk/win32/nsis/translations/danish.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/danish.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/danish.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "GTK+ runtime environment enten mangler eller skal opgraderes.$\rInstall\xE9r venligst GTK+ runtime version v${GTK_VERSION} eller h\xF8jere." +!define GTK_INSTALLER_NEEDED "GTK+ runtime environment enten mangler eller skal opgraderes.$\rInstall\xE9r venligst GTK+ runtime version v${GTK_MIN_VERSION} eller h\xF8jere." ; License Page !define GAIM_LICENSE_BUTTON "N\xE6ste >" Modified: trunk/gtk/win32/nsis/translations/dutch.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/dutch.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/dutch.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -11,7 +11,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Er is al een installatie actief." !define GAIM_IS_RUNNING "Gaim wordt op dit moment uitgevoerd. Sluit Gaim af en start de installatie opnieuw." -!define GTK_INSTALLER_NEEDED "De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_VERSION} of nieuwer van de GTK+ runtime-omgeving" +!define GTK_INSTALLER_NEEDED "De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_MIN_VERSION} of nieuwer van de GTK+ runtime-omgeving" ; License Page Modified: trunk/gtk/win32/nsis/translations/english.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/english.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/english.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -14,7 +14,7 @@ ; Startup Checks !insertmacro GAIM_MACRO_DEFAULT_STRING INSTALLER_IS_RUNNING "The installer is already running." !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_IS_RUNNING "An instance of Gaim is currently running. Exit Gaim and then try again." -!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED "The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_VERSION} or higher of the GTK+ runtime" +!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED "The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_MIN_VERSION} or higher of the GTK+ runtime" ; License Page !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BUTTON "Next >" Modified: trunk/gtk/win32/nsis/translations/finnish.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/finnish.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/finnish.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "GTK+ runtime ymp\xE4rist\xF6 joko puuttuu tai tarvitsee p\xE4ivityst\xE4.$\rOle hyv\xE4 ja asenna v${GTK_VERSION} tai uudempi GTK+ runtime" +!define GTK_INSTALLER_NEEDED "GTK+ runtime ymp\xE4rist\xF6 joko puuttuu tai tarvitsee p\xE4ivityst\xE4.$\rOle hyv\xE4 ja asenna v${GTK_MIN_VERSION} tai uudempi GTK+ runtime" ; License Page !define GAIM_LICENSE_BUTTON "Seuraava >" Modified: trunk/gtk/win32/nsis/translations/french.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/french.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/french.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -15,7 +15,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Le programme d'installation est d\xE9j\xE0 en cours d'ex\xE9cution." !define GAIM_IS_RUNNING "Une instance de Gaim est en cours d'ex\xE9cution. Veuillez quitter Gaim et r\xE9essayer." -!define GTK_INSTALLER_NEEDED "Les biblioth\xE8ques de l'environnement GTK+ ne sont pas install\xE9es ou ont besoin d'une mise \xE0 jour.$\rVeuillez installer la version ${GTK_VERSION} ou plus r\xE9cente des biblioth\xE8ques GTK+." +!define GTK_INSTALLER_NEEDED "Les biblioth\xE8ques de l'environnement GTK+ ne sont pas install\xE9es ou ont besoin d'une mise \xE0 jour.$\rVeuillez installer la version ${GTK_MIN_VERSION} ou plus r\xE9cente des biblioth\xE8ques GTK+." ; License Page !define GAIM_LICENSE_BUTTON "Suivant >" Modified: trunk/gtk/win32/nsis/translations/galician.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/galician.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/galician.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "O entorno de execuci\xF3n de GTK+ falta ou necesita ser actualizado.$\rPor favor, instale a versi\xF3n v${GTK_VERSION} do executable GTK+ ou algunha posterior." +!define GTK_INSTALLER_NEEDED "O entorno de execuci\xF3n de GTK+ falta ou necesita ser actualizado.$\rPor favor, instale a versi\xF3n v${GTK_MIN_VERSION} do executable GTK+ ou algunha posterior." ; License Page !define GAIM_LICENSE_BUTTON "Seguinte >" Modified: trunk/gtk/win32/nsis/translations/german.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/german.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/german.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -12,7 +12,7 @@ ; Startup checks !define INSTALLER_IS_RUNNING "Der Installer l\xE4uft schon." !define GAIM_IS_RUNNING "Eine Instanz von Gaim l\xE4uft momentan schon. Beenden Sie Gaim und versuchen Sie es nochmal." -!define GTK_INSTALLER_NEEDED "Die GTK+ Runtime Umgebung fehlt entweder oder mu\xDF aktualisiert werden.$\rBitte installieren Sie v${GTK_VERSION} oder h\xF6her der GTK+ Runtime" +!define GTK_INSTALLER_NEEDED "Die GTK+ Runtime Umgebung fehlt entweder oder mu\xDF aktualisiert werden.$\rBitte installieren Sie v${GTK_MIN_VERSION} oder h\xF6her der GTK+ Runtime" ; License Page !define GAIM_LICENSE_BUTTON "Weiter >" Modified: trunk/gtk/win32/nsis/translations/hebrew.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/hebrew.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/hebrew.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED ".\xEC\xE0 \xF0\xEE\xF6\xE0\xFA \xE0\xE5 \xF6\xF8\xE9\xEB\xE4 \xF9\xE9\xE3\xF8\xE5\xE2 GTK+ \xF1\xE1\xE9\xE1\xFA$\r\xE1\xE1\xF7\xF9\xE4 \xE4\xFA\xF7\xEF v${GTK_VERSION} .GTK+ \xE0\xE5 \xE2\xE1\xE5\xE4\xE4 \xE9\xE5\xFA\xF8 \xF9\xEC \xF1\xE1\xE9\xE1\xFA" +!define GTK_INSTALLER_NEEDED ".\xEC\xE0 \xF0\xEE\xF6\xE0\xFA \xE0\xE5 \xF6\xF8\xE9\xEB\xE4 \xF9\xE9\xE3\xF8\xE5\xE2 GTK+ \xF1\xE1\xE9\xE1\xFA$\r\xE1\xE1\xF7\xF9\xE4 \xE4\xFA\xF7\xEF v${GTK_MIN_VERSION} .GTK+ \xE0\xE5 \xE2\xE1\xE5\xE4\xE4 \xE9\xE5\xFA\xF8 \xF9\xEC \xF1\xE1\xE9\xE1\xFA" ; License Page !define GAIM_LICENSE_BUTTON "\xE4\xE1\xE0 >" Modified: trunk/gtk/win32/nsis/translations/hungarian.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/hungarian.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/hungarian.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup Checks -!define GTK_INSTALLER_NEEDED "A GTK+ futtat\xF3 k\xF6rnyezet hi\xE1nyzik vagy friss\xEDt\xE9se sz\xFCks\xE9ges.$\rK\xE9rem telep\xEDtse a v${GTK_VERSION} vagy magasabb verzi\xF3j\xFA GTK+ futtat\xF3 k\xF6rnyezetet." +!define GTK_INSTALLER_NEEDED "A GTK+ futtat\xF3 k\xF6rnyezet hi\xE1nyzik vagy friss\xEDt\xE9se sz\xFCks\xE9ges.$\rK\xE9rem telep\xEDtse a v${GTK_MIN_VERSION} vagy magasabb verzi\xF3j\xFA GTK+ futtat\xF3 k\xF6rnyezetet." !define INSTALLER_IS_RUNNING "A telep\xEDto m\xE1r fut." !define GAIM_IS_RUNNING "Jelenleg fut a Gaim egy p\xE9ld\xE1nya. L\xE9pjen ki a Gaimb\xF3l \xE9s azut\xE1n pr\xF3b\xE1lja \xFAjra." Modified: trunk/gtk/win32/nsis/translations/italian.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/italian.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/italian.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "L'ambiente di runtime GTK+ non \xE8 presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_VERSION} o maggiore" +!define GTK_INSTALLER_NEEDED "L'ambiente di runtime GTK+ non \xE8 presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_MIN_VERSION} o maggiore" ; License Page !define GAIM_LICENSE_BUTTON "Avanti >" Modified: trunk/gtk/win32/nsis/translations/japanese.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/japanese.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/japanese.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -12,7 +12,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xAA\x8A\xF9\x82Ɏ\xC0\x8Ds\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7" !define GAIM_IS_RUNNING "Gaim \x82\xAA\x8E\xC0\x8Ds\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81BGaim \x82\xF0\x8FI\x97\xB9\x82\xB5\x82Ă\xA9\x82\xE7\x8Dēx\x8E\xC0\x8Ds\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2" -!define GTK_INSTALLER_NEEDED "GTK+\x83\x89\x83\x93\x83^\x83C\x83\x80\x8A\xAB\x82\xAA\x96\xB3\x82\xA2\x82\xA9\x82\xE0\x82\xB5\x82\xAD\x82̓A\x83b\x83v\x83O\x83\x8C\x81[\x83h\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B$\rv${GTK_VERSION}\x82\xE0\x82\xB5\x82\xAD\x82͂\xBB\x82\xEA\x88ȏ\xE3\x82\xCCGTK+\x83\x89\x83\x93\x83^\x83C\x83\x80\x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B" +!define GTK_INSTALLER_NEEDED "GTK+\x83\x89\x83\x93\x83^\x83C\x83\x80\x8A\xAB\x82\xAA\x96\xB3\x82\xA2\x82\xA9\x82\xE0\x82\xB5\x82\xAD\x82̓A\x83b\x83v\x83O\x83\x8C\x81[\x83h\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B$\rv${GTK_MIN_VERSION}\x82\xE0\x82\xB5\x82\xAD\x82͂\xBB\x82\xEA\x88ȏ\xE3\x82\xCCGTK+\x83\x89\x83\x93\x83^\x83C\x83\x80\x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B" ; License Page !define GAIM_LICENSE_BUTTON "\x8E\x9F\x82\xD6 >" Modified: trunk/gtk/win32/nsis/translations/korean.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/korean.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/korean.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -8,7 +8,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "GTK+ \xB7\xB1Ÿ\xC0\xD3 ȯ\xB0濡 \xB9\xAE\xC1\xA6\xB0\xA1 \xC0ְų\xAA \xBE\xF7\xB1\xB9\xC0̵尡 \xC7ʿ\xE4\xC7մϴ\xD9.$\rGTK+ \xB7\xB1Ÿ\xC0\xD3 ȯ\xB0\xE6\xC0\xBB v${GTK_VERSION}\xC0̳\xAA \xB1\xD7 \xC0̻\xF3 \xB9\xF6\xC0\xFC\xC0\xB8\xB7\xCE \xBC\xB3ġ\xC7\xD8\xC1ּ\xBC\xBF\xE4." +!define GTK_INSTALLER_NEEDED "GTK+ \xB7\xB1Ÿ\xC0\xD3 ȯ\xB0濡 \xB9\xAE\xC1\xA6\xB0\xA1 \xC0ְų\xAA \xBE\xF7\xB1\xB9\xC0̵尡 \xC7ʿ\xE4\xC7մϴ\xD9.$\rGTK+ \xB7\xB1Ÿ\xC0\xD3 ȯ\xB0\xE6\xC0\xBB v${GTK_MIN_VERSION}\xC0̳\xAA \xB1\xD7 \xC0̻\xF3 \xB9\xF6\xC0\xFC\xC0\xB8\xB7\xCE \xBC\xB3ġ\xC7\xD8\xC1ּ\xBC\xBF\xE4." ; Components Page !define GAIM_SECTION_TITLE "\xB0\xA1\xC0\xD3 \xB8\xC5\xC0\xFA (\xC7ʼ\xF6)" Modified: trunk/gtk/win32/nsis/translations/kurdish.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/kurdish.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/kurdish.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -12,7 +12,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Sazker jixwe dime\xFEe." !define GAIM_IS_RUNNING "Gaim niha jixwe dime\xFEe. Ji Gaim\xEA derkeve \xFB careke din bicerib\xEEne." -!define GTK_INSTALLER_NEEDED "Derdora runtime ya GTK+ an tune an rojanekirina w\xEA p\xEAw\xEEst e. $\rJi kerema xwe v${GTK_VERSION} an bilindtir a GTK+ saz bike." +!define GTK_INSTALLER_NEEDED "Derdora runtime ya GTK+ an tune an rojanekirina w\xEA p\xEAw\xEEst e. $\rJi kerema xwe v${GTK_MIN_VERSION} an bilindtir a GTK+ saz bike." ; License Page !define GAIM_LICENSE_BUTTON "P\xEA\xFE >" Modified: trunk/gtk/win32/nsis/translations/lithuanian.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/lithuanian.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/lithuanian.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Diegimo programa jau paleista." !define GAIM_IS_RUNNING "\xD0iuo metu Gaim yra paleistas. U\xFEdarykite \xF0i\xE0 program\xE0 ir pabandykite i\xF0 naujo." -!define GTK_INSTALLER_NEEDED "GTK+ vykdymo meto aplinkos n\xEBra arba ji turi b\xFBti atnaujinta.$\r\xC1diekite v${GTK_VERSION} arba naujesn\xE6 GTK+ vykdymo meto aplinkos versij\xE0" +!define GTK_INSTALLER_NEEDED "GTK+ vykdymo meto aplinkos n\xEBra arba ji turi b\xFBti atnaujinta.$\r\xC1diekite v${GTK_MIN_VERSION} arba naujesn\xE6 GTK+ vykdymo meto aplinkos versij\xE0" ; License Page !define GAIM_LICENSE_BUTTON "Toliau >" Modified: trunk/gtk/win32/nsis/translations/norwegian.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/norwegian.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/norwegian.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -11,7 +11,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Installeren kj\xF8rer allerede." !define GAIM_IS_RUNNING "En instans av Gaim kj\xF8rer fra f\xF8r. Avslutt Gaim og pr\xF8v igjen." -!define GTK_INSTALLER_NEEDED "GTK+ runtime environment mangler eller trenger en oppgradering.$\rVennligst install\xE9r GTK+ v${GTK_VERSION} eller h\xF8yere" +!define GTK_INSTALLER_NEEDED "GTK+ runtime environment mangler eller trenger en oppgradering.$\rVennligst install\xE9r GTK+ v${GTK_MIN_VERSION} eller h\xF8yere" ; License Page !define GAIM_LICENSE_BUTTON "Neste >" Modified: trunk/gtk/win32/nsis/translations/polish.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/polish.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/polish.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "Runtime \x9Crodowiska GTK+ zosta\xB3 zagubiony lub wymaga upgrade-u.$\r Prosz\xEA zainstaluj v${GTK_VERSION} albo wy\xBFsz\xB9 wersj\xEA runtime-u GTK+." +!define GTK_INSTALLER_NEEDED "Runtime \x9Crodowiska GTK+ zosta\xB3 zagubiony lub wymaga upgrade-u.$\r Prosz\xEA zainstaluj v${GTK_MIN_VERSION} albo wy\xBFsz\xB9 wersj\xEA runtime-u GTK+." ; License Page !define GAIM_LICENSE_BUTTON "Dalej >" Modified: trunk/gtk/win32/nsis/translations/portuguese-br.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/portuguese-br.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/portuguese-br.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "O ambiente de tempo de execu\xE7\xE3o do GTK+ est\xE1 ausente ou precisa ser atualizado.$\rFavor instalar a vers\xE3o v${GTK_VERSION} ou superior do ambiente de tempo de execu\xE7\xE3o do GTK+." +!define GTK_INSTALLER_NEEDED "O ambiente de tempo de execu\xE7\xE3o do GTK+ est\xE1 ausente ou precisa ser atualizado.$\rFavor instalar a vers\xE3o v${GTK_MIN_VERSION} ou superior do ambiente de tempo de execu\xE7\xE3o do GTK+." ; License Page !define GAIM_LICENSE_BUTTON "Avan\xE7ar >" Modified: trunk/gtk/win32/nsis/translations/portuguese.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/portuguese.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/portuguese.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -11,7 +11,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "O instalador j\xE1 est\xE1 a ser executado." !define GAIM_IS_RUNNING "Uma inst\xE2ncia do Gaim j\xE1 est\xE1 a ser executada. Saia do Gaim e tente de novo." -!define GTK_INSTALLER_NEEDED "O ambiente de GTK+ est\xE1 ausente ou precisa de ser actualizado.$\rPor favor instale a vers\xE3o v${GTK_VERSION} ou mais recente do ambiente de GTK+." +!define GTK_INSTALLER_NEEDED "O ambiente de GTK+ est\xE1 ausente ou precisa de ser actualizado.$\rPor favor instale a vers\xE3o v${GTK_MIN_VERSION} ou mais recente do ambiente de GTK+." ; License Page !define GAIM_LICENSE_BUTTON "Seguinte >" Modified: trunk/gtk/win32/nsis/translations/romanian.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/romanian.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/romanian.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -10,7 +10,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Instalarea este deja pornit\xE3." !define GAIM_IS_RUNNING "O instan\xFE\xE3 a programului Gaim este deja pornit\xE3. \xCEnchide\xFEi-o \xBAi \xEEncerca\xFEi din nou." -!define GTK_INSTALLER_NEEDED "Mediul GTK+ nu e prezent sau ave\xFEi o versiune prea veche.$\rInstala\xFEi cel pu\xFEin versiunea v${GTK_VERSION} a mediului GTK+" +!define GTK_INSTALLER_NEEDED "Mediul GTK+ nu e prezent sau ave\xFEi o versiune prea veche.$\rInstala\xFEi cel pu\xFEin versiunea v${GTK_MIN_VERSION} a mediului GTK+" ; License Page !define GAIM_LICENSE_BUTTON "\xCEnainte >" Modified: trunk/gtk/win32/nsis/translations/russian.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/russian.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/russian.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "\xCE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xE5 \xE4\xEB\xFF \xE7\xE0\xEF\xF3\xF1\xEA\xE0 GTK+ \xED\xE5\xE4\xEE\xF1\xF2\xF3\xEF\xED\xEE \xE8\xEB\xE8 \xED\xF3\xE6\xE4\xE0\xE5\xF2\xF1\xFF \xE2 \xEE\xE1\xED\xEE\xE2\xEB\xE5\xED\xE8\xE8.$\r\xCF\xEE\xE6\xE0\xEB\xF3\xE9\xF1\xF2\xE0 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE5 v${GTK_VERSION} \xE8\xEB\xE8 \xE1\xEE\xEB\xE5\xE5 \xF1\xF2\xE0\xF0\xF8\xF3\xFE \xE2\xE5\xF0\xF1\xE8\xFE GTK+." +!define GTK_INSTALLER_NEEDED "\xCE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xE5 \xE4\xEB\xFF \xE7\xE0\xEF\xF3\xF1\xEA\xE0 GTK+ \xED\xE5\xE4\xEE\xF1\xF2\xF3\xEF\xED\xEE \xE8\xEB\xE8 \xED\xF3\xE6\xE4\xE0\xE5\xF2\xF1\xFF \xE2 \xEE\xE1\xED\xEE\xE2\xEB\xE5\xED\xE8\xE8.$\r\xCF\xEE\xE6\xE0\xEB\xF3\xE9\xF1\xF2\xE0 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE5 v${GTK_MIN_VERSION} \xE8\xEB\xE8 \xE1\xEE\xEB\xE5\xE5 \xF1\xF2\xE0\xF0\xF8\xF3\xFE \xE2\xE5\xF0\xF1\xE8\xFE GTK+." ; License Page !define GAIM_LICENSE_BUTTON "\xD1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE5 >" Modified: trunk/gtk/win32/nsis/translations/serbian-latin.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/serbian-latin.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/serbian-latin.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -8,7 +8,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "GTK+ okolina za izvr\x9Aavanje ili nije na\xF0ena ili se moraunaprediti.$\rMolimo instalirajte v${GTK_VERSION} ili ve\xE6u GTK+ okoline za izvr\x9Aavanje" +!define GTK_INSTALLER_NEEDED "GTK+ okolina za izvr\x9Aavanje ili nije na\xF0ena ili se moraunaprediti.$\rMolimo instalirajte v${GTK_MIN_VERSION} ili ve\xE6u GTK+ okoline za izvr\x9Aavanje" ; Components Page !define GAIM_SECTION_TITLE "Gaim klijent za brze poruke (neophodno)" Modified: trunk/gtk/win32/nsis/translations/simp-chinese.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/simp-chinese.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/simp-chinese.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -11,7 +11,7 @@ ; Startup GTK+ check !define INSTALLER_IS_RUNNING "\xB0\xB2װ\xB3\xCC\xD0\xF2\xD2Ѿ\xAD\xD4\xCB\xD0С\xA3" !define GAIM_IS_RUNNING "Gaim \xB5\xC4ʵ\xC0\xFD\xD5\xFD\xD4\xDA\xD4\xCB\xD0\xD0\xD6С\xA3\xC7\xEB\xCD˳\xF6 Gaim Ȼ\xBA\xF3\xD4\xD9\xCA\xD4һ\xB4Ρ\xA3" -!define GTK_INSTALLER_NEEDED "\xBF\xC9\xC4\xDCȱ\xC9\xD9 GTK+ \xD4\xCB\xD0\xD0ʱ\xBF̻\xB7\xBE\xB3\xA3\xAC\xBB\xF2\xD5\xDF\xD0\xE8Ҫ\xB8\xFC\xD0¸û\xB7\xBE\xB3\xA1\xA3$\r\xC7밲װ v${GTK_VERSION} \xBB\xF2\xB8\xFC\xB8߰汾\xB5\xC4 GTK+ \xD4\xCB\xD0\xD0ʱ\xBF̻\xB7\xBE\xB3" +!define GTK_INSTALLER_NEEDED "\xBF\xC9\xC4\xDCȱ\xC9\xD9 GTK+ \xD4\xCB\xD0\xD0ʱ\xBF̻\xB7\xBE\xB3\xA3\xAC\xBB\xF2\xD5\xDF\xD0\xE8Ҫ\xB8\xFC\xD0¸û\xB7\xBE\xB3\xA1\xA3$\r\xC7밲װ v${GTK_MIN_VERSION} \xBB\xF2\xB8\xFC\xB8߰汾\xB5\xC4 GTK+ \xD4\xCB\xD0\xD0ʱ\xBF̻\xB7\xBE\xB3" ; License Page !define GAIM_LICENSE_BUTTON "\xCF\xC2һ\xB2\xBD >" Modified: trunk/gtk/win32/nsis/translations/slovak.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/slovak.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/slovak.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -11,7 +11,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "In\x9Atal\xE1cia je u\x9E spusten\xE1" !define GAIM_IS_RUNNING "Gaim je pr\xE1ve spusten\xFD. Vypnite ho a sk\xFAste znova." -!define GTK_INSTALLER_NEEDED "GTK+ runtime prostredie ch\xFDba alebo mus\xED by\x9D upgradovan\xE9.$\rNain\x9Atalujte, pros\xEDm, GTK+ runtime verziu v${GTK_VERSION}, alebo nov\x9Aiu" +!define GTK_INSTALLER_NEEDED "GTK+ runtime prostredie ch\xFDba alebo mus\xED by\x9D upgradovan\xE9.$\rNain\x9Atalujte, pros\xEDm, GTK+ runtime verziu v${GTK_MIN_VERSION}, alebo nov\x9Aiu" ; License Page !define GAIM_LICENSE_BUTTON "\xCFalej >" Modified: trunk/gtk/win32/nsis/translations/slovenian.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/slovenian.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/slovenian.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -11,7 +11,7 @@ ; Startup GTK+ check !define INSTALLER_IS_RUNNING "Name\x9A\xE8anje \x9Ee poteka." !define GAIM_IS_RUNNING "Trenutno \x9Ee te\xE8e razli\xE8ica Gaima. Prosimo zaprite Gaim in poskusite znova." -!define GTK_INSTALLER_NEEDED "Izvajalno okolje GTK+ manjka ali pa ga je potrebno nadgraditi.$\rProsimo namestite v${GTK_VERSION} ali vi\x9Ajo razli\xE8ico izvajalnega okolja GTK+" +!define GTK_INSTALLER_NEEDED "Izvajalno okolje GTK+ manjka ali pa ga je potrebno nadgraditi.$\rProsimo namestite v${GTK_MIN_VERSION} ali vi\x9Ajo razli\xE8ico izvajalnega okolja GTK+" ; License Page !define GAIM_LICENSE_BUTTON "Naprej >" Modified: trunk/gtk/win32/nsis/translations/spanish.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/spanish.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/spanish.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -9,7 +9,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "El entorno de ejecuci\xF3n de GTK+ falta o necesita ser actualizado.$\rPor favor, instale la versi\xF3n v${GTK_VERSION} del ejecutable GTK+ o alguna posterior." +!define GTK_INSTALLER_NEEDED "El entorno de ejecuci\xF3n de GTK+ falta o necesita ser actualizado.$\rPor favor, instale la versi\xF3n v${GTK_MIN_VERSION} del ejecutable GTK+ o alguna posterior." ; License Page !define GAIM_LICENSE_BUTTON "Siguiente >" Modified: trunk/gtk/win32/nsis/translations/swedish.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/swedish.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/swedish.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -14,7 +14,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "Installationsprogrammet k\xF6rs redan." !define GAIM_IS_RUNNING "En instans av Giam k\xF6rs redan. Avsluta Gaim och f\xF6rs\xF6k igen." -!define GTK_INSTALLER_NEEDED "K\xF6rmilj\xF6n GTK+ \xE4r antingen inte installerat eller beh\xF6ver uppgraderas.$\rVar god installera v${GTK_VERSION} eller h\xF6gre av GTK+-k\xF6rmilj\xF6n." +!define GTK_INSTALLER_NEEDED "K\xF6rmilj\xF6n GTK+ \xE4r antingen inte installerat eller beh\xF6ver uppgraderas.$\rVar god installera v${GTK_MIN_VERSION} eller h\xF6gre av GTK+-k\xF6rmilj\xF6n." ; License Page !define GAIM_LICENSE_BUTTON "N\xE4sta >" Modified: trunk/gtk/win32/nsis/translations/trad-chinese.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/trad-chinese.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/trad-chinese.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -13,7 +13,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "\xA6w\xB8˵{\xA6\xA1\xA5\xBF\xA6b\xB0\xF5\xA6椤\xA1C" !define GAIM_IS_RUNNING "Gaim \xA5\xBF\xA6b\xB0\xF5\xA6椤\xA1A\xBDХ\xFD\xB5\xB2\xA7\xF4\xB3o\xADӵ{\xA6\xA1\xAB\xE1\xA6A\xA6\xE6\xA6w\xB8ˡC" -!define GTK_INSTALLER_NEEDED "\xA7䤣\xA8\xEC\xB2ŦX\xAA\xBA GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9ҩάO\xBBݭn\xB3Q\xA7\xF3\xB7s\xA1C$\r\xBDЦw\xB8\xCB v${GTK_VERSION} \xA5H\xA4W\xAA\xA9\xA5\xBB\xAA\xBA GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9ҡC" +!define GTK_INSTALLER_NEEDED "\xA7䤣\xA8\xEC\xB2ŦX\xAA\xBA GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9ҩάO\xBBݭn\xB3Q\xA7\xF3\xB7s\xA1C$\r\xBDЦw\xB8\xCB v${GTK_MIN_VERSION} \xA5H\xA4W\xAA\xA9\xA5\xBB\xAA\xBA GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9ҡC" ; License Page !define GAIM_LICENSE_BUTTON "\xA4U\xA4@\xA8B >" Modified: trunk/gtk/win32/nsis/translations/valencian.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/valencian.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/valencian.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -14,7 +14,7 @@ ; Startup Checks !define INSTALLER_IS_RUNNING "L'instalador encara est\xE0 eixecutant-se." !define GAIM_IS_RUNNING "Una instancia de Gaim est\xE0 eixecutant-se. Ix del Gaim i torna a intentar-ho." -!define GTK_INSTALLER_NEEDED "L'entorn d'eixecucio GTK+ no es troba o necessita ser actualisat.$\rPer favor instala la versio${GTK_VERSION} o superior de l'entorn GTK+" +!define GTK_INSTALLER_NEEDED "L'entorn d'eixecucio GTK+ no es troba o necessita ser actualisat.$\rPer favor instala la versio${GTK_MIN_VERSION} o superior de l'entorn GTK+" ; License Page !define GAIM_LICENSE_BUTTON "Seg\xFCent >" Modified: trunk/gtk/win32/nsis/translations/vietnamese.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/vietnamese.nsh 2006-10-31 03:11:33 UTC (rev 17635) +++ trunk/gtk/win32/nsis/translations/vietnamese.nsh 2006-10-31 04:40:05 UTC (rev 17636) @@ -10,7 +10,7 @@ ;; ; Startup GTK+ check -!define GTK_INSTALLER_NEEDED "The GTK+ runtime environment không có hoặc cần được nâng cấp.$\rHãy cài đặt GTK+ runtime v${GTK_VERSION} hoặc mới hơn" +!define GTK_INSTALLER_NEEDED "The GTK+ runtime environment không có hoặc cần được nâng cấp.$\rHãy cài đặt GTK+ runtime v${GTK_MIN_VERSION} hoặc mới hơn" ; License Page !define GAIM_LICENSE_BUTTON "Tiếp theo >" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lsc...@us...> - 2006-10-31 17:48:06
|
Revision: 17638 http://svn.sourceforge.net/gaim/?rev=17638&view=rev Author: lschiere Date: 2006-10-31 09:47:57 -0800 (Tue, 31 Oct 2006) Log Message: ----------- assigning responsibility as requested in the tracker item Modified Paths: -------------- trunk/gtk/gtkdialogs.c trunk/po/ChangeLog Modified: trunk/gtk/gtkdialogs.c =================================================================== --- trunk/gtk/gtkdialogs.c 2006-10-31 08:26:10 UTC (rev 17637) +++ trunk/gtk/gtkdialogs.c 2006-10-31 17:47:57 UTC (rev 17638) @@ -167,7 +167,7 @@ {N_("Serbian"), "sr", "Aleksandar Urosevic", "ur...@us..."}, {N_("Slovak"), "sk", "Richard Golier", "go...@gm..."}, {N_("Slovenian"), "sl", "Matjaz Horvat", "ma...@ow..."}, - {N_("Albanian"), "sq", "Programe Shqip", "an...@us..."}, + {N_("Albanian"), "sq", "Besnik Bleta", "be...@pr..."}, {N_("Swedish"), "sv", "Tore Lundqvist", "tl...@mi..."}, {N_("Tamil"), "ta", "Viveka Nathan K", "viv...@us..."}, {N_("Telugu"), "te", "Mr. Subbaramaih", "inf...@cd..."}, Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-10-31 08:26:10 UTC (rev 17637) +++ trunk/po/ChangeLog 2006-10-31 17:47:57 UTC (rev 17638) @@ -1,7 +1,7 @@ Gaim: The Pimpin' Penguin IM Clone that's good for the soul! version 2.0.0: - * Albanian translation updated (Programe Shqip) + * Albanian translation updated (Besnik Bleta) * Arabic translation added (Mohamed Magdy) * Bengali translation added (INDRANIL DAS GUPTA and Samia Nimatullah) * Bosnian translation added (Lejla Hadzialic) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-11-01 01:27:38
|
Revision: 17643 http://svn.sourceforge.net/gaim/?rev=17643&view=rev Author: rlaager Date: 2006-10-31 17:27:16 -0800 (Tue, 31 Oct 2006) Log Message: ----------- SF Patch #1469315 from R.Ramkumar - andyetitmoves "This is a small patch to make sounds enabled when available an optional feature. The use case is: Sounds being annoying, I would like them only when I am not seeing the comp. When I am on the comp, I have guifications/gaim-osd to inform me of whatever happens, and that happens to be less intrusive (especially when music is on :) )." The patch originally used: "Play sounds:" ("Always", "When available", "When away") I changed them to the strings KingAnt suggested: "Play sounds:" ("Always", "Only when available", "Only when not available") The ones from the patch submitter are not quite as clear, but they're shorter. What does everyone think about this? Modified Paths: -------------- trunk/COPYRIGHT trunk/gtk/gtkprefs.c trunk/libgaim/prefs.c trunk/libgaim/sound.c Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-11-01 00:57:39 UTC (rev 17642) +++ trunk/COPYRIGHT 2006-11-01 01:27:16 UTC (rev 17643) @@ -237,6 +237,7 @@ Federicco Mena Quintero Yosef Radchenko David Raeman +R. Ramkumar Mart Raudsepp Etan Reisner Kristian Rietveld Modified: trunk/gtk/gtkprefs.c =================================================================== --- trunk/gtk/gtkprefs.c 2006-11-01 00:57:39 UTC (rev 17642) +++ trunk/gtk/gtkprefs.c 2006-11-01 01:27:16 UTC (rev 17643) @@ -1606,8 +1606,12 @@ vbox = gaim_gtk_make_frame (ret, _("Sound Options")); gaim_gtk_prefs_checkbox(_("Sounds when conversation has _focus"), "/gaim/gtk/sound/conv_focus", vbox); - gaim_gtk_prefs_checkbox(_("_Sounds while away"), - "/core/sound/while_away", vbox); + gaim_gtk_prefs_dropdown(vbox, _("Enable sounds:"), + GAIM_PREF_INT, "/core/sound/while_status", + _("Only when available"), 1, + _("Only when not available"), 2, + _("Always"), 3, + NULL); #ifdef USE_GSTREAMER hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); Modified: trunk/libgaim/prefs.c =================================================================== --- trunk/libgaim/prefs.c 2006-11-01 00:57:39 UTC (rev 17642) +++ trunk/libgaim/prefs.c 2006-11-01 01:27:16 UTC (rev 17643) @@ -1116,6 +1116,14 @@ gaim_prefs_remove("/plugins/core/autorecon/hide_reconnecting_dialog"); gaim_prefs_remove("/plugins/core/autorecon/restore_state"); gaim_prefs_remove("/plugins/core/autorecon"); + + /* Convert old sounds while_away pref to new 3-way pref. */ + if (gaim_prefs_exists("/core/sound/while_away") && + gaim_prefs_get_bool("/core/sound/while_away")) + { + gaim_prefs_set_int("/core/sound/while_status", 3); + } + gaim_prefs_remove("/core/sound/while_away"); } void * Modified: trunk/libgaim/sound.c =================================================================== --- trunk/libgaim/sound.c 2006-11-01 00:57:39 UTC (rev 17642) +++ trunk/libgaim/sound.c 2006-11-01 01:27:16 UTC (rev 17643) @@ -28,18 +28,45 @@ static GaimSoundUiOps *sound_ui_ops = NULL; -void -gaim_sound_play_file(const char *filename, const GaimAccount *account) +#define STATUS_AVAILABLE 1 +#define STATUS_AWAY 2 + +static gboolean +gaim_sound_play_required(const GaimAccount *account) { - GaimStatus *status; + gint pref_status = gaim_prefs_get_int("/core/sound/while_status"); - if ((account != NULL) && (!gaim_prefs_get_bool("/core/sound/while_away"))) + if (pref_status == 3) { - status = gaim_account_get_active_status(account); - if (gaim_status_is_online(status) && !gaim_status_is_available(status)) - return; + /* Play sounds: Always */ + return TRUE; } + if (account != NULL) + { + GaimStatus *status = gaim_account_get_active_status(account); + + if (gaim_status_is_online(status)) + { + gboolean available = gaim_status_is_available(status); + return (( available && pref_status == STATUS_AVAILABLE) || + (!available && pref_status == STATUS_AWAY)); + } + } + + /* We get here a couple of ways. Either the request has been OK'ed + * by gaim_sound_play_event() and we're here because the UI has + * called gaim_sound_play_file(), or we're here for something + * not related to an account (like testing a sound). */ + return TRUE; +} + +void +gaim_sound_play_file(const char *filename, const GaimAccount *account) +{ + if (!gaim_sound_play_required(account)) + return; + if(sound_ui_ops && sound_ui_ops->play_file) sound_ui_ops->play_file(filename); } @@ -47,17 +74,9 @@ void gaim_sound_play_event(GaimSoundEventID event, const GaimAccount *account) { - GaimStatus *status; + if (!gaim_sound_play_required(account)) + return; - if ((account != NULL) && - (!gaim_prefs_get_bool("/core/sound/while_away"))) - { - status = gaim_account_get_active_status(account); - if (gaim_status_is_online(status) && - !gaim_status_is_available(status)) - return; - } - if(sound_ui_ops && sound_ui_ops->play_event) { int plugin_return; @@ -107,8 +126,7 @@ GAIM_SUBTYPE_ACCOUNT)); gaim_prefs_add_none("/core/sound"); - gaim_prefs_add_bool("/core/sound/while_away", FALSE); - + gaim_prefs_add_int("/core/sound/while_status", STATUS_AVAILABLE); } void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-11-01 02:14:06
|
Revision: 17644 http://svn.sourceforge.net/gaim/?rev=17644&view=rev Author: rlaager Date: 2006-10-31 18:13:37 -0800 (Tue, 31 Oct 2006) Log Message: ----------- SF Patch #1586467 from Benjamin Moody - floppusmaximus "Currently if a plugin creates a multi-line, non-HTML string preference, i.e. a GaimPluginPref with type GAIM_PLUGIN_PREF_STRING_FORMAT and format-type GAIM_STRING_FORMAT_TYPE_MULTILINE, the resulting widget is extremely narrow and impossible to use. This is because the widget is packed into an hbox without allowing expansion (expand = fill = FALSE.) If HTML is enabled, the presence of the format bar forces the widget to be wide enough to be usable. Disabling HTML causes the format bar to be removed, so the widget is set to the minimum allowed size." Modified Paths: -------------- trunk/COPYRIGHT trunk/gtk/gtkpluginpref.c Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-11-01 01:27:16 UTC (rev 17643) +++ trunk/COPYRIGHT 2006-11-01 02:13:37 UTC (rev 17644) @@ -202,6 +202,7 @@ Paul Miller Arkadiusz Miskiewicz Andrew Molloy +Benjamin Moody Tim Mooney Sergio Moretto Christian Muise Modified: trunk/gtk/gtkpluginpref.c =================================================================== --- trunk/gtk/gtkpluginpref.c 2006-11-01 01:27:16 UTC (rev 17643) +++ trunk/gtk/gtkpluginpref.c 2006-11-01 02:13:37 UTC (rev 17644) @@ -154,7 +154,7 @@ "changed", G_CALLBACK(imhtml_cb), imhtml); g_signal_connect(G_OBJECT(imhtml), "format_function_toggle", G_CALLBACK(imhtml_format_cb), imhtml); - gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0); } break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-11-03 17:28:38
|
Revision: 17663 http://svn.sourceforge.net/gaim/?rev=17663&view=rev Author: rlaager Date: 2006-11-03 09:21:18 -0800 (Fri, 03 Nov 2006) Log Message: ----------- SF Patch #1589599 Make gaim_gtk_cell_renderer_expander_activate()'s prototype match its definition. This is for consistency reasons only, since fixing the flags definition is all that was necessary to make this build on Solaris. Modified Paths: -------------- trunk/COPYRIGHT trunk/gtk/gtkcellrendererexpander.c Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-11-03 17:11:43 UTC (rev 17662) +++ trunk/COPYRIGHT 2006-11-03 17:21:18 UTC (rev 17663) @@ -44,6 +44,7 @@ Sean Burke Thomas Butter Andrea Canciani +Damien Carbery Michael Carlson Keegan Carruthers-Smith Steve Cavilia Modified: trunk/gtk/gtkcellrendererexpander.c =================================================================== --- trunk/gtk/gtkcellrendererexpander.c 2006-11-03 17:11:43 UTC (rev 17662) +++ trunk/gtk/gtkcellrendererexpander.c 2006-11-03 17:21:18 UTC (rev 17663) @@ -56,12 +56,12 @@ GdkRectangle *cell_area, GdkRectangle *expose_area, guint flags); -static gboolean gaim_gtk_cell_renderer_expander_activate (GtkCellRenderer *cell, +static gboolean gaim_gtk_cell_renderer_expander_activate (GtkCellRenderer *r, GdkEvent *event, GtkWidget *widget, - const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, + const gchar *p, + GdkRectangle *bg, + GdkRectangle *cell, GtkCellRendererState flags); static void gaim_gtk_cell_renderer_expander_finalize (GObject *gobject); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tal...@us...> - 2006-11-06 23:01:52
|
Revision: 17687 http://svn.sourceforge.net/gaim/?rev=17687&view=rev Author: taliesein Date: 2006-11-06 15:01:44 -0800 (Mon, 06 Nov 2006) Log Message: ----------- closing feature request 1487779, bug 1465187, with patch 1540877. This is all related to the psychic plugin, so ignore as befitting. Modified Paths: -------------- trunk/COPYRIGHT trunk/libgaim/plugins/psychic.c Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-11-06 22:32:49 UTC (rev 17686) +++ trunk/COPYRIGHT 2006-11-06 23:01:44 UTC (rev 17687) @@ -149,6 +149,7 @@ Kevin Hunter Rian Hunter Thomas Huriaux +Scott Jackson Hans Petter Jansson Henry Jen Benjamin Kahn Modified: trunk/libgaim/plugins/psychic.c =================================================================== --- trunk/libgaim/plugins/psychic.c 2006-11-06 22:32:49 UTC (rev 17686) +++ trunk/libgaim/plugins/psychic.c 2006-11-06 23:01:44 UTC (rev 17687) @@ -28,6 +28,7 @@ #define PREF_BUDDIES PREFS_BASE "/buddies_only" #define PREF_NOTICE PREFS_BASE "/show_notice" #define PREF_STATUS PREFS_BASE "/activate_online" +#define PREF_RAISE PREFS_BASE "/raise_conv" static void @@ -50,16 +51,18 @@ if(! gconv) { gaim_debug_info("psychic", "no previous conversation exists\n"); gconv = gaim_conversation_new(GAIM_CONV_TYPE_IM, acct, name); - gaim_conversation_present(gconv); + if(gaim_prefs_get_bool(PREF_RAISE)) { + gaim_conversation_present(gconv); + } + if(gaim_prefs_get_bool(PREF_NOTICE)) { + + /* 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." */ gaim_conversation_write(gconv, NULL, - /* 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." */ _("You feel a disturbance in the force..."), GAIM_MESSAGE_SYSTEM | GAIM_MESSAGE_NO_LOG | GAIM_MESSAGE_ACTIVE_ONLY, time(NULL)); @@ -92,6 +95,10 @@ " conversations")); gaim_plugin_pref_frame_add(frame, pref); + pref = gaim_plugin_pref_new_with_name(PREF_RAISE); + gaim_plugin_pref_set_label(pref, _("Raise psychic conversations")); + gaim_plugin_pref_frame_add(frame, pref); + return frame; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-11-10 06:23:43
|
Revision: 17719 http://svn.sourceforge.net/gaim/?rev=17719&view=rev Author: thekingant Date: 2006-11-09 22:23:10 -0800 (Thu, 09 Nov 2006) Log Message: ----------- Some updated translations Modified Paths: -------------- trunk/gtk/gtkdialogs.c trunk/po/en_GB.po trunk/po/gl.po trunk/po/sl.po Modified: trunk/gtk/gtkdialogs.c =================================================================== --- trunk/gtk/gtkdialogs.c 2006-11-10 05:18:10 UTC (rev 17718) +++ trunk/gtk/gtkdialogs.c 2006-11-10 06:23:10 UTC (rev 17719) @@ -167,7 +167,7 @@ {N_("Serbian"), "sr", "Danilo Šegan", "ds...@gm..."}, {N_("Serbian"), "sr", "Aleksandar Urosevic", "ur...@us..."}, {N_("Slovak"), "sk", "Richard Golier", "go...@gm..."}, - {N_("Slovenian"), "sl", "Matjaz Horvat", "ma...@ow..."}, + {N_("Slovenian"), "sl", "Martin Srebotnjak", "fi...@us..."}, {N_("Albanian"), "sq", "Besnik Bleta", "be...@pr..."}, {N_("Swedish"), "sv", "Tore Lundqvist", "tl...@mi..."}, {N_("Tamil"), "ta", "Viveka Nathan K", "viv...@us..."}, @@ -212,6 +212,7 @@ {N_("Russian"), "ru", "Alexandre Prokoudine", NULL}, {N_("Russian"), "ru", "Sergey Volozhanin", NULL}, {N_("Slovak"), "sk", "Daniel Režný", NULL}, + {N_("Slovenian"), "sl", "Matjaz Horvat", NULL}, {N_("Swedish"), "sv", "Christian Rose", NULL}, {N_("Simplified Chinese"), "zh_CN", "Hashao, Rocky S. Lee", NULL}, {N_("Traditional Chinese"), "zh_TW", "Hashao, Rocky S. Lee", NULL}, Modified: trunk/po/en_GB.po =================================================================== --- trunk/po/en_GB.po 2006-11-10 05:18:10 UTC (rev 17718) +++ trunk/po/en_GB.po 2006-11-10 06:23:10 UTC (rev 17719) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Gaim 1.1.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-07 12:33+0000\n" +"POT-Creation-Date: 2006-11-06 12:17+0000\n" "PO-Revision-Date: 2006-02-07 13:57+0000\n" "Last-Translator: Luke Ross <luk...@sy...>\n" "Language-Team: <en...@li...>\n" @@ -28,2280 +28,1260 @@ msgid "Send instant messages over multiple protocols" msgstr "Send instant messages over multiple protocols" -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/ciphertest.c:264 -msgid "Cipher Test" -msgstr "Cipher Test" +#: ../console/gntaccount.c:119 ../console/gntblist.c:277 +#: ../console/gntblist.c:395 ../console/gntblist.c:408 +#: ../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 "Error" -#. *< name -#. *< version -#. * summary -#. * description -#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269 -msgid "Tests the ciphers that ship with gaim." -msgstr "Tests the ciphers that ship with gaim." +#: ../console/gntaccount.c:119 +msgid "Account was not added" +msgstr "Account was not added" -#: ../plugins/contact_priority.c:61 -msgid "Buddy is idle" -msgstr "Buddy is idle" +#: ../console/gntaccount.c:120 +msgid "Screenname of an account must be non-empty." +msgstr "Screen name of an account must not be empty." -#: ../plugins/contact_priority.c:62 -msgid "Buddy is away" -msgstr "Buddy is away" +#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558 +msgid "New mail notifications" +msgstr "New mail notifications" -#: ../plugins/contact_priority.c:63 -msgid "Buddy is \"extended\" away" -msgstr "Buddy is away for an extended period" +#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487 +msgid "Remember password" +msgstr "Remember password" -#. Not used yet. -#: ../plugins/contact_priority.c:66 -msgid "Buddy is mobile" -msgstr "Buddy is mobile" +#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3797 +msgid "Modify Account" +msgstr "Modify Account" -#: ../plugins/contact_priority.c:68 -msgid "Buddy is offline" -msgstr "Buddy is offline" +#: ../console/gntaccount.c:474 +msgid "New Account" +msgstr "New Account" -#: ../plugins/contact_priority.c:90 -msgid "Point values to use when..." -msgstr "Point values to use when..." +#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695 +msgid "Protocol:" +msgstr "Protocol:" -#: ../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 "" -"The buddy with the <i>highest score</i> is the buddy who will have priority " -"in the contact.\n" +#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4942 +#: ../gtk/plugins/gevolution/new_person_dialog.c:295 +msgid "Screen name:" +msgstr "Screen name:" -#: ../plugins/contact_priority.c:125 -msgid "Use last buddy when scores are equal" -msgstr "Use last buddy when scores are equal" +#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478 +msgid "Password:" +msgstr "Password:" -#: ../plugins/contact_priority.c:130 -msgid "Point values to use for account..." -msgstr "Point values to use for account..." +#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4963 ../gtk/gtkblist.c:5328 +msgid "Alias:" +msgstr "Alias:" -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/contact_priority.c:182 -msgid "Contact Priority" -msgstr "Contact Priority" +#. Cancel +#: ../console/gntaccount.c:554 ../console/gntaccount.c:615 +#: ../console/gntaccount.c:834 ../console/gntblist.c:318 +#: ../console/gntblist.c:385 ../console/gntblist.c:418 +#: ../console/gntblist.c:747 ../console/gntblist.c:916 +#: ../console/gntblist.c:1007 ../console/gntblist.c:1920 +#: ../console/gntprefs.c:224 ../console/gntstatus.c:139 +#: ../console/gntstatus.c:471 ../console/gntstatus.c:596 +#: ../gtk/gtkaccount.c:1833 ../gtk/gtkaccount.c:2307 ../gtk/gtkblist.c:5384 +#: ../gtk/gtkdialogs.c:681 ../gtk/gtkdialogs.c:818 ../gtk/gtkdialogs.c:909 +#: ../gtk/gtkdialogs.c:928 ../gtk/gtkdialogs.c:950 ../gtk/gtkdialogs.c:970 +#: ../gtk/gtkdialogs.c:1014 ../gtk/gtkdialogs.c:1052 ../gtk/gtkdialogs.c:1106 +#: ../gtk/gtkdialogs.c:1143 ../gtk/gtkdialogs.c:1168 +#: ../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:1389 +#: ../libgaim/protocols/oscar/oscar.c:2153 +#: ../libgaim/protocols/oscar/oscar.c:2192 +#: ../libgaim/protocols/oscar/oscar.c:2240 +#: ../libgaim/protocols/oscar/oscar.c:5734 +#: ../libgaim/protocols/oscar/oscar.c:5786 +#: ../libgaim/protocols/oscar/oscar.c:5938 +#: ../libgaim/protocols/oscar/oscar.c:5963 +#: ../libgaim/protocols/oscar/oscar.c:6019 +#: ../libgaim/protocols/oscar/oscar.c:6088 +#: ../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 "Cancel" -#. *< name -#. *< version -#. *< summary -#: ../plugins/contact_priority.c:185 -msgid "" -"Allows for controlling the values associated with different buddy states." -msgstr "" -"Allows for controlling the values associated with different buddy states." +#. 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 "Save" -#. *< 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 "" -"Allows for changing the point values of idle/away/offline states for buddies " -"in contact priority computations." - -#. *< 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 "Plug-in to establish a Crazychat session." - -#. * description -#: ../plugins/crazychat/cc_gaim_plugin.c:151 -msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session" -msgstr "Uses Gaim to obtain buddy IPs to connect for a Crazychat session" - -#. make the network configuration frame -#: ../plugins/crazychat/cc_gaim_plugin.c:295 -msgid "Network Configuration" -msgstr "Network Configuration" - -#: ../plugins/crazychat/cc_gaim_plugin.c:307 -msgid "TCP port" -msgstr "TCP port" - -#: ../plugins/crazychat/cc_gaim_plugin.c:317 -msgid "UDP port" -msgstr "UDP port" - -#. make the feature configuration frame -#: ../plugins/crazychat/cc_gaim_plugin.c:329 -msgid "Feature Calibration" -msgstr "Feature Calibration" - -#. add enabled / disabled -#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251 -#: ../src/gtkplugin.c:574 -msgid "Enabled" -msgstr "Enabled" - -#: ../plugins/crazychat/cc_gaim_plugin.c:350 -msgid "Disabled" -msgstr "Disabled" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/dbus-example.c:135 -msgid "DBus" -msgstr "DBus" - -#. *< name -#. *< version -#. * summary -#. * description -#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140 -msgid "DBus Plugin Example" -msgstr "DBus Plug-in Example" - -#: ../plugins/docklet/docklet.c:154 -msgid "Right-click for more unread messages...\n" -msgstr "Right-click for more unread messages...\n" - -#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3239 +#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827 +#: ../gtk/gtksavedstatuses.c:293 #, c-format -msgid "%d unread message from %s\n" -msgid_plural "%d unread messages from %s\n" -msgstr[0] "%d unread message from %s\n" -msgstr[1] "%d unread messages from %s\n" +msgid "Are you sure you want to delete %s?" +msgstr "Are you sure you want to delete %s?" -#: ../plugins/docklet/docklet.c:432 -msgid "Change Status" -msgstr "Change Status" +#. Close any other opened delete window +#: ../console/gntaccount.c:614 +msgid "Delete Account" +msgstr "Delete Account" -#: ../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 -msgid "Available" -msgstr "Available" +#: ../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 "Delete" -#. 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:793 -#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7871 -#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3188 -#: ../src/status.c:158 -msgid "Away" -msgstr "Away" - -#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675 -#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2728 -#: ../src/status.c:157 -msgid "Invisible" -msgstr "Invisible" - -#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2969 -#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099 -#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859 -#: ../src/protocols/oscar/oscar.c:7843 ../src/protocols/yahoo/yahoo.c:2732 -#: ../src/status.c:154 -msgid "Offline" -msgstr "Offline" - -#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681 -msgid "New..." -msgstr "New..." - -#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682 -msgid "Saved..." -msgstr "Saved..." - -#: ../plugins/docklet/docklet.c:484 -msgid "Show Buddy List" -msgstr "Show Buddy List" - -#: ../plugins/docklet/docklet.c:489 -msgid "Unread Messages" -msgstr "Unread Messages" - -#: ../plugins/docklet/docklet.c:510 -msgid "New Message..." -msgstr "New Message..." - -#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467 +#: ../console/gntaccount.c:644 ../console/gntblist.c:1841 +#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2139 ../gtk/gtkdocklet.c:530 msgid "Accounts" msgstr "Accounts" -#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538 -msgid "Plugins" -msgstr "Plug-ins" +#: ../console/gntaccount.c:650 +msgid "You can enable/disable accounts from the following list." +msgstr "You can enable/disable accounts from the following list." -#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900 -msgid "Preferences" -msgstr "Preferences" +#: ../console/gntaccount.c:673 ../console/gntaccount.c:833 +#: ../console/gntblist.c:318 ../console/gntblist.c:385 +#: ../console/gntblist.c:418 ../console/gntnotify.c:306 +#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2306 ../gtk/gtkblist.c:5383 +#: ../gtk/gtkconv.c:1634 ../gtk/gtkrequest.c:274 +#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2431 +#: ../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 "Add" -#: ../plugins/docklet/docklet.c:525 -msgid "Mute Sounds" -msgstr "Mute Sounds" +#: ../console/gntaccount.c:677 +msgid "Modify" +msgstr "Modify" -#. 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 "Quit" +#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2255 +#, c-format +msgid "%s%s%s%s has made %s his or her buddy%s%s" +msgstr "%s%s%s%s has made %s his or her buddy%s%s" -#: ../plugins/docklet/docklet.c:679 -msgid "Blink tray icon for unread..." -msgstr "Blink tray icon for unread..." +#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2304 +msgid "Add buddy to your list?" +msgstr "Add buddy to your list?" -#: ../plugins/docklet/docklet.c:682 -msgid "_Instant Messages:" -msgstr "_Instant Messages:" +#: ../console/gntblist.c:269 +msgid "You must provide a screename for the buddy." +msgstr "You must provide a screen name for the buddy." -#: ../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 -msgid "Never" -msgstr "Never" +#: ../console/gntblist.c:271 +msgid "You must provide a group." +msgstr "You must provide a group." -#: ../plugins/docklet/docklet.c:685 -msgid "In hidden conversations" -msgstr "In hidden conversations" +#: ../console/gntblist.c:273 +msgid "You must select an account." +msgstr "You must select an account." -#: ../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 -msgid "Always" -msgstr "Always" +#: ../console/gntblist.c:277 +msgid "Error adding buddy" +msgstr "Error adding buddy" -#: ../plugins/docklet/docklet.c:690 -msgid "C_hat Messages:" -msgstr "C_hat Messages:" +#: ../console/gntblist.c:302 ../gtk/gtkaccount.c:1896 +#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2805 +msgid "Screen Name" +msgstr "Screen Name" -#: ../plugins/docklet/docklet.c:693 -msgid "When my nick is said" -msgstr "When my nick is mentioned" +#: ../console/gntblist.c:305 ../console/gntblist.c:377 ../gtk/gtkdialogs.c:927 +#: ../gtk/gtkdialogs.c:949 ../gtk/gtkdialogs.c:969 ../gtk/gtkrequest.c:277 +#: ../libgaim/protocols/silc/chat.c:587 +msgid "Alias" +msgstr "Alias" -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/docklet/docklet.c:720 -msgid "System Tray Icon" -msgstr "System Tray Icon" +#: ../console/gntblist.c:308 ../console/gntblist.c:380 +msgid "Group" +msgstr "Group" -#. *< name -#. *< version -#. * summary -#: ../plugins/docklet/docklet.c:723 -msgid "Displays an icon for Gaim in the system tray." -msgstr "Displays an icon for Gaim in the system tray." +#: ../console/gntblist.c:311 ../console/gntblist.c:368 +#: ../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 "Account" -#. * 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 "" -"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." +#: ../console/gntblist.c:317 ../console/gntblist.c:794 ../gtk/gtkblist.c:4896 +#: ../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 "Add Buddy" -#: ../plugins/docklet/eggtrayicon.c:123 -msgid "Orientation" -msgstr "Orientation" +#: ../console/gntblist.c:317 +msgid "Please enter buddy information." +msgstr "Please enter buddy information." -#: ../plugins/docklet/eggtrayicon.c:124 -msgid "The orientation of the tray." -msgstr "The orientation of the tray." +#: ../console/gntblist.c:340 ../libgaim/blist.c:1195 +msgid "Chats" +msgstr "Chats" -#: ../plugins/extplacement.c:80 -msgid "By conversation count" -msgstr "By conversation count" +#. Extract their Name and put it in +#. Contact Info +#. Personal +#. Business +#: ../console/gntblist.c:374 ../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 "Name" -#: ../plugins/extplacement.c:101 -msgid "Conversation Placement" -msgstr "Conversation Placement" +#: ../console/gntblist.c:383 ../console/gntblist.c:796 ../gtk/gtkblist.c:5274 +msgid "Add Chat" +msgstr "Add Chat" -#: ../plugins/extplacement.c:106 -msgid "Number of conversations per window" -msgstr "Number of conversations per window" +#: ../console/gntblist.c:384 +msgid "You can edit more information from the context menu later." +msgstr "You can edit more information from the context menu later." -#: ../plugins/extplacement.c:112 -msgid "Separate IM and Chat windows when placing by number" -msgstr "Separate IM and Chat windows when placing by number" +#: ../console/gntblist.c:395 ../console/gntblist.c:408 +msgid "Error adding group" +msgstr "Error adding group" -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/extplacement.c:135 -msgid "ExtPlacement" -msgstr "ExtPlacement" +#: ../console/gntblist.c:396 +msgid "You must give a name for the group to add." +msgstr "You must give a name for the group to add." -#. *< name -#. *< version -#: ../plugins/extplacement.c:137 -msgid "Extra conversation placement options." -msgstr "Extra conversation placement options." +#: ../console/gntblist.c:409 +msgid "A group with the name already exists." +msgstr "A group with that name already exists." -#. *< summary -#. * description -#: ../plugins/extplacement.c:139 -msgid "" -"Restrict the number of conversations per windows, optionally separating IMs " -"and Chats" -msgstr "" -"Restrict the number of conversations per windows, optionally separating IMs " -"and Chats" +#: ../console/gntblist.c:416 ../console/gntblist.c:798 ../gtk/gtkblist.c:5380 +#: ../libgaim/protocols/sametime/sametime.c:5310 +#: ../libgaim/protocols/sametime/sametime.c:5397 +msgid "Add Group" +msgstr "Add Group" -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/filectl.c:245 -msgid "Gaim File Control" -msgstr "Gaim File Control" +#: ../console/gntblist.c:416 +msgid "Enter the name of the group" +msgstr "Enter the name of the group" -#. *< name -#. *< version -#. * summary -#. * description -#: ../plugins/filectl.c:248 ../plugins/filectl.c:250 -msgid "Allows you to control Gaim by entering commands in a file." -msgstr "Allows you to control Gaim by entering commands in a file." +#: ../console/gntblist.c:746 +msgid "Edit Chat" +msgstr "Edit Chat" -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/gaiminc.c:91 -msgid "Gaim Demonstration Plugin" -msgstr "Gaim Demonstration Plug-in" +#: ../console/gntblist.c:746 +msgid "Please Update the necessary fields." +msgstr "Please update the necessary fields." -#. *< name -#. *< version -#. * summary -#: ../plugins/gaiminc.c:94 -msgid "An example plugin that does stuff - see the description." -msgstr "An example plug-in that does stuff - see the description." +#: ../console/gntblist.c:747 ../console/gntstatus.c:196 +msgid "Edit" +msgstr "Edit" -#. * 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 "" -"This is a really cool plug-in 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" +#: ../console/gntblist.c:761 +msgid "Auto-join" +msgstr "Auto-join" -#: ../plugins/gaimrc.c:41 -msgid "Cursor Color" -msgstr "Cursor Colour" +#: ../console/gntblist.c:770 +msgid "Edit Settings" +msgstr "Edit Settings" -#: ../plugins/gaimrc.c:42 -msgid "Secondary Cursor Color" -msgstr "Secondary Cursor Colour" +#: ../console/gntblist.c:816 ../libgaim/protocols/silc/chat.c:878 +msgid "Get Info" +msgstr "Get Info" -#: ../plugins/gaimrc.c:43 -msgid "Hyperlink Color" -msgstr "Hyperlink Colour" +#: ../console/gntblist.c:821 +msgid "Add Buddy Pounce" +msgstr "Add Buddy Pounce" -#: ../plugins/gaimrc.c:56 -msgid "GtkTreeView Expander Size" -msgstr "GtkTreeView Expander Size" +#: ../console/gntblist.c:828 ../gtk/gtkconv.c:1582 +#: ../libgaim/protocols/oscar/oscar.c:615 +msgid "Send File" +msgstr "Send File" -#: ../plugins/gaimrc.c:57 -msgid "GtkTreeView Horizontal Separation" -msgstr "GtkTreeView Horizontal Separation" +#: ../console/gntblist.c:832 +msgid "View Log" +msgstr "View Log" -#: ../plugins/gaimrc.c:76 -msgid "Conversation Entry" -msgstr "Conversation Entry" +#: ../console/gntblist.c:912 +#, c-format +msgid "Please enter the new name for %s" +msgstr "Please enter the new name for %s" -#: ../plugins/gaimrc.c:77 -msgid "Conversation History" -msgstr "Conversation History" +#: ../console/gntblist.c:914 ../console/gntblist.c:915 +#: ../console/gntblist.c:1084 +msgid "Rename" +msgstr "Rename" -#: ../plugins/gaimrc.c:78 -msgid "Log Viewer" -msgstr "Log Viewer" +#: ../console/gntblist.c:914 +msgid "Enter empty string to reset the name." +msgstr "Enter empty string to reset the name." -#: ../plugins/gaimrc.c:79 -msgid "Request Dialog" -msgstr "Request Dialog" +#: ../console/gntblist.c:987 +msgid "Removing this contact will also remove all the buddies in the contact" +msgstr "Removing this contact will also remove all the buddies in the contact" -#: ../plugins/gaimrc.c:80 -msgid "Notify Dialog" -msgstr "Notify Dialog" +#: ../console/gntblist.c:995 +msgid "Removing this group will also remove all the buddies in the group" +msgstr "Removing this group will also remove all the buddies in the group" -#: ../plugins/gaimrc.c:91 -msgid "GtkTreeView Indent Expanders" -msgstr "GtkTreeView Indent Expanders" - -#: ../plugins/gaimrc.c:287 +#: ../console/gntblist.c:1000 #, c-format -msgid "Select Color for %s" -msgstr "Select Colour for %s" +msgid "Are you sure you want to remove %s?" +msgstr "Are you sure you want to remove %s?" -#: ../plugins/gaimrc.c:289 -msgid "Select Color" -msgstr "Select Colour" +#. XXX: anything to do with the returned ui-handle? +#: ../console/gntblist.c:1003 +msgid "Confirm Remove" +msgstr "Confirm Remove" -#: ../plugins/gaimrc.c:324 -#, c-format -msgid "Select Font for %s" -msgstr "Select Font for %s" +#: ../console/gntblist.c:1006 ../console/gntblist.c:1086 +#: ../gtk/gtkblist.c:1039 ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275 +msgid "Remove" +msgstr "Remove" -#: ../plugins/gaimrc.c:362 -msgid "Select Interface Font" -msgstr "Select Interface Font" +#. Buddy List +#: ../console/gntblist.c:1061 ../console/gntblist.c:1987 +#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3914 +#: ../gtk/plugins/win32/winprefs/winprefs.c:327 +msgid "Buddy List" +msgstr "Buddy List" -#: ../plugins/gaimrc.c:415 -msgid "General" -msgstr "General" +#: ../console/gntblist.c:1090 +msgid "Place tagged" +msgstr "Place tagged" -#: ../plugins/gaimrc.c:420 -msgid "GTK+ Interface Font" -msgstr "GTK+ Interface Font" +#: ../console/gntblist.c:1093 +msgid "Tag" +msgstr "Tag" -#: ../plugins/gaimrc.c:440 -msgid "GTK+ Text Shortcut Theme" -msgstr "GTK+ Text Shortcut Theme" +#: ../console/gntblist.c:1120 ../console/gntblist.c:1221 +#, c-format +msgid "Account: %s (%s)" +msgstr "Account: %s (%s)" -#: ../plugins/gaimrc.c:475 -msgid "Interface colors" -msgstr "Interface colours" - -#: ../plugins/gaimrc.c:499 -msgid "Widget Sizes" -msgstr "Widget Sizes" - -#: ../plugins/gaimrc.c:520 -msgid "Fonts" -msgstr "Fonts" - -#: ../plugins/gaimrc.c:543 -msgid "Tools" -msgstr "Tools" - -#: ../plugins/gaimrc.c:548 +#: ../console/gntblist.c:1145 #, c-format -msgid "Write settings to %s%sgtkrc-2.0" -msgstr "Write settings to %s%sgtkrc-2.0" - -#: ../plugins/gaimrc.c:556 -msgid "Re-read gtkrc files" -msgstr "Re-read gtkrc files" - -#: ../plugins/gaimrc.c:583 -msgid "Gaim GTK+ Theme Control" -msgstr "Gaim GTK+ Theme Control" - -#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586 -msgid "Provides access to commonly used gtkrc settings." -msgstr "Provides access to commonly used gtkrc settings." - -#. Configuration frame -#: ../plugins/gestures/gestures.c:235 -msgid "Mouse Gestures Configuration" -msgstr "Mouse Gestures Configuration" - -#: ../plugins/gestures/gestures.c:242 -msgid "Middle mouse button" -msgstr "Middle mouse button" - -#: ../plugins/gestures/gestures.c:247 -msgid "Right mouse button" -msgstr "Right mouse button" - -#. "Visual gesture display" checkbox -#: ../plugins/gestures/gestures.c:259 -msgid "_Visual gesture display" -msgstr "_Visual gesture display" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/gestures/gestures.c:289 -msgid "Mouse Gestures" -msgstr "Mouse Gestures" - -#. *< name -#. *< version -#. * summary -#: ../plugins/gestures/gestures.c:292 -msgid "Provides support for mouse gestures" -msgstr "Provides support for mouse gestures" - -#. * 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." +"Idle: %s" msgstr "" -"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." +"Idle: %s" -#. Extract their Name and put it in -#: ../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:755 -#: ../src/protocols/msn/msn.c:1525 -msgid "Name" -msgstr "Name" +#: ../console/gntblist.c:1200 +#, c-format +msgid "Nickname: %s\n" +msgstr "Nickname: %s\n" -#: ../plugins/gevolution/add_buddy_dialog.c:142 -msgid "Instant Messaging" -msgstr "Instant Messaging" - -#. Add the label. -#: ../plugins/gevolution/add_buddy_dialog.c:454 -msgid "Select a person from your address book below, or add a new person." -msgstr "Select a person from your address book below, or add a new person." - -#. "Search" -#: ../plugins/gevolution/add_buddy_dialog.c:467 -#: ../plugins/gevolution/assoc-buddy.c:353 -#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8391 -#: ../src/protocols/sametime/sametime.c:5532 -msgid "Search" -msgstr "Search" - -#: ../plugins/gevolution/add_buddy_dialog.c:548 -#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4535 -#: ../src/gtkblist.c:4899 -msgid "Group:" -msgstr "Group:" - -#. "New Person" button -#: ../plugins/gevolution/add_buddy_dialog.c:574 -#: ../plugins/gevolution/assoc-buddy.c:464 -msgid "New Person" -msgstr "New Person" - -#. "Select Buddy" button -#: ../plugins/gevolution/add_buddy_dialog.c:591 -msgid "Select Buddy" -msgstr "Select Buddy" - -#. Add the label. -#: ../plugins/gevolution/assoc-buddy.c:340 +#: ../console/gntblist.c:1212 +#, c-format msgid "" -"Select a person from your address book to add this buddy to, or create a new " -"person." +"Online: %d\n" +"Total: %d" msgstr "" -"Select a person from your address book to add this buddy to, or create a new " -"person." +"Online: %d\n" +"Total: %d" -#. Add the expander -#: ../plugins/gevolution/assoc-buddy.c:428 -msgid "User _details" -msgstr "User _details" - -#. "Associate Buddy" button -#: ../plugins/gevolution/assoc-buddy.c:481 -msgid "_Associate Buddy" -msgstr "_Associate Buddy" - -#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86 -#: ../src/protocols/jabber/jabber.c:1121 -msgid "None" -msgstr "None" - -#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96 -#: ../src/blist.c:516 ../src/blist.c:1271 ../src/blist.c:1498 -#: ../src/gtkblist.c:4344 ../src/protocols/jabber/roster.c:65 -msgid "Buddies" -msgstr "Buddies" - -#: ../plugins/gevolution/gevolution.c:262 -#: ../plugins/gevolution/gevolution.c:268 -msgid "Unable to send e-mail" -msgstr "Unable to send e-mail" - -#: ../plugins/gevolution/gevolution.c:263 -msgid "The evolution executable was not found in the PATH." -msgstr "The evolution executable was not found in the PATH." - -#: ../plugins/gevolution/gevolution.c:269 -msgid "The specified buddy was not found in the Evolution Contacts." -msgstr "The specified buddy was not found in the Evolution Contacts." - -#: ../plugins/gevolution/gevolution.c:286 -msgid "Add to Address Book" -msgstr "Add to Address Book" - -#: ../plugins/gevolution/gevolution.c:290 -msgid "Send E-Mail" -msgstr "Send E-Mail" - -#. Configuration frame -#: ../plugins/gevolution/gevolution.c:417 -msgid "Evolution Integration Configuration" -msgstr "Evolution Integration Configuration" - -#. Label -#: ../plugins/gevolution/gevolution.c:420 -msgid "Select all accounts that buddies should be auto-added to." -msgstr "Select all accounts that buddies should be auto-added to." - -#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147 -#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262 -msgid "Account" -msgstr "Account" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/gevolution/gevolution.c:527 -msgid "Evolution Integration" -msgstr "Evolution Integration" - -#. *< name -#. *< version -#. * summary -#. * description -#: ../plugins/gevolution/gevolution.c:530 -#: ../plugins/gevolution/gevolution.c:532 -msgid "Provides integration with Evolution." -msgstr "Provides integration with Evolution." - -#: ../plugins/gevolution/new_person_dialog.c:266 -msgid "Please enter the person's information below." -msgstr "Please enter the person's information below." - -#: ../plugins/gevolution/new_person_dialog.c:270 -msgid "Please enter the buddy's screen name and account type below." -msgstr "Please enter the buddy's screen name and account type below." - -#: ../plugins/gevolution/new_person_dialog.c:290 -msgid "Account type:" -msgstr "Account type:" - -#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784 -msgid "Screen name:" -msgstr "Screen name:" - -#. Optional Information section -#: ../plugins/gevolution/new_person_dialog.c:314 -msgid "Optional information:" -msgstr "Optional information:" - -#. Label -#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424 -#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:699 -msgid "Buddy Icon" -msgstr "Buddy Icon" - -#: ../plugins/gevolution/new_person_dialog.c:349 -msgid "First name:" -msgstr "Forename" - -#: ../plugins/gevolution/new_person_dialog.c:361 -msgid "Last name:" -msgstr "Surname" - -#: ../plugins/gevolution/new_person_dialog.c:381 -msgid "E-mail:" -msgstr "E-mail:" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/gtk-signals-test.c:160 -msgid "GTK Signals Test" -msgstr "GTK Signals Test" - -#. *< 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 "Test to see that all UI signals are working properly." - -#: ../plugins/history.c:120 +#: ../console/gntblist.c:1233 #, c-format -msgid "<b>Conversation with %s on %s:</b><br>" -msgstr "<h1>Conversation with %s on %s:</b><br>" - -#: ../plugins/history.c:147 -msgid "History Plugin Requires Logging" -msgstr "History Plug-in Requires Logging" - -#: ../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)." +"Last Seen: %s ago" msgstr "" -"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)." +"Last Seen: %s ago" -#: ../plugins/history.c:188 -msgid "History" -msgstr "History" +#: ../console/gntblist.c:1456 ../gtk/gtkdocklet.c:478 +#: ../gtk/gtkstatusbox.c:984 +msgid "New..." +msgstr "New..." -#: ../plugins/history.c:190 -msgid "Shows recently logged conversations in new conversations." -msgstr "Shows recently logged conversations in new conversations." +#: ../console/gntblist.c:1463 ../gtk/gtkdocklet.c:479 +#: ../gtk/gtkstatusbox.c:985 +msgid "Saved..." +msgstr "Saved..." -#: ../plugins/history.c:191 -msgid "" -"When a new conversation is opened this plugin will insert the last " -"conversation into the current conversation." -msgstr "" -"When a new conversation is opened this plug-in will insert the last " -"conversation into the current conversation." +#: ../console/gntblist.c:1809 ../console/gntplugin.c:231 ../console/gntui.c:73 +#: ../gtk/gtkdocklet.c:531 ../gtk/gtkplugin.c:538 +msgid "Plugins" +msgstr "Plug-ins" -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/iconaway.c:82 -msgid "Iconify on Away" -msgstr "Iconify on Away" +#: ../console/gntblist.c:1901 ../gtk/gtkdialogs.c:662 ../gtk/gtkdialogs.c:799 +#: ../gtk/gtkdialogs.c:879 +msgid "_Name" +msgstr "_Name" -#. *< 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 "Iconifies the buddy list and your conversations when you go away." +#: ../console/gntblist.c:1906 ../gtk/gtkdialogs.c:667 ../gtk/gtkdialogs.c:804 +#: ../gtk/gtkdialogs.c:884 +msgid "_Account" +msgstr "_Account" -#: ../plugins/idle.c:152 ../plugins/idle.c:210 -msgid "Minutes" -msgstr "Minutes" +#: ../console/gntblist.c:1914 ../gtk/gtkdialogs.c:675 +msgid "New Instant Message" +msgstr "New Instant Message" -#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217 -#: ../plugins/idle.c:306 -msgid "I'dle Mak'er" -msgstr "I'dle Mak'er" +#: ../console/gntblist.c:1916 ../gtk/gtkdialogs.c:677 +msgid "" +"Please enter the screen name or alias of the person you would like to IM." +msgstr "" +"Please enter the screen name or alias of the person you would like to IM." -#: ../plugins/idle.c:160 ../plugins/idle.c:249 -msgid "Set Account Idle Time" -msgstr "Set Account Idle Time" +#. * +#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons. +#. +#: ../console/gntblist.c:1919 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3796 +#: ../gtk/gtkdialogs.c:680 ../gtk/gtkdialogs.c:817 ../gtk/gtkdialogs.c:908 +#: ../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:1388 +#: ../libgaim/protocols/oscar/oscar.c:2152 +#: ../libgaim/protocols/oscar/oscar.c:2239 +#: ../libgaim/protocols/oscar/oscar.c:5733 +#: ../libgaim/protocols/oscar/oscar.c:5937 +#: ../libgaim/protocols/oscar/oscar.c:5962 +#: ../libgaim/protocols/oscar/oscar.c:6018 +#: ../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 "OK" -#: ../plugins/idle.c:163 ../plugins/idle.c:221 -msgid "_Set" -msgstr "_Set" +#. Create the "Options" frame. +#: ../console/gntblist.c:1938 ../gtk/gtkpounce.c:766 +msgid "Options" +msgstr "Options" -#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222 -msgid "_Cancel" -msgstr "_Cancel" +#: ../console/gntblist.c:1944 +msgid "Send IM..." +msgstr "Send IM..." -#: ../plugins/idle.c:177 -msgid "None of your accounts are idle." -msgstr "None of your accounts are idle." +#: ../console/gntblist.c:1948 +msgid "Toggle offline buddies" +msgstr "Toggle offline buddies" -#: ../plugins/idle.c:193 ../plugins/idle.c:253 -msgid "Unset Account Idle Time" -msgstr "Unset Account Idle Time" +#: ../console/gntblist.c:1952 +msgid "Sort by status" +msgstr "Sort by status" -#: ../plugins/idle.c:196 -msgid "_Unset" -msgstr "_Unset" +#: ../console/gntblist.c:1956 +msgid "Sort alphabetically" +msgstr "Sort alphabetically" -#: ../plugins/idle.c:218 ../plugins/idle.c:257 -msgid "Set Idle Time for All Accounts" -msgstr "Set Idle Time for All Accounts" +#: ../console/gntblist.c:1960 +msgid "Sort by log size" +msgstr "Sort by log size" -#: ../plugins/idle.c:262 -msgid "Unset Idle Time for All Idled Accounts" -msgstr "Unset Idle Time For All Idled Accounts" +#: ../console/gntconn.c:36 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" -#: ../plugins/idle.c:308 ../plugins/idle.c:309 -msgid "Allows you to hand-configure how long you've been idle" -msgstr "Allows you to hand-configure how long you've been idle for" +#: ../console/gntconn.c:39 +#, c-format +msgid "%s disconnected." +msgstr "%s disconnected." -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/ipc-test-client.c:87 -msgid "IPC Test Client" -msgstr "IPC Test Client" - -#. *< name -#. *< version -#. * summary -#: ../plugins/ipc-test-client.c:90 -msgid "Test plugin IPC support, as a client." -msgstr "Test plug-in IPC support, as a client." - -#. * description -#: ../plugins/ipc-test-client.c:92 +#: ../console/gntconn.c:40 +#, c-format msgid "" -"Test plugin IPC support, as a client. This locates the server plugin and " -"calls the commands registered." +"%s was disconnected due to the following error:\n" +"%s" msgstr "" -"Test plug-in IPC support, as a client. This locates the server plug-in and " -"calls the commands registered." +"%s was disconnected because of the following error:\n" +"%s" -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/ipc-test-server.c:74 -msgid "IPC Test Server" -msgstr "IPC Test Server" +#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3794 ../libgaim/account.c:991 +#: ../libgaim/connection.c:107 +msgid "Connection Error" +msgstr "Connection Error" -#. *< name -#. *< version -#. * summary -#: ../plugins/ipc-test-server.c:77 -msgid "Test plugin IPC support, as a server." -msgstr "Test plug-in IPC support, as a server." +#: ../console/gntconv.c:71 +msgid "No such command." +msgstr "No such command." -#. * description -#: ../plugins/ipc-test-server.c:79 -msgid "Test plugin IPC support, as a server. This registers the IPC commands." +#: ../console/gntconv.c:75 ../gtk/gtkconv.c:493 +msgid "Syntax Error: You typed the wrong number of arguments to that command." msgstr "" -"Test plug-in IPC support, as a server. This registers the IPC commands." +"Syntax Error: You typed the wrong number of arguments to that command." -#: ../plugins/log_reader.c:1407 -msgid "User is offline." -msgstr "User is offline." +#: ../console/gntconv.c:80 ../gtk/gtkconv.c:498 +msgid "Your command failed for an unknown reason." +msgstr "Your command failed for an unknown reason." -#: ../plugins/log_reader.c:1413 -msgid "Auto-response sent:" -msgstr "Auto-response sent:" +#: ../console/gntconv.c:85 ../gtk/gtkconv.c:504 +msgid "That command only works in chats, not IMs." +msgstr "That command only works in chats, not IMs." -#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426 -#: ../plugins/statenotify.c:79 -#, c-format -msgid "%s has signed off." -msgstr "%s has signed off." +#: ../console/gntconv.c:88 ../gtk/gtkconv.c:507 +msgid "That command only works in IMs, not chats." +msgstr "That command only works in IMs, not chats." -#: ../plugins/log_reader.c:1440 -msgid "One or more messages may have been undeliverable." -msgstr "One or more messages may not have been delivered." +#: ../console/gntconv.c:92 ../gtk/gtkconv.c:511 +msgid "That command doesn't work on this protocol." +msgstr "That command doesn't work on this protocol." -#. MSG_SERVER_DISCONNECTING -#. we have been kicked off =^( -#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363 -msgid "You were disconnected from the server." -msgstr "You were disconnected from the server." +#: ../console/gntconv.c:99 +msgid "Commands are not supported yet. Message was NOT sent." +msgstr "Commands are not supported yet. Message was NOT sent." -#: ../plugins/log_reader.c:1458 -msgid "" -"You are currently disconnected. Messages will not be received unless you are " -"logged in." -msgstr "" -"You are currently disconnected. Messages will not be received unless you are " -"logged in." +#: ../console/gntconv.c:198 +#, c-format +msgid "%s (%s -- %s)" +msgstr "%s (%s -- %s)" -#: ../plugins/log_reader.c:1473 -msgid "Message could not be sent because the maximum length was exceeded." -msgstr "Message could not be sent because the maximum length was exceeded." +#: ../console/gntconv.c:219 +#, c-format +msgid "%s [%s]" +msgstr "%s [%s]" -#: ../plugins/log_reader.c:1478 -msgid "Message could not be sent." -msgstr "Message could not be sent." +#: ../console/gntconv.c:349 +msgid "<AUTO-REPLY> " +msgstr "<AUTO-REPLY> " -#: ../plugins/log_reader.c:1837 ../plugins/log_reader.c:1930 -msgid "Adium" -msgstr "Adium" +#. Print the list of users in the room +#: ../console/gntconv.c:443 +msgid "List of users:\n" +msgstr "List of users:\n" -#: ../plugins/log_reader.c:1846 ../plugins/log_reader.c:1934 -msgid "Fire" -msgstr "Fire" +#: ../console/gntconv.c:567 ../gtk/gtkconv.c:386 +msgid "Supported debug options are: version" +msgstr "Supported debug options are: version" -#: ../plugins/log_reader.c:1855 ../plugins/log_reader.c:1938 -msgid "Messenger Plus!" -msgstr "Messenger Plus!" +#: ../console/gntconv.c:602 ../gtk/gtkconv.c:422 +msgid "No such command (in this context)." +msgstr "No such command (in this context)." -#: ../plugins/log_reader.c:1864 ../plugins/log_reader.c:1942 -msgid "MSN Messenger" -msgstr "MSN Messenger" - -#: ../plugins/log_reader.c:1873 ../plugins/log_reader.c:1946 -msgid "Trillian" -msgstr "Trillian" - -#. Add general preferences. -#: ../plugins/log_reader.c:1912 -msgid "General Log Reading Configuration" -msgstr "General Log Reading Configuration" - -#: ../plugins/log_reader.c:1916 -msgid "Fast size calculations" -msgstr "Fast size calculations" - -#: ../plugins/log_reader.c:1920 -msgid "Use name heuristics" -msgstr "Use name heuristics" - -#. Add Log Directory preferences. -#: ../plugins/log_reader.c:1926 -msgid "Log Directory" -msgstr "Log Directory" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/log_reader.c:1969 -msgid "Log Reader" -msgstr "Log Reader" - -#. *< name -#. *< version -#. * summary -#: ../plugins/log_reader.c:1973 -msgid "Includes other IM clients' logs in the log viewer." -msgstr "Includes other IM clients' logs in the log viewer." - -#. * description -#: ../plugins/log_reader.c:1977 +#: ../console/gntconv.c:605 ../gtk/gtkconv.c:425 msgid "" -"When viewing logs, this plugin will include logs from other IM clients. " -"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and " -"Trillian." +"Use \"/help <command>\" for help on a specific command.\n" +"The following commands are available in this context:\n" msgstr "" -"When viewing logs, this plug-in will include logs from other IM clients. " -"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and " -"Trillian." +"Use \"/help <command>\" for help on a specific command.\n" +"The following commands are available in this context:\n" -#: ../plugins/mailchk.c:160 -msgid "Mail Checker" -msgstr "Mail Checker" - -#: ../plugins/mailchk.c:162 -msgid "Checks for new local mail." -msgstr "Checks for new local mail." - -#: ../plugins/mailchk.c:163 -msgid "Adds a small box to the buddy list that shows if you have new mail." -msgstr "Adds a small box to the buddy list that shows if you have new mail." - -#: ../plugins/mono/loader/mono.c:213 -msgid "Mono Plugin Loader" -msgstr "Mono Plug-in Loader" - -#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216 -msgid "Loads .NET plugins with Mono." -msgstr "Loads .NET plug-ins with Mono." - -#: ../plugins/musicmessaging/musicmessaging.c:44 +#: ../console/gntconv.c:644 ../gtk/gtkconv.c:6732 msgid "" -"A music messaging session has been requested. Please click the MM icon to " -"accept." +"say <message>: Send a message normally as if you weren't using a " +"command." msgstr "" -"A music messaging session has been requested. Please click the MM icon to " -"accept." +"say <message>: Send a message normally as if you weren't using a " +"command." -#: ../plugins/musicmessaging/musicmessaging.c:45 -msgid "Music messaging session confirmed." -msgstr "Music messaging session confirmed." +#: ../console/gntconv.c:647 ../gtk/gtkconv.c:6735 +msgid "me <action>: Send an IRC style action to a buddy or chat." +msgstr "me <action>: Send an IRC style action to a buddy or chat." -#: ../plugins/musicmessaging/musicmessaging.c:414 -msgid "Music Messaging" -msgstr "Music Messaging" - -#: ../plugins/musicmessaging/musicmessaging.c:415 -msgid "There was a conflict in running the command:" -msgstr "There was a conflict in running the command:" - -#: ../plugins/musicmessaging/musicmessaging.c:523 -msgid "Error Running Editor" -msgstr "Error Running Editor" - -#: ../plugins/musicmessaging/musicmessaging.c:524 -msgid "The following error has occured:" -msgstr "The following error has occurred:" - -#. Configuration frame -#: ../plugins/musicmessaging/musicmessaging.c:623 -msgid "Music Messaging Configuration" -msgstr "Music Messaging Configuration" - -#: ../plugins/musicmessaging/musicmessaging.c:627 -msgid "Score Editor Path" -msgstr "Score Editor Path" - -#: ../plugins/musicmessaging/musicmessaging.c:628 -msgid "_Apply" -msgstr "_Apply" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#. *< name -#. *< version -#: ../plugins/musicmessaging/musicmessaging.c:663 -msgid "Music Messaging Plugin for collaborative composition." -msgstr "Music Messaging Plugin for collaborative composition." - -#. * summary -#: ../plugins/musicmessaging/musicmessaging.c:665 +#: ../console/gntconv.c:650 ../gtk/gtkconv.c:6738 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." +"debug <option>: Send various debug information to the current " +"conversation." msgstr "" -"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." +"debug <option>: Send various debug information to the current " +"conversation." -#. ---------- "Notify For" ---------- -#: ../plugins/notify.c:638 -msgid "Notify For" -msgstr "Notify For" +#: ../console/gntconv.c:653 ../gtk/gtkconv.c:6741 +msgid "clear: Clears the conversation scrollback." +msgstr "clear: Clears the conversation scrollback." -#: ../plugins/notify.c:642 -msgid "_IM windows" -msgstr "_IM windows" +#: ../console/gntconv.c:656 ../gtk/gtkconv.c:6744 +msgid "help <command>: Help on a specific command." +msgstr "help <command>: Help on a specific command." -#: ../plugins/notify.c:649 -msgid "C_hat windows" -msgstr "C_hat windows" +#: ../console/gntconv.c:661 +msgid "plugins: Show the plugins window." +msgstr "plugins: Show the plugins window" -#: ../plugins/notify.c:657 -msgid "\t_Only when someone says your nick" -msgstr "\t_Only when someone says your nick" +#: ../console/gntconv.c:664 +msgid "buddylist: Show the buddylist." +msgstr "buddylist: Show the buddy list." -#: ../plugins/notify.c:667 -msgid "_Focused windows" -msgstr "_Focused windows" +#: ../console/gntconv.c:667 +msgid "accounts: Show the accounts window." +msgstr "accounts: Show the accounts window." -#. ---------- "Notification Methods" ---------- -#: ../plugins/notify.c:675 -msgid "Notification Methods" -msgstr "Notification Methods" +#: ../console/gntconv.c:670 +msgid "debugwin: Show the debug window." +msgstr "debugwin: Show the debug window." -#: ../plugins/notify.c:682 -msgid "Prepend _string into window title:" -msgstr "Prepend _string into window title:" +#: ../console/gntconv.c:673 +msgid "prefs: Show the preference window." +msgstr "prefs: Show the preference window." -#. Count method button -#: ../plugins/notify.c:701 -msgid "Insert c_ount of new messages into window title" -msgstr "Insert c_ount of new messages into window title" +#: ../console/gntconv.c:676 +msgid "statuses: Show the savedstatuses window." +msgstr "statuses: Show the saved-statuses window." -#. Urgent method button -#: ../plugins/notify.c:710 -msgid "Set window manager \"_URGENT\" hint" -msgstr "Set window manager \"_URGENT\" hint" +#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708 +msgid "Debug Window" +msgstr "Debug Window" -#. Raise window method button -#: ../plugins/notify.c:719 -msgid "R_aise conversation window" -msgstr "R_aise conversation window" +#. 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:235 ../gtk/gtkdebug.c:767 +msgid "Clear" +msgstr "Clear" -#. ---------- "Notification Removals" ---------- -#: ../plugins/notify.c:727 -msgid "Notification Removal" -msgstr "Notification Removal" +#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776 +msgid "Pause" +msgstr "Pause" -#. Remove on focus button -#: ../plugins/notify.c:732 -msgid "Remove when conversation window _gains focus" -msgstr "Remove when conversation window _gains focus" +#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784 +msgid "Timestamps" +msgstr "Timestamps" -#. Remove on click button -#: ../plugins/notify.c:739 -msgid "Remove when conversation window _receives click" -msgstr "Remove when conversation window _receives click" - -#. Remove on type button -#: ../plugins/notify.c:747 -msgid "Remove when _typing in conversation window" -msgstr "Remove when _typing in conversation window" - -#. Remove on message send button -#: ../plugins/notify.c:755 -msgid "Remove when a _message gets sent" -msgstr "Remove when a _message gets sent" - -#. Remove on conversation switch button -#: ../plugins/notify.c:764 -msgid "Remove on switch to conversation ta_b" -msgstr "Remove on switch to conversation ta_b" - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/notify.c:853 -msgid "Message Notification" -msgstr "Message Notification" - -#. *< 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 "Provides a variety of ways of notifying you of unread messages." - -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/perl/perl.c:583 -msgid "Perl Plugin Loader" -msgstr "Perl Plug-in Loader" - -#. *< name -#. *< version -#. *< summary -#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586 -msgid "Provides support for loading perl plugins." -msgstr "Provides support for loading perl plug-ins." - -#: ../plugins/psychic.c:22 -msgid "Psychic Mode" -msgstr "Psychic Mode" - -#: ../plugins/psychic.c:23 -msgid "Psychic mode for incoming conversation" -msgstr "Psychic mode for incoming conversation" - -#: ../plugins/psychic.c:24 -msgid "" -"Causes conversation windows to appear as other users begin to message you. " -"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!" -msgstr "" -"Causes conversation windows to appear as other users begin to message you. " -"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!" - -#: ../plugins/psychic.c:60 -msgid "You feel a disturbance in the force..." -msgstr "You have a premonition..." - -#: ../plugins/psychic.c:79 -msgid "Only enable for users on the buddy list" -msgstr "Only enable for users on the buddy list" - -#: ../plugins/psychic.c:84 -msgid "Disable when away" -msgstr "Disable when away" - -#: ../plugins/psychic.c:88 -msgid "Display notification message in conversations" -msgstr "Display notification message in conversations" - -#: ../plugins/raw.c:175 -msgid "Raw" -msgstr "Raw" - -#: ../plugins/raw.c:177 -msgid "Lets you send raw input to text-based protocols." -msgstr "Lets you send raw input to text-based protocols." - -#: ../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 "" -"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." - -#: ../plugins/relnot.c:63 +#: ../console/gntgaim.c:166 #, c-format -msgid "You are using Gaim version %s. The current version is %s.<hr>" -msgstr "You are using Gaim version %s. The current version is %s.<hr>" +msgid "%s. Try `%s -h' for more information.\n" +msgstr "%s. Try `%s -h' for more information.\n" -#: ../plugins/relnot.c:69 +#: ../console/gntgaim.c:168 #, c-format msgid "" -"<b>ChangeLog:</b>\n" -"%s<br><br>" +"%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 "" -"<b>ChangeLog:</b>\n" -"%s<br><br>" +"%s\n" +"Usage: %s [OPTION]...\n" +"\n" +" -c, --config=DIR use DIR for config files\n" +" -d, --debug print debug 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" -#: ../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 "" -"You can get version %s from <br><a href=\"http://gaim.sourceforge.net/" -"\">http://gaim.sourceforge.net</a>." +#: ../console/gntnotify.c:146 +msgid "Emails" +msgstr "Emails" -#: ../plugins/relnot.c:78 ../plugins/relnot.c:79 -msgid "New Version Available" -msgstr "New Version Available" +#: ../console/gntnotify.c:152 ../console/gntnotify.c:206 +msgid "You have mail!" +msgstr "You have e-mail!" -#. *< type -#. *< ui_requirement -#. *< flags -#. *< dependencies -#. *< priority -#. *< id -#: ../plugins/relno... [truncated message content] |
From: <the...@us...> - 2006-11-10 08:27:44
|
Revision: 17729 http://svn.sourceforge.net/gaim/?rev=17729&view=rev Author: thekingant Date: 2006-11-10 00:27:42 -0800 (Fri, 10 Nov 2006) Log Message: ----------- Beta 5 is tagged n' stuff Modified Paths: -------------- trunk/configure.ac trunk/gaim.spec.in Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-11-10 07:43:09 UTC (rev 17728) +++ trunk/configure.ac 2006-11-10 08:27:42 UTC (rev 17729) @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([gaim], [2.0.0beta5], [gai...@li...]) +AC_INIT([gaim], [2.0.0dev], [gai...@li...]) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) Modified: trunk/gaim.spec.in =================================================================== --- trunk/gaim.spec.in 2006-11-10 07:43:09 UTC (rev 17728) +++ trunk/gaim.spec.in 2006-11-10 08:27:42 UTC (rev 17729) @@ -6,7 +6,7 @@ # When not doing betas comment this out # NOTE: %defines in spec files are evaluated in comments so the correct # way to comment it out is to replace the % with # -%define beta 5 +#%define beta 6 %if 0%{?beta} %define gaimver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <the...@us...> - 2006-11-13 06:47:23
|
Revision: 17744 http://svn.sourceforge.net/gaim/?rev=17744&view=rev Author: thekingant Date: 2006-11-12 22:47:19 -0800 (Sun, 12 Nov 2006) Log Message: ----------- Stuff we ship should not include gaim.h--we should include individual header files. Eventually 3rd party plugins should just need to include only gaim.h, but not yet Modified Paths: -------------- trunk/gtk/gtkdocklet-x11.c trunk/gtk/win32/gtkwin32dep.c trunk/libgaim/win32/win32dep.c Modified: trunk/gtk/gtkdocklet-x11.c =================================================================== --- trunk/gtk/gtkdocklet-x11.c 2006-11-13 04:16:49 UTC (rev 17743) +++ trunk/gtk/gtkdocklet-x11.c 2006-11-13 06:47:19 UTC (rev 17744) @@ -27,7 +27,6 @@ #include "debug.h" #include "gaimstock.h" -#include "gaim.h" #include "gtkdialogs.h" #include "eggtrayicon.h" Modified: trunk/gtk/win32/gtkwin32dep.c =================================================================== --- trunk/gtk/win32/gtkwin32dep.c 2006-11-13 04:16:49 UTC (rev 17743) +++ trunk/gtk/win32/gtkwin32dep.c 2006-11-13 06:47:19 UTC (rev 17744) @@ -37,7 +37,6 @@ #include <gtk/gtk.h> #include <gdk/gdkwin32.h> -#include "gaim.h" #include "debug.h" #include "notify.h" Modified: trunk/libgaim/win32/win32dep.c =================================================================== --- trunk/libgaim/win32/win32dep.c 2006-11-13 04:16:49 UTC (rev 17743) +++ trunk/libgaim/win32/win32dep.c 2006-11-13 06:47:19 UTC (rev 17744) @@ -32,7 +32,6 @@ #include <glib.h> #include <glib/gstdio.h> -#include "gaim.h" #include "debug.h" #include "notify.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-11-13 17:04:34
|
Revision: 17716 http://svn.sourceforge.net/gaim/?rev=17716&view=rev Author: seanegan Date: 2006-11-09 15:12:29 -0800 (Thu, 09 Nov 2006) Log Message: ----------- beta5 Modified Paths: -------------- trunk/NEWS trunk/configure.ac Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2006-11-09 22:28:56 UTC (rev 17715) +++ trunk/NEWS 2006-11-09 23:12:29 UTC (rev 17716) @@ -1,5 +1,10 @@ -=[ Gaim ]=- The Pimpin' Penguin IM Client That's Good For The Soul! +2.0.0beta5 (11/9/2006): + Sean: Another release in our endless stream in betas. This one's + pretty awesome; and it fixes major bugs introduced in previous + ones. + 2.0.0beta4 (10/17/2006) Sean: Still beta. Maybe the next one should be a gamma.. :) Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-11-09 22:28:56 UTC (rev 17715) +++ trunk/configure.ac 2006-11-09 23:12:29 UTC (rev 17716) @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([gaim], [2.0.0dev], [gai...@li...]) +AC_INIT([gaim], [2.0.0beta5], [gai...@li...]) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-11-14 16:32:50
|
Revision: 17748 http://svn.sourceforge.net/gaim/?rev=17748&view=rev Author: datallah Date: 2006-11-14 08:32:40 -0800 (Tue, 14 Nov 2006) Log Message: ----------- Update wingaim build and installer for oscar changes. Modified Paths: -------------- trunk/gaim-installer.nsi trunk/libgaim/protocols/oscar/Makefile.mingw Modified: trunk/gaim-installer.nsi =================================================================== --- trunk/gaim-installer.nsi 2006-11-14 04:04:04 UTC (rev 17747) +++ trunk/gaim-installer.nsi 2006-11-14 16:32:40 UTC (rev 17748) @@ -663,13 +663,14 @@ Delete "$INSTDIR\plugins\history.dll" Delete "$INSTDIR\plugins\iconaway.dll" Delete "$INSTDIR\plugins\idle.dll" + Delete "$INSTDIR\plugins\libaim.dll" Delete "$INSTDIR\plugins\libgg.dll" + Delete "$INSTDIR\plugins\libicq.dll" Delete "$INSTDIR\plugins\libirc.dll" Delete "$INSTDIR\plugins\libjabber.dll" Delete "$INSTDIR\plugins\libmsn.dll" Delete "$INSTDIR\plugins\libnapster.dll" Delete "$INSTDIR\plugins\libnovell.dll" - Delete "$INSTDIR\plugins\liboscar.dll" Delete "$INSTDIR\plugins\libqq.dll" Delete "$INSTDIR\plugins\libsametime.dll" Delete "$INSTDIR\plugins\libsilc.dll" @@ -704,6 +705,7 @@ Delete "$INSTDIR\idletrack.dll" Delete "$INSTDIR\libgaim.dll" Delete "$INSTDIR\libgtkspell.dll" + Delete "$INSTDIR\liboscar.dll" Delete "$INSTDIR\libmeanwhile-1.dll" Delete "$INSTDIR\libxml2.dll" Delete "$INSTDIR\nspr4.dll" Modified: trunk/libgaim/protocols/oscar/Makefile.mingw =================================================================== --- trunk/libgaim/protocols/oscar/Makefile.mingw 2006-11-14 04:04:04 UTC (rev 17747) +++ trunk/libgaim/protocols/oscar/Makefile.mingw 2006-11-14 16:32:40 UTC (rev 17748) @@ -8,6 +8,8 @@ include $(GAIM_TOP)/libgaim/win32/global.mak TARGET = liboscar +AIM_TARGET = libaim +ICQ_TARGET = libicq TYPE = PLUGIN # Static or Plugin... @@ -32,7 +34,8 @@ -I$(GAIM_TOP) LIB_PATHS = -L$(GTK_TOP)/lib \ - -L$(GAIM_LIB_TOP) + -L$(GAIM_LIB_TOP) \ + -L. ## ## SOURCES, OBJECTS @@ -75,6 +78,12 @@ OBJECTS = $(C_SRC:%.c=%.o) +AIM_C_SRC = libaim.c +AIM_OBJECTS = $(AIM_C_SRC:%.c=%.o) + +ICQ_C_SRC = libicq.c +ICQ_OBJECTS = $(ICQ_C_SRC:%.c=%.o) + ## ## LIBRARIES ## @@ -91,21 +100,29 @@ ## .PHONY: all install clean -all: $(TARGET).dll +all: $(TARGET).dll $(AIM_TARGET).dll $(ICQ_TARGET).dll install: all $(DLL_INSTALL_DIR) - cp $(TARGET).dll $(DLL_INSTALL_DIR) + cp $(AIM_TARGET).dll $(ICQ_TARGET).dll $(DLL_INSTALL_DIR) + cp $(TARGET).dll $(GAIM_INSTALL_DIR) $(OBJECTS): $(GAIM_CONFIG_H) -$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS) - $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll +$(TARGET).dll.a $(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS) + $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll +$(AIM_TARGET).dll: $(TARGET).dll.a $(AIM_OBJECTS) + $(CC) -shared $(AIM_OBJECTS) $(LIB_PATHS) $(LIBS) -loscar $(DLL_LD_FLAGS) -o $(AIM_TARGET).dll + +$(ICQ_TARGET).dll: $(TARGET).dll.a $(ICQ_OBJECTS) + $(CC) -shared $(ICQ_OBJECTS) $(LIB_PATHS) $(LIBS) -loscar $(DLL_LD_FLAGS) -o $(ICQ_TARGET).dll + ## ## CLEAN RULES ## clean: - rm -f $(OBJECTS) - rm -f $(TARGET).dll + rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a + rm -f $(AIM_OBJECTS) $(AIM_TARGET).dll + rm -f $(ICQ_OBJECTS) $(ICQ_TARGET).dll include $(GAIM_COMMON_TARGETS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-11-15 06:00:52
|
Revision: 17749 http://svn.sourceforge.net/gaim/?rev=17749&view=rev Author: datallah Date: 2006-11-14 22:00:51 -0800 (Tue, 14 Nov 2006) Log Message: ----------- Re-read Windows proxy information when it has changed. Modified Paths: -------------- trunk/gtk/win32/win_gaim.c trunk/libgaim/proxy.c trunk/libgaim/win32/win32dep.c trunk/libgaim/win32/win32dep.h Property Changed: ---------------- trunk/libgaim/protocols/oscar/ Modified: trunk/gtk/win32/win_gaim.c =================================================================== --- trunk/gtk/win32/win_gaim.c 2006-11-14 16:32:40 UTC (rev 17748) +++ trunk/gtk/win32/win_gaim.c 2006-11-15 06:00:51 UTC (rev 17749) @@ -35,8 +35,6 @@ #include <string.h> #include <stdio.h> -#define WIN32_PROXY_REGKEY "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings" - /* These will hopefully be in the win32api next time it is updated - at which point, we'll remove them */ #ifndef LANG_PERSIAN #define LANG_PERSIAN 0x29 @@ -460,49 +458,7 @@ return TRUE; } -static void wgaim_set_proxy() { - DWORD regval = 1; - DWORD reglen = sizeof(DWORD); - /* If the proxy server environment variables are already set, - * we shouldn't override them */ - if (getenv("HTTP_PROXY") || getenv("http_proxy") || getenv("HTTPPROXY")) - return; - - if (read_reg_string(HKEY_CURRENT_USER, WIN32_PROXY_REGKEY, - "ProxyEnable", - (LPBYTE) ®val, ®len) && (regval & 1)) { - char proxy_server[2048]; - char *c = NULL; - reglen = sizeof(proxy_server); - - if (!read_reg_string(HKEY_CURRENT_USER, WIN32_PROXY_REGKEY, - "ProxyServer", (LPBYTE) &proxy_server, ®len)) - return; - - if ((reglen > strlen("http=")) - && (c = strstr(proxy_server, "http="))) { - char *d; - c += strlen("http="); - d = strchr(c, ';'); - if (d) { - *d = '\0'; - } - /* c now points the proxy server (and port) */ - } - - if (c) { - const char envstr_prefix[] = "HTTP_PROXY=http://"; - char envstr[sizeof(envstr_prefix) + strlen(c) + 1]; - snprintf(envstr, sizeof(envstr), "%s%s", - envstr_prefix, c); - printf("Setting HTTP Proxy: %s\n", envstr); - putenv(envstr); - } - } - -} - #ifdef __GNUC__ # ifndef _stdcall # define _stdcall __attribute__((stdcall)) @@ -572,8 +528,6 @@ if (!getenv("GAIM_MULTI_INST") && !wgaim_set_running()) return 0; - wgaim_set_proxy(); - /* Now we are ready for Gaim .. */ if ((hmod = LoadLibrary("gtkgaim.dll"))) { gaim_main = (LPFNGAIMMAIN) GetProcAddress(hmod, "gaim_main"); Property changes on: trunk/libgaim/protocols/oscar ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile .deps .libs liboscar.* *.lo *.o + Makefile.in Makefile .deps .libs *.lo *.o *.dll *.dll.a Modified: trunk/libgaim/proxy.c =================================================================== --- trunk/libgaim/proxy.c 2006-11-14 16:32:40 UTC (rev 17748) +++ trunk/libgaim/proxy.c 2006-11-15 06:00:51 UTC (rev 17749) @@ -1688,6 +1688,13 @@ GaimProxyInfo *gpi; const gchar *tmp; + /* This is used as a fallback so we don't overwrite the selected proxy type */ + static GaimProxyInfo *tmp_none_proxy_info = NULL; + if (!tmp_none_proxy_info) { + tmp_none_proxy_info = gaim_proxy_info_new(); + gaim_proxy_info_set_type(tmp_none_proxy_info, GAIM_PROXY_NONE); + } + if (account && gaim_account_get_proxy_info(account) != NULL) gpi = gaim_account_get_proxy_info(account); else if (gaim_running_gnome()) @@ -1696,41 +1703,41 @@ gpi = gaim_global_proxy_get_info(); if (gaim_proxy_info_get_type(gpi) == GAIM_PROXY_USE_ENVVAR) { +#ifdef _WIN32 + wgaim_check_for_proxy_changes(); +#endif if ((tmp = g_getenv("HTTP_PROXY")) != NULL || (tmp = g_getenv("http_proxy")) != NULL || (tmp = g_getenv("HTTPPROXY")) != NULL) { - char *proxyhost,*proxypath,*proxyuser,*proxypasswd; + char *proxyhost, *proxyuser, *proxypasswd; int proxyport; /* http_proxy-format: * export http_proxy="http://user:pa...@yo...rver:port/" */ - if(gaim_url_parse(tmp, &proxyhost, &proxyport, &proxypath, &proxyuser, &proxypasswd)) { + if(gaim_url_parse(tmp, &proxyhost, &proxyport, NULL, &proxyuser, &proxypasswd)) { gaim_proxy_info_set_host(gpi, proxyhost); g_free(proxyhost); - g_free(proxypath); - if (proxyuser != NULL) { - gaim_proxy_info_set_username(gpi, proxyuser); - g_free(proxyuser); - } - if (proxypasswd != NULL) { - gaim_proxy_info_set_password(gpi, proxypasswd); - g_free(proxypasswd); - } + gaim_proxy_info_set_username(gpi, proxyuser); + g_free(proxyuser); + + gaim_proxy_info_set_password(gpi, proxypasswd); + g_free(proxypasswd); + /* only for backward compatibility */ if (proxyport == 80 && ((tmp = g_getenv("HTTP_PROXY_PORT")) != NULL || (tmp = g_getenv("http_proxy_port")) != NULL || (tmp = g_getenv("HTTPPROXYPORT")) != NULL)) - proxyport = atoi(tmp); + proxyport = atoi(tmp); gaim_proxy_info_set_port(gpi, proxyport); } } else { /* no proxy environment variable found, don't use a proxy */ gaim_debug_info("proxy", "No environment settings found, not using a proxy\n"); - gaim_proxy_info_set_type(gpi, GAIM_PROXY_NONE); + gpi = tmp_none_proxy_info; } /* XXX: Do we want to skip this step if user/password were part of url? */ Modified: trunk/libgaim/win32/win32dep.c =================================================================== --- trunk/libgaim/win32/win32dep.c 2006-11-14 16:32:40 UTC (rev 17748) +++ trunk/libgaim/win32/win32dep.c 2006-11-15 06:00:51 UTC (rev 17749) @@ -44,6 +44,8 @@ */ #define _(x) gettext(x) +#define WIN32_PROXY_REGKEY "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings" + /* For shfolder.dll */ typedef HRESULT (CALLBACK* LPFNSHGETFOLDERPATHA)(HWND, int, HANDLE, DWORD, LPSTR); typedef HRESULT (CALLBACK* LPFNSHGETFOLDERPATHW)(HWND, int, HANDLE, DWORD, LPWSTR); @@ -56,6 +58,9 @@ static HINSTANCE libgaimdll_hInstance = 0; +static HANDLE proxy_change_event = NULL; +static HKEY proxy_regkey = NULL; + /* * PUBLIC CODE */ @@ -319,77 +324,198 @@ return success; } +static HKEY _reg_open_key(HKEY rootkey, const char *subkey, REGSAM access) { + HKEY reg_key = NULL; + LONG rv; + + if(G_WIN32_HAVE_WIDECHAR_API()) { + wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL, + NULL, NULL); + rv = RegOpenKeyExW(rootkey, wc_subkey, 0, access, ®_key); + g_free(wc_subkey); + } else { + char *cp_subkey = g_locale_from_utf8(subkey, -1, NULL, + NULL, NULL); + rv = RegOpenKeyExA(rootkey, cp_subkey, 0, access, ®_key); + g_free(cp_subkey); + } + + if (rv != ERROR_SUCCESS) { + char *errmsg = g_win32_error_message(rv); + gaim_debug_info("wgaim", "Could not open reg key '%s' subkey '%s'.\nMessage: (%ld) %s\n", + ((rootkey == HKEY_LOCAL_MACHINE) ? "HKLM" : + (rootkey == HKEY_CURRENT_USER) ? "HKCU" : + (rootkey == HKEY_CLASSES_ROOT) ? "HKCR" : "???"), + subkey, rv, errmsg); + g_free(errmsg); + } + + return reg_key; +} + +static gboolean _reg_read(HKEY reg_key, const char *valname, LPDWORD type, LPBYTE data, LPDWORD data_len) { + LONG rv; + + if(G_WIN32_HAVE_WIDECHAR_API()) { + wchar_t *wc_valname = NULL; + if (valname) + wc_valname = g_utf8_to_utf16(valname, -1, NULL, NULL, NULL); + rv = RegQueryValueExW(reg_key, wc_valname, 0, type, data, data_len); + g_free(wc_valname); + } else { + char *cp_valname = NULL; + if(valname) + cp_valname = g_locale_from_utf8(valname, -1, NULL, NULL, NULL); + rv = RegQueryValueExA(reg_key, cp_valname, 0, type, data, data_len); + g_free(cp_valname); + } + + if (rv != ERROR_SUCCESS) { + char *errmsg = g_win32_error_message(rv); + gaim_debug_info("wgaim", "Could not read from reg key value '%s'.\nMessage: (%ld) %s\n", + valname, rv, errmsg); + g_free(errmsg); + } + + return (rv == ERROR_SUCCESS); +} + +gboolean wgaim_read_reg_dword(HKEY rootkey, const char *subkey, const char *valname, LPDWORD result) { + + DWORD type; + DWORD nbytes; + HKEY reg_key = _reg_open_key(rootkey, subkey, KEY_QUERY_VALUE); + gboolean success = FALSE; + + if(reg_key) { + if(_reg_read(reg_key, valname, &type, (LPBYTE)result, &nbytes)) + success = TRUE; + RegCloseKey(reg_key); + } + + return success; +} + char *wgaim_read_reg_string(HKEY rootkey, const char *subkey, const char *valname) { DWORD type; DWORD nbytes; - HKEY reg_key; + HKEY reg_key = _reg_open_key(rootkey, subkey, KEY_QUERY_VALUE); char *result = NULL; - if(G_WIN32_HAVE_WIDECHAR_API()) { - wchar_t *wc_subkey = g_utf8_to_utf16(subkey, -1, NULL, - NULL, NULL); + if(reg_key) { + if(_reg_read(reg_key, valname, &type, NULL, &nbytes) && type == REG_SZ) { + LPBYTE data; + if(G_WIN32_HAVE_WIDECHAR_API()) + data = (LPBYTE) g_new(wchar_t, ((nbytes + 1) / sizeof(wchar_t)) + 1); + else + data = (LPBYTE) g_malloc(nbytes + 1); - if(RegOpenKeyExW(rootkey, wc_subkey, 0, - KEY_QUERY_VALUE, ®_key) == ERROR_SUCCESS) { - wchar_t *wc_valname = NULL; - if (valname) - wc_valname = g_utf8_to_utf16(valname, -1, - NULL, NULL, NULL); - - if(RegQueryValueExW(reg_key, wc_valname, 0, &type, - NULL, &nbytes) == ERROR_SUCCESS - && type == REG_SZ) { - wchar_t *wc_temp = - g_new(wchar_t, ((nbytes + 1) / sizeof(wchar_t)) + 1); - - if(RegQueryValueExW(reg_key, wc_valname, 0, - &type, (LPBYTE) wc_temp, - &nbytes) == ERROR_SUCCESS) { + if(_reg_read(reg_key, valname, &type, data, &nbytes)) { + if(G_WIN32_HAVE_WIDECHAR_API()) { + wchar_t *wc_temp = (wchar_t*) data; wc_temp[nbytes / sizeof(wchar_t)] = '\0'; result = g_utf16_to_utf8(wc_temp, -1, NULL, NULL, NULL); - } - g_free(wc_temp); - } - g_free(wc_valname); - } - g_free(wc_subkey); - } else { - char *cp_subkey = g_locale_from_utf8(subkey, -1, NULL, - NULL, NULL); - if(RegOpenKeyExA(rootkey, cp_subkey, 0, - KEY_QUERY_VALUE, ®_key) == ERROR_SUCCESS) { - char *cp_valname = NULL; - if(valname) - cp_valname = g_locale_from_utf8(valname, -1, - NULL, NULL, NULL); - - if(RegQueryValueExA(reg_key, cp_valname, 0, &type, - NULL, &nbytes) == ERROR_SUCCESS - && type == REG_SZ) { - char *cp_temp = g_malloc(nbytes + 1); - - if(RegQueryValueExA(reg_key, cp_valname, 0, - &type, cp_temp, - &nbytes) == ERROR_SUCCESS) { + } else { + char *cp_temp = (char*) data; cp_temp[nbytes] = '\0'; result = g_locale_to_utf8(cp_temp, -1, NULL, NULL, NULL); } - g_free (cp_temp); } - g_free(cp_valname); + g_free(data); } - g_free(cp_subkey); + RegCloseKey(reg_key); } - if(reg_key != NULL) - RegCloseKey(reg_key); - return result; } +static void wgaim_refresh_proxy(void) { + gboolean set_proxy = FALSE; + DWORD enabled = 0; + + wgaim_read_reg_dword(HKEY_CURRENT_USER, WIN32_PROXY_REGKEY, + "ProxyEnable", &enabled); + + if (enabled & 1) { + char *c = NULL; + char *tmp = wgaim_read_reg_string(HKEY_CURRENT_USER, WIN32_PROXY_REGKEY, + "ProxyServer"); + + /* There are proxy settings for several protocols */ + if (tmp && (c = g_strstr_len(tmp, strlen(tmp), "http="))) { + char *d; + c += strlen("http="); + d = strchr(c, ';'); + if (d) + *d = '\0'; + /* c now points the proxy server (and port) */ + + /* There is only a global proxy */ + } else if (tmp && strlen(tmp) > 0 && !strchr(tmp, ';')) { + c = tmp; + } + + if (c) { + gaim_debug_info("wgaim", "Setting HTTP Proxy: 'http://%s'\n", c); + g_setenv("HTTP_PROXY", c, TRUE); + set_proxy = TRUE; + } + g_free(tmp); + } + + /* If there previously was a proxy set and there isn't one now, clear it */ + if (getenv("HTTP_PROXY") && !set_proxy) { + gaim_debug_info("wgaim", "Clearing HTTP Proxy\n"); + g_unsetenv("HTTP_PROXY"); + } +} + +static void watch_for_proxy_changes(void) { + LONG rv; + DWORD filter = REG_NOTIFY_CHANGE_NAME | + REG_NOTIFY_CHANGE_LAST_SET; + + if (!proxy_regkey && + !(proxy_regkey = _reg_open_key(HKEY_CURRENT_USER, + WIN32_PROXY_REGKEY, KEY_NOTIFY))) { + return; + } + + if (!(proxy_change_event = CreateEvent(NULL, TRUE, FALSE, NULL))) { + char *errmsg = g_win32_error_message(GetLastError()); + gaim_debug_error("wgaim", "Unable to watch for proxy changes: %s\n", errmsg); + g_free(errmsg); + return; + } + + rv = RegNotifyChangeKeyValue(proxy_regkey, TRUE, filter, proxy_change_event, TRUE); + if (rv != ERROR_SUCCESS) { + char *errmsg = g_win32_error_message(rv); + gaim_debug_error("wgaim", "Unable to watch for proxy changes: %s\n", errmsg); + g_free(errmsg); + CloseHandle(proxy_change_event); + proxy_change_event = NULL; + } + +} + +gboolean wgaim_check_for_proxy_changes(void) { + gboolean changed = FALSE; + + if (proxy_change_event && WaitForSingleObject(proxy_change_event, 0) == WAIT_OBJECT_0) { + CloseHandle(proxy_change_event); + proxy_change_event = NULL; + changed = TRUE; + wgaim_refresh_proxy(); + watch_for_proxy_changes(); + } + + return changed; +} + void wgaim_init(void) { WORD wVersionRequested; WSADATA wsaData; @@ -430,6 +556,15 @@ if (!g_thread_supported()) g_thread_init(NULL); + /* If the proxy server environment variables are already set, + * we shouldn't override them */ + if (!getenv("HTTP_PROXY") && !getenv("http_proxy") && !getenv("HTTPPROXY")) { + wgaim_refresh_proxy(); + watch_for_proxy_changes(); + } else { + gaim_debug_info("wgaim", "HTTP_PROXY env. var already set. Ignoring win32 Internet Settings.\n"); + } + gaim_debug_info("wgaim", "wgaim_init end\n"); } @@ -444,6 +579,11 @@ g_free(app_data_dir); app_data_dir = NULL; + if (proxy_regkey) { + RegCloseKey(proxy_regkey); + proxy_regkey = NULL; + } + libgaimdll_hInstance = NULL; } Modified: trunk/libgaim/win32/win32dep.h =================================================================== --- trunk/libgaim/win32/win32dep.h 2006-11-14 16:32:40 UTC (rev 17748) +++ trunk/libgaim/win32/win32dep.h 2006-11-15 06:00:51 UTC (rev 17749) @@ -41,6 +41,8 @@ gboolean wgaim_write_reg_string(HKEY rootkey, const char *subkey, const char *valname, const char *value); char *wgaim_escape_dirsep(const char *filename); /* needs to be g_free'd */ GIOChannel *wgaim_g_io_channel_win32_new_socket(int socket); /* Until we get the post-2.8 glib win32 giochannel implementation working, use the thread-based one */ +/** Check for changes to the system proxy settings and update the HTTP_PROXY env. var. if there have been changes */ +gboolean wgaim_check_for_proxy_changes(void); /* Determine Gaim paths */ char *wgaim_get_special_folder(int folder_type); /* needs to be g_free'd */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2006-11-15 19:38:55
|
Revision: 17752 http://svn.sourceforge.net/gaim/?rev=17752&view=rev Author: sadrul Date: 2006-11-15 11:38:49 -0800 (Wed, 15 Nov 2006) Log Message: ----------- Warmenhoved patch #1594991 (make del_prev_word work more like in emacs) from Trevor Caira. Modified Paths: -------------- trunk/COPYRIGHT trunk/console/libgnt/gntentry.c Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-11-15 19:12:09 UTC (rev 17751) +++ trunk/COPYRIGHT 2006-11-15 19:38:49 UTC (rev 17752) @@ -43,6 +43,7 @@ Philip Brown Sean Burke Thomas Butter +Trevor Caira Andrea Canciani Damien Carbery Michael Carlson Modified: trunk/console/libgnt/gntentry.c =================================================================== --- trunk/console/libgnt/gntentry.c 2006-11-15 19:12:09 UTC (rev 17751) +++ trunk/console/libgnt/gntentry.c 2006-11-15 19:38:49 UTC (rev 17752) @@ -338,6 +338,8 @@ begin_word(const char *text, const char *begin) { char ch; + while (text > begin && (isspace(*text) || !*text)) + text--; ch = *text; #define SAME(a,b) ((isalpha(a) && isalpha(b)) || (isdigit(a) && isdigit(b)) || (isspace(a) && isspace(b))) while (--text >= begin) { @@ -563,7 +565,7 @@ gnt_bindable_class_register_action(bindable, "delete-end", del_to_end, GNT_KEY_CTRL_K, NULL); gnt_bindable_class_register_action(bindable, "delete-prev-word", del_prev_word, - NULL, NULL); + GNT_KEY_CTRL_W, NULL); #if 0 gnt_bindable_class_register_action(bindable, "delete-next-word", del_next_word, NULL, 1, NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2006-11-15 19:52:38
|
Revision: 17753 http://svn.sourceforge.net/gaim/?rev=17753&view=rev Author: sadrul Date: 2006-11-15 11:52:37 -0800 (Wed, 15 Nov 2006) Log Message: ----------- Patch #1595831 (fix for bug 1595828 - chat_invite has reversed params) from Ryan Barrett. Modified Paths: -------------- trunk/COPYRIGHT trunk/libgaim/prpl.h Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-11-15 19:38:49 UTC (rev 17752) +++ trunk/COPYRIGHT 2006-11-15 19:52:37 UTC (rev 17753) @@ -16,6 +16,7 @@ Chris Banal Luca Barbato Levi Bard +Ryan Barrett Kevin Barry Derek Battams Martin Bayard Modified: trunk/libgaim/prpl.h =================================================================== --- trunk/libgaim/prpl.h 2006-11-15 19:38:49 UTC (rev 17752) +++ trunk/libgaim/prpl.h 2006-11-15 19:52:37 UTC (rev 17753) @@ -244,7 +244,7 @@ void (*reject_chat)(GaimConnection *, GHashTable *components); char *(*get_chat_name)(GHashTable *components); void (*chat_invite)(GaimConnection *, int id, - const char *who, const char *message); + const char *message, const char *who); void (*chat_leave)(GaimConnection *, int id); void (*chat_whisper)(GaimConnection *, int id, const char *who, const char *message); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sa...@us...> - 2006-11-16 03:17:34
|
Revision: 17757 http://svn.sourceforge.net/gaim/?rev=17757&view=rev Author: sadrul Date: 2006-11-15 19:17:27 -0800 (Wed, 15 Nov 2006) Log Message: ----------- show-menu action for a window. Modified Paths: -------------- trunk/console/libgnt/gntstyle.c trunk/console/libgnt/gntwindow.c trunk/doc/gaim-text.1.in Modified: trunk/console/libgnt/gntstyle.c =================================================================== --- trunk/console/libgnt/gntstyle.c 2006-11-16 00:27:30 UTC (rev 17756) +++ trunk/console/libgnt/gntstyle.c 2006-11-16 03:17:27 UTC (rev 17757) @@ -46,7 +46,8 @@ return bool_styles[style]; } -void refine(char *text) +static void +refine(char *text) { char *s = text, *t = text; Modified: trunk/console/libgnt/gntwindow.c =================================================================== --- trunk/console/libgnt/gntwindow.c 2006-11-16 00:27:30 UTC (rev 17756) +++ trunk/console/libgnt/gntwindow.c 2006-11-16 03:17:27 UTC (rev 17757) @@ -9,18 +9,17 @@ static GntBoxClass *parent_class = NULL; -static gboolean (*org_keypress)(GntWidget *widget, const char *text); static void (*org_destroy)(GntWidget *widget); static gboolean -gnt_window_key_pressed(GntWidget *widget, const char *text) +show_menu(GntBindable *bind, GList *null) { - if (strcmp(text, GNT_KEY_CTRL_O) == 0 && GNT_WINDOW(widget)->menu) { - gnt_screen_menu_show(GNT_WINDOW(widget)->menu); + GntWindow *win = GNT_WINDOW(bind); + if (win->menu) { + gnt_screen_menu_show(win->menu); return TRUE; - } else - return org_keypress(widget, text); - + } + return FALSE; } static void @@ -35,15 +34,17 @@ static void gnt_window_class_init(GntWindowClass *klass) { + GntBindableClass *bindable = GNT_BINDABLE_CLASS(klass); GntWidgetClass *wid_class = GNT_WIDGET_CLASS(klass); parent_class = GNT_BOX_CLASS(klass); - org_keypress = wid_class->key_pressed; - wid_class->key_pressed = gnt_window_key_pressed; - org_destroy = wid_class->destroy; wid_class->destroy = gnt_window_destroy; + gnt_bindable_class_register_action(bindable, "show-menu", show_menu, + GNT_KEY_CTRL_O, NULL); + gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), bindable); + GNTDEBUG; } Modified: trunk/doc/gaim-text.1.in =================================================================== --- trunk/doc/gaim-text.1.in 2006-11-16 00:27:30 UTC (rev 17756) +++ trunk/doc/gaim-text.1.in 2006-11-16 03:17:27 UTC (rev 17757) @@ -261,7 +261,12 @@ # The following will let you open the context-menu in the buddylist with c-b .br c-b = context-menu +.br +[GntWindow::binding] +.br +c-o = show-menu + The \fBc-\fR corresponds to the \fBControl\fR key. You can also use \fBctrl-\fR or \fBctr-\fR or \fBctl-\fR to indicate a combination. For alt-keys, you can use one of \fBa-\fR, \fBalt-\fR, \fBm-\fR or \fBmeta-\fR. You can also use This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-11-16 04:58:41
|
Revision: 17758 http://svn.sourceforge.net/gaim/?rev=17758&view=rev Author: datallah Date: 2006-11-15 20:58:40 -0800 (Wed, 15 Nov 2006) Log Message: ----------- Don't lose the account proxy settings just because they are hidden and not in use. Also, make the MSN HTTP method use the same proxy setup code as the core - this should improve env. var proxy handling. Modified Paths: -------------- trunk/gtk/gtkaccount.c trunk/libgaim/account.c trunk/libgaim/protocols/msn/httpconn.c trunk/libgaim/proxy.c Modified: trunk/gtk/gtkaccount.c =================================================================== --- trunk/gtk/gtkaccount.c 2006-11-16 03:17:27 UTC (rev 17757) +++ trunk/gtk/gtkaccount.c 2006-11-16 04:58:40 UTC (rev 17758) @@ -1004,6 +1004,8 @@ (proxy_info = gaim_account_get_proxy_info(dialog->account)) != NULL) { GaimProxyType type = gaim_proxy_info_get_type(proxy_info); + const char *value; + int int_val; /* Hah! */ /* I dunno what you're laughing about, fuzz ball. */ @@ -1012,30 +1014,26 @@ type + 1); if (type == GAIM_PROXY_USE_GLOBAL || type == GAIM_PROXY_NONE || - type == GAIM_PROXY_USE_ENVVAR) { + type == GAIM_PROXY_USE_ENVVAR) gtk_widget_hide_all(vbox2); - } - else { - const char *value; - int int_val; - if ((value = gaim_proxy_info_get_host(proxy_info)) != NULL) - gtk_entry_set_text(GTK_ENTRY(dialog->proxy_host_entry), value); - if ((int_val = gaim_proxy_info_get_port(proxy_info)) != 0) { - char buf[32]; + if ((value = gaim_proxy_info_get_host(proxy_info)) != NULL) + gtk_entry_set_text(GTK_ENTRY(dialog->proxy_host_entry), value); - g_snprintf(buf, sizeof(buf), "%d", int_val); + if ((int_val = gaim_proxy_info_get_port(proxy_info)) != 0) { + char buf[11]; - gtk_entry_set_text(GTK_ENTRY(dialog->proxy_port_entry), buf); - } + g_snprintf(buf, sizeof(buf), "%d", int_val); - if ((value = gaim_proxy_info_get_username(proxy_info)) != NULL) - gtk_entry_set_text(GTK_ENTRY(dialog->proxy_user_entry), value); + gtk_entry_set_text(GTK_ENTRY(dialog->proxy_port_entry), buf); + } - if ((value = gaim_proxy_info_get_password(proxy_info)) != NULL) - gtk_entry_set_text(GTK_ENTRY(dialog->proxy_pass_entry), value); - } + if ((value = gaim_proxy_info_get_username(proxy_info)) != NULL) + gtk_entry_set_text(GTK_ENTRY(dialog->proxy_user_entry), value); + + if ((value = gaim_proxy_info_get_password(proxy_info)) != NULL) + gtk_entry_set_text(GTK_ENTRY(dialog->proxy_pass_entry), value); } else { dialog->new_proxy_type = GAIM_PROXY_USE_GLOBAL; @@ -1258,54 +1256,61 @@ } /* Set the proxy stuff. */ - if (dialog->new_proxy_type == GAIM_PROXY_USE_GLOBAL) { - gaim_account_set_proxy_info(account, NULL); + proxy_info = gaim_account_get_proxy_info(account); + + /* Create the proxy info if it doesn't exist. */ + if (proxy_info == NULL) { + proxy_info = gaim_proxy_info_new(); + gaim_account_set_proxy_info(account, proxy_info); } - else { - proxy_info = gaim_account_get_proxy_info(account); - /* Create the proxy info if it doesn't exist. */ - if (proxy_info == NULL) { - proxy_info = gaim_proxy_info_new(); - gaim_account_set_proxy_info(account, proxy_info); - } + /* Set the proxy info type. */ + gaim_proxy_info_set_type(proxy_info, dialog->new_proxy_type); - /* Set the proxy info type. */ - gaim_proxy_info_set_type(proxy_info, dialog->new_proxy_type); + /* Host */ + value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_host_entry)); - /* Host */ - value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_host_entry)); + if (*value != '\0') + gaim_proxy_info_set_host(proxy_info, value); + else + gaim_proxy_info_set_host(proxy_info, NULL); - if (*value != '\0') - gaim_proxy_info_set_host(proxy_info, value); - else - gaim_proxy_info_set_host(proxy_info, NULL); + /* Port */ + value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_port_entry)); - /* Port */ - value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_port_entry)); + if (*value != '\0') + gaim_proxy_info_set_port(proxy_info, atoi(value)); + else + gaim_proxy_info_set_port(proxy_info, 0); - if (*value != '\0') - gaim_proxy_info_set_port(proxy_info, atoi(value)); - else - gaim_proxy_info_set_port(proxy_info, 0); + /* Username */ + value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_user_entry)); - /* Username */ - value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_user_entry)); + if (*value != '\0') + gaim_proxy_info_set_username(proxy_info, value); + else + gaim_proxy_info_set_username(proxy_info, NULL); - if (*value != '\0') - gaim_proxy_info_set_username(proxy_info, value); - else - gaim_proxy_info_set_username(proxy_info, NULL); + /* Password */ + value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_pass_entry)); - /* Password */ - value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_pass_entry)); + if (*value != '\0') + gaim_proxy_info_set_password(proxy_info, value); + else + gaim_proxy_info_set_password(proxy_info, NULL); - if (*value != '\0') - gaim_proxy_info_set_password(proxy_info, value); - else - gaim_proxy_info_set_password(proxy_info, NULL); + /* If there are no values set then proxy_info NULL */ + if ((gaim_proxy_info_get_type(proxy_info) == GAIM_PROXY_USE_GLOBAL) && + (gaim_proxy_info_get_host(proxy_info) == NULL) && + (gaim_proxy_info_get_port(proxy_info) == 0) && + (gaim_proxy_info_get_username(proxy_info) == NULL) && + (gaim_proxy_info_get_password(proxy_info) == NULL)) + { + gaim_account_set_proxy_info(account, NULL); + proxy_info = NULL; } + /* We no longer need the data from the dialog window */ account_win_destroy_cb(NULL, NULL, dialog); Modified: trunk/libgaim/account.c =================================================================== --- trunk/libgaim/account.c 2006-11-16 03:17:27 UTC (rev 17757) +++ trunk/libgaim/account.c 2006-11-16 04:58:40 UTC (rev 17758) @@ -269,34 +269,29 @@ proxy_type == GAIM_PROXY_SOCKS5 ? "socks5" : proxy_type == GAIM_PROXY_USE_ENVVAR ? "envvar" : "unknown"), -1); - if (proxy_type != GAIM_PROXY_USE_GLOBAL && - proxy_type != GAIM_PROXY_NONE && - proxy_type != GAIM_PROXY_USE_ENVVAR) + if ((value = gaim_proxy_info_get_host(proxy_info)) != NULL) { - if ((value = gaim_proxy_info_get_host(proxy_info)) != NULL) - { - child = xmlnode_new_child(node, "host"); - xmlnode_insert_data(child, value, -1); - } + child = xmlnode_new_child(node, "host"); + xmlnode_insert_data(child, value, -1); + } - if ((int_value = gaim_proxy_info_get_port(proxy_info)) != 0) - { - snprintf(buf, sizeof(buf), "%d", int_value); - child = xmlnode_new_child(node, "port"); - xmlnode_insert_data(child, buf, -1); - } + if ((int_value = gaim_proxy_info_get_port(proxy_info)) != 0) + { + snprintf(buf, sizeof(buf), "%d", int_value); + child = xmlnode_new_child(node, "port"); + xmlnode_insert_data(child, buf, -1); + } - if ((value = gaim_proxy_info_get_username(proxy_info)) != NULL) - { - child = xmlnode_new_child(node, "username"); - xmlnode_insert_data(child, value, -1); - } + if ((value = gaim_proxy_info_get_username(proxy_info)) != NULL) + { + child = xmlnode_new_child(node, "username"); + xmlnode_insert_data(child, value, -1); + } - if ((value = gaim_proxy_info_get_password(proxy_info)) != NULL) - { - child = xmlnode_new_child(node, "password"); - xmlnode_insert_data(child, value, -1); - } + if ((value = gaim_proxy_info_get_password(proxy_info)) != NULL) + { + child = xmlnode_new_child(node, "password"); + xmlnode_insert_data(child, value, -1); } return node; @@ -657,7 +652,7 @@ g_free(data); } - /* If there are no values set then proxy_infourn NULL */ + /* If there are no values set then proxy_info NULL */ if ((gaim_proxy_info_get_type(proxy_info) == GAIM_PROXY_USE_GLOBAL) && (gaim_proxy_info_get_host(proxy_info) == NULL) && (gaim_proxy_info_get_port(proxy_info) == 0) && @@ -1031,7 +1026,7 @@ gc = gaim_account_get_connection(account); gaim_connection_destroy(gc); if (!gaim_account_get_remember_password(account)) - gaim_account_set_password(account, NULL); + gaim_account_set_password(account, NULL); gaim_account_set_connection(account, NULL); account->disconnecting = FALSE; Modified: trunk/libgaim/protocols/msn/httpconn.c =================================================================== --- trunk/libgaim/protocols/msn/httpconn.c 2006-11-16 03:17:27 UTC (rev 17757) +++ trunk/libgaim/protocols/msn/httpconn.c 2006-11-16 04:58:40 UTC (rev 17758) @@ -475,10 +475,7 @@ account = httpconn->session->account; - if (gaim_account_get_proxy_info(account) == NULL) - gpi = gaim_global_proxy_get_info(); - else - gpi = gaim_account_get_proxy_info(account); + gpi = gaim_proxy_get_setup(account); if (gpi == NULL || !(gaim_proxy_info_get_type(gpi) == GAIM_PROXY_HTTP || gaim_proxy_info_get_type(gpi) == GAIM_PROXY_USE_ENVVAR)) Modified: trunk/libgaim/proxy.c =================================================================== --- trunk/libgaim/proxy.c 2006-11-16 03:17:27 UTC (rev 17757) +++ trunk/libgaim/proxy.c 2006-11-16 04:58:40 UTC (rev 17758) @@ -1685,7 +1685,7 @@ GaimProxyInfo * gaim_proxy_get_setup(GaimAccount *account) { - GaimProxyInfo *gpi; + GaimProxyInfo *gpi = NULL; const gchar *tmp; /* This is used as a fallback so we don't overwrite the selected proxy type */ @@ -1695,12 +1695,17 @@ gaim_proxy_info_set_type(tmp_none_proxy_info, GAIM_PROXY_NONE); } - if (account && gaim_account_get_proxy_info(account) != NULL) + if (account && gaim_account_get_proxy_info(account) != NULL) { gpi = gaim_account_get_proxy_info(account); - else if (gaim_running_gnome()) - gpi = gaim_gnome_proxy_get_info(); - else - gpi = gaim_global_proxy_get_info(); + if (gaim_proxy_info_get_type(gpi) == GAIM_PROXY_USE_GLOBAL) + gpi = NULL; + } + if (gpi == NULL) { + if (gaim_running_gnome()) + gpi = gaim_gnome_proxy_get_info(); + else + gpi = gaim_global_proxy_get_info(); + } if (gaim_proxy_info_get_type(gpi) == GAIM_PROXY_USE_ENVVAR) { #ifdef _WIN32 @@ -1733,6 +1738,18 @@ proxyport = atoi(tmp); gaim_proxy_info_set_port(gpi, proxyport); + + /* XXX: Do we want to skip this step if user/password were part of url? */ + if ((tmp = g_getenv("HTTP_PROXY_USER")) != NULL || + (tmp = g_getenv("http_proxy_user")) != NULL || + (tmp = g_getenv("HTTPPROXYUSER")) != NULL) + gaim_proxy_info_set_username(gpi, tmp); + + if ((tmp = g_getenv("HTTP_PROXY_PASS")) != NULL || + (tmp = g_getenv("http_proxy_pass")) != NULL || + (tmp = g_getenv("HTTPPROXYPASS")) != NULL) + gaim_proxy_info_set_password(gpi, tmp); + } } else { /* no proxy environment variable found, don't use a proxy */ @@ -1740,16 +1757,6 @@ gpi = tmp_none_proxy_info; } - /* XXX: Do we want to skip this step if user/password were part of url? */ - if ((tmp = g_getenv("HTTP_PROXY_USER")) != NULL || - (tmp = g_getenv("http_proxy_user")) != NULL || - (tmp = g_getenv("HTTPPROXYUSER")) != NULL) - gaim_proxy_info_set_username(gpi, tmp); - - if ((tmp = g_getenv("HTTP_PROXY_PASS")) != NULL || - (tmp = g_getenv("http_proxy_pass")) != NULL || - (tmp = g_getenv("HTTPPROXYPASS")) != NULL) - gaim_proxy_info_set_password(gpi, tmp); } return gpi; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dat...@us...> - 2006-11-17 03:26:19
|
Revision: 17764 http://svn.sourceforge.net/gaim/?rev=17764&view=rev Author: datallah Date: 2006-11-16 19:26:19 -0800 (Thu, 16 Nov 2006) Log Message: ----------- Don't install incompatible GTK+ versions on Win95/98/ME. Alert the user about the incompatibility and abort installation if a good version of GTK+ isn't already installed. Also don't allow a theme selection because it wont work with our GTK+ 2.6.10 runtime. Modified Paths: -------------- trunk/gaim-installer.nsi trunk/gtk/win32/nsis/langmacros.nsh trunk/gtk/win32/nsis/translations/english.nsh Modified: trunk/gaim-installer.nsi =================================================================== --- trunk/gaim-installer.nsi 2006-11-17 02:15:28 UTC (rev 17763) +++ trunk/gaim-installer.nsi 2006-11-17 03:26:19 UTC (rev 17764) @@ -120,9 +120,7 @@ ;-------------------------------- ;Pages -!ifndef WITH_GTK !define MUI_PAGE_CUSTOMFUNCTION_PRE preWelcomePage -!endif !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "./COPYING" !insertmacro MUI_PAGE_COMPONENTS @@ -831,7 +829,9 @@ StrCmp $2 "HKLM" 0 user_theme ; Global Theme + ClearErrors ReadRegStr $2 HKLM ${GTK_REG_KEY} "Path" + IfErrors user_theme StrCpy $3 "$2\etc\gtk-2.0\gtkrc" Goto update_theme user_theme: @@ -1227,24 +1227,56 @@ ; Page enter and exit functions.. +Function preWelcomePage + Push R0 + !ifndef WITH_GTK -Function preWelcomePage ; If this installer dosn't have GTK, check whether we need it. ; We do this here an not in .onInit because language change in ; .onInit doesn't take effect until it is finished. - Push $R0 + Call DoWeNeedGtk + Pop $R0 + Pop $GTK_FOLDER + + IntCmp $R0 1 done done + MessageBox MB_OK $(GTK_INSTALLER_NEEDED) /SD IDOK + Quit + + done: + +!else + Push R1 + + ; If on Win95/98/ME warn them that the GTK+ version wont work + Call GetWindowsVersion + Pop $R1 + StrCmp $R1 "95" win_ver_bad + StrCmp $R1 "98" win_ver_bad + StrCmp $R1 "ME" win_ver_bad + Goto done + + win_ver_bad: + !insertmacro UnselectSection ${SecGtk} + !insertmacro SetSectionFlag ${SecGtkNone} ${SF_RO} + !insertmacro UnselectSection ${SecGtkNone} + !insertmacro SetSectionFlag ${SecGtkWimp} ${SF_RO} + !insertmacro UnselectSection ${SecGtkWimp} + !insertmacro SetSectionFlag ${SecGtkBluecurve} ${SF_RO} + !insertmacro UnselectSection ${SecGtkBluecurve} + !insertmacro SetSectionFlag ${SecGtkLighthouseblue} ${SF_RO} + !insertmacro UnselectSection ${SecGtkLighthouseblue} + MessageBox MB_OK $(GTK_WINDOWS_INCOMPATIBLE) /SD IDOK Call DoWeNeedGtk Pop $R0 - Pop $GTK_FOLDER + Pop $R1 + IntCmp $R0 1 done done ; Upgrade isn't optional - abort if we don't have a suitable version + Quit - IntCmp $R0 1 have_gtk have_gtk - - MessageBox MB_OK $(GTK_INSTALLER_NEEDED) /SD IDOK - Quit - have_gtk: - Pop $R0 + done: + Pop $R1 +!endif + Pop $R0 FunctionEnd -!endif !ifdef WITH_GTK Function preGtkDirPage @@ -1307,7 +1339,7 @@ ; ; Returns on top of stack ; -; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003) +; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista) ; or ; '' (Unknown Windows Version) ; @@ -1361,7 +1393,8 @@ StrCmp $R1 '5.0' lbl_winnt_2000 StrCmp $R1 '5.1' lbl_winnt_XP - StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error + StrCmp $R1 '5.2' lbl_winnt_2003 + StrCmp $R1 '6.0' lbl_winnt_vista lbl_error lbl_winnt_x: StrCpy $R0 "NT $R0" 6 @@ -1379,6 +1412,10 @@ Strcpy $R0 '2003' Goto lbl_done + lbl_winnt_vista: + Strcpy $R0 'Vista' + Goto lbl_done + lbl_error: Strcpy $R0 '' lbl_done: Modified: trunk/gtk/win32/nsis/langmacros.nsh =================================================================== --- trunk/gtk/win32/nsis/langmacros.nsh 2006-11-17 02:15:28 UTC (rev 17763) +++ trunk/gtk/win32/nsis/langmacros.nsh 2006-11-17 03:26:19 UTC (rev 17764) @@ -61,6 +61,7 @@ ; GTK+ Directory Page !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_UPGRADE_PROMPT ${CUR_LANG} + !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_WINDOWS_INCOMPATIBLE ${CUR_LANG} ; Installer Finish Page !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_FINISH_VISIT_WEB_SITE ${CUR_LANG} Modified: trunk/gtk/win32/nsis/translations/english.nsh =================================================================== --- trunk/gtk/win32/nsis/translations/english.nsh 2006-11-17 02:15:28 UTC (rev 17763) +++ trunk/gtk/win32/nsis/translations/english.nsh 2006-11-17 03:26:19 UTC (rev 17764) @@ -44,6 +44,7 @@ ; GTK+ Directory Page !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_UPGRADE_PROMPT "An old version of the GTK+ runtime was found. Do you wish to upgrade?$\rNote: Gaim may not work unless you do." +!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WINDOWS_INCOMPATIBLE "Windows 95/98/Me are incompatible with GTK+ 2.8.0 or newer. GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} or newer already installed, installation will now abort." ; Installer Finish Page !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_FINISH_VISIT_WEB_SITE "Visit the Windows Gaim Web Page" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-11-17 19:39:17
|
Revision: 17769 http://svn.sourceforge.net/gaim/?rev=17769&view=rev Author: seanegan Date: 2006-11-17 11:39:17 -0800 (Fri, 17 Nov 2006) Log Message: ----------- Change oscar-to-aim-and-icq hack. This does the renaming gtkgaim, after everything's initialized (so it fixes broken Persons and pounces and savedstatuses, but it introduces a hack in gaim_account_get_protocol_id(), since some initialization requires the protocol id to match the plugin. I don't really like this, but it's the best workaround I could think of. Hopefully we can remove this after not-long. Modified Paths: -------------- trunk/gtk/gtkmain.c trunk/libgaim/account.c Modified: trunk/gtk/gtkmain.c =================================================================== --- trunk/gtk/gtkmain.c 2006-11-17 19:27:58 UTC (rev 17768) +++ trunk/gtk/gtkmain.c 2006-11-17 19:39:17 UTC (rev 17769) @@ -726,6 +726,22 @@ /* TODO: Move pounces loading into gaim_pounces_init() */ gaim_pounces_load(); + + /* HACK BY SEANEGAN: + * We've renamed prpl-oscar to prpl-aim and prpl-icq, accordingly. + * Let's do that change right here... after everything's loaded, but + * before anything has happened + */ + for (accounts = gaim_accounts_get_all(); accounts != NULL; accounts = accounts->next) { + GaimAccount *account = accounts->data; + if (!strcmp(gaim_account_get_protocol_id(account), "prpl-oscar")) { + if (isdigit(gaim_account_get_username(account))) + gaim_account_set_protocol_id(account, "prpl-icq"); + else + gaim_account_set_protocol_id(account, "prpl-aim"); + } + } + ui_main(); #ifdef USE_SM Modified: trunk/libgaim/account.c =================================================================== --- trunk/libgaim/account.c 2006-11-17 19:27:58 UTC (rev 17768) +++ trunk/libgaim/account.c 2006-11-17 19:39:17 UTC (rev 17769) @@ -697,19 +697,6 @@ return NULL; } - - /* HACK BY SEANEGAN: special case prpl-oscar to either prpl-icq - * prpl-aim for users upgrading to 2.0.0. This can probably - * be removed after a while - */ - if (!strcmp(protocol_id, "prpl-oscar")) { - g_free(protocol_id); - if (isdigit(name[0])) - protocol_id = g_strdup("prpl-icq"); - else - protocol_id = g_strdup("prpl-aim"); - } - ret = gaim_account_new(name, protocol_id); g_free(name); g_free(protocol_id); @@ -1663,7 +1650,15 @@ gaim_account_get_protocol_id(const GaimAccount *account) { g_return_val_if_fail(account != NULL, NULL); - + /* + * HACK by Seanegan + */ + if (!strcmp(account->protocol_id, "prpl-oscar")) { + if (isdigit(account->username[0])) + return "prpl-icq"; + else + return "prpl-aim"; + } return account->protocol_id; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-11-19 19:14:55
|
Revision: 17783 http://svn.sourceforge.net/gaim/?rev=17783&view=rev Author: rlaager Date: 2006-11-19 11:14:48 -0800 (Sun, 19 Nov 2006) Log Message: ----------- SF Patch #1577602 from Konstantin Korikov - lostclus "This patch makes message text in gaim_request_action dialog selectable by user. This allows copy-and-paste operations." Modified Paths: -------------- trunk/COPYRIGHT trunk/gtk/gtkrequest.c Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-11-19 17:24:56 UTC (rev 17782) +++ trunk/COPYRIGHT 2006-11-19 19:14:48 UTC (rev 17783) @@ -159,6 +159,7 @@ Praveen Karadakal John Kelm Akuke Kok +Konstantin Korikov Cole Kowalski Gary Kramlich Jan Kratochvil Modified: trunk/gtk/gtkrequest.c =================================================================== --- trunk/gtk/gtkrequest.c 2006-11-19 17:24:56 UTC (rev 17782) +++ trunk/gtk/gtkrequest.c 2006-11-19 19:14:48 UTC (rev 17783) @@ -626,6 +626,7 @@ gtk_label_set_markup(GTK_LABEL(label), label_text); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_label_set_selectable(GTK_LABEL(label), TRUE); gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); g_free(label_text); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-11-19 20:40:34
|
Revision: 17785 http://svn.sourceforge.net/gaim/?rev=17785&view=rev Author: rlaager Date: 2006-11-19 12:40:34 -0800 (Sun, 19 Nov 2006) Log Message: ----------- SF Patch 1571670, Patch 2 "I already have Welker Zsombor in the COPYRIGHTS file, but that should be Zsombor Welker... The patch I added is also needed to make the patch work under windows." Modified Paths: -------------- trunk/COPYRIGHT trunk/libgaim/plugins/perl/common/Makefile.mingw Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-11-19 19:58:45 UTC (rev 17784) +++ trunk/COPYRIGHT 2006-11-19 20:40:34 UTC (rev 17785) @@ -332,6 +332,7 @@ Jonty Wareing Eric Warmenhoven Adam J. Warrington +Zsombor Welker Andrew Wellington Adam Wendt Dave West @@ -352,5 +353,4 @@ Nickolai Zeldovich Marco Ziech Piotr Zielinski -Welker Zsombor Jeroen Zwartepoorte Modified: trunk/libgaim/plugins/perl/common/Makefile.mingw =================================================================== --- trunk/libgaim/plugins/perl/common/Makefile.mingw 2006-11-19 19:58:45 UTC (rev 17784) +++ trunk/libgaim/plugins/perl/common/Makefile.mingw 2006-11-19 20:40:34 UTC (rev 17785) @@ -41,6 +41,7 @@ Cmds.xs \ Connection.xs \ Conversation.xs \ + Core.xs \ Debug.xs \ FT.xs \ Gaim.xs \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ebl...@us...> - 2006-11-20 03:57:48
|
Revision: 17788 http://svn.sourceforge.net/gaim/?rev=17788&view=rev Author: eblanton Date: 2006-11-19 19:57:47 -0800 (Sun, 19 Nov 2006) Log Message: ----------- This patch causes jabber to use DNS SRV lookups when registering jabber accounts. Thanks to George-Cristian B?\195?\174rzan for this. From Debian Bug #399230. Modified Paths: -------------- trunk/COPYRIGHT trunk/libgaim/protocols/jabber/jabber.c Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-11-20 02:56:35 UTC (rev 17787) +++ trunk/COPYRIGHT 2006-11-20 03:57:47 UTC (rev 17788) @@ -26,6 +26,7 @@ Brian Bernas Paul Betts Jonas Birmé +George-Cristian Bîrzan Eric Blade Ethan Blanton Joshua Blanton Modified: trunk/libgaim/protocols/jabber/jabber.c =================================================================== --- trunk/libgaim/protocols/jabber/jabber.c 2006-11-20 02:56:35 UTC (rev 17787) +++ trunk/libgaim/protocols/jabber/jabber.c 2006-11-20 03:57:47 UTC (rev 17788) @@ -926,10 +926,17 @@ } if(!js->gsc) { - if (gaim_proxy_connect(gc, account, server, - gaim_account_get_int(account, "port", 5222), - jabber_login_callback, gc) == NULL) - gaim_connection_error(gc, _("Unable to create socket")); + if (connect_server[0]) { + jabber_login_connect(js, server, + gaim_account_get_int(account, + "port", 5222)); + } else { + js->srv_query_data = gaim_srv_resolve("xmpp-client", + "tcp", + js->user->domain, + srv_resolved_cb, + js); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rl...@us...> - 2006-11-20 05:33:35
|
Revision: 17790 http://svn.sourceforge.net/gaim/?rev=17790&view=rev Author: rlaager Date: 2006-11-19 21:33:32 -0800 (Sun, 19 Nov 2006) Log Message: ----------- Part of SF Patch #1599432 from Leonardo Fernandes "This patch ... solves a check for NULL that produced an error in the debug console." Modified Paths: -------------- trunk/COPYRIGHT trunk/libgaim/plugins/log_reader.c Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2006-11-20 04:05:33 UTC (rev 17789) +++ trunk/COPYRIGHT 2006-11-20 05:33:32 UTC (rev 17790) @@ -103,6 +103,7 @@ Gábor Farkas Jesse Farmer Gavan Fantom (gavan) +Leonardo Fernandes David Fiander Rob Flynn <ga...@ro...> Rob Foehl (rwf) Modified: trunk/libgaim/plugins/log_reader.c =================================================================== --- trunk/libgaim/plugins/log_reader.c 2006-11-20 04:05:33 UTC (rev 17789) +++ trunk/libgaim/plugins/log_reader.c 2006-11-20 05:33:32 UTC (rev 17790) @@ -973,7 +973,8 @@ if (friendly_name != NULL) { int friendly_name_length = strlen(friendly_name); - int alias_length = log->account->alias ? strlen(log->account->alias) : 0; + const char *alias; + int alias_length; GaimBuddy *buddy = gaim_find_buddy(log->account, log->name); gboolean from_name_matches; gboolean to_name_matches; @@ -981,6 +982,17 @@ if (buddy && buddy->alias) their_name = buddy->alias; + if (log->account->alias) + { + alias = log->account->alias; + alias_length = strlen(alias); + } + else + { + alias = ""; + alias_length = 0; + } + /* Try to guess which user is me. * The first step is to determine if either of the names matches either my * friendly name or alias. For this test, "match" is defined as: @@ -988,13 +1000,13 @@ */ from_name_matches = (gaim_str_has_prefix(from_name, friendly_name) && !isalnum(*(from_name + friendly_name_length))) || - (gaim_str_has_prefix(from_name, log->account->alias) && + (gaim_str_has_prefix(from_name, alias) && !isalnum(*(from_name + alias_length))); to_name_matches = to_name != NULL && ( (gaim_str_has_prefix(to_name, friendly_name) && !isalnum(*(to_name + friendly_name_length))) || - (gaim_str_has_prefix(to_name, log->account->alias) && + (gaim_str_has_prefix(to_name, alias) && !isalnum(*(to_name + alias_length)))); if (from_name_matches) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2006-11-22 15:30:06
|
Revision: 17807 http://svn.sourceforge.net/gaim/?rev=17807&view=rev Author: markhuetsch Date: 2006-11-22 07:29:57 -0800 (Wed, 22 Nov 2006) Log Message: ----------- Thanks to everyone who worked on OpenQ! Please let me know if I left anything/anyone out. Modified Paths: -------------- trunk/AUTHORS trunk/libgaim/protocols/qq/buddy_info.c trunk/libgaim/protocols/qq/buddy_info.h trunk/libgaim/protocols/qq/buddy_list.c trunk/libgaim/protocols/qq/buddy_list.h trunk/libgaim/protocols/qq/buddy_opt.c trunk/libgaim/protocols/qq/buddy_opt.h trunk/libgaim/protocols/qq/buddy_status.c trunk/libgaim/protocols/qq/buddy_status.h trunk/libgaim/protocols/qq/char_conv.c trunk/libgaim/protocols/qq/char_conv.h trunk/libgaim/protocols/qq/crypt.c trunk/libgaim/protocols/qq/crypt.h trunk/libgaim/protocols/qq/file_trans.c trunk/libgaim/protocols/qq/file_trans.h trunk/libgaim/protocols/qq/group.c trunk/libgaim/protocols/qq/group.h trunk/libgaim/protocols/qq/group_conv.c trunk/libgaim/protocols/qq/group_conv.h trunk/libgaim/protocols/qq/group_find.c trunk/libgaim/protocols/qq/group_find.h trunk/libgaim/protocols/qq/group_free.c trunk/libgaim/protocols/qq/group_free.h trunk/libgaim/protocols/qq/group_im.c trunk/libgaim/protocols/qq/group_im.h trunk/libgaim/protocols/qq/group_info.c trunk/libgaim/protocols/qq/group_info.h trunk/libgaim/protocols/qq/group_internal.c trunk/libgaim/protocols/qq/group_internal.h trunk/libgaim/protocols/qq/group_join.c trunk/libgaim/protocols/qq/group_join.h trunk/libgaim/protocols/qq/group_misc.c trunk/libgaim/protocols/qq/group_misc.h trunk/libgaim/protocols/qq/group_network.c trunk/libgaim/protocols/qq/group_network.h trunk/libgaim/protocols/qq/group_opt.c trunk/libgaim/protocols/qq/group_opt.h trunk/libgaim/protocols/qq/group_search.c trunk/libgaim/protocols/qq/group_search.h trunk/libgaim/protocols/qq/header_info.c trunk/libgaim/protocols/qq/header_info.h trunk/libgaim/protocols/qq/im.c trunk/libgaim/protocols/qq/im.h trunk/libgaim/protocols/qq/keep_alive.c trunk/libgaim/protocols/qq/keep_alive.h trunk/libgaim/protocols/qq/login_logout.c trunk/libgaim/protocols/qq/login_logout.h trunk/libgaim/protocols/qq/packet_parse.c trunk/libgaim/protocols/qq/packet_parse.h trunk/libgaim/protocols/qq/qq.c trunk/libgaim/protocols/qq/qq.h trunk/libgaim/protocols/qq/qq_proxy.c trunk/libgaim/protocols/qq/qq_proxy.h trunk/libgaim/protocols/qq/recv_core.c trunk/libgaim/protocols/qq/recv_core.h trunk/libgaim/protocols/qq/send_core.c trunk/libgaim/protocols/qq/send_core.h trunk/libgaim/protocols/qq/send_file.c trunk/libgaim/protocols/qq/send_file.h trunk/libgaim/protocols/qq/sendqueue.c trunk/libgaim/protocols/qq/sendqueue.h trunk/libgaim/protocols/qq/sys_msg.c trunk/libgaim/protocols/qq/sys_msg.h trunk/libgaim/protocols/qq/udp_proxy_s5.c trunk/libgaim/protocols/qq/udp_proxy_s5.h trunk/libgaim/protocols/qq/utils.c trunk/libgaim/protocols/qq/utils.h Modified: trunk/AUTHORS =================================================================== --- trunk/AUTHORS 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/AUTHORS 2006-11-22 15:29:57 UTC (rev 17807) @@ -122,3 +122,17 @@ Elliot Tobin <el...@bh...> Thanks to Jeroen van der Vegt for the initial smiley plugin and images. + +Puzzlebird +Henry Ou <he...@li...> +David ZH.R. Huang +joymarquis +gfhuang +arfankai +rakescar +yyw +lvxiang +Shufeng Tan <http://sf.net/projects/perl-oicq> +Jeff Ye <http://www.sinomac.com> +Hu Zheng <http://forlinux.yeah.net> + Wrote OpenQ, which became the QQ plugin Modified: trunk/libgaim/protocols/qq/buddy_info.c =================================================================== --- trunk/libgaim/protocols/qq/buddy_info.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/buddy_info.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file buddy_info.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/buddy_info.h =================================================================== --- trunk/libgaim/protocols/qq/buddy_info.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/buddy_info.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file buddy_info.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/buddy_list.c =================================================================== --- trunk/libgaim/protocols/qq/buddy_list.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/buddy_list.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file buddy_list.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/buddy_list.h =================================================================== --- trunk/libgaim/protocols/qq/buddy_list.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/buddy_list.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file buddy_list.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/buddy_opt.c =================================================================== --- trunk/libgaim/protocols/qq/buddy_opt.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/buddy_opt.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file buddy_opt.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/buddy_opt.h =================================================================== --- trunk/libgaim/protocols/qq/buddy_opt.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/buddy_opt.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file buddy_opt.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/buddy_status.c =================================================================== --- trunk/libgaim/protocols/qq/buddy_status.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/buddy_status.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file buddy_status.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/buddy_status.h =================================================================== --- trunk/libgaim/protocols/qq/buddy_status.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/buddy_status.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file buddy_status.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/char_conv.c =================================================================== --- trunk/libgaim/protocols/qq/char_conv.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/char_conv.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file char_conv.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/char_conv.h =================================================================== --- trunk/libgaim/protocols/qq/char_conv.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/char_conv.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file char_conv.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/crypt.c =================================================================== --- trunk/libgaim/protocols/qq/crypt.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/crypt.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file crypt.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/crypt.h =================================================================== --- trunk/libgaim/protocols/qq/crypt.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/crypt.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file crypt.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/file_trans.c =================================================================== --- trunk/libgaim/protocols/qq/file_trans.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/file_trans.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,12 +1,12 @@ /** - * The QQ2003C protocol plugin + * @file file_trans.c * - * for gaim + * gaim * - * Author: Henry Ou <he...@li...> + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * - * Copyright (C) 2004 Puzzlebird - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or Modified: trunk/libgaim/protocols/qq/file_trans.h =================================================================== --- trunk/libgaim/protocols/qq/file_trans.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/file_trans.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,12 +1,12 @@ /** - * The QQ2003C protocol plugin + * @file file_trans.h * - * for gaim + * gaim * - * Author: Henry Ou <he...@li...> + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * - * Copyright (C) 2004 Puzzlebird - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or Modified: trunk/libgaim/protocols/qq/group.c =================================================================== --- trunk/libgaim/protocols/qq/group.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group.h =================================================================== --- trunk/libgaim/protocols/qq/group.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_conv.c =================================================================== --- trunk/libgaim/protocols/qq/group_conv.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_conv.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_conv.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_conv.h =================================================================== --- trunk/libgaim/protocols/qq/group_conv.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_conv.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_conv.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_find.c =================================================================== --- trunk/libgaim/protocols/qq/group_find.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_find.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file group_find.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_find.h =================================================================== --- trunk/libgaim/protocols/qq/group_find.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_find.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file group_find.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_free.c =================================================================== --- trunk/libgaim/protocols/qq/group_free.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_free.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_free.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_free.h =================================================================== --- trunk/libgaim/protocols/qq/group_free.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_free.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_free.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_im.c =================================================================== --- trunk/libgaim/protocols/qq/group_im.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_im.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_im.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_im.h =================================================================== --- trunk/libgaim/protocols/qq/group_im.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_im.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_im.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_info.c =================================================================== --- trunk/libgaim/protocols/qq/group_info.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_info.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_info.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_info.h =================================================================== --- trunk/libgaim/protocols/qq/group_info.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_info.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_info.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_internal.c =================================================================== --- trunk/libgaim/protocols/qq/group_internal.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_internal.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_internal.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_internal.h =================================================================== --- trunk/libgaim/protocols/qq/group_internal.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_internal.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_internal.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_join.c =================================================================== --- trunk/libgaim/protocols/qq/group_join.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_join.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_join.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_join.h =================================================================== --- trunk/libgaim/protocols/qq/group_join.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_join.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_join.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_misc.c =================================================================== --- trunk/libgaim/protocols/qq/group_misc.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_misc.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_misc.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_misc.h =================================================================== --- trunk/libgaim/protocols/qq/group_misc.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_misc.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_misc.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_network.c =================================================================== --- trunk/libgaim/protocols/qq/group_network.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_network.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_network.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_network.h =================================================================== --- trunk/libgaim/protocols/qq/group_network.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_network.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_network.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_opt.c =================================================================== --- trunk/libgaim/protocols/qq/group_opt.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_opt.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_opt.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_opt.h =================================================================== --- trunk/libgaim/protocols/qq/group_opt.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_opt.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_opt.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_search.c =================================================================== --- trunk/libgaim/protocols/qq/group_search.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_search.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file group_search.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/group_search.h =================================================================== --- trunk/libgaim/protocols/qq/group_search.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/group_search.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file group_search.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/header_info.c =================================================================== --- trunk/libgaim/protocols/qq/header_info.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/header_info.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file header_info.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/header_info.h =================================================================== --- trunk/libgaim/protocols/qq/header_info.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/header_info.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file header_info.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/im.c =================================================================== --- trunk/libgaim/protocols/qq/im.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/im.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file im.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/im.h =================================================================== --- trunk/libgaim/protocols/qq/im.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/im.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file im.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/keep_alive.c =================================================================== --- trunk/libgaim/protocols/qq/keep_alive.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/keep_alive.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file keep_alive.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/keep_alive.h =================================================================== --- trunk/libgaim/protocols/qq/keep_alive.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/keep_alive.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file keep_alive.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/login_logout.c =================================================================== --- trunk/libgaim/protocols/qq/login_logout.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/login_logout.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file login_logout.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/login_logout.h =================================================================== --- trunk/libgaim/protocols/qq/login_logout.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/login_logout.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * file login_logout.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/packet_parse.c =================================================================== --- trunk/libgaim/protocols/qq/packet_parse.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/packet_parse.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file packet_parse.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/packet_parse.h =================================================================== --- trunk/libgaim/protocols/qq/packet_parse.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/packet_parse.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file packet_parse.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/qq.c =================================================================== --- trunk/libgaim/protocols/qq/qq.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/qq.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * @file qq.c The QQ2003C protocol plugin + * @file qq.c * * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/qq.h =================================================================== --- trunk/libgaim/protocols/qq/qq.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/qq.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file qq.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/qq_proxy.c =================================================================== --- trunk/libgaim/protocols/qq/qq_proxy.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/qq_proxy.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,10 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file qq_proxy.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird - * Henry Ou <he...@li...> + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/qq_proxy.h =================================================================== --- trunk/libgaim/protocols/qq/qq_proxy.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/qq_proxy.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,10 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file qq_proxy.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird - * Henry Ou <he...@li...> + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/recv_core.c =================================================================== --- trunk/libgaim/protocols/qq/recv_core.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/recv_core.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file recv_core.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/recv_core.h =================================================================== --- trunk/libgaim/protocols/qq/recv_core.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/recv_core.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file recv_core.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/send_core.c =================================================================== --- trunk/libgaim/protocols/qq/send_core.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/send_core.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file send_core.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/send_core.h =================================================================== --- trunk/libgaim/protocols/qq/send_core.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/send_core.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file send_core.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/send_file.c =================================================================== --- trunk/libgaim/protocols/qq/send_file.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/send_file.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,12 +1,12 @@ /** - * The QQ2003C protocol plugin + * @file send_file.c * - * for gaim + * gaim * - * Author: Henry Ou <he...@li...> + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * - * Copyright (C) 2004 Puzzlebird - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or Modified: trunk/libgaim/protocols/qq/send_file.h =================================================================== --- trunk/libgaim/protocols/qq/send_file.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/send_file.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,3 +1,27 @@ +/** + * @file send_file.h + * + * gaim + * + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #ifndef _QQ_QQ_SEND_FILE_H_ #define _QQ_QQ_SEND_FILE_H_ Modified: trunk/libgaim/protocols/qq/sendqueue.c =================================================================== --- trunk/libgaim/protocols/qq/sendqueue.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/sendqueue.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file sendqueue.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/sendqueue.h =================================================================== --- trunk/libgaim/protocols/qq/sendqueue.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/sendqueue.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file sendqueue.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/sys_msg.c =================================================================== --- trunk/libgaim/protocols/qq/sys_msg.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/sys_msg.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file sys_msg.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/sys_msg.h =================================================================== --- trunk/libgaim/protocols/qq/sys_msg.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/sys_msg.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** -* The QQ2003C protocol plugin + * @file sys_msg.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/udp_proxy_s5.c =================================================================== --- trunk/libgaim/protocols/qq/udp_proxy_s5.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/udp_proxy_s5.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,10 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file udp_proxy_s5.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird - * Henry Ou <he...@li...> + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/udp_proxy_s5.h =================================================================== --- trunk/libgaim/protocols/qq/udp_proxy_s5.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/udp_proxy_s5.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,10 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file udp_proxy_s5.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird - * Henry Ou <he...@li...> + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/utils.c =================================================================== --- trunk/libgaim/protocols/qq/utils.c 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/utils.c 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file utils.c * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libgaim/protocols/qq/utils.h =================================================================== --- trunk/libgaim/protocols/qq/utils.h 2006-11-22 08:00:42 UTC (rev 17806) +++ trunk/libgaim/protocols/qq/utils.h 2006-11-22 15:29:57 UTC (rev 17807) @@ -1,9 +1,11 @@ /** - * The QQ2003C protocol plugin + * @file utils.h * - * for gaim + * gaim * - * Copyright (C) 2004 Puzzlebird + * Gaim is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sea...@us...> - 2006-11-23 22:35:34
|
Revision: 17817 http://svn.sourceforge.net/gaim/?rev=17817&view=rev Author: seanegan Date: 2006-11-23 14:35:32 -0800 (Thu, 23 Nov 2006) Log Message: ----------- minor graphical tweaks Modified Paths: -------------- trunk/gtk/gtkaccount.c trunk/gtk/gtkblist.c trunk/gtk/gtkutils.c trunk/libgaim/account.h Modified: trunk/gtk/gtkaccount.c =================================================================== --- trunk/gtk/gtkaccount.c 2006-11-23 15:22:53 UTC (rev 17816) +++ trunk/gtk/gtkaccount.c 2006-11-23 22:35:32 UTC (rev 17817) @@ -2316,7 +2316,7 @@ : (gaim_connection_get_display_name(gc) != NULL ? gaim_connection_get_display_name(gc) : gaim_account_get_username(account))), - (msg != NULL ? ":\n" : "."), + (msg != NULL ? ": " : "."), (msg != NULL ? msg : "")); } Modified: trunk/gtk/gtkblist.c =================================================================== --- trunk/gtk/gtkblist.c 2006-11-23 15:22:53 UTC (rev 17816) +++ trunk/gtk/gtkblist.c 2006-11-23 22:35:32 UTC (rev 17817) @@ -4177,11 +4177,11 @@ gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sw, TRUE, TRUE, 0); gtk_container_add(GTK_CONTAINER(sw), gtkblist->treeview); + gtkblist->scrollbook = gtk_gaim_scroll_book_new(); + gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->scrollbook, FALSE, FALSE, 0); + sep = gtk_hseparator_new(); gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sep, FALSE, FALSE, 0); - - gtkblist->scrollbook = gtk_gaim_scroll_book_new(); - gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->scrollbook, FALSE, FALSE, 0); /* Create an empty vbox used for showing connection errors */ gtkblist->error_buttons = gtk_vbox_new(FALSE, 0); Modified: trunk/gtk/gtkutils.c =================================================================== --- trunk/gtk/gtkutils.c 2006-11-23 15:22:53 UTC (rev 17816) +++ trunk/gtk/gtkutils.c 2006-11-23 22:35:32 UTC (rev 17817) @@ -2883,10 +2883,11 @@ { GtkWidget *vbox; GtkWidget *hbox; - GtkWidget *bbox; + GtkWidget *hbox2; GtkWidget *label; GtkWidget *button; GtkWidget *img = NULL; + GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); char label_text[2048]; const char *button_text; GCallback callback; @@ -2926,37 +2927,38 @@ primary_esc, secondary ? "\n" : "", secondary?secondary_esc:""); g_free(primary_esc); label = gtk_label_new(NULL); + gtk_widget_set_size_request(label, gaim_prefs_get_int("/gaim/gtk/blist/width")-16,-1); gtk_widget_modify_text(vbox, GTK_STATE_NORMAL, &(label->style->white)); gtk_label_set_markup(GTK_LABEL(label), label_text); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); #if GTK_CHECK_VERSION(2,6,0) - g_object_set(label, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + // g_object_set(label, "ellipsize", PANGO_ELLIPSIZE_END, NULL); #endif - - bbox = gtk_hbutton_box_new(); - gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); - gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); - gtk_box_set_spacing(GTK_BOX(bbox), 6); + hbox2 = gtk_hbox_new(FALSE, 6); + gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0); + va_start(args, user_data); while ((button_text = va_arg(args, char*))) { callback = va_arg(args, GCallback); button = gtk_button_new(); - gtk_container_set_border_width(GTK_CONTAINER(button), 0); + if (callback) g_signal_connect_swapped(G_OBJECT(button), "clicked", callback, user_data); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy), vbox); hbox = gtk_hbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(button), hbox); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 3); g_snprintf(label_text, sizeof(label_text), "<span size=\"smaller\">%s</span>", button_text); label = gtk_label_new(NULL); gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), label_text); gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(bbox), button); + gtk_box_pack_end(GTK_CONTAINER(hbox2), button, FALSE, FALSE, 0); + gtk_size_group_add_widget(sg, button); } va_end(args); Modified: trunk/libgaim/account.h =================================================================== --- trunk/libgaim/account.h 2006-11-23 15:22:53 UTC (rev 17816) +++ trunk/libgaim/account.h 2006-11-23 22:35:32 UTC (rev 17817) @@ -44,7 +44,7 @@ { /* A buddy we already have added us to their buddy list. */ void (*notify_added)(GaimAccount *account, const char *remote_user, - const char *id, const char *alias, + const char *id, const char *alias, const char *message); void (*status_changed)(GaimAccount *account, GaimStatus *status); /* Someone we don't have on our list added us. Will prompt to add them. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |