Menu
▾
▴
pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(106) |
Oct
(334) |
Nov
(246) |
Dec
(145) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(42) |
Feb
(53) |
Mar
(232) |
Apr
(109) |
May
(137) |
Jun
(63) |
Jul
(26) |
Aug
(263) |
Sep
(193) |
Oct
(507) |
Nov
(440) |
Dec
(241) |
| 2003 |
Jan
(567) |
Feb
(195) |
Mar
(504) |
Apr
(481) |
May
(524) |
Jun
(522) |
Jul
(594) |
Aug
(502) |
Sep
(643) |
Oct
(508) |
Nov
(430) |
Dec
(377) |
| 2004 |
Jan
(361) |
Feb
(251) |
Mar
(219) |
Apr
(499) |
May
(461) |
Jun
(419) |
Jul
(314) |
Aug
(519) |
Sep
(416) |
Oct
(247) |
Nov
(305) |
Dec
(382) |
| 2005 |
Jan
(267) |
Feb
(282) |
Mar
(327) |
Apr
(338) |
May
(189) |
Jun
(400) |
Jul
(462) |
Aug
(530) |
Sep
(316) |
Oct
(523) |
Nov
(481) |
Dec
(650) |
| 2006 |
Jan
(536) |
Feb
(361) |
Mar
(287) |
Apr
(146) |
May
(101) |
Jun
(169) |
Jul
(221) |
Aug
(498) |
Sep
(300) |
Oct
(236) |
Nov
(209) |
Dec
(205) |
| 2007 |
Jan
(30) |
Feb
(23) |
Mar
(26) |
Apr
(15) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <lsc...@us...> - 2007-02-09 15:19:19
|
Revision: 18187
http://svn.sourceforge.net/gaim/?rev=18187&view=rev
Author: lschiere
Date: 2007-02-09 07:19:15 -0800 (Fri, 09 Feb 2007)
Log Message:
-----------
one more
Modified Paths:
--------------
trunk/po/eo.po
Modified: trunk/po/eo.po
===================================================================
--- trunk/po/eo.po 2007-02-09 07:47:20 UTC (rev 18186)
+++ trunk/po/eo.po 2007-02-09 15:19:15 UTC (rev 18187)
@@ -3,16 +3,16 @@
#
# Copyright (C) 2006, Stéphane Fillod <fi...@us...>
#
-# Stéphane Fillod <f8...@fr...>, 2006.
+# Stéphane Fillod <f8...@fr...>, 2006, 2007.
# This file is distributed under the same license as the Gaim package.
msgid ""
msgstr ""
"Project-Id-Version: eo\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-11 11:45+0100\n"
-"PO-Revision-Date: 2006-11-12 18:59+0100\n"
+"POT-Creation-Date: 2007-01-25 00:00-0500\n"
+"PO-Revision-Date: 2007-01-28 23:07+0100\n"
"Last-Translator: Stéphane Fillod <f8...@fr...>\n"
-"Language-Team: Esperanto\n"
+"Language-Team: Esperanto <eo...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -31,16 +31,16 @@
msgid "Send instant messages over multiple protocols"
msgstr "Sendu tujmesaĝojn per pluraj protokoloj"
-#: ../console/gntaccount.c:119 ../console/gntblist.c:266
-#: ../console/gntblist.c:384 ../console/gntblist.c:397
-#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
+#: ../console/gntaccount.c:119 ../console/gntblist.c:272
+#: ../console/gntblist.c:390 ../console/gntblist.c:403
+#: ../console/gntplugin.c:154 ../console/gntplugin.c:199
#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c: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
+#: ../libgaim/protocols/jabber/buddy.c:1399
+#: ../libgaim/protocols/jabber/chat.c:679
+#: ../libgaim/protocols/jabber/chat.c:690
+#: ../libgaim/protocols/jabber/jabber.c:1210
+#: ../libgaim/protocols/qq/group_join.c:324
+#: ../libgaim/protocols/silc/ops.c:1451
msgid "Error"
msgstr "Eraro"
@@ -52,15 +52,15 @@
msgid "Screenname of an account must be non-empty."
msgstr "Ekrannomo de konto ne devas esti malplena."
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
msgid "New mail notifications"
msgstr "Nova retpoŝto avizoj"
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
msgid "Remember password"
msgstr "Memoru pasvorton"
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3797
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868
msgid "Modify Account"
msgstr "Ŝanĝu Konton"
@@ -68,100 +68,91 @@
msgid "New Account"
msgstr "Nova Konto"
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695
msgid "Protocol:"
msgstr "Protokolo:"
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4942
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229
#: ../gtk/plugins/gevolution/new_person_dialog.c:295
msgid "Screen name:"
msgstr "Ekrannomo:"
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
msgid "Password:"
msgstr "Pasvorton:"
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4963 ../gtk/gtkblist.c:5328
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613
msgid "Alias:"
msgstr "Alinomo:"
#. Cancel
#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:307
-#: ../console/gntblist.c:374 ../console/gntblist.c:407
-#: ../console/gntblist.c:736 ../console/gntblist.c:905
-#: ../console/gntblist.c:996 ../console/gntblist.c:1949
+#: ../console/gntaccount.c:834 ../console/gntblist.c:313
+#: ../console/gntblist.c:380 ../console/gntblist.c:413
+#: ../console/gntblist.c:737 ../console/gntblist.c:906
+#: ../console/gntblist.c:997 ../console/gntblist.c:2021
#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c:471 ../console/gntstatus.c:596
-#: ../gtk/gtkaccount.c:1833 ../gtk/gtkaccount.c:2307 ../gtk/gtkblist.c:5384
-#: ../gtk/gtkdialogs.c:683 ../gtk/gtkdialogs.c:820 ../gtk/gtkdialogs.c:911
-#: ../gtk/gtkdialogs.c:930 ../gtk/gtkdialogs.c:952 ../gtk/gtkdialogs.c:972
-#: ../gtk/gtkdialogs.c:1016 ../gtk/gtkdialogs.c:1054 ../gtk/gtkdialogs.c:1108
-#: ../gtk/gtkdialogs.c:1145 ../gtk/gtkdialogs.c:1170
-#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:296
-#: ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
+#: ../console/gntstatus.c:472 ../console/gntstatus.c:597
+#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669
+#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974
+#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110
+#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172
+#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286
+#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c: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:3399
-#: ../libgaim/protocols/sametime/sametime.c:3484
-#: ../libgaim/protocols/sametime/sametime.c:3654
-#: ../libgaim/protocols/sametime/sametime.c:5402
-#: ../libgaim/protocols/sametime/sametime.c:5491
-#: ../libgaim/protocols/sametime/sametime.c:5615
+#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961
+#: ../libgaim/account.c:1149 ../libgaim/account.c:1183
+#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51
+#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1761
+#: ../libgaim/protocols/jabber/buddy.c:1795
+#: ../libgaim/protocols/jabber/chat.c:788
+#: ../libgaim/protocols/jabber/jabber.c:861
+#: ../libgaim/protocols/jabber/jabber.c:1365
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249
+#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279
+#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311
+#: ../libgaim/protocols/oscar/oscar.c:6043
+#: ../libgaim/protocols/oscar/peer.c:1021
+#: ../libgaim/protocols/qq/buddy_info.c:484
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
+#: ../libgaim/protocols/qq/group_join.c:138
+#: ../libgaim/protocols/qq/group_join.c:359
+#: ../libgaim/protocols/qq/group_opt.c:142
+#: ../libgaim/protocols/qq/group_opt.c:392
+#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:3410
+#: ../libgaim/protocols/sametime/sametime.c:3495
+#: ../libgaim/protocols/sametime/sametime.c:3665
+#: ../libgaim/protocols/sametime/sametime.c:5409
+#: ../libgaim/protocols/sametime/sametime.c:5498
+#: ../libgaim/protocols/sametime/sametime.c:5622
#: ../libgaim/protocols/silc/buddy.c:467
#: ../libgaim/protocols/silc/buddy.c:1078
#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1910
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912
#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
-#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
-#: ../libgaim/request.h:1354
+#: ../libgaim/protocols/yahoo/yahoo.c:961
+#: ../libgaim/protocols/yahoo/yahoo.c:3208
+#: ../libgaim/protocols/yahoo/yahoo.c:3217
msgid "Cancel"
msgstr "Rezignu"
#. 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
+#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182
+#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587
msgid "Save"
msgstr "Konservu"
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827
-#: ../gtk/gtksavedstatuses.c:293
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
+#: ../gtk/gtksavedstatuses.c:328
#, c-format
msgid "Are you sure you want to delete %s?"
msgstr "Ĉu vi certas vi volas forigi %s-n?"
@@ -173,13 +164,13 @@
#: ../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
+#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:335
msgid "Delete"
msgstr "Forigu"
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1870
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2139 ../gtk/gtkdocklet.c:530
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
msgid "Accounts"
msgstr "Kontoj"
@@ -188,14 +179,13 @@
msgstr "Vi povas ŝalti/malŝalti kontojn de la jena listo."
#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:307 ../console/gntblist.c:374
-#: ../console/gntblist.c:407 ../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:5490
+#: ../console/gntblist.c:313 ../console/gntblist.c:380
+#: ../console/gntblist.c:413 ../console/gntnotify.c:309
+#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668
+#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104
+#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:5497
#: ../libgaim/protocols/silc/chat.c:596
msgid "Add"
msgstr "Aldonu"
@@ -204,225 +194,236 @@
msgid "Modify"
msgstr "Ŝanĝu"
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2255
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
#, c-format
msgid "%s%s%s%s has made %s his or her buddy%s%s"
msgstr "%s%s%s%s faris %s-n sia kunul%s%s"
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2304
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431
msgid "Add buddy to your list?"
msgstr "Aldonu kunulon al via listo?"
-#: ../console/gntblist.c:258
+#: ../console/gntblist.c:264
msgid "You must provide a screename for the buddy."
msgstr "Vi devas enigi ekrannomon por la kunul."
-#: ../console/gntblist.c:260
+#: ../console/gntblist.c:266
msgid "You must provide a group."
msgstr "Vi devas enigi grupon."
-#: ../console/gntblist.c:262
+#: ../console/gntblist.c:268
msgid "You must select an account."
msgstr "Vi devas elekti konton."
-#: ../console/gntblist.c:266
+#: ../console/gntblist.c:272
msgid "Error adding buddy"
msgstr "Eraro aldonante kunul"
-#: ../console/gntblist.c:291 ../gtk/gtkaccount.c:1896
-#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2805
+#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849
msgid "Screen Name"
msgstr "Ekranonomo"
-#: ../console/gntblist.c:294 ../console/gntblist.c:366 ../gtk/gtkdialogs.c:929
-#: ../gtk/gtkdialogs.c:951 ../gtk/gtkdialogs.c:971 ../gtk/gtkrequest.c:277
-#: ../libgaim/protocols/silc/chat.c:587
+#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931
+#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
+#: ../libgaim/protocols/zephyr/zephyr.c:789
+#: ../libgaim/protocols/zephyr/zephyr.c:1207
msgid "Alias"
msgstr "Alinomo"
-#: ../console/gntblist.c:297 ../console/gntblist.c:369
+#: ../console/gntblist.c:303 ../console/gntblist.c:375
msgid "Group"
msgstr "Grupo"
-#: ../console/gntblist.c:300 ../console/gntblist.c:357
-#: ../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
+#: ../console/gntblist.c:306 ../console/gntblist.c:363
+#: ../console/gntblist.c:1166 ../console/gntnotify.c:155
+#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467
+#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444
+#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189
msgid "Account"
msgstr "Konto"
-#: ../console/gntblist.c:306 ../console/gntblist.c:783 ../gtk/gtkblist.c:4896
+#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183
#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
#: ../libgaim/protocols/silc/buddy.c:736
#: ../libgaim/protocols/silc/buddy.c:1030
#: ../libgaim/protocols/silc/buddy.c:1075
#: ../libgaim/protocols/silc/buddy.c:1174
-#: ../libgaim/protocols/yahoo/yahoo.c:3128
+#: ../libgaim/protocols/yahoo/yahoo.c:3122
msgid "Add Buddy"
msgstr "Aldonu Kunulon"
-#: ../console/gntblist.c:306
+#: ../console/gntblist.c:312
msgid "Please enter buddy information."
msgstr "B.v. enigi kunul informon."
-#: ../console/gntblist.c:329 ../libgaim/blist.c:1195
+#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
msgid "Chats"
msgstr "Babilejoj"
#. Extract their Name and put it in
-#. Contact Info
-#. Personal
-#. Business
-#: ../console/gntblist.c:363 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621
#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
#: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c: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
+#: ../libgaim/protocols/jabber/jabber.c:792
+#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600
+#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44
msgid "Name"
msgstr "Nomo"
-#: ../console/gntblist.c:372 ../console/gntblist.c:785 ../gtk/gtkblist.c:5274
+#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559
msgid "Add Chat"
msgstr "Aldonu Babilejon"
-#: ../console/gntblist.c:373
+#: ../console/gntblist.c:379
msgid "You can edit more information from the context menu later."
msgstr "Vi povas redakti plian informon per la ĉirkaŭteksto menuo poste."
-#: ../console/gntblist.c:384 ../console/gntblist.c:397
+#: ../console/gntblist.c:390 ../console/gntblist.c:403
msgid "Error adding group"
msgstr "Eraro aldonante grupo"
-#: ../console/gntblist.c:385
+#: ../console/gntblist.c:391
msgid "You must give a name for the group to add."
msgstr "Vi devas enigi nomon de la grupo aldonenda."
-#: ../console/gntblist.c:398
+#: ../console/gntblist.c:404
msgid "A group with the name already exists."
msgstr "Grupo samnomita jam ekzistas."
-#: ../console/gntblist.c:405 ../console/gntblist.c:787 ../gtk/gtkblist.c:5380
-#: ../libgaim/protocols/sametime/sametime.c:5401
-#: ../libgaim/protocols/sametime/sametime.c:5488
+#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665
+#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../libgaim/protocols/sametime/sametime.c:5495
msgid "Add Group"
msgstr "Aldonu Grupon"
-#: ../console/gntblist.c:405
+#: ../console/gntblist.c:411
msgid "Enter the name of the group"
msgstr "B.v. enigi la nomon de la grupo"
-#: ../console/gntblist.c:735
+#: ../console/gntblist.c:736
msgid "Edit Chat"
msgstr "Redaktu Babilejon"
-#: ../console/gntblist.c:735
+#: ../console/gntblist.c:736
msgid "Please Update the necessary fields."
msgstr "B.v. Aktualigi la necesajn kampojn."
-#: ../console/gntblist.c:736 ../console/gntstatus.c:196
+#: ../console/gntblist.c:737 ../console/gntstatus.c:196
msgid "Edit"
msgstr "Redaktu"
-#: ../console/gntblist.c:750
+#: ../console/gntblist.c:751
msgid "Auto-join"
msgstr "Aŭtomate-aliĝu"
-#: ../console/gntblist.c:759
+#: ../console/gntblist.c:760
msgid "Edit Settings"
msgstr "Agordu"
-#: ../console/gntblist.c:805 ../libgaim/protocols/silc/chat.c:878
+#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
msgid "Get Info"
msgstr "Ricevu Informon"
-#: ../console/gntblist.c:810
+#: ../console/gntblist.c:811
msgid "Add Buddy Pounce"
msgstr "Aldonu Kunul Atentigon"
-#: ../console/gntblist.c:817 ../gtk/gtkconv.c:1582
-#: ../libgaim/protocols/oscar/oscar.c:615
+#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602
+#: ../libgaim/protocols/oscar/oscar.c:633
msgid "Send File"
msgstr "Sendu Dosieron"
-#: ../console/gntblist.c:821
+#: ../console/gntblist.c:822
msgid "View Log"
msgstr "Montru Protokolon"
-#: ../console/gntblist.c:901
+#: ../console/gntblist.c:902
#, c-format
msgid "Please enter the new name for %s"
msgstr "B.v. enigi la novan nomon por %s"
-#: ../console/gntblist.c:903 ../console/gntblist.c:904
-#: ../console/gntblist.c:1073
+#: ../console/gntblist.c:904 ../console/gntblist.c:905
+#: ../console/gntblist.c:1116
msgid "Rename"
msgstr "Alinomu"
-#: ../console/gntblist.c:903
+#: ../console/gntblist.c:904
msgid "Enter empty string to reset the name."
msgstr "Enigu malplenan ĉenon por forviŝi la nomon."
-#: ../console/gntblist.c:976
+#: ../console/gntblist.c:977
msgid "Removing this contact will also remove all the buddies in the contact"
msgstr "Forigi tiun kontakton ankaŭ forigos ĉiujn kunulojn en la kontakto"
-#: ../console/gntblist.c:984
+#: ../console/gntblist.c:985
msgid "Removing this group will also remove all the buddies in the group"
msgstr "Forigi tiun grupon ankaŭ forigos ĉiujn kunulojn en la grupo"
-#: ../console/gntblist.c:989
+#: ../console/gntblist.c:990
#, c-format
msgid "Are you sure you want to remove %s?"
msgstr "Ĉu vi certas vi volas forigi %s?"
#. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:992
+#: ../console/gntblist.c:993
msgid "Confirm Remove"
msgstr "Konfirmu Forigon"
-#: ../console/gntblist.c:995 ../console/gntblist.c:1075 ../gtk/gtkblist.c:1039
-#: ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275
+#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106
+#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248
msgid "Remove"
msgstr "Forigu"
#. Buddy List
-#: ../console/gntblist.c:1050 ../console/gntblist.c:2016
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3914
+#: ../console/gntblist.c:1093 ../console/gntblist.c:2088
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091
#: ../gtk/plugins/win32/winprefs/winprefs.c:327
msgid "Buddy List"
msgstr "Kunul Listo"
-#: ../console/gntblist.c:1079
+#: ../console/gntblist.c:1123
msgid "Place tagged"
msgstr "Loko etikedita"
-#: ../console/gntblist.c:1082
-msgid "Tag"
-msgstr "Etikedo"
+#: ../console/gntblist.c:1128
+msgid "Toggle Tag"
+msgstr ""
-#: ../console/gntblist.c:1109 ../console/gntblist.c:1228
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Konto: %s (%s)"
+#. General
+#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035
+#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:814
+#: ../libgaim/protocols/jabber/buddy.c:1562
+#: ../libgaim/protocols/jabber/buddy.c:1744
+#: ../libgaim/protocols/jabber/jabber.c:802
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
+msgid "Nickname"
+msgstr "Karesnomo"
-#: ../console/gntblist.c:1134
-#, c-format
-msgid ""
-"\n"
-"Idle: %s"
-msgstr ""
-"\n"
-"Senfara: %s"
+#. Idle stuff
+#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307
+#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:645
+#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2860
+#: ../libgaim/protocols/oscar/oscar.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:2876
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
+msgid "Idle"
+msgstr "Senfara"
-#: ../console/gntblist.c:1191 ../console/gntblist.c:1207
+#: ../console/gntblist.c:1270
#, c-format
-msgid "Nickname: %s\n"
-msgstr "Karesnomo: %s\n"
-
-#: ../console/gntblist.c:1219
-#, c-format
msgid ""
"Online: %d\n"
"Total: %d"
@@ -430,8 +431,13 @@
"Konektita: %d\n"
"Entute: %d"
-#: ../console/gntblist.c:1240
+#: ../console/gntblist.c:1279
#, c-format
+msgid "Account: %s (%s)"
+msgstr "Konto: %s (%s)"
+
+#: ../console/gntblist.c:1291
+#, c-format
msgid ""
"\n"
"Last Seen: %s ago"
@@ -439,88 +445,79 @@
"\n"
"Laste vidita: antaŭ %s"
-#: ../console/gntblist.c:1485 ../gtk/gtkdocklet.c:478
-#: ../gtk/gtkstatusbox.c:984
+#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
+#: ../gtk/gtkstatusbox.c:1000
msgid "New..."
msgstr "Nova..."
-#: ../console/gntblist.c:1492 ../gtk/gtkdocklet.c:479
-#: ../gtk/gtkstatusbox.c:985
+#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
+#: ../gtk/gtkstatusbox.c:1001
msgid "Saved..."
msgstr "Konservita..."
-#: ../console/gntblist.c:1838 ../console/gntplugin.c:231 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:531 ../gtk/gtkplugin.c:538
+#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
msgid "Plugins"
msgstr "Kromaĵoj"
-#: ../console/gntblist.c:1930 ../gtk/gtkdialogs.c:664 ../gtk/gtkdialogs.c:801
-#: ../gtk/gtkdialogs.c:881
+#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
+#: ../gtk/gtkdialogs.c:883
msgid "_Name"
msgstr "_Nomo"
-#: ../console/gntblist.c:1935 ../gtk/gtkdialogs.c:669 ../gtk/gtkdialogs.c:806
-#: ../gtk/gtkdialogs.c:886
+#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
+#: ../gtk/gtkdialogs.c:888
msgid "_Account"
msgstr "_Konto"
-#: ../console/gntblist.c:1943 ../gtk/gtkdialogs.c:677
+#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
msgid "New Instant Message"
msgstr "Nova Tuj Mesaĝo"
-#: ../console/gntblist.c:1945 ../gtk/gtkdialogs.c:679
+#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
msgid "Please enter the screen name or alias of the person you would like to IM."
msgstr "B.v. enigi la ekrannomon aŭ alinomon de persono kiun vi dezrias TM-i."
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../console/gntblist.c:1948 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3796
-#: ../gtk/gtkdialogs.c:682 ../gtk/gtkdialogs.c:819 ../gtk/gtkdialogs.c:910
-#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:963 ../libgaim/account.c:1134
+#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867
+#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912
+#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148
#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c: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/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1364
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248
+#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042
#: ../libgaim/protocols/silc/buddy.c:466
#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:749
-#: ../libgaim/protocols/yahoo/yahoo.c:3213
-#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911
+#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960
+#: ../libgaim/protocols/yahoo/yahoo.c:3207
+#: ../libgaim/protocols/yahoo/yahoo.c:3216
msgid "OK"
msgstr "Daŭrigu"
#. Create the "Options" frame.
-#: ../console/gntblist.c:1967 ../gtk/gtkpounce.c:766
+#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
msgid "Options"
msgstr "Opcioj"
-#: ../console/gntblist.c:1973
+#: ../console/gntblist.c:2045
msgid "Send IM..."
msgstr "Sendu TM-n..."
-#: ../console/gntblist.c:1977
+#: ../console/gntblist.c:2049
msgid "Toggle offline buddies"
msgstr "Inversigi senkonektajn kunulojn"
-#: ../console/gntblist.c:1981
+#: ../console/gntblist.c:2053
msgid "Sort by status"
msgstr "Ordigi laŭ stato"
-#: ../console/gntblist.c:1985
+#: ../console/gntblist.c:2057
msgid "Sort alphabetically"
msgstr "Ordigi alfabete"
-#: ../console/gntblist.c:1989
+#: ../console/gntblist.c:2061
msgid "Sort by log size"
msgstr "Oridgi laŭ protokolo grandeco"
@@ -543,117 +540,126 @@
"%s estis diskonektigita pro la jena eraro:\n"
"%s"
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3794 ../libgaim/account.c:991
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988
#: ../libgaim/connection.c:107
msgid "Connection Error"
msgstr "Konekteraro"
-#: ../console/gntconv.c:71
+#: ../console/gntconv.c:102
msgid "No such command."
msgstr "Nenia komando."
-#: ../console/gntconv.c:75 ../gtk/gtkconv.c:493
+#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505
msgid "Syntax Error: You typed the wrong number of arguments to that command."
msgstr ""
-#: ../console/gntconv.c:80 ../gtk/gtkconv.c:498
+#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510
msgid "Your command failed for an unknown reason."
msgstr "Via komanda malsukcesis pro nekonata kialo."
-#: ../console/gntconv.c:85 ../gtk/gtkconv.c:504
+#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516
msgid "That command only works in chats, not IMs."
msgstr "Tiu komando nur funkcias en babilejoj, ne TM-oj."
-#: ../console/gntconv.c:88 ../gtk/gtkconv.c:507
+#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519
msgid "That command only works in IMs, not chats."
msgstr "Tiu komando nur funkcias en TM-oj, ne babilejoj."
-#: ../console/gntconv.c:92 ../gtk/gtkconv.c:511
+#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523
msgid "That command doesn't work on this protocol."
msgstr "Tiu komando ne funkcias je tiu protokolo."
-#: ../console/gntconv.c:99
+#: ../console/gntconv.c:130
msgid "Commands are not supported yet. Message was NOT sent."
msgstr "Komandoj estas ne akceptitaj nune. Mesaĝo NE estis sendita."
-#: ../console/gntconv.c:198
+#: ../console/gntconv.c:232
#, c-format
msgid "%s (%s -- %s)"
msgstr "%s (%s -- %s)"
-#: ../console/gntconv.c:219
+#: ../console/gntconv.c:255
#, c-format
msgid "%s [%s]"
msgstr "%s [%s]"
-#: ../console/gntconv.c:349
+#: ../console/gntconv.c:260 ../console/gntconv.c:432
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s tajpas..."
+
+#: ../console/gntconv.c:399
msgid "<AUTO-REPLY> "
msgstr "<AŬTO-RESPONDO> "
#. Print the list of users in the room
-#: ../console/gntconv.c:443
+#: ../console/gntconv.c:501
msgid "List of users:\n"
msgstr "Uzantoj Listo:\n"
-#: ../console/gntconv.c:567 ../gtk/gtkconv.c:386
+#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
msgid "Supported debug options are: version"
msgstr "Subtenitaj sencimigopcioj estas: versio"
-#: ../console/gntconv.c:602 ../gtk/gtkconv.c:422
+#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
msgid "No such command (in this context)."
msgstr "Nenia komand (en tiu kunteksto)."
-#: ../console/gntconv.c:605 ../gtk/gtkconv.c:425
+#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
msgid ""
"Use \"/help <command>\" for help on a specific command.\n"
"The following commands are available in this context:\n"
msgstr ""
-#: ../console/gntconv.c:644 ../gtk/gtkconv.c:6737
+#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824
msgid ""
"say <message>: Send a message normally as if you weren't using a "
"command."
msgstr ""
-#: ../console/gntconv.c:647 ../gtk/gtkconv.c:6740
+#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827
msgid "me <action>: Send an IRC style action to a buddy or chat."
msgstr ""
-#: ../console/gntconv.c:650 ../gtk/gtkconv.c:6743
+#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830
msgid ""
"debug <option>: Send various debug information to the current "
"conversation."
msgstr ""
-#: ../console/gntconv.c:653 ../gtk/gtkconv.c:6746
+#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833
msgid "clear: Clears the conversation scrollback."
msgstr ""
-#: ../console/gntconv.c:656 ../gtk/gtkconv.c:6749
+#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836
msgid "help <command>: Help on a specific command."
msgstr ""
-#: ../console/gntconv.c:661
+#: ../console/gntconv.c:719
msgid "plugins: Show the plugins window."
msgstr ""
-#: ../console/gntconv.c:664
+#: ../console/gntconv.c:722
msgid "buddylist: Show the buddylist."
msgstr ""
-#: ../console/gntconv.c:667
+#: ../console/gntconv.c:725
msgid "accounts: Show the accounts window."
msgstr ""
-#: ../console/gntconv.c:670
+#: ../console/gntconv.c:728
msgid "debugwin: Show the debug window."
msgstr ""
-#: ../console/gntconv.c:673
+#: ../console/gntconv.c:731
msgid "prefs: Show the preference window."
msgstr ""
-#: ../console/gntconv.c:676
+#: ../console/gntconv.c:734
msgid "statuses: Show the savedstatuses window."
msgstr ""
@@ -677,12 +683,12 @@
msgid "Timestamps"
msgstr "Tempomarkojn"
-#: ../console/gntgaim.c:166
+#: ../console/gntgaim.c:227
#, c-format
msgid "%s. Try `%s -h' for more information.\n"
msgstr "%s. Provu `%s -h' por plia informo.\n"
-#: ../console/gntgaim.c:168
+#: ../console/gntgaim.c:229
#, c-format
msgid ""
"%s\n"
@@ -711,19 +717,18 @@
msgid "You have mail!"
msgstr "Vi ricevis retmesaĝon!"
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
-#: ../libgaim/protocols/jabber/jabber.c:1138
+#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1155
msgid "From"
msgstr "De"
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
msgid "Subject"
msgstr "Subjekto"
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
-#: ../console/gntplugin.c:274 ../console/gntstatus.c:206
-#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
-#: ../libgaim/protocols/silc/util.c:377
+#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
+#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
+#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
+#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
msgid "Close"
msgstr "Fermu"
@@ -734,46 +739,45 @@
msgstr[0] "%s (%s) havas %d novan mesaĝon."
msgstr[1] "%s (%s) havas %d novajn mesaĝojn."
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
msgid "New Mail"
msgstr "Nova Retmesaĝo"
-#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
-#: ../libgaim/protocols/oscar/oscar.c:2612
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
#, c-format
msgid "Info for %s"
msgstr "Informo pri %s"
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
#: ../libgaim/protocols/toc/toc.c:476
msgid "Buddy Information"
msgstr "Kunul Informo"
-#: ../console/gntnotify.c:303
+#: ../console/gntnotify.c:306
msgid "Continue"
msgstr "Daŭrigu"
-#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1610 ../gtk/gtkdebug.c:862
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862
msgid "Info"
msgstr "Informo"
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1571
+#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
msgid "IM"
msgstr "TM"
-#: ../console/gntnotify.c:315
+#: ../console/gntnotify.c:318
msgid "Join"
msgstr "Aliĝu"
-#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3483
+#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494
msgid "Invite"
msgstr "Invitu"
-#: ../console/gntnotify.c:321
+#: ../console/gntnotify.c:324
msgid "(none)"
msgstr "(neniu)"
-#: ../console/gntplugin.c:117
+#: ../console/gntplugin.c:102
#, c-format
msgid ""
"Name: %s\n"
@@ -790,27 +794,27 @@
"Retejo: %s\n"
"Dosiernomo: %s\n"
-#: ../console/gntplugin.c:170
+#: ../console/gntplugin.c:155
msgid "Plugin need to be loaded before you can configure it."
msgstr "Necesas ŝarĝi kromaĵon por agordi ĝin."
-#: ../console/gntplugin.c:208
+#: ../console/gntplugin.c:193
msgid "..."
msgstr "..."
-#: ../console/gntplugin.c:209
+#: ../console/gntplugin.c:194
msgid "Still need to do something about this."
msgstr ""
-#: ../console/gntplugin.c:215
+#: ../console/gntplugin.c:200
msgid "No configuration options for this plugin."
msgstr "Neniuj agordaj opcioj por tiu kromaĵo."
-#: ../console/gntplugin.c:236
+#: ../console/gntplugin.c:221
msgid "You can (un)load plugins from the following list."
msgstr "Vi povas (mal)ŝarĝi kromaĵojn de la jena listo."
-#: ../console/gntplugin.c:279
+#: ../console/gntplugin.c:264
msgid "Configure Plugin"
msgstr "Agordu Kromaĵon"
@@ -847,17 +851,17 @@
msgstr "Protokolu stato ŝanĝeventojn"
#. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1909
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
#: ../gtk/plugins/win32/winprefs/winprefs.c:341
msgid "Conversations"
msgstr "Konversacioj"
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1349 ../gtk/gtkprefs.c:1920
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
msgid "Logging"
msgstr "Protokolado"
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:532
-#: ../gtk/gtkprefs.c:1945
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
+#: ../gtk/gtkprefs.c:1951
msgid "Preferences"
msgstr "Agordo"
@@ -874,60 +878,60 @@
msgid "Delete Status"
msgstr "Forigu Staton"
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:526
+#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556
msgid "Saved Statuses"
msgstr "Konservitaj Statoj"
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:525
-#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
+#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:931
#: ../libgaim/protocols/novell/novell.c:1484
msgid "Title"
msgstr "Titolon"
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:448
+#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
msgid "Type"
msgstr "Tipo"
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:550
-#: ../console/gntstatus.c:562 ../gtk/gtksavedstatuses.c:459
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
+#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489
+#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256
#: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/gg/gg.c:1598 ../libgaim/protocols/gg/gg.c:1608
-#: ../libgaim/protocols/gg/gg.c:1614 ../libgaim/protocols/gg/gg.c:1623
-#: ../libgaim/protocols/gg/gg.c:1628 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1205
-#: ../libgaim/protocols/jabber/jabber.c:1215
-#: ../libgaim/protocols/jabber/jabber.c:1225
-#: ../libgaim/protocols/jabber/jabber.c:1235
-#: ../libgaim/protocols/jabber/jabber.c:1245
+#: ../libgaim/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591
+#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619
+#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634
+#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1227
+#: ../libgaim/protocols/jabber/jabber.c:1237
+#: ../libgaim/protocols/jabber/jabber.c:1247
#: ../libgaim/protocols/jabber/jabber.c:1257
-#: ../libgaim/protocols/novell/novell.c:2876
+#: ../libgaim/protocols/jabber/jabber.c:1267
+#: ../libgaim/protocols/jabber/jabber.c:1279
+#: ../libgaim/protocols/novell/novell.c:2873
+#: ../libgaim/protocols/novell/novell.c:2976
#: ../libgaim/protocols/novell/novell.c:2982
#: ../libgaim/protocols/novell/novell.c:2988
-#: ../libgaim/protocols/novell/novell.c:2994
-#: ../libgaim/protocols/oscar/oscar.c:5397
-#: ../libgaim/protocols/oscar/oscar.c:5412
-#: ../libgaim/protocols/oscar/oscar.c:5417
-#: ../libgaim/protocols/oscar/oscar.c:5625
-#: ../libgaim/protocols/oscar/oscar.c:5637
-#: ../libgaim/protocols/oscar/oscar.c:5650
-#: ../libgaim/protocols/oscar/oscar.c:5657
-#: ../libgaim/protocols/oscar/oscar.c:5664
-#: ../libgaim/protocols/sametime/sametime.c:3297
-#: ../libgaim/protocols/sametime/sametime.c:3303
-#: ../libgaim/protocols/sametime/sametime.c:3309
-#: ../libgaim/protocols/sametime/sametime.c:3388
+#: ../libgaim/protocols/oscar/oscar.c:5501
+#: ../libgaim/protocols/oscar/oscar.c:5729
+#: ../libgaim/protocols/oscar/oscar.c:5741
+#: ../libgaim/protocols/oscar/oscar.c:5754
+#: ../libgaim/protocols/oscar/oscar.c:5761
+#: ../libgaim/protocols/oscar/oscar.c:5768
+#: ../libgaim/protocols/sametime/sametime.c:3308
+#: ../libgaim/protocols/sametime/sametime.c:3314
+#: ../libgaim/protocols/sametime/sametime.c:3320
+#: ../libgaim/protocols/sametime/sametime.c:3399
#: ../libgaim/protocols/silc/buddy.c:1544
#: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3450
#: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/yahoo/yahoo.c:3462
-#: ../libgaim/protocols/zephyr/zephyr.c:2333
+#: ../libgaim/protocols/zephyr/zephyr.c:2337
msgid "Message"
msgstr "Mesaĝo"
#. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:579
+#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
msgid "Use"
msgstr "Uzu"
@@ -947,50 +951,55 @@
msgid "Please enter a different title for the status."
msgstr "B.v. enigi malsimilan titolon por la stato."
-#: ../console/gntstatus.c:439
+#: ../console/gntstatus.c:440
msgid "Substatus"
msgstr "Substato"
#. Set up stuff for the account box
-#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:4990 ../gtk/gtkblist.c:5308
+#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593
msgid "Account:"
msgstr "Konto:"
-#: ../console/gntstatus.c:450 ../gtk/gtkft.c:698
+#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
msgid "Status:"
msgstr "Stato"
-#: ../console/gntstatus.c:465
+#: ../console/gntstatus.c:466
msgid "Message:"
msgstr "Mesaĝo:"
-#: ../console/gntstatus.c:514
+#: ../console/gntstatus.c:515
msgid "Edit Status"
msgstr "Redaktu Staton"
-#: ../console/gntstatus.c:533 ../console/gntstatus.c:562
-#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1581
-#: ../libgaim/protocols/gg/gg.c:1585 ../libgaim/protocols/jabber/buddy.c:623
-#: ../libgaim/protocols/jabber/buddy.c:630
-#: ../libgaim/protocols/jabber/buddy.c:658
-#: ../libgaim/protocols/jabber/jabber.c:1176
-#: ../libgaim/protocols/msn/msn.c:546
-#: ../libgaim/protocols/novell/novell.c:2875
-#: ../libgaim/protocols/novell/novell.c:2879
-#: ../libgaim/protocols/oscar/oscar.c:759
-#: ../libgaim/protocols/oscar/oscar.c:765
-#: ../libgaim/protocols/oscar/oscar.c:768
-#: ../libgaim/protocols/yahoo/yahoo.c:3032
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
+#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
+#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588
+#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637
+#: ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:674
+#: ../libgaim/protocols/jabber/jabber.c:1195
+#: ../libgaim/protocols/msn/msn.c:547
+#: ../libgaim/protocols/novell/novell.c:2870
+#: ../libgaim/protocols/oscar/oscar.c:800
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:2655
+#: ../libgaim/protocols/sametime/sametime.c:3285
+#: ../libgaim/protocols/sametime/sametime.c:4170
+#: ../libgaim/protocols/yahoo/yahoo.c:3027
msgid "Status"
msgstr "Stato"
-#: ../console/gntstatus.c:556
+#: ../console/gntstatus.c:557
msgid "Use different status for following accounts"
msgstr "Uzu malsimilan staton por jenaj kontoj"
#. Save & Use
-#: ../console/gntstatus.c:590
+#: ../console/gntstatus.c:591
msgid "Save & Use"
msgstr "Konservu & Uzu"
@@ -1121,8 +1130,8 @@
msgstr "_Alinomo"
#. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1120 ../gtk/gtkroomlist.c:285
-#: ../gtk/gtkroomlist.c:442
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
+#: ../gtk/gtkroomlist.c:463
msgid "_Join"
msgstr "_Aliĝu"
@@ -1130,7 +1139,7 @@
msgid "Close _tabs"
msgstr "Fermu _langetojn"
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1004
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
msgid "I_M"
msgstr "T_M"
@@ -1156,51 +1165,55 @@
msgstr "_Paŭzo"
#. Build the login options frame.
-#: ../gtk/gtkaccount.c:382
+#: ../gtk/gtkaccount.c:390
msgid "Login Options"
msgstr "Salutaj Opcioj"
-#: ../gtk/gtkaccount.c:483
+#: ../gtk/gtkaccount.c:492
msgid "Local alias:"
msgstr "Loka Alinomo:"
#. Build the user options frame.
-#: ../gtk/gtkaccount.c:545
+#: ../gtk/gtkaccount.c:554
msgid "User Options"
msgstr "Uzantoopcioj"
#. Buddy icon
-#: ../gtk/gtkaccount.c:563
+#: ../gtk/gtkaccount.c:572
msgid "Use this buddy icon for this account:"
msgstr "Uzu tiun kunul piktogramon por tiu konto:"
#. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:671
+#: ../gtk/gtkaccount.c:684
#, c-format
msgid "%s Options"
msgstr "%s Opcioj"
-#: ../gtk/gtkaccount.c:867
+#: ../gtk/gtkaccount.c:881
+msgid "Use GNOME Proxy Settings"
+msgstr "Uzu GNOME-ajn Prokurilo-Agordojn"
+
+#: ../gtk/gtkaccount.c:882
msgid "Use Global Proxy Settings"
msgstr "Uzu Sistemajn Prokurilo-Agordojn"
-#: ../gtk/gtkaccount.c:873
+#: ../gtk/gtkaccount.c:888
msgid "No Proxy"
msgstr "Sen Prokurilo"
-#: ../gtk/gtkaccount.c:879
+#: ../gtk/gtkaccount.c:894
msgid "HTTP"
msgstr "HTTP"
-#: ../gtk/gtkaccount.c:885
+#: ../gtk/gtkaccount.c:900
msgid "SOCKS 4"
msgstr "SOCKS 4"
-#: ../gtk/gtkaccount.c:891
+#: ../gtk/gtkaccount.c:906
msgid "SOCKS 5"
msgstr "SOCKS 5"
-#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1095
+#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100
msgid "Use Environmental Settings"
msgstr "Uzu Mediajn Agordojn"
@@ -1209,265 +1222,303 @@
#. A) your network is really slow and you have nothing better to do than
#. look at butterflies.
#. B)You are looking really closely at something that shouldn't matter.
-#: ../gtk/gtkaccount.c:936
+#: ../gtk/gtkaccount.c:951
msgid "If you look real closely"
msgstr "Se vi rigardas sufiĉe proksime"
#. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:939
+#: ../gtk/gtkaccount.c:954
msgid "you can see the butterflies mating"
msgstr "vi povas vidi la Zamenhofan barbon kreski"
-#: ../gtk/gtkaccount.c:960
+#: ../gtk/gtkaccount.c:975
msgid "Proxy Options"
msgstr "Prokurilo Opcioj"
-#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1089
+#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094
msgid "Proxy _type:"
msgstr "Prokurilo _tipo:"
-#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1110
+#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
msgid "_Host:"
msgstr "_Retnodo:"
-#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1128
+#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
msgid "_Port:"
msgstr "_Pordo:"
-#: ../gtk/gtkaccount.c:995
+#: ../gtk/gtkaccount.c:1010
msgid "_Username:"
msgstr "_Salutnomo:"
-#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1165
+#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
msgid "Pa_ssword:"
msgstr "Pa_svorto:"
-#: ../gtk/gtkaccount.c:1398
+#: ../gtk/gtkaccount.c:1428
msgid "Add Account"
msgstr "Aldonu Konton"
-#: ../gtk/gtkaccount.c:1422
+#: ../gtk/gtkaccount.c:1452
msgid "_Basic"
msgstr "_Baza"
-#: ../gtk/gtkaccount.c:1433
+#: ../gtk/gtkaccount.c:1463
msgid "_Advanced"
msgstr "_Kroma"
#. Register button
-#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:849
+#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:860
msgid "Register"
msgstr "Registru"
-#: ../gtk/gtkaccount.c:1919 ../gtk/gtkplugin.c:576
+#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566
msgid "Enabled"
msgstr "Enŝaltita"
-#: ../gtk/gtkaccount.c:1927
+#: ../gtk/gtkaccount.c:1961
msgid "Protocol"
msgstr "Protokolo"
-#: ../gtk/gtkblist.c:705
+#: ../gtk/gtkaccount.c:2133
+msgid ""
+"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with Gaim press the "
+"<b>Add</b> button below and configure your first account. If you want Gaim "
+"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+
+#: ../gtk/gtkaccount.c:2483
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s volas aldoni %s-n al sia kunullisto%s%s"
+
+#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512
+msgid "Authorize buddy?"
+msgstr "Permesi kunulon?"
+
+#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513
+msgid "Authorize"
+msgstr "Permesi"
+
+#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514
+msgid "Deny"
+msgstr "Rifuzi"
+
+#: ../gtk/gtkblist.c:709
msgid "Join a Chat"
msgstr "Aliĝu Babilejon"
-#: ../gtk/gtkblist.c:726
+#: ../gtk/gtkblist.c:730
msgid ""
"Please enter the appropriate information about the chat you would like to "
"join.\n"
msgstr "B.v enigi la konvenan informon pri la babilejo kiun vi deziras aliĝi.\n"
-#: ../gtk/gtkblist.c:737 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
+#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399
msgid "_Account:"
msgstr "_Konto:"
-#: ../gtk/gtkblist.c:1001
+#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
+msgid "_Block"
+msgstr "_Bloku"
+
+#: ../gtk/gtkblist.c:1015
+msgid "Un_block"
+msgstr "Mal_bloku"
+
+#: ../gtk/gtkblist.c:1066
msgid "Get _Info"
msgstr "Ricevu _Informon"
-#: ../gtk/gtkblist.c:1010
+#: ../gtk/gtkblist.c:1075
msgid "_Send File"
msgstr "_Sendu Dosieron"
-#: ../gtk/gtkblist.c:1017
+#: ../gtk/gtkblist.c:1082
msgid "Add Buddy _Pounce"
msgstr "Aldonu Kunul _Atentigon"
-#: ../gtk/gtkblist.c:1021 ../gtk/gtkblist.c:1025 ../gtk/gtkblist.c:1124
-#: ../gtk/gtkblist.c:1147
+#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
+#: ../gtk/gtkblist.c:1213
msgid "View _Log"
msgstr "Montru Protoko_lon"
-#: ../gtk/gtkblist.c:1036
+#: ../gtk/gtkblist.c:1103
msgid "Alias..."
msgstr "Alinomo..."
-#: ../gtk/gtkblist.c:1045 ../gtk/gtkblist.c:1132 ../gtk/gtkblist.c:1153
+#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
msgid "_Alias..."
msgstr "_Alinomo..."
-#: ../gtk/gtkblist.c:1047 ../gtk/gtkblist.c:1134 ../gtk/gtkblist.c:1155
+#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
msgid "_Remove"
msgstr "Fo_rigu"
-#: ../gtk/gtkblist.c:1095
+#: ../gtk/gtkblist.c:1161
msgid "Add a _Buddy"
msgstr "Aldonu K_unulon"
-#: ../gtk/gtkblist.c:1097
+#: ../gtk/gtkblist.c:1163
msgid "Add a C_hat"
msgstr "Aldonu Babile_jon"
-#: ../gtk/gtkblist.c:1100
+#: ../gtk/gtkblist.c:1166
msgid "_Delete Group"
msgstr "_Forigu Grupon"
-#: ../gtk/gtkblist.c:1102
+#: ../gtk/gtkblist.c:1168
msgid "_Rename"
msgstr "_Alinomu"
-#: ../gtk/gtkblist.c:1122
+#: ../gtk/gtkblist.c:1188
msgid "Auto-Join"
msgstr "Aŭtomate-aliĝu"
-#: ../gtk/gtkblist.c:1160 ../gtk/gtkblist.c:1183
+#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
msgid "_Collapse"
msgstr "_Maletendu"
-#: ../gtk/gtkblist.c:1188
+#: ../gtk/gtkblist.c:1254
msgid "_Expand"
msgstr "_Etendu"
-#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4115
-#: ../gtk/gtkblist.c:4125
+#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374
+#: ../gtk/gtkblist.c:4384
msgid "/Tools/Mute Sounds"
msgstr "/Iloj/Mutu Sonojn"
-#: ../gtk/gtkblist.c:1906 ../gtk/gtkconv.c:4350 ../gtk/gtkpounce.c:422
+#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4415 ../gtk/gtkpounce.c:421
msgid "You are not currently signed on with an account that can add that buddy."
msgstr "Vi ne ensalutis nun per konto kiu povas aldoni tiun kunul."
#. Buddies menu
-#: ../gtk/gtkblist.c:2500
+#: ../gtk/gtkblist.c:2567
msgid "/_Buddies"
msgstr "/K_unuloj"
-#: ../gtk/gtkblist.c:2501
+#: ../gtk/gtkblist.c:2568
msgid "/Buddies/New Instant _Message..."
msgstr "/Kunuloj/Nova Tuj _Mesaĝo..."
-#: ../gtk/gtkblist.c:2502
+#: ../gtk/gtkblist.c:2569
msgid "/Buddies/Join a _Chat..."
msgstr "/Kunuloj/Aliĝu Babile_jon..."
-#: ../gtk/gtkblist.c:2503
+#: ../gtk/gtkblist.c:2570
msgid "/Buddies/Get User _Info..."
msgstr "/Kunuloj/Ricevu Uzanto-_Informon..."
-#: ../gtk/gtkblist.c:2504
+#: ../gtk/gtkblist.c:2571
msgid "/Buddies/View User _Log..."
msgstr "/Kunuloj/Montru Uzanto-_Protokolon..."
-#: ../gtk/gtkblist.c:2506
+#: ../gtk/gtkblist.c:2573
msgid "/Buddies/Show _Offline Buddies"
msgstr "/Kunuloj/Montru Senk_onektajn Kunulojn"
-#: ../gtk/gtkblist.c:2507
+#: ../gtk/gtkblist.c:2574
msgid "/Buddies/Show _Empty Groups"
msgstr "/Kunuloj/Montru Malpl_enajn Grupojn"
-#: ../gtk/gtkblist.c:2508
+#: ../gtk/gtkblist.c:2575
msgid "/Buddies/Show Buddy _Details"
msgstr "/Kunuloj/Montru Kunul-_Detalojn"
-#: ../gtk/gtkblist.c:2509
+#: ../gtk/gtkblist.c:2576
msgid "/Buddies/Show Idle _Times"
msgstr "/Kunuloj/Montru Senfarajn _Tempojn"
-#: ../gtk/gtkblist.c:2510
+#: ../gtk/gtkblist.c:2577
msgid "/Buddies/_Sort Buddies"
msgstr "/Kunuloj/_Oridgu Kunulojn"
-#: ../gtk/gtkblist.c:2512
+#: ../gtk/gtkblist.c:2579
msgid "/Buddies/_Add Buddy..."
msgstr "/Kunuloj/_Aldonu Kunulon..."
-#: ../gtk/gtkblist.c:2513
+#: ../gtk/gtkblist.c:2580
msgid "/Buddies/Add C_hat..."
msgstr "/Kunuloj/Aldonu Babile_jon..."
-#: ../gtk/gtkblist.c:2514
+#: ../gtk/gtkblist.c:2581
msgid "/Buddies/Add _Group..."
msgstr "/Kunuloj/Aldonu _Grupon..."
-#: ../gtk/gtkblist.c:2516
+#: ../gtk/gtkblist.c:2583
msgid "/Buddies/_Quit"
msgstr "/Kunuloj/_Finu"
#. Accounts menu
-#: ../gtk/gtkblist.c:2519
+#: ../gtk/gtkblist.c:2586
msgid "/_Accounts"
msgstr "/_Kontoj"
-#: ../gtk/gtkblist.c:2520 ../gtk/gtkblist.c:5967
+#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6279
msgid "/Accounts/Add\\/Edit"
msgstr "/Kontoj/Aldonu\\/Redaktu"
#. Tools
-#: ../gtk/gtkblist.c:2523
+#: ../gtk/gtkblist.c:2590
msgid "/_Tools"
msgstr "/_Iloj"
-#: ../gtk/gtkblist.c:2524
+#: ../gtk/gtkblist.c:2591
msgid "/Tools/Buddy _Pounces"
msgstr "/Iloj/Kunul _Atentigoj"
-#: ../gtk/gtkblist.c:2525
+#: ../gtk/gtkblist.c:2592
msgid "/Tools/Plu_gins"
msgstr "/Iloj/Kromaĵoj"
-#: ../gtk/gtkblist.c:2526
+#: ../gtk/gtkblist.c:2593
msgid "/Tools/Pr_eferences"
msgstr "/Iloj/Agordoj"
-#: ../gtk/gtkblist.c:2527
+#: ../gtk/gtkblist.c:2594
msgid "/Tools/Pr_ivacy"
msgstr "/Iloj/Pr_ivateco"
-#: ../gtk/gtkblist.c:2529
+#: ../gtk/gtkblist.c:2596
msgid "/Tools/_File Transfers"
msgstr "/Iloj/_Dosiero-alŝutoj"
-#: ../gtk/gtkblist.c:2530
+#: ../gtk/gtkblist.c:2597
msgid "/Tools/R_oom List"
msgstr "/Iloj/Ĉambro-Listo"
-#: ../gtk/gtkblist.c:2531
+#: ../gtk/gtkblist.c:2598
msgid "/Tools/System _Log"
msgstr "/Iloj/Sistemo-_Protokolo"
-#: ../gtk/gtkblist.c:2533
+#: ../gtk/gtkblist.c:2600
msgid "/Tools/Mute _Sounds"
msgstr "/Iloj/Mutu _Sonojn"
#. Help
-#: ../gtk/gtkblist.c:2536
+#: ../gtk/gtkblist.c:2603
msgid "/_Help"
msgstr "/_Helpo"
-#: ../gtk/gtkblist.c:2537
+#: ../gtk/gtkblist.c:2604
msgid "/Help/Online _Help"
msgstr "/Helpo/Reta _Helpo"
-#: ../gtk/gtkblist.c:2538
+#: ../gtk/gtkblist.c:2605
msgid "/Help/_Debug Window"
msgstr "/Helpo/_Sencimig-fenestro"
-#: ../gtk/gtkblist.c:2539
+#: ../gtk/gtkblist.c:2606
msgid "/Help/_About"
msgstr "/Helpo/_Pri"
-#: ../gtk/gtkblist.c:2571 ../gtk/gtkblist.c:2640
+#: ../gtk/gtkblist.c:2638
#, c-format
msgid ""
"\n"
@@ -1476,219 +1527,188 @@
"\n"
"<b>Konto:</b> %s"
-#: ../gtk/gtkblist.c:2652
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Kunul Alinomo:</b> %s"
+#: ../gtk/gtkblist.c:2722
+msgid "Buddy Alias"
+msgstr "Kunul Alinomo"
-#: ../gtk/gtkblist.c:2664
-#, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Karesnamo:</b> %s"
+#: ../gtk/gtkblist.c:2743
+msgid "Logged In"
+msgstr "Ensalutita"
-#: ../gtk/gtkblist.c:2673
-#, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Ensalutita En:</b> %s"
+#: ../gtk/gtkblist.c:2789
+msgid "Last Seen"
+msgstr "Laste Vidita"
-#: ../gtk/gtkblist.c:2684
-#, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>Senfara:</b> %s"
+#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471
+#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993
+#: ../libgaim/protocols/jabber/buddy.c:1401
+#: ../libgaim/protocols/novell/novell.c:2863
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:5551 ../libgaim/protocols/qq/qq.c:170
+#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878
+#: ../libgaim/status.c:154
+msgid "Offline"
+msgstr "Senkonekta"
-#: ../gtk/gtkblist.c:2719
-#, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>Laste vidita:</b> antaŭ %s"
+#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680
+#: ../libgaim/protocols/jabber/buddy.c:289
+#: ../libgaim/protocols/jabber/buddy.c:937
+#: ../libgaim/protocols/jabber/chat.c:777
+msgid "Description"
+msgstr "Priskibo"
-#: ../gtk/gtkblist.c:2728
-msgid ""
-"\n"
-"<b>Status:</b> Offline"
+#: ../gtk/gtkblist.c:2809
+msgid "Spooky"
msgstr ""
-"\n"
-"<b>Stato:</b> Senkonekta"
-#: ../gtk/gtkblist.c:2739
-msgid ""
-"\n"
-"<b>Description:</b> Spooky"
+#: ../gtk/gtkblist.c:2811
+msgid "Awesome"
msgstr ""
-"\n"
-"<b>Priskribo:</b> Timiga"
-#: ../gtk/gtkblist.c:2741
-msgid ""
-"\n"
-"<b>Status:</b> Awesome"
+#: ../gtk/gtkblist.c:2813
+msgid "Rockin'"
msgstr ""
-#: ../gtk/gtkblist.c:2743
-msgid ""
-"\n"
-"<b>Status:</b> Rockin'"
-msgstr ""
-
-#: ../gtk/gtkblist.c:3210 ../gtk/gtkdocklet.c:458 ../gtk/gtkstatusbox.c:974
-#: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1365
-#: ../libgaim/protocols/novell/novell.c:2865
-#: ../libgaim/protocols/oscar/oscar.c:769
-#: ../libgaim/protocols/oscar/oscar.c:5447
-#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
-msgid "Offline"
-msgstr "Senkonekta"
-
-#: ../gtk/gtkblist.c:3226
+#: ../gtk/gtkblist.c:3302
#, c-format
msgid "Idle %dh %02dm"
msgstr "Senfara %dh %02dm"
-#: ../gtk/gtkblist.c:3228
+#: ../gtk/gtkblist.c:3304
#, c-format
msgid "Idle %dm"
msgstr "Senfara %dm"
-#. Idle stuff
-#: ../gtk/gtkblist.c:3231 ../gtk/gtkprefs.c:1801
-#: ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:635
-#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
-#: ../libgaim/protocols/msn/state.c:32
-#: ../libgaim/protocols/novell/novell.c:2862
-#: ../libgaim/protocols/oscar/oscar.c:2826
-#: ../libgaim/protocols/yahoo/yahoo.c:2881
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
-msgid "Idle"
-msgstr "Senfara"
-
-#: ../gtk/gtkblist.c:3359
+#: ../gtk/gtkblist.c:3435
msgid "/Buddies/New Instant Message..."
msgstr "/Kunuloj/Nova Tuj Mesaĝo..."
-#: ../gtk/gtkblist.c:3360 ../gtk/gtkblist.c:3393
+#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
msgid "/Buddies/Join a Chat..."
msgstr "/Kunuloj/Aliĝu Babilejon..."
-#: ../gtk/gtkblist.c:3361
+#: ../gtk/gtkblist.c:3437
msgid "/Buddies/Get User Info..."
msgstr "/Kunuloj/Ricevu Uzanto-Informon..."
-#: ../gtk/gtkblist.c:3362
+#: ../gtk/gtkblist.c:3438
msgid "/Buddies/Add Buddy..."
msgstr "/Kunuloj/Aldonu Kunulon..."
-#: ../gtk/gtkblist.c:3363 ../gtk/gtkblist.c:3396
+#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
msgid "/Buddies/Add Chat..."
msgstr "/Kunuloj/Aldonu Babilejon..."
-#: ../gtk/gtkblist.c:3364
+#: ../gtk/gtkblist.c:3440
msgid "/Buddies/Add Group..."
msgstr "/Kunuloj/Aldonu Grupon..."
-#: ../gtk/gtkblist.c:3399
+#: ../gtk/gtkblist.c:3475
msgid "/Tools/Buddy Pounces"
msgstr "/Iloj/K...
[truncated message content] |
|
From: <the...@us...> - 2007-02-09 07:47:23
|
Revision: 18186
http://svn.sourceforge.net/gaim/?rev=18186&view=rev
Author: thekingant
Date: 2007-02-08 23:47:20 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
sf patch #1655057, from Peter Tang
Fix a memory leak when signing off an account, I think. Peter Tang
found it and suggested one fix. I suggested another, then Sadrul
made it work. I like this change. We're now re-using GaimStatusType
objects instead of making lots of copies of them.
Modified Paths:
--------------
trunk/libgaim/account.c
trunk/libgaim/prpl.c
Modified: trunk/libgaim/account.c
===================================================================
--- trunk/libgaim/account.c 2007-02-09 07:28:34 UTC (rev 18185)
+++ trunk/libgaim/account.c 2007-02-09 07:47:20 UTC (rev 18186)
@@ -827,8 +827,6 @@
/* 0 is not a valid privacy setting */
account->perm_deny = GAIM_PRIVACY_ALLOW_ALL;
- account->presence = gaim_presence_new_for_account(account);
-
prpl = gaim_find_prpl(protocol_id);
if (prpl == NULL)
@@ -838,6 +836,8 @@
if (prpl_info != NULL && prpl_info->status_types != NULL)
gaim_account_set_status_types(account, prpl_info->status_types(account));
+ account->presence = gaim_presence_new_for_account(account);
+
status_type = gaim_account_get_status_type_with_primitive(account, GAIM_STATUS_AVAILABLE);
if (status_type != NULL)
gaim_presence_set_status_active(account->presence,
Modified: trunk/libgaim/prpl.c
===================================================================
--- trunk/libgaim/prpl.c 2007-02-09 07:28:34 UTC (rev 18185)
+++ trunk/libgaim/prpl.c 2007-02-09 07:47:20 UTC (rev 18186)
@@ -221,31 +221,20 @@
GList *
gaim_prpl_get_statuses(GaimAccount *account, GaimPresence *presence)
{
- GaimPlugin *prpl;
- GaimPluginProtocolInfo *prpl_info;
GList *statuses = NULL;
- GList *l, *list;
+ const GList *l;
GaimStatus *status;
g_return_val_if_fail(account != NULL, NULL);
g_return_val_if_fail(presence != NULL, NULL);
- prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
-
- if (prpl == NULL)
- return NULL;
-
- prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
- if (prpl_info == NULL || prpl_info->status_types == NULL)
- return NULL;
-
- for (l = list = prpl_info->status_types(account); l != NULL; l = l->next)
+ for (l = gaim_account_get_status_types(account); l != NULL; l = l->next)
{
status = gaim_status_new((GaimStatusType *)l->data, presence);
- statuses = g_list_append(statuses, status);
+ statuses = g_list_prepend(statuses, status);
}
- g_list_free(list);
+ statuses = g_list_reverse(statuses);
return statuses;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2007-02-09 07:28:34
|
Revision: 18185
http://svn.sourceforge.net/gaim/?rev=18185&view=rev
Author: sadrul
Date: 2007-02-08 23:28:34 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
Add a note about saving/loading plugins.
Please feel free to add/modify any notes you think would make it better.
Modified Paths:
--------------
trunk/libgaim/example/defines.h
trunk/libgaim/example/nullclient.c
Modified: trunk/libgaim/example/defines.h
===================================================================
--- trunk/libgaim/example/defines.h 2007-02-09 02:05:14 UTC (rev 18184)
+++ trunk/libgaim/example/defines.h 2007-02-09 07:28:34 UTC (rev 18185)
@@ -1,3 +1,4 @@
#define CUSTOM_USER_DIRECTORY "/dev/null"
#define CUSTOM_PLUGIN_PATH ""
+#define PLUGIN_SAVE_PREF "/gaim/nullclient/plugins/saved"
#define UI_ID "nullclient"
Modified: trunk/libgaim/example/nullclient.c
===================================================================
--- trunk/libgaim/example/nullclient.c 2007-02-09 02:05:14 UTC (rev 18184)
+++ trunk/libgaim/example/nullclient.c 2007-02-09 07:28:34 UTC (rev 18185)
@@ -174,10 +174,9 @@
/* Load the preferences. */
gaim_prefs_load();
-#if 0
- /* Load the desired plugins. */
- gaim_plugins_load_saved("/");
-#endif
+ /* Load the desired plugins. The client should save the list of loaded plugins in
+ * the preferences using gaim_plugins_save_loaded(PLUGIN_SAVE_PREF) */
+ gaim_plugins_load_saved(PLUGIN_SAVE_PREF);
/* Load the pounces. */
gaim_pounces_load();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2007-02-09 02:05:16
|
Revision: 18184
http://svn.sourceforge.net/gaim/?rev=18184&view=rev
Author: sadrul
Date: 2007-02-08 18:05:14 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
An example client for libgaim. It is called nullclient, for obvious reasons ;)
Added Paths:
-----------
trunk/libgaim/example/
trunk/libgaim/example/Makefile.am
trunk/libgaim/example/defines.h
trunk/libgaim/example/nullclient.c
Added: trunk/libgaim/example/Makefile.am
===================================================================
--- trunk/libgaim/example/Makefile.am (rev 0)
+++ trunk/libgaim/example/Makefile.am 2007-02-09 02:05:14 UTC (rev 18184)
@@ -0,0 +1,25 @@
+bin_PROGRAMS = nullclient
+
+nullclient_SOURCES = nullclient.c
+nullclient_DEPENDENCIES =
+nullclient_LDFLAGS = -export-dynamic
+nullclient_LDADD = \
+ $(DBUS_LIBS) \
+ $(INTLLIBS) \
+ $(GLIB_LIBS) \
+ $(LIBXML_LIBS) \
+ $(top_builddir)/libgaim/libgaim.la
+
+AM_CPPFLAGS = \
+ -DSTANDALONE \
+ -DBR_PTHREADS=0 \
+ -DDATADIR=\"$(datadir)\" \
+ -DLIBDIR=\"$(libdir)/gaim/\" \
+ -DLOCALEDIR=\"$(datadir)/locale\" \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -I$(top_srcdir)/libgaim/ \
+ -I$(top_srcdir) \
+ $(DEBUG_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(LIBXML_CFLAGS)
Property changes on: trunk/libgaim/example/Makefile.am
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/libgaim/example/defines.h
===================================================================
--- trunk/libgaim/example/defines.h (rev 0)
+++ trunk/libgaim/example/defines.h 2007-02-09 02:05:14 UTC (rev 18184)
@@ -0,0 +1,3 @@
+#define CUSTOM_USER_DIRECTORY "/dev/null"
+#define CUSTOM_PLUGIN_PATH ""
+#define UI_ID "nullclient"
Property changes on: trunk/libgaim/example/defines.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/libgaim/example/nullclient.c
===================================================================
--- trunk/libgaim/example/nullclient.c (rev 0)
+++ trunk/libgaim/example/nullclient.c 2007-02-09 02:05:14 UTC (rev 18184)
@@ -0,0 +1,255 @@
+#include "account.h"
+#include "conversation.h"
+#include "core.h"
+#include "debug.h"
+#include "eventloop.h"
+#include "ft.h"
+#include "log.h"
+#include "notify.h"
+#include "prefix.h"
+#include "prefs.h"
+#include "prpl.h"
+#include "pounce.h"
+#include "savedstatuses.h"
+#include "sound.h"
+#include "status.h"
+#include "util.h"
+#include "whiteboard.h"
+
+#include <glib.h>
+
+#include <string.h>
+#include <unistd.h>
+
+#include "defines.h"
+
+/**
+ * The following eventloop functions are used in both gaim and gaim-text. If your
+ * application uses glib mainloop, you can safely use this verbatim.
+ */
+#define GAIM_GLIB_READ_COND (G_IO_IN | G_IO_HUP | G_IO_ERR)
+#define GAIM_GLIB_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
+
+typedef struct _GaimGLibIOClosure {
+ GaimInputFunction function;
+ guint result;
+ gpointer data;
+} GaimGLibIOClosure;
+
+static void gaim_glib_io_destroy(gpointer data)
+{
+ g_free(data);
+}
+
+static gboolean gaim_glib_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
+{
+ GaimGLibIOClosure *closure = data;
+ GaimInputCondition gaim_cond = 0;
+
+ if (condition & GAIM_GLIB_READ_COND)
+ gaim_cond |= GAIM_INPUT_READ;
+ if (condition & GAIM_GLIB_WRITE_COND)
+ gaim_cond |= GAIM_INPUT_WRITE;
+
+ closure->function(closure->data, g_io_channel_unix_get_fd(source),
+ gaim_cond);
+
+ return TRUE;
+}
+
+static guint glib_input_add(gint fd, GaimInputCondition condition, GaimInputFunction function,
+ gpointer data)
+{
+ GaimGLibIOClosure *closure = g_new0(GaimGLibIOClosure, 1);
+ GIOChannel *channel;
+ GIOCondition cond = 0;
+
+ closure->function = function;
+ closure->data = data;
+
+ if (condition & GAIM_INPUT_READ)
+ cond |= GAIM_GLIB_READ_COND;
+ if (condition & GAIM_INPUT_WRITE)
+ cond |= GAIM_GLIB_WRITE_COND;
+
+ channel = g_io_channel_unix_new(fd);
+ closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
+ gaim_glib_io_invoke, closure, gaim_glib_io_destroy);
+
+ g_io_channel_unref(channel);
+ return closure->result;
+}
+
+static GaimEventLoopUiOps glib_eventloops =
+{
+ g_timeout_add,
+ g_source_remove,
+ glib_input_add,
+ g_source_remove
+};
+/*** End of the eventloop functions. ***/
+
+/*** Conversation uiops ***/
+static void
+null_write_conv(GaimConversation *conv, const char *who, const char *alias,
+ const char *message, GaimMessageFlags flags, time_t mtime)
+{
+ const char *name;
+ if (alias && *alias)
+ name = alias;
+ else if (who && *who)
+ name = who;
+ else
+ name = NULL;
+
+ printf("(%s) %s %s: %s\n", gaim_conversation_get_name(conv),
+ gaim_utf8_strftime("(%H:%M:%S)", localtime(&mtime)),
+ name, message);
+}
+
+static GaimConversationUiOps null_conv_uiops =
+{
+ .write_conv = null_write_conv
+};
+
+static void
+null_ui_init()
+{
+ /**
+ * This should initialize the UI components for all the modules. Here we
+ * just initialize the UI for conversations.
+ */
+ gaim_conversations_set_ui_ops(&null_conv_uiops);
+}
+
+static GaimCoreUiOps null_core_uiops =
+{
+ NULL,
+ NULL,
+ null_ui_init,
+ NULL
+};
+
+static void
+init_libgaim()
+{
+ /* Set a custom user directory (optional) */
+ gaim_util_set_user_dir(CUSTOM_USER_DIRECTORY);
+
+ /* We do not want any debugging for now to keep the noise to a minimum. */
+ gaim_debug_set_enabled(FALSE);
+
+ /* Set the core-uiops, which is used to
+ * - initialize the ui specific preferences.
+ * - initialize the debug ui.
+ * - initialize the ui components for all the modules.
+ * - uninitialize the ui components for all the modules when the core terminates.
+ */
+ gaim_core_set_ui_ops(&null_core_uiops);
+
+ /* Set the uiops for the eventloop. If your client is glib-based, you can safely
+ * copy this verbatim. */
+ gaim_eventloop_set_ui_ops(&glib_eventloops);
+
+ /* Set path to search for plugins. The core (libgaim) takes care of loading the
+ * core-plugins, which includes the protocol-plugins. So it is not essential to add
+ * any path here, but it might be desired, especially for ui-specific plugins. */
+ gaim_plugins_add_search_path(CUSTOM_PLUGIN_PATH);
+
+ /* Now that all the essential stuff has been set, let's try to init the core. It's
+ * necessary to provide a non-NULL name for the current ui to the core. This name
+ * is used by stuff that depends on this ui, for example the ui-specific plugins. */
+ if (!gaim_core_init(UI_ID)) {
+ /* Initializing the core failed. Terminate. */
+ fprintf(stderr,
+ "libgaim initialization failed. Dumping core.\n"
+ "Please report this!\n");
+ abort();
+ }
+
+ /* Create and load the buddylist. */
+ gaim_set_blist(gaim_blist_new());
+ gaim_blist_load();
+
+ /* Load the preferences. */
+ gaim_prefs_load();
+
+#if 0
+ /* Load the desired plugins. */
+ gaim_plugins_load_saved("/");
+#endif
+
+ /* Load the pounces. */
+ gaim_pounces_load();
+}
+
+static void
+signed_on(GaimConnection *gc, gpointer null)
+{
+ GaimAccount *account = gaim_connection_get_account(gc);
+ printf("Account connected: %s %s\n", account->username, account->protocol_id);
+}
+
+static void
+connect_to_signals_for_demonstration_purposes_only()
+{
+ static int handle;
+ gaim_signal_connect(gaim_connections_get_handle(), "signed-on", &handle,
+ GAIM_CALLBACK(signed_on), NULL);
+}
+
+int main()
+{
+ GList *iter;
+ int i, num;
+ GList *names = NULL;
+ const char *prpl;
+ char name[128];
+ char *password;
+ GMainLoop *loop = g_main_loop_new(NULL, FALSE);
+ GaimAccount *account;
+ GaimSavedStatus *status;
+
+ init_libgaim();
+
+ printf("libgaim initialized.\n");
+
+ iter = gaim_plugins_get_protocols();
+ for (i = 0; iter; iter = iter->next) {
+ GaimPlugin *plugin = iter->data;
+ GaimPluginInfo *info = plugin->info;
+ if (info && info->name) {
+ printf("\t%d: %s\n", i++, info->name);
+ names = g_list_append(names, info->id);
+ }
+ }
+ printf("Select the protocol [0-%d]: ", i-1);
+ fgets(name, sizeof(name), stdin);
+ sscanf(name, "%d", &num);
+ prpl = g_list_nth_data(names, num);
+
+ printf("Username: ");
+ fgets(name, sizeof(name), stdin);
+ name[strlen(name) - 1] = 0; /* strip the \n at the end */
+
+ /* Create the account */
+ account = gaim_account_new(name, prpl);
+
+ /* Get the password for the account */
+ password = getpass("Password: ");
+ gaim_account_set_password(account, password);
+
+ /* It's necessary to enable the account first. */
+ gaim_account_set_enabled(account, UI_ID, TRUE);
+
+ /* Now, to connect the account(s), create a status and activate it. */
+ status = gaim_savedstatus_new(NULL, GAIM_STATUS_AVAILABLE);
+ gaim_savedstatus_activate(status);
+
+ connect_to_signals_for_demonstration_purposes_only();
+
+ g_main_loop_run(loop);
+
+ return 0;
+}
+
Property changes on: trunk/libgaim/example/nullclient.c
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-02-08 17:32:46
|
Revision: 18183
http://svn.sourceforge.net/gaim/?rev=18183&view=rev
Author: thekingant
Date: 2007-02-08 09:32:43 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
sf patch #1651457, from Paul-Christiaan Spruijtenburg
"Selecting a non-existing Sound Command for Method: Command in
Preferences->Sounds causes gaim to double free the command."
My bad!
Modified Paths:
--------------
trunk/gtk/gtksound.c
Modified: trunk/gtk/gtksound.c
===================================================================
--- trunk/gtk/gtksound.c 2007-02-08 16:19:32 UTC (rev 18182)
+++ trunk/gtk/gtksound.c 2007-02-08 17:32:43 UTC (rev 18183)
@@ -436,7 +436,6 @@
if(!g_spawn_command_line_async(command, &error)) {
gaim_debug_error("gtksound", "sound command could not be launched: %s\n", error->message);
- g_free(command);
g_error_free(error);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2007-02-08 16:20:00
|
Revision: 18182
http://svn.sourceforge.net/gaim/?rev=18182&view=rev
Author: lschiere
Date: 2007-02-08 08:19:32 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
a gaggle of translation updates
Modified Paths:
--------------
trunk/po/en_GB.po
trunk/po/es.po
trunk/po/fi.po
trunk/po/he.po
trunk/po/ja.po
trunk/po/lt.po
trunk/po/sv.po
Modified: trunk/po/en_GB.po
===================================================================
--- trunk/po/en_GB.po 2007-02-04 19:43:08 UTC (rev 18181)
+++ trunk/po/en_GB.po 2007-02-08 16:19:32 UTC (rev 18182)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Gaim 1.1.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-06 12:17+0000\n"
+"POT-Creation-Date: 2007-01-30 21:19+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,16 +28,16 @@
msgid "Send instant messages over multiple protocols"
msgstr "Send instant messages over multiple protocols"
-#: ../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/gntaccount.c:119 ../console/gntblist.c:272
+#: ../console/gntblist.c:390 ../console/gntblist.c:403
+#: ../console/gntplugin.c:154 ../console/gntplugin.c:199
#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c: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
+#: ../libgaim/protocols/jabber/buddy.c:1399
+#: ../libgaim/protocols/jabber/chat.c:679
+#: ../libgaim/protocols/jabber/chat.c:690
+#: ../libgaim/protocols/jabber/jabber.c:1210
+#: ../libgaim/protocols/qq/group_join.c:324
+#: ../libgaim/protocols/silc/ops.c:1451
msgid "Error"
msgstr "Error"
@@ -49,15 +49,15 @@
msgid "Screenname of an account must be non-empty."
msgstr "Screen name of an account must not be empty."
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
msgid "New mail notifications"
msgstr "New mail notifications"
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
msgid "Remember password"
msgstr "Remember password"
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3797
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868
msgid "Modify Account"
msgstr "Modify Account"
@@ -65,100 +65,91 @@
msgid "New Account"
msgstr "New Account"
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695
msgid "Protocol:"
msgstr "Protocol:"
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4942
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229
#: ../gtk/plugins/gevolution/new_person_dialog.c:295
msgid "Screen name:"
msgstr "Screen name:"
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
msgid "Password:"
msgstr "Password:"
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4963 ../gtk/gtkblist.c:5328
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613
msgid "Alias:"
msgstr "Alias:"
#. 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/gntaccount.c:834 ../console/gntblist.c:313
+#: ../console/gntblist.c:380 ../console/gntblist.c:413
+#: ../console/gntblist.c:737 ../console/gntblist.c:906
+#: ../console/gntblist.c:997 ../console/gntblist.c:2021
#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c: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
+#: ../console/gntstatus.c:472 ../console/gntstatus.c:597
+#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669
+#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974
+#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110
+#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172
+#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286
+#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c: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
+#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961
+#: ../libgaim/account.c:1149 ../libgaim/account.c:1183
+#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51
+#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1761
+#: ../libgaim/protocols/jabber/buddy.c:1795
+#: ../libgaim/protocols/jabber/chat.c:788
+#: ../libgaim/protocols/jabber/jabber.c:861
+#: ../libgaim/protocols/jabber/jabber.c:1365
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249
+#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279
+#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311
+#: ../libgaim/protocols/oscar/oscar.c:6043
+#: ../libgaim/protocols/oscar/peer.c:1021
+#: ../libgaim/protocols/qq/buddy_info.c:484
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
+#: ../libgaim/protocols/qq/group_join.c:138
+#: ../libgaim/protocols/qq/group_join.c:359
+#: ../libgaim/protocols/qq/group_opt.c:142
+#: ../libgaim/protocols/qq/group_opt.c:392
+#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:3410
+#: ../libgaim/protocols/sametime/sametime.c:3495
+#: ../libgaim/protocols/sametime/sametime.c:3665
+#: ../libgaim/protocols/sametime/sametime.c:5409
+#: ../libgaim/protocols/sametime/sametime.c:5498
+#: ../libgaim/protocols/sametime/sametime.c:5622
#: ../libgaim/protocols/silc/buddy.c:467
#: ../libgaim/protocols/silc/buddy.c:1078
#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1910
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912
#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
-#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
-#: ../libgaim/request.h:1354
+#: ../libgaim/protocols/yahoo/yahoo.c:961
+#: ../libgaim/protocols/yahoo/yahoo.c:3208
+#: ../libgaim/protocols/yahoo/yahoo.c:3217
msgid "Cancel"
msgstr "Cancel"
#. 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
+#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182
+#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587
msgid "Save"
msgstr "Save"
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827
-#: ../gtk/gtksavedstatuses.c:293
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
+#: ../gtk/gtksavedstatuses.c:328
#, c-format
msgid "Are you sure you want to delete %s?"
msgstr "Are you sure you want to delete %s?"
@@ -170,13 +161,13 @@
#: ../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
+#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:335
msgid "Delete"
msgstr "Delete"
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1841
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2139 ../gtk/gtkdocklet.c:530
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
msgid "Accounts"
msgstr "Accounts"
@@ -185,14 +176,13 @@
msgstr "You can enable/disable accounts from the following list."
#: ../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
+#: ../console/gntblist.c:313 ../console/gntblist.c:380
+#: ../console/gntblist.c:413 ../console/gntnotify.c:309
+#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668
+#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104
+#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:5497
#: ../libgaim/protocols/silc/chat.c:596
msgid "Add"
msgstr "Add"
@@ -201,225 +191,236 @@
msgid "Modify"
msgstr "Modify"
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2255
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
#, c-format
msgid "%s%s%s%s has made %s his or her buddy%s%s"
msgstr "%s%s%s%s has made %s his or her buddy%s%s"
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2304
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431
msgid "Add buddy to your list?"
msgstr "Add buddy to your list?"
-#: ../console/gntblist.c:269
+#: ../console/gntblist.c:264
msgid "You must provide a screename for the buddy."
msgstr "You must provide a screen name for the buddy."
-#: ../console/gntblist.c:271
+#: ../console/gntblist.c:266
msgid "You must provide a group."
msgstr "You must provide a group."
-#: ../console/gntblist.c:273
+#: ../console/gntblist.c:268
msgid "You must select an account."
msgstr "You must select an account."
-#: ../console/gntblist.c:277
+#: ../console/gntblist.c:272
msgid "Error adding buddy"
msgstr "Error adding buddy"
-#: ../console/gntblist.c:302 ../gtk/gtkaccount.c:1896
-#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2805
+#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849
msgid "Screen Name"
msgstr "Screen Name"
-#: ../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
+#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931
+#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
+#: ../libgaim/protocols/zephyr/zephyr.c:789
+#: ../libgaim/protocols/zephyr/zephyr.c:1207
msgid "Alias"
msgstr "Alias"
-#: ../console/gntblist.c:308 ../console/gntblist.c:380
+#: ../console/gntblist.c:303 ../console/gntblist.c:375
msgid "Group"
msgstr "Group"
-#: ../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
+#: ../console/gntblist.c:306 ../console/gntblist.c:363
+#: ../console/gntblist.c:1166 ../console/gntnotify.c:155
+#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467
+#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444
+#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189
msgid "Account"
msgstr "Account"
-#: ../console/gntblist.c:317 ../console/gntblist.c:794 ../gtk/gtkblist.c:4896
+#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183
#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
#: ../libgaim/protocols/silc/buddy.c:736
#: ../libgaim/protocols/silc/buddy.c:1030
#: ../libgaim/protocols/silc/buddy.c:1075
#: ../libgaim/protocols/silc/buddy.c:1174
-#: ../libgaim/protocols/yahoo/yahoo.c:3128
+#: ../libgaim/protocols/yahoo/yahoo.c:3122
msgid "Add Buddy"
msgstr "Add Buddy"
-#: ../console/gntblist.c:317
+#: ../console/gntblist.c:312
msgid "Please enter buddy information."
msgstr "Please enter buddy information."
-#: ../console/gntblist.c:340 ../libgaim/blist.c:1195
+#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
msgid "Chats"
msgstr "Chats"
#. Extract their Name and put it in
-#. Contact Info
-#. Personal
-#. Business
-#: ../console/gntblist.c:374 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621
#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
#: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c: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
+#: ../libgaim/protocols/jabber/jabber.c:792
+#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600
+#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44
msgid "Name"
msgstr "Name"
-#: ../console/gntblist.c:383 ../console/gntblist.c:796 ../gtk/gtkblist.c:5274
+#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559
msgid "Add Chat"
msgstr "Add Chat"
-#: ../console/gntblist.c:384
+#: ../console/gntblist.c:379
msgid "You can edit more information from the context menu later."
msgstr "You can edit more information from the context menu later."
-#: ../console/gntblist.c:395 ../console/gntblist.c:408
+#: ../console/gntblist.c:390 ../console/gntblist.c:403
msgid "Error adding group"
msgstr "Error adding group"
-#: ../console/gntblist.c:396
+#: ../console/gntblist.c:391
msgid "You must give a name for the group to add."
msgstr "You must give a name for the group to add."
-#: ../console/gntblist.c:409
+#: ../console/gntblist.c:404
msgid "A group with the name already exists."
msgstr "A group with that name already exists."
-#: ../console/gntblist.c:416 ../console/gntblist.c:798 ../gtk/gtkblist.c:5380
-#: ../libgaim/protocols/sametime/sametime.c:5310
-#: ../libgaim/protocols/sametime/sametime.c:5397
+#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665
+#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../libgaim/protocols/sametime/sametime.c:5495
msgid "Add Group"
msgstr "Add Group"
-#: ../console/gntblist.c:416
+#: ../console/gntblist.c:411
msgid "Enter the name of the group"
msgstr "Enter the name of the group"
-#: ../console/gntblist.c:746
+#: ../console/gntblist.c:736
msgid "Edit Chat"
msgstr "Edit Chat"
-#: ../console/gntblist.c:746
+#: ../console/gntblist.c:736
msgid "Please Update the necessary fields."
msgstr "Please update the necessary fields."
-#: ../console/gntblist.c:747 ../console/gntstatus.c:196
+#: ../console/gntblist.c:737 ../console/gntstatus.c:196
msgid "Edit"
msgstr "Edit"
-#: ../console/gntblist.c:761
+#: ../console/gntblist.c:751
msgid "Auto-join"
msgstr "Auto-join"
-#: ../console/gntblist.c:770
+#: ../console/gntblist.c:760
msgid "Edit Settings"
msgstr "Edit Settings"
-#: ../console/gntblist.c:816 ../libgaim/protocols/silc/chat.c:878
+#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
msgid "Get Info"
msgstr "Get Info"
-#: ../console/gntblist.c:821
+#: ../console/gntblist.c:811
msgid "Add Buddy Pounce"
msgstr "Add Buddy Pounce"
-#: ../console/gntblist.c:828 ../gtk/gtkconv.c:1582
-#: ../libgaim/protocols/oscar/oscar.c:615
+#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602
+#: ../libgaim/protocols/oscar/oscar.c:633
msgid "Send File"
msgstr "Send File"
-#: ../console/gntblist.c:832
+#: ../console/gntblist.c:822
msgid "View Log"
msgstr "View Log"
-#: ../console/gntblist.c:912
+#: ../console/gntblist.c:902
#, c-format
msgid "Please enter the new name for %s"
msgstr "Please enter the new name for %s"
-#: ../console/gntblist.c:914 ../console/gntblist.c:915
-#: ../console/gntblist.c:1084
+#: ../console/gntblist.c:904 ../console/gntblist.c:905
+#: ../console/gntblist.c:1116
msgid "Rename"
msgstr "Rename"
-#: ../console/gntblist.c:914
+#: ../console/gntblist.c:904
msgid "Enter empty string to reset the name."
msgstr "Enter empty string to reset the name."
-#: ../console/gntblist.c:987
+#: ../console/gntblist.c:977
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"
-#: ../console/gntblist.c:995
+#: ../console/gntblist.c:985
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"
-#: ../console/gntblist.c:1000
+#: ../console/gntblist.c:990
#, c-format
msgid "Are you sure you want to remove %s?"
msgstr "Are you sure you want to remove %s?"
#. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:1003
+#: ../console/gntblist.c:993
msgid "Confirm Remove"
msgstr "Confirm Remove"
-#: ../console/gntblist.c:1006 ../console/gntblist.c:1086
-#: ../gtk/gtkblist.c:1039 ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275
+#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106
+#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248
msgid "Remove"
msgstr "Remove"
#. Buddy List
-#: ../console/gntblist.c:1061 ../console/gntblist.c:1987
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3914
+#: ../console/gntblist.c:1093 ../console/gntblist.c:2088
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091
#: ../gtk/plugins/win32/winprefs/winprefs.c:327
msgid "Buddy List"
msgstr "Buddy List"
-#: ../console/gntblist.c:1090
+#: ../console/gntblist.c:1123
msgid "Place tagged"
msgstr "Place tagged"
-#: ../console/gntblist.c:1093
-msgid "Tag"
-msgstr "Tag"
+#: ../console/gntblist.c:1128
+msgid "Toggle Tag"
+msgstr "Toggle Tag"
-#: ../console/gntblist.c:1120 ../console/gntblist.c:1221
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Account: %s (%s)"
+#. General
+#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035
+#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:814
+#: ../libgaim/protocols/jabber/buddy.c:1562
+#: ../libgaim/protocols/jabber/buddy.c:1744
+#: ../libgaim/protocols/jabber/jabber.c:802
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
+msgid "Nickname"
+msgstr "Nickname"
-#: ../console/gntblist.c:1145
-#, c-format
-msgid ""
-"\n"
-"Idle: %s"
-msgstr ""
-"\n"
-"Idle: %s"
+#. Idle stuff
+#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307
+#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:645
+#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2860
+#: ../libgaim/protocols/oscar/oscar.c:2873
+#: ../libgaim/protocols/yahoo/yahoo.c:2876
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
+msgid "Idle"
+msgstr "Idle"
-#: ../console/gntblist.c:1200
+#: ../console/gntblist.c:1270
#, c-format
-msgid "Nickname: %s\n"
-msgstr "Nickname: %s\n"
-
-#: ../console/gntblist.c:1212
-#, c-format
msgid ""
"Online: %d\n"
"Total: %d"
@@ -427,8 +428,13 @@
"Online: %d\n"
"Total: %d"
-#: ../console/gntblist.c:1233
+#: ../console/gntblist.c:1279
#, c-format
+msgid "Account: %s (%s)"
+msgstr "Account: %s (%s)"
+
+#: ../console/gntblist.c:1291
+#, c-format
msgid ""
"\n"
"Last Seen: %s ago"
@@ -436,90 +442,81 @@
"\n"
"Last Seen: %s ago"
-#: ../console/gntblist.c:1456 ../gtk/gtkdocklet.c:478
-#: ../gtk/gtkstatusbox.c:984
+#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
+#: ../gtk/gtkstatusbox.c:1000
msgid "New..."
msgstr "New..."
-#: ../console/gntblist.c:1463 ../gtk/gtkdocklet.c:479
-#: ../gtk/gtkstatusbox.c:985
+#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
+#: ../gtk/gtkstatusbox.c:1001
msgid "Saved..."
msgstr "Saved..."
-#: ../console/gntblist.c:1809 ../console/gntplugin.c:231 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:531 ../gtk/gtkplugin.c:538
+#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
msgid "Plugins"
msgstr "Plug-ins"
-#: ../console/gntblist.c:1901 ../gtk/gtkdialogs.c:662 ../gtk/gtkdialogs.c:799
-#: ../gtk/gtkdialogs.c:879
+#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
+#: ../gtk/gtkdialogs.c:883
msgid "_Name"
msgstr "_Name"
-#: ../console/gntblist.c:1906 ../gtk/gtkdialogs.c:667 ../gtk/gtkdialogs.c:804
-#: ../gtk/gtkdialogs.c:884
+#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
+#: ../gtk/gtkdialogs.c:888
msgid "_Account"
msgstr "_Account"
-#: ../console/gntblist.c:1914 ../gtk/gtkdialogs.c:675
+#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
msgid "New Instant Message"
msgstr "New Instant Message"
-#: ../console/gntblist.c:1916 ../gtk/gtkdialogs.c:677
+#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
msgid ""
"Please enter the screen name or alias of the person you would like to IM."
msgstr ""
"Please enter the screen name or alias of the person you would like to IM."
-#. *
-#. * 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
+#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867
+#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912
+#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148
#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c: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/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1364
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248
+#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042
#: ../libgaim/protocols/silc/buddy.c:466
#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:749
-#: ../libgaim/protocols/yahoo/yahoo.c:3213
-#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911
+#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960
+#: ../libgaim/protocols/yahoo/yahoo.c:3207
+#: ../libgaim/protocols/yahoo/yahoo.c:3216
msgid "OK"
msgstr "OK"
#. Create the "Options" frame.
-#: ../console/gntblist.c:1938 ../gtk/gtkpounce.c:766
+#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
msgid "Options"
msgstr "Options"
-#: ../console/gntblist.c:1944
+#: ../console/gntblist.c:2045
msgid "Send IM..."
msgstr "Send IM..."
-#: ../console/gntblist.c:1948
+#: ../console/gntblist.c:2049
msgid "Toggle offline buddies"
msgstr "Toggle offline buddies"
-#: ../console/gntblist.c:1952
+#: ../console/gntblist.c:2053
msgid "Sort by status"
msgstr "Sort by status"
-#: ../console/gntblist.c:1956
+#: ../console/gntblist.c:2057
msgid "Sort alphabetically"
msgstr "Sort alphabetically"
-#: ../console/gntblist.c:1960
+#: ../console/gntblist.c:2061
msgid "Sort by log size"
msgstr "Sort by log size"
@@ -542,68 +539,77 @@
"%s was disconnected because of the following error:\n"
"%s"
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3794 ../libgaim/account.c:991
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988
#: ../libgaim/connection.c:107
msgid "Connection Error"
msgstr "Connection Error"
-#: ../console/gntconv.c:71
+#: ../console/gntconv.c:102
msgid "No such command."
msgstr "No such command."
-#: ../console/gntconv.c:75 ../gtk/gtkconv.c:493
+#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505
msgid "Syntax Error: You typed the wrong number of arguments to that command."
msgstr ""
"Syntax Error: You typed the wrong number of arguments to that command."
-#: ../console/gntconv.c:80 ../gtk/gtkconv.c:498
+#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510
msgid "Your command failed for an unknown reason."
msgstr "Your command failed for an unknown reason."
-#: ../console/gntconv.c:85 ../gtk/gtkconv.c:504
+#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516
msgid "That command only works in chats, not IMs."
msgstr "That command only works in chats, not IMs."
-#: ../console/gntconv.c:88 ../gtk/gtkconv.c:507
+#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519
msgid "That command only works in IMs, not chats."
msgstr "That command only works in IMs, not chats."
-#: ../console/gntconv.c:92 ../gtk/gtkconv.c:511
+#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523
msgid "That command doesn't work on this protocol."
msgstr "That command doesn't work on this protocol."
-#: ../console/gntconv.c:99
+#: ../console/gntconv.c:130
msgid "Commands are not supported yet. Message was NOT sent."
msgstr "Commands are not supported yet. Message was NOT sent."
-#: ../console/gntconv.c:198
+#: ../console/gntconv.c:232
#, c-format
msgid "%s (%s -- %s)"
msgstr "%s (%s -- %s)"
-#: ../console/gntconv.c:219
+#: ../console/gntconv.c:255
#, c-format
msgid "%s [%s]"
msgstr "%s [%s]"
-#: ../console/gntconv.c:349
+#: ../console/gntconv.c:260 ../console/gntconv.c:432
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s is typing..."
+
+#: ../console/gntconv.c:399
msgid "<AUTO-REPLY> "
msgstr "<AUTO-REPLY> "
#. Print the list of users in the room
-#: ../console/gntconv.c:443
+#: ../console/gntconv.c:501
msgid "List of users:\n"
msgstr "List of users:\n"
-#: ../console/gntconv.c:567 ../gtk/gtkconv.c:386
+#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
msgid "Supported debug options are: version"
msgstr "Supported debug options are: version"
-#: ../console/gntconv.c:602 ../gtk/gtkconv.c:422
+#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
msgid "No such command (in this context)."
msgstr "No such command (in this context)."
-#: ../console/gntconv.c:605 ../gtk/gtkconv.c:425
+#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
msgid ""
"Use \"/help <command>\" for help on a specific command.\n"
"The following commands are available in this context:\n"
@@ -611,7 +617,7 @@
"Use \"/help <command>\" for help on a specific command.\n"
"The following commands are available in this context:\n"
-#: ../console/gntconv.c:644 ../gtk/gtkconv.c:6732
+#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824
msgid ""
"say <message>: Send a message normally as if you weren't using a "
"command."
@@ -619,11 +625,11 @@
"say <message>: Send a message normally as if you weren't using a "
"command."
-#: ../console/gntconv.c:647 ../gtk/gtkconv.c:6735
+#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827
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."
-#: ../console/gntconv.c:650 ../gtk/gtkconv.c:6738
+#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830
msgid ""
"debug <option>: Send various debug information to the current "
"conversation."
@@ -631,35 +637,35 @@
"debug <option>: Send various debug information to the current "
"conversation."
-#: ../console/gntconv.c:653 ../gtk/gtkconv.c:6741
+#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833
msgid "clear: Clears the conversation scrollback."
msgstr "clear: Clears the conversation scrollback."
-#: ../console/gntconv.c:656 ../gtk/gtkconv.c:6744
+#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836
msgid "help <command>: Help on a specific command."
msgstr "help <command>: Help on a specific command."
-#: ../console/gntconv.c:661
+#: ../console/gntconv.c:719
msgid "plugins: Show the plugins window."
msgstr "plugins: Show the plugins window"
-#: ../console/gntconv.c:664
+#: ../console/gntconv.c:722
msgid "buddylist: Show the buddylist."
msgstr "buddylist: Show the buddy list."
-#: ../console/gntconv.c:667
+#: ../console/gntconv.c:725
msgid "accounts: Show the accounts window."
msgstr "accounts: Show the accounts window."
-#: ../console/gntconv.c:670
+#: ../console/gntconv.c:728
msgid "debugwin: Show the debug window."
msgstr "debugwin: Show the debug window."
-#: ../console/gntconv.c:673
+#: ../console/gntconv.c:731
msgid "prefs: Show the preference window."
msgstr "prefs: Show the preference window."
-#: ../console/gntconv.c:676
+#: ../console/gntconv.c:734
msgid "statuses: Show the savedstatuses window."
msgstr "statuses: Show the saved-statuses window."
@@ -683,12 +689,12 @@
msgid "Timestamps"
msgstr "Timestamps"
-#: ../console/gntgaim.c:166
+#: ../console/gntgaim.c:227
#, c-format
msgid "%s. Try `%s -h' for more information.\n"
msgstr "%s. Try `%s -h' for more information.\n"
-#: ../console/gntgaim.c:168
+#: ../console/gntgaim.c:229
#, c-format
msgid ""
"%s\n"
@@ -717,19 +723,18 @@
msgid "You have mail!"
msgstr "You have e-mail!"
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
-#: ../libgaim/protocols/jabber/jabber.c:1138
+#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1155
msgid "From"
msgstr "From"
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
msgid "Subject"
msgstr "Subject"
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
-#: ../console/gntplugin.c:274 ../console/gntstatus.c:206
-#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
-#: ../libgaim/protocols/silc/util.c:377
+#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
+#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
+#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
+#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
msgid "Close"
msgstr "Close"
@@ -740,46 +745,45 @@
msgstr[0] "%s (%s) has %d new message."
msgstr[1] "%s (%s) has %d new messages."
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
msgid "New Mail"
msgstr "New Mail"
-#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
-#: ../libgaim/protocols/oscar/oscar.c:2612
+#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
#, c-format
msgid "Info for %s"
msgstr "Info for %s"
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
#: ../libgaim/protocols/toc/toc.c:476
msgid "Buddy Information"
msgstr "Buddy Information"
-#: ../console/gntnotify.c:303
+#: ../console/gntnotify.c:306
msgid "Continue"
msgstr "Continue"
-#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1610 ../gtk/gtkdebug.c:862
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862
msgid "Info"
msgstr "Info"
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1571
+#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
msgid "IM"
msgstr "IM"
-#: ../console/gntnotify.c:315
+#: ../console/gntnotify.c:318
msgid "Join"
msgstr "Join"
-#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3445
+#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494
msgid "Invite"
msgstr "Invite"
-#: ../console/gntnotify.c:321
+#: ../console/gntnotify.c:324
msgid "(none)"
msgstr "(none)"
-#: ../console/gntplugin.c:117
+#: ../console/gntplugin.c:102
#, c-format
msgid ""
"Name: %s\n"
@@ -796,27 +800,27 @@
"Website: %s\n"
"Filename: %s\n"
-#: ../console/gntplugin.c:170
+#: ../console/gntplugin.c:155
msgid "Plugin need to be loaded before you can configure it."
msgstr "Plugin needs to be loaded before you can configure it."
-#: ../console/gntplugin.c:208
+#: ../console/gntplugin.c:193
msgid "..."
msgstr "..."
-#: ../console/gntplugin.c:209
+#: ../console/gntplugin.c:194
msgid "Still need to do something about this."
msgstr "Still need to do something about this."
-#: ../console/gntplugin.c:215
+#: ../console/gntplugin.c:200
msgid "No configuration options for this plugin."
msgstr "No configuration options for this plugin."
-#: ../console/gntplugin.c:236
+#: ../console/gntplugin.c:221
msgid "You can (un)load plugins from the following list."
msgstr "You are (un)load plugins from the following list."
-#: ../console/gntplugin.c:279
+#: ../console/gntplugin.c:264
msgid "Configure Plugin"
msgstr "Configure Plugin"
@@ -853,17 +857,17 @@
msgstr "Log status change events"
#. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1909
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
#: ../gtk/plugins/win32/winprefs/winprefs.c:341
msgid "Conversations"
msgstr "Conversations"
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1349 ../gtk/gtkprefs.c:1920
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
msgid "Logging"
msgstr "Logging"
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:532
-#: ../gtk/gtkprefs.c:1945
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
+#: ../gtk/gtkprefs.c:1951
msgid "Preferences"
msgstr "Preferences"
@@ -880,60 +884,60 @@
msgid "Delete Status"
msgstr "Delete Status"
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:526
+#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556
msgid "Saved Statuses"
msgstr "Saved Statuses"
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:525
-#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
+#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:931
#: ../libgaim/protocols/novell/novell.c:1484
msgid "Title"
msgstr "Title"
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:448
+#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
msgid "Type"
msgstr "Type"
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:550
-#: ../console/gntstatus.c:562 ../gtk/gtksavedstatuses.c:459
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
+#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489
+#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256
#: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/gg/gg.c:1602
-#: ../libgaim/protocols/gg/gg.c:1608 ../libgaim/protocols/gg/gg.c:1617
-#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1205
-#: ../libgaim/protocols/jabber/jabber.c:1215
-#: ../libgaim/protocols/jabber/jabber.c:1225
-#: ../libgaim/protocols/jabber/jabber.c:1235
-#: ../libgaim/protocols/jabber/jabber.c:1245
+#: ../libgaim/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591
+#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619
+#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634
+#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1227
+#: ../libgaim/protocols/jabber/jabber.c:1237
+#: ../libgaim/protocols/jabber/jabber.c:1247
#: ../libgaim/protocols/jabber/jabber.c:1257
-#: ../libgaim/protocols/novell/novell.c:2876
+#: ../libgaim/protocols/jabber/jabber.c:1267
+#: ../libgaim/protocols/jabber/jabber.c:1279
+#: ../libgaim/protocols/novell/novell.c:2873
+#: ../libgaim/protocols/novell/novell.c:2976
#: ../libgaim/protocols/novell/novell.c:2982
#: ../libgaim/protocols/novell/novell.c:2988
-#: ../libgaim/protocols/novell/novell.c:2994
-#: ../libgaim/protocols/oscar/oscar.c:5397
-#: ../libgaim/protocols/oscar/oscar.c:5412
-#: ../libgaim/protocols/oscar/oscar.c:5417
-#: ../libgaim/protocols/oscar/oscar.c:5625
-#: ../libgaim/protocols/oscar/oscar.c:5637
-#: ../libgaim/protocols/oscar/oscar.c:5650
-#: ../libgaim/protocols/oscar/oscar.c:5657
-#: ../libgaim/protocols/oscar/oscar.c:5664
-#: ../libgaim/protocols/sametime/sametime.c:3259
-#: ../libgaim/protocols/sametime/sametime.c:3265
-#: ../libgaim/protocols/sametime/sametime.c:3271
-#: ../libgaim/protocols/sametime/sametime.c:3350
+#: ../libgaim/protocols/oscar/oscar.c:5501
+#: ../libgaim/protocols/oscar/oscar.c:5729
+#: ../libgaim/protocols/oscar/oscar.c:5741
+#: ../libgaim/protocols/oscar/oscar.c:5754
+#: ../libgaim/protocols/oscar/oscar.c:5761
+#: ../libgaim/protocols/oscar/oscar.c:5768
+#: ../libgaim/protocols/sametime/sametime.c:3308
+#: ../libgaim/protocols/sametime/sametime.c:3314
+#: ../libgaim/protocols/sametime/sametime.c:3320
+#: ../libgaim/protocols/sametime/sametime.c:3399
#: ../libgaim/protocols/silc/buddy.c:1544
#: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3450
#: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/yahoo/yahoo.c:3462
-#: ../libgaim/protocols/zephyr/zephyr.c:2333
+#: ../libgaim/protocols/zephyr/zephyr.c:2337
msgid "Message"
msgstr "Message"
#. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:579
+#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
msgid "Use"
msgstr "Use"
@@ -953,50 +957,55 @@
msgid "Please enter a different title for the status."
msgstr "Please enter a different title for the status."
-#: ../console/gntstatus.c:439
+#: ../console/gntstatus.c:440
msgid "Substatus"
msgstr "Sub-status"
#. Set up stuff for the account box
-#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:4990 ../gtk/gtkblist.c:5308
+#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593
msgid "Account:"
msgstr "Account:"
-#: ../console/gntstatus.c:450 ../gtk/gtkft.c:698
+#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
msgid "Status:"
msgstr "Status:"
-#: ../console/gntstatus.c:465
+#: ../console/gntstatus.c:466
msgid "Message:"
msgstr "Message:"
-#: ../console/gntstatus.c:514
+#: ../console/gntstatus.c:515
msgid "Edit Status"
msgstr "Edit Status"
-#: ../console/gntstatus.c:533 ../console/gntstatus.c:562
-#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1575
-#: ../libgaim/protocols/gg/gg.c:1579 ../libgaim/protocols/jabber/buddy.c:623
-#: ../libgaim/protocols/jabber/buddy.c:630
-#: ../libgaim/protocols/jabber/buddy.c:658
-#: ../libgaim/protocols/jabber/jabber.c:1176
-#: ../libgaim/protocols/msn/msn.c:546
-#: ../libgaim/protocols/novell/novell.c:2875
-#: ../libgaim/protocols/novell/novell.c:2879
-#: ../libgaim/protocols/oscar/oscar.c:759
-#: ../libgaim/protocols/oscar/oscar.c:765
-#: ../libgaim/protocols/oscar/oscar.c:768
-#: ../libgaim/protocols/yahoo/yahoo.c:3032
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
+#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
+#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588
+#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637
+#: ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:674
+#: ../libgaim/protocols/jabber/jabber.c:1195
+#: ../libgaim/protocols/msn/msn.c:547
+#: ../libgaim/protocols/novell/novell.c:2870
+#: ../libgaim/protocols/oscar/oscar.c:800
+#: ../libgaim/protocols/oscar/oscar.c:805
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:2655
+#: ../libgaim/protocols/sametime/sametime.c:3285
+#: ../libgaim/protocols/sametime/sametime.c:4170
+#: ../libgaim/protocols/yahoo/yahoo.c:3027
msgid "Status"
msgstr "Status"
-#: ../console/gntstatus.c:556
+#: ../console/gntstatus.c:557
msgid "Use different status for following accounts"
msgstr "Use different status for the following accounts"
#. Save & Use
-#: ../console/gntstatus.c:590
+#: ../console/gntstatus.c:591
msgid "Save & Use"
msgstr "Save & Use"
@@ -1131,8 +1140,8 @@
msgstr "_Alias"
#. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1120 ../gtk/gtkroomlist.c:285
-#: ../gtk/gtkroomlist.c:442
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
+#: ../gtk/gtkroomlist.c:463
msgid "_Join"
msgstr "_Join"
@@ -1140,7 +1149,7 @@
msgid "Close _tabs"
msgstr "Close _tabs"
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1004
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
msgid "I_M"
msgstr "I_M"
@@ -1166,51 +1175,55 @@
msgstr "_Pause"
#. Build the login options frame.
-#: ../gtk/gtkaccount.c:382
+#: ../gtk/gtkaccount.c:390
msgid "Login Options"
msgstr "Login Options"
-#: ../gtk/gtkaccount.c:483
+#: ../gtk/gtkaccount.c:492
msgid "Local alias:"
msgstr "Local alias:"
#. Build the user options frame.
-#: ../gtk/gtkaccount.c:545
+#: ../gtk/gtkaccount.c:554
msgid "User Options"
msgstr "User Options"
#. Buddy icon
-#: ../gtk/gtkaccount.c:563
+#: ../gtk/gtkaccount.c:572
msgid "Use this buddy icon for this account:"
msgstr "Use this buddy icon for this account:"
#. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:671
+#: ../gtk/gtkaccount.c:684
#, c-format
msgid "%s Options"
msgstr "%s Options"
-#: ../gtk/gtkaccount.c:867
+#: ../gtk/gtkaccount.c:881
+msgid "Use GNOME Proxy Settings"
+msgstr "Use GNOME Proxy Settings"
+
+#: ../gtk/gtkaccount.c:882
msgid "Use Global Proxy Settings"
msgstr "Use Global Proxy Settings"
-#: ../gtk/gtkaccount.c:873
+#: ../gtk/gtkaccount.c:888
msgid "No Proxy"
msgstr "No Proxy"
-#: ../gtk/gtkaccount.c:879
+#: ../gtk/gtkaccount.c:894
msgid "HTTP"
msgstr "HTTP"
-#: ../gtk/gtkaccount.c:885
+#: ../gtk/gtkaccount.c:900
msgid "SOCKS 4"
msgstr "SOCKS 4"
-#: ../gtk/gtkaccount.c:891
+#: ../gtk/gtkaccount.c:906
msgid "SOCKS 5"
msgstr "SOCKS 5"
-#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1095
+#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100
msgid "Use Environmental Settings"
msgstr "Use Environmental Settings"
@@ -1219,69 +1232,108 @@
#. A) your network is really slow and you have nothing better to do than
#. look at butterflies.
#. B)You are looking really closely at something that shouldn't matter.
-#: ../gtk/gtkaccount.c:936
+#: ../gtk/gtkaccount.c:951
msgid "If you look real closely"
msgstr "If you look real closely"
#. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:939
+#: ../gtk/gtkaccount.c:954
msgid "you can see the butterflies mating"
msgstr "you can see the butterflies mating"
-#: ../gtk/gtkaccount.c:960
+#: ../gtk/gtkaccount.c:975
msgid "Proxy Options"
msgstr "Proxy Options"
-#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1089
+#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094
msgid "Proxy _type:"
msgstr "Proxy _type:"
-#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1110
+#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
msgid "_Host:"
msgstr "_Host:"
-#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1128
+#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
msgid "_Port:"
msgstr "_Port:"
-#: ../gtk/gtkaccount.c:995
+#: ../gtk/gtkaccount.c:1010
msgid "_Username:"
msgstr "_Username:"
-#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1165
+#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
msgid "Pa_ssword:"
msgstr "Pa_ssword:"
-#: ../gtk/gtkaccount.c:1398
+#: ../gtk/gtkaccount.c:1428
msgid "Add Account"
msgstr "Add Account"
-#: ../gtk/gtkaccount.c:1422
+#: ../gtk/gtkaccount.c:1452
msgid "_Basic"
msgstr "_Basic"
-#: ../gtk/gtkaccount.c:1433
+#: ../gtk/gtkaccount.c:1463
msgid "_Advanced"
msgstr "_Advanced"
#. Register button
-#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:849
+#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:860
msgid "Register"
msgstr "Register"
-#: ../gtk/gtkaccount.c:1919 ../gtk/gtkplugin.c:576
+#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566
msgid "Enabled"
msgstr "Enabled"
-#: ../gtk/gtkaccount.c:1927
+#: ../gtk/gtkaccount.c:1961
msgid "Protocol"
msgstr "Protocol"
-#: ../gtk/gtkblist.c:705
+#: ../gtk/gtkaccount.c:2133
+msgid ""
+"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with Gaim press the "
+"<b>Add</b> button below and configure your first account. If you want Gaim "
+"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with Gaim press the "
+"<b>Add</b> button below and configure your first account. If you want Gaim "
+"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+
+#: ../gtk/gtkaccount.c:2483
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+
+#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512
+msgid "Authorize buddy?"
+msgstr "Authorise buddy?"
+
+#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513
+msgid "Authorize"
+msgstr "Authorise"
+
+#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514
+msgid "Deny"
+msgstr "Deny"
+
+#: ../gtk/gtkblist.c:709
msgid "Join a Chat"
msgstr "Join a Chat"
-#: ../gtk/gtkblist.c:726
+#: ../gtk/gtkblist.c:730
msgid ""
"Please enter the appropriate information about the chat you would like to "
"join.\n"
@@ -1289,199 +1341,207 @@
"Please enter the appropriate information about the chat you would like to "
"join.\n"
-#: ../gtk/gtkblist.c:737 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
+#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399
msgid "_Account:"
msgstr "_Account:"
-#: ../gtk/gtkblist.c:1001
+#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
+msgid "_Block"
+msgstr "_Block"
+
+#: ../gtk/gtkblist.c:1015
+msgid "Un_block"
+msgstr "Un_block"
+
+#: ../gtk/gtkblist.c:1066
msgid "Get _Info"
msgstr "Get _Info"
-#: ../gtk/gtkblist.c:1010
+#: ../gtk/gtkblist.c:1075
msgid "_Send File"
msgstr "_Send File"
-#: ../gtk/gtkblist.c:1017
+#: ../gtk/gtkblist.c:1082
msgid "Add Buddy _Pounce"
msgstr "Add Buddy _Pounce"
-#: ../gtk/gtkblist.c:1021 ../gtk/gtkblist.c:1025 ../gtk/gtkblist.c:1124
-#: ../gtk/gtkblist.c:1147
+#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
+#: ../gtk/gtkblist.c:1213
msgid "View _Log"
msgstr "View _Log"
-#: ../gtk/gtkblist.c:1036
+#: ../gtk/gtkblist.c:1103
msgid "Alias..."
msgstr "Alias..."
-#: ../gtk/gtkblist.c:1045 ../gtk/gtkblist.c:1132 ../gtk/gtkblist.c:1153
+#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
msgid "_Alias..."
msgstr "_Alias..."
-#: ../gtk/gtkblist.c:1047 ../gtk/gtkblist.c:1134 ../gtk/gtkblist.c:1155
+#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
msgid "_Remove"
msgstr "_Remove"
-#: ../gtk/gtkblist.c:1095
+#: ../gtk/gtkblist.c:1161
msgid "Add a _Buddy"
msgstr "Add a _Buddy"
-#: ../gtk/gtkblist.c:1097
+#: ../gtk/gtkblist.c:1163
msgid "Add a C_hat"
msgstr "Add a C_hat"
-#: ../gtk/gtkblist.c:1100
+#: ../gtk/gtkblist.c:1166
msgid "_Delete Group"
msgstr "_Delete Group"
-#: ../gtk/gtkblist.c:1102
+#: ../gtk/gtkblist.c:1168
msgid "_Rename"
msgstr "_Rename"
-#: ../gtk/gtkblist.c:1122
+#: ../gtk/gtkblist.c:1188
msgid "Auto-Join"
msgstr "Auto-Join"
-#: ../gtk/gtkblist.c:1160 ../gtk/gtkblist.c:1183
+#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
msgid "_Collapse"
msgstr "_Collapse"
-#: ../gtk/gtkblist.c:1188
+#: ../gtk/gtkblist.c:1254
msgid "_Expand"
msgstr "_Expand"
-#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4115
-#: ../gtk/gtkblist.c:4125
+#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374
+#: ../gtk/gtkblist.c:4384
msgid "/Tools/Mute Sounds"
msgstr "/Tools/Mute Sounds"
-#: ../gtk/gtkblist.c:1906 ../gtk/gtkconv.c:4345 ../gtk/gtkpounce.c:422
+#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4415 ../gtk/gtkpounce.c:421
msgid ""
"You are not currently signed on with an account that can add that buddy."
msgstr ""
"You are not currently signed on with an account that can add that buddy."
#. Buddies menu
-#: ../gtk/gtkblist.c:2500
+#: ../gtk/gtkblist.c:2567
msgid "/_Buddies"
msgstr "/_Buddies"
-#: ../gtk/gtkblist.c:2501
+#: ../gtk/gtkblist.c:2568
msgid "/Buddies/New Instant _Message..."
msgstr "/Buddies/New Instant _Message..."
-#: ../gtk/gtkblist.c:2502
+#: ../gtk/gtkblist.c:2569
msgid "/Buddies/Join a _Chat..."
msgstr "/Buddies/Join a _Chat..."
-#: ../gtk/gtkblist.c:2503
+#: ../gtk/gtkblist.c:2570
msgid "/Buddies/Get User _Info..."
msgstr "/Buddies/Get User _Info..."
-#: ../gtk/gtkblist.c:2504
+#: ../gtk/gtkblist.c:2571
msgid "/Buddies/View User _Log..."
msgstr "/Buddies/View User _Log..."
-#: ../gtk/gtkblist.c:2506
+#: ../gtk/gtkblist.c:2573
msgid "/Buddies/Show _Offline Buddies"
msgstr "/Buddies/Show _Offline Buddies"
-#: ../gtk/gtkblist.c:2507
+#: ../gtk/gtkblist.c:2574
msgid "/Buddies/Show _Empty Groups"
msgstr "/Buddies/Show _Empty Groups"
-#: ../gtk/gtkblist.c:2508
+#: ../gtk/gtkblist.c:2575
msgid "/Buddies/Show Buddy _Details"
msgstr "/Buddies/Show Buddy _Details"
-#: ../gtk/gtkblist.c:2509
+#: ../gtk/gtkblist.c:2576
msgid "/Buddies/Show Idle _Times"
msgstr "/Buddies/Show Idle _Times"
-#: ../gtk/gtkblist.c:2510
+#: ../gtk/gtkblist.c:2577
msgid "/Buddies/_Sort Buddies"
msgstr "/Buddies/_Sort Buddies"
-#: ../gtk/gtkblist.c:2512
+#: ../gtk/gtkblist.c:2579
msgid "/Buddies/_Add Buddy..."
msgstr "/Buddies/_Add Buddy..."
-#: ../gtk/gtkblist.c:2513
+#: ../gtk/gtkblist.c:2580
msgid "/Buddies/Add C_hat..."
msgstr "/Buddies/Add C_hat..."
-#: ../gtk/gtkblist.c:2514
+#: ../gtk/gtkblist.c:2581
msgid "/Buddies/Add _Group..."
msgstr "/Buddies/Add _Group..."
-#: ../gtk/gtkblist.c:2516
+#: ../gtk/gtkblist.c:2583
msgid "/Buddies/_Quit"
msgstr "/Buddies/_Quit"
#. Accounts menu
-#: ../gtk/gtkblist.c:2519
+#: ../gtk/gtkblist.c:2586
msgid "/_Accounts"
msgstr "/_Accounts"
-#: ../gtk/gtkblist.c:2520 ../gtk/gtkblist.c:5967
+#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6279
msgid "/Accounts/Add\\/Edit"
msgstr "/Accounts/Add\\/Edit"
#. Tools
-#: ../gtk/gtkblist.c:2523
+#: ../gtk/gtkblist.c:2590
msgid "/_Tools"
msgstr "/_Tools"
-#: ../gtk/gtkblist.c:2524
+#: ../gtk/gtkblist.c:2591
msgid "/Tools/Buddy _Pounces"
msgstr "/Tools/Buddy _Pounces"
-#: ../gtk/gtkblist.c:2525
+#: ../gtk/gtkblist.c:2592
msgid "/Tools/Plu_gins"
msgstr "/Tools/Plu_g-ins"
-#: ../gtk/gtkblist.c:2526
+#: ../gtk/gtkblist.c:2593
msgid "/Tools/Pr_eferences"
msgstr "/Tools/Pr_eferences"
-#: ../gtk/gtkblist.c:2527
+#: ../gtk/gtkblist.c:2594
msgid "/Tools/Pr_ivacy"
msgstr "/Tools/Pr_ivacy"
-#: ../gtk/gtkblist.c:2529
+#: ../gtk/gtkblist.c:2596
msgid "/Tools/_File Transfers"
msgstr "/Tools/_File Transfers"
-#: ../gtk/gtkblist.c:2530
+#: ../gtk/gtkblist.c:2597
msgid "/Tools/R_oom List"
msgstr "/Tools/R_oom List"
-#: ../gtk/gtkblist.c:2531
+#: ../gtk/gtkblist.c:2598
msgid "/Tools/System _Log"
msgstr "/Tools/System _Log"
-#: ../gtk/gtkblist.c:2533
+#: ../gtk/gtkblist.c:2600
msgid "/Tools/Mute _Sounds"
msgstr "/Tools/Mute _Sounds"
#. Help
-#: ../gtk/gtkblist.c:2536
+#: ../gtk/gtkblist.c:2603
msgid "/_Help"
msgstr "/_Help"
-#: ../gtk/gtkblist.c:2537
+#: ../gtk/gtkblist.c:2604
msgid "/Help/Online _Help"
msgstr "/Help/Online _Help"
-#: ../gtk/gtkblist.c:2538
+#: ../gtk/gtkblist.c:2605
msgid "/Help/_Debug Window"
msgstr "/Help/_Debug Window"
-#: ../gtk/gtkblist.c:2539
+#: ../gtk/gtkblist.c:2606
msgid "/Help/_About"
msgstr "/Help/_About"
-#: ../gtk/gtkblist.c:2571 ../gtk/gtkblist.c:2640
+#: ../gtk/gtkblist.c:2638
#, c-format
msgid ""
"\n"
@@ -1490,223 +1550,193 @@
"\n"
"<b>Account:</b> %s"
-#: ../gtk/gtkblist.c:2652
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Buddy Alias:</b> %s"
+#: ../gtk/gtkblist.c:2722
+msgid "Buddy Alias"
+msgstr "Buddy Alias"
-#: ../gtk/gtkblist.c:2664
-#, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Nickname:</b> %s"
+#: ../gtk/gtkblist.c:2743
+msgid "Logged In"
+msgstr "Logged In"
-#: ../gtk/gtkblist.c:2673
-#, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Logged In:</b> %s"
+#: ../gtk/gtkblist.c:2789
+msgid "Last Seen"
+msgstr "Last Seen"
-#: ../gtk/gtkblist.c:2684
-#, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>Idle:</b> %s"
+#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471
+#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993
+#: ../libgaim/protocols/jabber/buddy.c:1401
+#: ../libgaim/protocols/novell/novell.c:2863
+#: ../libgaim/protocols/oscar/oscar.c:807
+#: ../libgaim/protocols/oscar/oscar.c:5551 ../libgaim/protocols/qq/qq.c:170
+#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878
+#: ../libgaim/status.c:154
+msgid "Offline"
+msgstr "Offline"
-#: ../gtk/gtkblist.c:2719
-#, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>Last Seen:</b> %s ago"
+#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680
+#: ../libgaim/protocols/jabber/buddy.c:289
+#: ../libgaim/protocols/jabber/buddy.c:937
+#: ../libgaim/protocols/jabber/chat.c:777
+msgid "Description"
+msgstr "Description"
-#: ../gtk/gtkblist.c:2728
-msgid ""
-"\n"
-"<b>Status:</b> Offline"
-msgstr ""
-"\n"
-"<b>Status:</b> Offline"
+#: ../gtk/gtkblist.c:2809
+msgid "Spooky"
+msgstr "Spooky"
-#: ../gtk/gtkblist.c:2739
-msgid ""
-"\n"
-"<b>Description:</b> Spooky"
-msgstr ""
-"\n"
-"<b>Description:</b> Spooky"
+#: ../gtk/gtkblist.c:2811
+msgid "Awesome"
+msgstr "Awesome"
-#: ../gtk/gtkblist.c:2741
-msgid ""
-"\n"
-"<b>Status:</b> Awesome"
-msgstr ""
-"\n"
-"<b>Status:</b> Awesome"
+#: ../gtk/gtkblist.c:2813
+msgid "Rockin'"
+msgstr "Rockin'"
-#: ../gtk/gtkblist.c:2743
-msgid ""
-"\n"
-"<b>Status:</b> Rockin'"
-msgstr ""
-"\n"
-"<b>Status:</b> Rockin'"
-
-#: ../gtk/gtkblist.c:3210 ../gtk/gtkdocklet.c:458 ../gtk/gtkstatusbox.c:974
-#: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1365
-#: ../libgaim/protocols/novell/novell.c:2865
-#: ../libgaim/protocols/oscar/oscar.c:769
-#: ../libgaim/protocols/oscar/oscar.c:5447
-#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
-msgid "Offline"
-msgstr "Offline"
-
-#: ../gtk/gtkblist.c:3226
+#: ../gtk/gtkblist.c:3302
#, c-format
msgid "Idle %dh %02dm"
msgstr "Idle %dh %02dm"
-#: ../gtk/gtkblist.c:3228
+#: ../gtk/gtkblist.c:3304
#, c-format
msgid "Idle %dm"
msgstr "Idle %dm"
-#. Idle stuff
-#: ../gtk/gtkblist.c:3231 ../gtk/gtkprefs.c:1801
-#: ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:635
-#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
-#: ../libgaim/protocols/msn/state.c:32
-#: ../libgaim/protocols/novell/novell.c:2862
-#: ../libgaim/protocols/oscar/oscar.c:2826
-#: ../libgaim/protocols/yahoo/yahoo.c:2881
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
-msgid "Idle"
-msgstr "Idle"
-
-#: ../gtk/gtkblist.c:3359
+#: ../gtk/gtkblist.c:3435
msgid "/Buddies/New Instan...
[truncated message content] |
|
From: Mark D. <ma...@ki...> - 2007-02-05 00:25:39
|
On Sun, 4 Feb 2007 13:13:27 -0800, Sean Egan wrote > Want to show us an update, Mark? Sure. When multiple votes came from the same IP address, the last vote was the one that counted. 5 votes for [commits] 30 votes for no header 36 votes for [Gaim-commits] I was expecting an overwhelming majority to vote for [Gaim-commits]. Like, 90%. But since that didn't happen, and I agree that not munging the header is technically more correct, we should remove that header sometime. My intention of having a poll wasn't exactly to let the masses decide if we should have a header or not. It was more because I was curious to know which way people preferred. I had a feeling that a huge majority would vote for the full header, and if that were the case then I think it would be absolutely ridiculous for us remove something that so many people want (even if they want it because they're ignorant). -Mark |
|
From: <rl...@us...> - 2007-02-04 19:43:11
|
Revision: 18181
http://svn.sourceforge.net/gaim/?rev=18181&view=rev
Author: rlaager
Date: 2007-02-04 11:43:08 -0800 (Sun, 04 Feb 2007)
Log Message:
-----------
SF Patch #1637687 from Damien Carbery
'The "__attribute__ ((constructor))" breaks on Solaris when using the Sun Forte compiler.'
This patch uses the appropriate #pragma when using the Sun Forte compiler.
Modified Paths:
--------------
trunk/libgaim/plugins/perl/libgaimperl.c
Modified: trunk/libgaim/plugins/perl/libgaimperl.c
===================================================================
--- trunk/libgaim/plugins/perl/libgaimperl.c 2007-02-03 06:47:06 UTC (rev 18180)
+++ trunk/libgaim/plugins/perl/libgaimperl.c 2007-02-04 19:43:08 UTC (rev 18181)
@@ -1,7 +1,16 @@
#include <gmodule.h>
+
+#ifdef __SUNPRO_C
+#pragma init (my_init)
+void my_init(void);
+
+void my_init() {
+#else
void __attribute__ ((constructor)) my_init(void);
void __attribute__ ((constructor)) my_init() {
+#endif
+
/* Very evil hack...puts perl.so's symbols in the global table
* but does not create a circular dependancy because g_module_open
* will only open the library once. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2007-02-03 06:47:08
|
Revision: 18180
http://svn.sourceforge.net/gaim/?rev=18180&view=rev
Author: seanegan
Date: 2007-02-02 22:47:06 -0800 (Fri, 02 Feb 2007)
Log Message:
-----------
Adium deserves a shoutout
Modified Paths:
--------------
web/htdocs/news.txt
Modified: web/htdocs/news.txt
===================================================================
--- web/htdocs/news.txt 2007-02-01 09:23:48 UTC (rev 18179)
+++ web/htdocs/news.txt 2007-02-03 06:47:06 UTC (rev 18180)
@@ -1,3 +1,7 @@
+Adium 1.0!
+February 2nd, 2007 - 10:42PM PST
+Not really Gaim news, so much, but if you use a Macintosh, you should know that <a href='http://www.adiumx.com/'>Adium X</a> has just released version 1.0 of their fine OS X IM client. Adium uses libgaim, the backend to gaim and gaim-text behind a slick OS X native UI. It's our standard response to "how do I get Gaim for OS X?" Many congratulations to the Adium team!
+#
2.0.0beta6
January 19th, 2007 - 8:46AM PST
Greetings Earth people. We have watched your planet from afar for 17 years. And much like the Magicicada of your planet, we have emerged to make lots of loud noises. Also, we heard that <a href="http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=479631">Gaim 2.0.0 beta 6 has been released</a> and we wanted to let everyone know. We consider this release to be reasonably stable. With a little luck dragon, 2.0.0 final is just around the corner.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Sean E. <sea...@gm...> - 2007-02-02 20:12:27
|
Becaues democracy only works with informed voters: http://www.andrew.cmu.edu/user/qralston/writing/tagging-harmful/ |
|
From: Nirbheek C. <nir...@gm...> - 2007-02-02 20:11:42
|
And for good reason :P On 2/3/07, Luke Schierer <lsc...@us...> wrote: > > On Fri, Feb 02, 2007 at 12:24:30PM -0500, Mark Doliner wrote: > > Hi! We're debating whether we should keep the short little > [gaim-commits] > > header thing at the beginning of the subject line in emails sent through > this > > mailing list. > > > > Could every single person on this list please go to > > http://kingant.net/gaimpoll/ > > and vote for your preference? Thanks! > > > > -Mark > > > > You aren't showing running results!! > > luke > > ------------------------------------------------------------------------- > Using Tomcat but need to do more? Need to support web services, security? > Get stuff done quickly with pre-integrated technology to make your job > easier. > Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo > http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 > _______________________________________________ > Gaim-commits mailing list > Gai...@li... > https://lists.sourceforge.net/lists/listinfo/gaim-commits > -- Nirbheek Chauhan Sophomore UG Civil Engg "..." -- Nirbheek Chauhan |
|
From: Luke S. <lsc...@us...> - 2007-02-02 18:49:08
|
On Fri, Feb 02, 2007 at 12:24:30PM -0500, Mark Doliner wrote: > Hi! We're debating whether we should keep the short little [gaim-commits] > header thing at the beginning of the subject line in emails sent through this > mailing list. > > Could every single person on this list please go to > http://kingant.net/gaimpoll/ > and vote for your preference? Thanks! > > -Mark > You aren't showing running results!! luke |
|
From: Mark D. <ma...@ki...> - 2007-02-02 17:24:15
|
Hi! We're debating whether we should keep the short little [gaim-commits]
header thing at the beginning of the subject line in emails sent through this
mailing list.
Could every single person on this list please go to
http://kingant.net/gaimpoll/
and vote for your preference? Thanks!
-Mark
|
|
From: <mar...@us...> - 2007-02-01 09:23:48
|
Revision: 18179
http://svn.sourceforge.net/gaim/?rev=18179&view=rev
Author: markhuetsch
Date: 2007-02-01 01:23:48 -0800 (Thu, 01 Feb 2007)
Log Message:
-----------
I believe there's a bug in the get_buddies_levels() code that I don't have time to find. Temporarily disable it.
Modified Paths:
--------------
trunk/libgaim/protocols/qq/buddy_info.c
trunk/libgaim/protocols/qq/buddy_info.h
trunk/libgaim/protocols/qq/buddy_list.c
Modified: trunk/libgaim/protocols/qq/buddy_info.c
===================================================================
--- trunk/libgaim/protocols/qq/buddy_info.c 2007-01-29 22:07:00 UTC (rev 18178)
+++ trunk/libgaim/protocols/qq/buddy_info.c 2007-02-01 09:23:48 UTC (rev 18179)
@@ -741,6 +741,7 @@
qq_send_cmd(gc, QQ_CMD_GET_LEVEL, TRUE, 0, TRUE, buf, 5);
}
+/*
void qq_send_packet_get_buddies_levels(GaimConnection *gc)
{
guint8 *buf, *tmp, size;
@@ -749,8 +750,10 @@
GList *node = qd->buddies;
if (qd->buddies) {
+*/
/* server only sends back levels for online buddies, no point
* in asking for anyone else */
+/*
size = 4*g_list_length(qd->buddies) + 1;
buf = g_new0(guint8, size);
tmp = buf + 1;
@@ -767,8 +770,9 @@
}
qq_send_cmd(gc, QQ_CMD_GET_LEVEL, TRUE, 0, TRUE, buf, size);
g_free(buf);
- }
+ }
}
+*/
void qq_process_get_level_reply(guint8 *buf, gint buf_len, GaimConnection *gc)
{
Modified: trunk/libgaim/protocols/qq/buddy_info.h
===================================================================
--- trunk/libgaim/protocols/qq/buddy_info.h 2007-01-29 22:07:00 UTC (rev 18178)
+++ trunk/libgaim/protocols/qq/buddy_info.h 2007-02-01 09:23:48 UTC (rev 18179)
@@ -93,7 +93,9 @@
void qq_process_get_info_reply(guint8 *buf, gint buf_len, GaimConnection *gc);
void qq_info_query_free(qq_data *qd);
void qq_send_packet_get_level(GaimConnection *gc, guint32 uid);
+/*
void qq_send_packet_get_buddies_levels(GaimConnection *gc);
+*/
void qq_process_get_level_reply(guint8 *buf, gint buf_len, GaimConnection *gc);
#endif
Modified: trunk/libgaim/protocols/qq/buddy_list.c
===================================================================
--- trunk/libgaim/protocols/qq/buddy_list.c 2007-01-29 22:07:00 UTC (rev 18178)
+++ trunk/libgaim/protocols/qq/buddy_list.c 2007-02-01 09:23:48 UTC (rev 18179)
@@ -215,8 +215,7 @@
q_bud->flag1 = fe->flag1;
q_bud->comm_flag = fe->comm_flag;
qq_update_buddy_contact(gc, q_bud);
- }
- else {
+ } else {
gaim_debug(GAIM_DEBUG_ERROR, "QQ",
"Got an online buddy %d, but not in my buddy list\n", fe->s->uid);
}
@@ -234,9 +233,8 @@
gaim_debug(GAIM_DEBUG_INFO, "QQ", "Has more online buddies, position from %d\n", position);
qq_send_packet_get_buddies_online(gc, position);
- }
- else {
- qq_send_packet_get_buddies_levels(gc);
+ } else {
+ /* qq_send_packet_get_buddies_levels(gc); */
qq_refresh_all_buddy_status(gc);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2007-01-29 22:07:03
|
Revision: 18178
http://svn.sourceforge.net/gaim/?rev=18178&view=rev
Author: lschiere
Date: 2007-01-29 14:07:00 -0800 (Mon, 29 Jan 2007)
Log Message:
-----------
Nathan noticed this.
Modified Paths:
--------------
web/htdocs/faq.php
Modified: web/htdocs/faq.php
===================================================================
--- web/htdocs/faq.php 2007-01-29 21:58:46 UTC (rev 18177)
+++ web/htdocs/faq.php 2007-01-29 22:07:00 UTC (rev 18178)
@@ -7,7 +7,7 @@
<h1>Frequently Asked Questions</h1>
<p><i>Frequently asked questions specific to Windows have their own <a href="/win32">FAQ</a>.</i></p>
-<p><i>For those users testing <a href="http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=456679">2.0.0beta6</a>, we have an updated <a href="faq2.php">FAQ</a>.</i></p>
+<p><i>For those users testing <a href="http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=479631">2.0.0beta6</a>, we have an updated <a href="faq2.php">FAQ</a>.</i></p>
<?
/* The Q&A begins here */
$faq = file("./faq.txt");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2007-01-29 21:58:50
|
Revision: 18177
http://svn.sourceforge.net/gaim/?rev=18177&view=rev
Author: lschiere
Date: 2007-01-29 13:58:46 -0800 (Mon, 29 Jan 2007)
Log Message:
-----------
update
Modified Paths:
--------------
web/htdocs/faq.php
Modified: web/htdocs/faq.php
===================================================================
--- web/htdocs/faq.php 2007-01-26 06:14:50 UTC (rev 18176)
+++ web/htdocs/faq.php 2007-01-29 21:58:46 UTC (rev 18177)
@@ -7,7 +7,7 @@
<h1>Frequently Asked Questions</h1>
<p><i>Frequently asked questions specific to Windows have their own <a href="/win32">FAQ</a>.</i></p>
-<p><i>For those users testing <a href="http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=456679">2.0.0beta4</a>, we have an updated <a href="faq2.php">FAQ</a>.</i></p>
+<p><i>For those users testing <a href="http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=456679">2.0.0beta6</a>, we have an updated <a href="faq2.php">FAQ</a>.</i></p>
<?
/* The Q&A begins here */
$faq = file("./faq.txt");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2007-01-26 06:14:50
|
Revision: 18176
http://svn.sourceforge.net/gaim/?rev=18176&view=rev
Author: markhuetsch
Date: 2007-01-25 22:14:50 -0800 (Thu, 25 Jan 2007)
Log Message:
-----------
Apparently GBK is old and we should be using GB18030.
Hopefully this fixes bugs 1625210, 1619225, and 1562372.
Modified Paths:
--------------
trunk/libgaim/protocols/qq/char_conv.c
trunk/libgaim/protocols/qq/char_conv.h
Modified: trunk/libgaim/protocols/qq/char_conv.c
===================================================================
--- trunk/libgaim/protocols/qq/char_conv.c 2007-01-25 17:39:22 UTC (rev 18175)
+++ trunk/libgaim/protocols/qq/char_conv.c 2007-01-26 06:14:50 UTC (rev 18176)
@@ -33,7 +33,7 @@
#define QQ_SMILEY_AMOUNT 96
#define UTF8 "UTF-8"
-#define QQ_CHARSET_ZH_CN "GBK"
+#define QQ_CHARSET_ZH_CN "GB18030"
#define QQ_CHARSET_ENG "ISO-8859-1"
#define QQ_NULL_MSG "(NULL)" /* return this if conversion fails */
Modified: trunk/libgaim/protocols/qq/char_conv.h
===================================================================
--- trunk/libgaim/protocols/qq/char_conv.h 2007-01-25 17:39:22 UTC (rev 18175)
+++ trunk/libgaim/protocols/qq/char_conv.h 2007-01-26 06:14:50 UTC (rev 18176)
@@ -27,7 +27,7 @@
#include <glib.h>
-#define QQ_CHARSET_DEFAULT "GBK"
+#define QQ_CHARSET_DEFAULT "GB18030"
gint convert_as_pascal_string(guint8 *data, gchar **ret, const gchar *from_charset);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-01-25 17:39:26
|
Revision: 18175
http://svn.sourceforge.net/gaim/?rev=18175&view=rev
Author: thekingant
Date: 2007-01-25 09:39:22 -0800 (Thu, 25 Jan 2007)
Log Message:
-----------
Sun apparently doesn't like when void functions return
the return value from another void function. For example:
void func1(void) {
printf("hi");
}
void func2(void) {
return func1(); /* this line causes a warning */
}
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/misc.c
Modified: trunk/libgaim/protocols/oscar/misc.c
===================================================================
--- trunk/libgaim/protocols/oscar/misc.c 2007-01-25 08:27:28 UTC (rev 18174)
+++ trunk/libgaim/protocols/oscar/misc.c 2007-01-25 17:39:22 UTC (rev 18175)
@@ -70,7 +70,10 @@
aim_snacid_t snacid;
if (!longdata)
- return aim_genericreq_n(od, conn, family, subtype);
+ {
+ aim_genericreq_n(od, conn, family, subtype);
+ return;
+ }
frame = flap_frame_new(od, 0x02, 10+4);
@@ -89,7 +92,10 @@
aim_snacid_t snacid;
if (!shortdata)
- return aim_genericreq_n(od, conn, family, subtype);
+ {
+ aim_genericreq_n(od, conn, family, subtype);
+ return;
+ }
frame = flap_frame_new(od, 0x02, 10+2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-01-25 08:27:34
|
Revision: 18174
http://svn.sourceforge.net/gaim/?rev=18174&view=rev
Author: thekingant
Date: 2007-01-25 00:27:28 -0800 (Thu, 25 Jan 2007)
Log Message:
-----------
sf patch #1644019, from good ol' Ka-Hing Cheung
"fix compiling on gtk 2.4. xmppconsole.c is the culprit.
gtk_combo_box_get_active_text is defined in gtk 2.6 but not 2.4."
Modified Paths:
--------------
trunk/gtk/gaimcombobox.c
trunk/gtk/gaimcombobox.h
trunk/gtk/gtkgaim.h
Modified: trunk/gtk/gaimcombobox.c
===================================================================
--- trunk/gtk/gaimcombobox.c 2007-01-25 08:17:08 UTC (rev 18173)
+++ trunk/gtk/gaimcombobox.c 2007-01-25 08:27:28 UTC (rev 18174)
@@ -21,9 +21,10 @@
#include <config.h>
*/
#include <gtk/gtkversion.h>
-#if !GTK_CHECK_VERSION(2,4,0)
+#if !GTK_CHECK_VERSION(2,6,0)
#include "gaimcombobox.h"
+#if !GTK_CHECK_VERSION(2,4,0)
#include <gtk/gtkarrow.h>
#include <gtk/gtkbindings.h>
#include "gtkcelllayout.h"
@@ -3557,21 +3558,6 @@
gtk_list_store_remove (store, &iter);
}
-static gchar *
-gtk_combo_box_get_active_text (GtkComboBox *combo_box)
-{
- GtkTreeIter iter;
- gchar *text = NULL;
-
- g_return_val_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model), NULL);
-
- if (gtk_combo_box_get_active_iter (combo_box, &iter))
- gtk_tree_model_get (combo_box->priv->model, &iter,
- 0, &text, -1);
- return text;
-}
-
-
static gboolean
gtk_combo_box_mnemonic_activate (GtkWidget *widget,
gboolean group_cycling)
@@ -3745,3 +3731,19 @@
}
}
#endif /* Gtk 2.4 */
+
+gchar *
+gtk_combo_box_get_active_text (GtkComboBox *combo_box)
+{
+ GtkTreeIter iter;
+ gchar *text = NULL;
+
+ /* g_return_val_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model), NULL); */
+
+ if (gtk_combo_box_get_active_iter (combo_box, &iter))
+ gtk_tree_model_get (gtk_combo_box_get_model(combo_box), &iter,
+ 0, &text, -1);
+ return text;
+}
+
+#endif
Modified: trunk/gtk/gaimcombobox.h
===================================================================
--- trunk/gtk/gaimcombobox.h 2007-01-25 08:17:08 UTC (rev 18173)
+++ trunk/gtk/gaimcombobox.h 2007-01-25 08:27:28 UTC (rev 18174)
@@ -17,6 +17,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifndef __GAIM_COMBO_BOX_H__
+#define __GAIM_COMBO_BOX_H__
+
#ifndef __GTK_COMBO_BOX_H__
#define __GTK_COMBO_BOX_H__
@@ -98,8 +101,6 @@
const gchar *text);
void gtk_combo_box_remove_text (GtkComboBox *combo_box,
gint position);
-gchar *gtk_combo_box_get_active_text (GtkComboBox *combo_box);
-
/* programmatic control */
void gtk_combo_box_popup (GtkComboBox *combo_box);
void gtk_combo_box_popdown (GtkComboBox *combo_box);
@@ -107,3 +108,7 @@
G_END_DECLS
#endif /* __GTK_COMBO_BOX_H__ */
+
+gchar *gtk_combo_box_get_active_text (GtkComboBox *combo_box);
+
+#endif /* __GAIM_COMBOX_BOX_H__ */
Modified: trunk/gtk/gtkgaim.h
===================================================================
--- trunk/gtk/gtkgaim.h 2007-01-25 08:17:08 UTC (rev 18173)
+++ trunk/gtk/gtkgaim.h 2007-01-25 08:27:28 UTC (rev 18174)
@@ -55,24 +55,24 @@
*/
/** @cond */
#if (!GTK_CHECK_VERSION(2,4,0))
-#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
-#include "gtkexpander.h"
+# define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
+# include "gtkexpander.h"
#endif
/** @endcond */
/*
* We include the sources for GtkComboBox and GtkCellView because
- * they don't exist in older version of Gtk+, and we use them
+ * they don't exist in older versions of GTK+, and we use them
* in a few places.
*/
#if !GTK_CHECK_VERSION(2,6,0)
# include "gtkcellview.h"
# include "gtkcellviewmenuitem.h"
+# include "gaimcombobox.h"
# if !GTK_CHECK_VERSION(2,4,0)
# include "gtkcelllayout.h"
-# include "gaimcombobox.h"
-# endif /* Gtk 2.4 */
-#endif /* Gtk 2.6 */
+# endif /* Less than GTK+ 2.4 */
+#endif /* Less than GTK+ 2.6 */
/*
* Spacings between components, as defined by the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-01-25 08:17:08
|
Revision: 18173
http://svn.sourceforge.net/gaim/?rev=18173&view=rev
Author: thekingant
Date: 2007-01-25 00:17:08 -0800 (Thu, 25 Jan 2007)
Log Message:
-----------
Show "(experimental)" next to the enable-mono option
when calling "./configure --help"
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-01-25 08:09:04 UTC (rev 18172)
+++ trunk/configure.ac 2007-01-25 08:17:08 UTC (rev 18173)
@@ -1019,7 +1019,7 @@
dnl #######################################################################
dnl # Check for Mono support
dnl #######################################################################
-AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support])], , enable_mono=no)
+AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support (experimental)])], , enable_mono=no)
if test x"$enable_mono" = x"yes" ; then
AC_MSG_CHECKING(for Mono compile flags)
MONO_CFLAGS=`pkg-config --cflags mono 2> /dev/null`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-01-25 08:09:04
|
Revision: 18172
http://svn.sourceforge.net/gaim/?rev=18172&view=rev
Author: thekingant
Date: 2007-01-25 00:09:04 -0800 (Thu, 25 Jan 2007)
Log Message:
-----------
sf patch #1639901, from Saleem Abdulrasool
Fix the build failure of the Mono example dlls due to the
Mono API change
Modified Paths:
--------------
trunk/COPYRIGHT
trunk/libgaim/plugins/mono/GetBuddyBack.cs
trunk/libgaim/plugins/mono/MPlugin.cs
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT 2007-01-25 07:44:39 UTC (rev 18171)
+++ trunk/COPYRIGHT 2007-01-25 08:09:04 UTC (rev 18172)
@@ -4,6 +4,7 @@
If you have contributed to Gaim, you deserve to be on this list.
Contact us (see: AUTHORS) and we'll add you.
+Saleem Abdulrasool
Dave Ahlswede
Manuel Amador
Matt Amato
Modified: trunk/libgaim/plugins/mono/GetBuddyBack.cs
===================================================================
--- trunk/libgaim/plugins/mono/GetBuddyBack.cs 2007-01-25 07:44:39 UTC (rev 18171)
+++ trunk/libgaim/plugins/mono/GetBuddyBack.cs 2007-01-25 08:09:04 UTC (rev 18172)
@@ -1,7 +1,14 @@
using Gaim;
-public class GetBuddyBack : GaimPlugin
+public class GetBuddyBack : Plugin
{
+ private static PluginInfo info = new PluginInfo("C# Get Buddy Back", "0.1", "Prints when a Buddy returns", "Longer Description", "Eoin Coffey", "urled");
+
+ public GetBuddyBack()
+ : base (info)
+ {
+ }
+
public void HandleSig(object[] args)
{
Buddy buddy = (Buddy)args[0];
@@ -24,9 +31,4 @@
public override void Destroy()
{
}
-
- public override GaimPluginInfo Info()
- {
- return new GaimPluginInfo("C# Get Buddy Back", "0.1", "Prints when a Buddy returns", "Longer Description", "Eoin Coffey", "urled");
- }
}
Modified: trunk/libgaim/plugins/mono/MPlugin.cs
===================================================================
--- trunk/libgaim/plugins/mono/MPlugin.cs 2007-01-25 07:44:39 UTC (rev 18171)
+++ trunk/libgaim/plugins/mono/MPlugin.cs 2007-01-25 08:09:04 UTC (rev 18172)
@@ -1,7 +1,14 @@
using Gaim;
-public class MPlugin : GaimPlugin
+public class MPlugin : Plugin
{
+ private static PluginInfo info = new PluginInfo("C# Plugin", "0.1", "Test C# Plugin", "Longer Description", "Eoin Coffey", "urled");
+
+ public MPlugin()
+ : base(info)
+ {
+ }
+
public void HandleSig(object[] args)
{
Buddy buddy = (Buddy)args[0];
@@ -28,9 +35,4 @@
{
Debug.debug(Debug.INFO, "mplug", "destroying...\n");
}
-
- public override GaimPluginInfo Info()
- {
- return new GaimPluginInfo("C# Plugin", "0.1", "Test C# Plugin", "Longer Description", "Eoin Coffey", "urled");
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-01-25 07:44:39
|
Revision: 18171
http://svn.sourceforge.net/gaim/?rev=18171&view=rev
Author: thekingant
Date: 2007-01-24 23:44:39 -0800 (Wed, 24 Jan 2007)
Log Message:
-----------
sf patch #1640011, from Celso Pinto
Patch for gaim.spec that fixes dependencies on SUSE
Modified Paths:
--------------
trunk/COPYRIGHT
trunk/gaim.spec.in
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT 2007-01-25 07:30:13 UTC (rev 18170)
+++ trunk/COPYRIGHT 2007-01-25 07:44:39 UTC (rev 18171)
@@ -242,6 +242,7 @@
Havoc Pennington
Ted Percival
Eduardo Pérez
+Celso Pinto
Joao Luís Marques Pinto
Aleksander Piotrowski
Julien Pivotto
Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in 2007-01-25 07:30:13 UTC (rev 18170)
+++ trunk/gaim.spec.in 2007-01-25 07:44:39 UTC (rev 18171)
@@ -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 6
+#define beta 7
%if 0%{?beta}
%define gaimver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//')
@@ -29,8 +29,6 @@
# Generic build requirements
BuildRequires: libtool, pkgconfig, intltool, gettext, libxml2-devel
%{?_with_avahi:BuildRequires: avahi-compat-howl-devel}
-%{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
-%{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
%{!?_without_gtkspell:BuildRequires: gtkspell-devel}
%{?_with_howl:BuildRequires: howl-devel}
%{?_with_meanwhile:BuildRequires: meanwhile-devel}
@@ -40,6 +38,16 @@
%{?_with_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h}
%{!?_without_text:BuildRequires: ncurses-devel}
+%if "%{_vendor}" == "suse"
+# For SuSE:
+BuildRequires: gnutls-devel
+%{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35}
+%{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10}
+%else
+%{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
+%{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
+%endif
+
# Mandrake 10.1 and lower || Mandrake 10.2 (and higher?)
%if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft" || "%{_vendor}" == "Mandriva"
# For Mandrake/Mandriva:
@@ -48,10 +56,7 @@
%else
# For SuSE, Red Hat, Fedora and others:
BuildRequires: gtk2-devel
-%if "%{_vendor}" == "suse"
-# For SuSE:
-BuildRequires: gnutls-devel
-%else
+%if "%{_vendor}" != "suse"
# For Red Hat, Fedora and others:
# let's assume RH & FC1 are the only brain-dead distros missing the
# perl-XML-Parser dependency on intltool and that other RH/FC releases
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-01-25 07:30:13
|
Revision: 18170
http://svn.sourceforge.net/gaim/?rev=18170&view=rev
Author: thekingant
Date: 2007-01-24 23:30:13 -0800 (Wed, 24 Jan 2007)
Log Message:
-----------
Allow localization of the xmpp console plugin
Modified Paths:
--------------
trunk/po/POTFILES.in
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2007-01-24 15:47:35 UTC (rev 18169)
+++ trunk/po/POTFILES.in 2007-01-25 07:30:13 UTC (rev 18170)
@@ -83,6 +83,7 @@
gtk/plugins/ticker/ticker.c
gtk/plugins/timestamp.c
gtk/plugins/timestamp_format.c
+gtk/plugins/xmppconsole.c
gtk/plugins/win32/transparency/win2ktrans.c
gtk/plugins/win32/winprefs/winprefs.c
libgaim/account.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2007-01-24 15:53:41
|
Revision: 18169
http://svn.sourceforge.net/gaim/?rev=18169&view=rev
Author: lschiere
Date: 2007-01-24 07:47:35 -0800 (Wed, 24 Jan 2007)
Log Message:
-----------
(10:44:23) EvilDennisR: LSchiere2: Did we get anyone to update that?
(10:44:33) EvilDennisR: ...for beta6
(10:44:45) LSchiere2: I'm not sure its any different
(10:45:10) resiak: http://gaim.svn.sourceforge.net/viewvc/gaim/tags/v2_0_0beta6/ChangeLog?r1=17727&r2=18165
(10:45:16) resiak: that's beta5 to beta6
(10:45:26) LSchiere2: apparently it is different
Modified Paths:
--------------
web/htdocs/ChangeLog
Modified: web/htdocs/ChangeLog
===================================================================
--- web/htdocs/ChangeLog 2007-01-19 17:40:19 UTC (rev 18168)
+++ web/htdocs/ChangeLog 2007-01-24 15:47:35 UTC (rev 18169)
@@ -38,6 +38,10 @@
account editor)
* The space wasted by the group expanders has been eliminated and
the expander setting in .gtkrc-2.0 is no longer needed
+ * Authorization requests don't popup new dialogs any more. They are
+ displayed at the bottom of the buddy list instead.
+ * New mail notifications don't popup new dialogs any more. The are
+ displayed at the top of the buddylist instead.
Conversations and Chats:
* Timestamps honor the locale. To use the traditional style,
@@ -126,6 +130,8 @@
times when people in your buddylist will most likely respond
to you, based on times in the past when they have responded
(Geoffrey Foster, Google Summer of Code)
+ * A few new plugins: Autoaccept, Autoreply, Buddy Notes, New Line, Offline
+ Message Emulation, Conversation Colors and Markerline
MSN Features:
* Custom smiley receiving support (Irving Cordova & Francesco Fracassi)
@@ -145,8 +151,10 @@
AIM/ICQ Features:
* ICQ file transfer support with newer ICQ clients (Jonathan Clark,
Google Summer of Code)
- * Many overall improvements to OSCAR file transfers (Jonathan Clark,
- Google Summer of Code)
+ * Many overall improvements to AIM and ICQ file transfers (Jonathan
+ Clark, Google Summer of Code)
+ * Support for pausing and resuming AIM and ICQ file transfers
+ (Graham Booker)
* Ability to set ICQ "require authorization" and "web aware"
setting (Ettore Simone)
* ICQ encoding fix for offline buddies (Ilya Konstantinov)
@@ -201,7 +209,7 @@
The spaces (and now backslashes) must be backslash-escaped.
(Sadrul Habib Chowdhury)
* New e-mail notices are now grouped into one dialog.
- (Sadrul Habib Chowdhury)
+ (Sadrul Habib Chowdhury, Chris Stafford)
* "Open" in the File Transfer window integrates with GNOME, KDE, and
Windows and falls back to the browser in other environments.
* On Mac OS X, the keyboard/mouse idle time pref now uses system idle
@@ -702,7 +710,7 @@
* Removed "Icons on tabs", default to yes
* Removed "Sounds when you log in", default to no
* Removed "Seconds before resending autoresponse", default to 600
- seconds
+ seconds
* Removed "Send autoresponse in active conversations", default to no
* Removed "Show people joining in window", default to yes
* Removed "Show people leaving in window", default to yes
@@ -970,7 +978,7 @@
list as well.
* Events in a conversation (user logged in, logged out, window closed,
etc.) now grey the tab.
- * Various bug fixes (larne from irc, Tim Ringenbach, Bjoern
+ * Various bug fixes (larne from irc, Tim Ringenbach, Bjoern
Voigt, Paul A (darkrain))
version 0.66 (07/18/2003):
@@ -1032,10 +1040,10 @@
* Napster protocol updates (Thanks Auke Kok).
version 0.62 (04/23/2003):
- * Keyboard shortcuts in the buddy list work again (Thanks Joe
+ * Keyboard shortcuts in the buddy list work again (Thanks Joe
Clarke).
* Support for Jabber XHTML messages
- * Ability to re-request authorization from ICQ and Jabber users by right
+ * Ability to re-request authorization from ICQ and Jabber users by right
clicking on them in your buddy list.
* Improved Zephyr internationalization.
* Bug causing 'Hide on Send' windows to be lost forever fixed.
@@ -1051,7 +1059,7 @@
* Re-implemented the logout icons.
* New icons for "away" and "aol" (Thanks, Moses Lei)
-version 0.60 (04/04/2003):
+version 0.60 (04/04/2003):
Core:
* Auto-loading protocol plugins.
* Plugins dialog and perl script menu merged into preferences.
@@ -1063,7 +1071,7 @@
* Added support for automake 1.6.
* aim:// URI's supported with gaim-remote command.
* Quit Gaim remotely with gaim-remote. (Thanks, John Silvestri)
- * Added rudimentary support for X11R6 session management. (Thanks,
+ * Added rudimentary support for X11R6 session management. (Thanks,
Robert McQueen)
* Conversation backend and UI are now separated. (Thanks,
Christian Hammond)
@@ -1071,11 +1079,11 @@
Lichtmaier)
* As a side effect of the above: IPv6 support. Tested only with IRC
(you can receive ipv6 chat requests from irssi!).
-
+
Plugins:
- * Tray icon plugin--replaces the old GNOME applet. You'll need
- the panel Notification Area applet (aka system-tray-applet)
- for GNOME 2, or the Kicker for KDE 3.1. (Thanks, Robert
+ * Tray icon plugin--replaces the old GNOME applet. You'll need
+ the panel Notification Area applet (aka system-tray-applet)
+ for GNOME 2, or the Kicker for KDE 3.1. (Thanks, Robert
McQueen, Nicolás Lichtmaier, Kristian Rietveld, Ari Pollak &
Patrick Aussems)
* Added GAIM::remove_event_handler and made set_info short
@@ -1090,9 +1098,9 @@
AIM/ICQ:
* TOC no longer compiles statically by default--use OSCAR.
* ICQ plugin no longer gets built--use OSCAR.
- * Server-stored buddy lists for ICQ with full support for
+ * Server-stored buddy lists for ICQ with full support for
authorization (Thanks, Mark Doliner)
- * File send/receive support for Aim over Oscar (Thanks, William T.
+ * File send/receive support for Aim over Oscar (Thanks, William T.
Mahan and Mark Doliner)
* Non-direct connect typing notification for AIM over OSCAR.
(Thanks, Mark Doliner)
@@ -1105,19 +1113,19 @@
* Ability to add scr...@ma... people to AIM buddy lists.
(Thanks, Graham Booker)
* Ability to change ICQ password. (Thanks, Mark Doliner)
- * Option to have AIM notify you if you have
+ * Option to have AIM notify you if you have
unread mail. (Thanks, Mark Doliner)
* Parse URL messages, Contact Sending and Pager Messages
in ICQ. (Thanks, Mark Doliner)
* use snprintf instead of sprintf. (Thanks, William T. Mahan)
- * Fixed crashbug on empty rvous requests. (Thanks Brandon Scott
+ * Fixed crashbug on empty rvous requests. (Thanks Brandon Scott
(Xeon) for pointing this out, and Matt Pandina for the patch)
* Nice Oscar changes--mostly internal. (Thanks, Mark Doliner)
IRC:
* Added more IRC slash commands -- /W, /VERSION, /MODE, /CTCP stuff,
-- and other cool IRC enhancments. (Thanks, Jonas Birmé)
- * IRC's /topic with no argument displays the current topic (Thanks,
+ * IRC's /topic with no argument displays the current topic (Thanks,
Mark Doliner)
* DCC File Receive support for IRC.
* Optional password on IRC accounts. (Thanks, Christian Hammond)
@@ -1129,21 +1137,21 @@
* Jabber roster updated on group renames.
* Fixed a possible segfault when signing off Jabber. (Thanks,
Craig Boston)
- * Improved typing notification support for Jabber and
+ * Improved typing notification support for Jabber and
Yahoo! (Thanks, Nathan Walp)
* File receive support for Jabber. (Thanks, Nathan Walp)
MSN:
* MSN users are notified when the other party closes the conversation
window. (Thanks, Christian Hammond)
- * File receive support for MSN. (Thanks, Christian Hammond)
+ * File receive support for MSN. (Thanks, Christian Hammond)
Internationalization:
- * Now using libiconv for better i18n support (Thanks, Junichi
+ * Now using libiconv for better i18n support (Thanks, Junichi
Uekawa)
* Lots of i18n fixes (Thanks Matt Wilson, Ethan Blanton, A Lee)
* Correct i18n handling for many parts of AIM/ICQ, including
- instant messages, away messages, and profiles (Thanks,
+ instant messages, away messages, and profiles (Thanks,
Ethan Blanton)
* Improved MSN internationalization (Thanks, A Lee)
@@ -1158,7 +1166,7 @@
* Fix first message in tab not displaying bug (Thanks, Etan Reisner)
* Changed some default options
* Updated desktop and window icons (Thanks, Robert McQueen)
- * Switch the .desktop file to the new KDE/GNOME common vfolder
+ * Switch the .desktop file to the new KDE/GNOME common vfolder
format (Thanks, Robert McQueen)
* Removed all deprecated GTK calls. Now 100% GTK 2. (Thanks Nathan
Walp, Christian Hammond, Ari Pollak, Ethan Blanton, Robert McQueen)
@@ -1167,7 +1175,7 @@
Robert McQueen)
* Can get info for ICQ and Jabber users from the "Edit
Buddies" tab (Thanks, Brian Bernas)
- * Code cleanups and fixes (Thanks, Federico Mena Quintero and
+ * Code cleanups and fixes (Thanks, Federico Mena Quintero and
Ka-Hing Cheung)
* Word-wrapping on mail notification text (Thanks, Andrew Molloy)
* Generic File Transfer PRPL interface (Thanks, Christian Hammond)
@@ -1177,10 +1185,10 @@
version 0.59.9 (03/01/2003):
* Updated zh_TW.po file (Thanks breeze833)
- * Fix an oscar bug that caused some messages from
+ * Fix an oscar bug that caused some messages from
AOL 8.0 to be dropped (Thanks Mark Doliner)
* Changed "openprojects" to "freenode" in irc.c
- * Fixed charset conversion on systems which use a BOM for UCS-4
+ * Fixed charset conversion on systems which use a BOM for UCS-4
(Thanks, Alfredo Pen~a, Ethan Blanton)
* Fixed a typo in the man page (Thanks Eric S. Raymond)
@@ -1225,7 +1233,7 @@
* Changed "color" binding to Ctrl-K.
* Unaliaising a person in the "Online" tab will show up
in the "Edit" tab as well (Thanks, Jason Willis)
- * Internationalization fixes, esp. with UTF-8 locales
+ * Internationalization fixes, esp. with UTF-8 locales
(Thanks Matt Wilson and Ethan Blanton)
version 0.59.2 (09/09/2002):
@@ -1262,9 +1270,9 @@
Robert McQueen)
* Now using libiconv for better i18n support (Thanks Junichi
Uekawa)
- * Will work with Perl 5.8 (thanks, Timothy Lee and Dan
+ * Will work with Perl 5.8 (thanks, Timothy Lee and Dan
Colascione)
- * Fix for HTTP proxies (thanks, Ethan Blanton)
+ * Fix for HTTP proxies (thanks, Ethan Blanton)
* Read proxy environment variables. (thanks, Christian Hammond)
* Use the pretty gaim.png for our menu entry.
* Added support for gettext 0.11.x.
@@ -1288,7 +1296,7 @@
* Perl scripts can play Gaim sounds (thanks Andrew Rodland)
* Internal sounds can be played by commands (thanks Lex Spoon)
* Auto-login item in applet menu (thanks Chris Boyle)
- * Fixed MSN "Unkown Error Code", "Already there", and
+ * Fixed MSN "Unkown Error Code", "Already there", and
"Already in opposite list" errors
* Changed "Play sound" button to "Mute" button
* You can now have "reserved" chars in IM and proxy passwords
@@ -1305,7 +1313,7 @@
entirely
* Gaim can now handle messages from Mac ICQ and Miranda ICQ
(Thanks, Mark Doliner)
- * Added Mozilla to browser options and changed KFM to
+ * Added Mozilla to browser options and changed KFM to
Konqueror.
* Can now set the server and port for MSN and Napster
* MSN Internationalization (Thanks Felipe Contreras and
@@ -1316,7 +1324,7 @@
version 0.58 (05/13/2002):
* Better applet transparency
* Option to raise buddy list on signons/signoffs
- * Formatting of incoming MSN messages
+ * Formatting of incoming MSN messages
* Get Info from menu multiple-account-aware (thanks
Brian Bernas)
* Hide and unhide functions for the filectl plugin.
@@ -1366,7 +1374,7 @@
* Fixed MSN privacy settings
* Group deletion fix (Thanks Mark Doliner)
* Alias/Group syncronization for Jabber (Thanks JSeymour)
- * Fixed broken signal handling in gdm-started GNOME sessions
+ * Fixed broken signal handling in gdm-started GNOME sessions
(Thanks Jim Seymour, Vann, Robert McQueen)
* Oscar group syncronization (Thanks, Mark Doliner)
* ICQ Authorization via Oscar (Thanks, Mark Doliner)
@@ -1374,18 +1382,18 @@
version 0.55 (03/29/2002):
* Jabber improvements (Thanks Jim Seymour)
* Various sound cleanups (Thanks Robert McQueen)
- * Login process shown in single window (Thanks Michael
+ * Login process shown in single window (Thanks Michael
Golden)
* Can reorder your accounts in the account editor (Thanks
Luke Schierer)
* Shows "mobile" icon for Oscar buddies using mobile
devices (Thanks Mark Doliner)
* Fixed bug in MSN smilies that crashed PPC (and other?) platforms
- * HTTP Proxy settings now HTTP compliant (Thanks Robert McQueen)
+ * HTTP Proxy settings now HTTP compliant (Thanks Robert McQueen)
* Speling corections (Thanks Tero Kuusela)
* Oscar list icon fixes (Thanks Mark Doliner)
* Oscar idle times work again (Thanks Mark Doliner)
- * Protocol icons on Edit Buddies tab (Thanks Christian Hammond)
+ * Protocol icons on Edit Buddies tab (Thanks Christian Hammond)
version 0.54 (03/14/2002):
* Compiles without GdkPixbuf again
@@ -1396,8 +1404,8 @@
* Option to globally disable Buddy Icon animation (Thanks
Luke Schierer)
* Numerous bugfixes
- * Yahoo! will tell you when your buddies are playing Yahoo!
- games and give you the ability to join them
+ * Yahoo! will tell you when your buddies are playing Yahoo!
+ games and give you the ability to join them
* Yahoo! can receive offline messages
* IRC can do DCC chat.
* IRC will convert HTML formatting to mIRC formatting.
@@ -1500,7 +1508,7 @@
* Better applet icon drawing (thanks to Ari Pollak)
* An extraordinary number of bug fixes
* Ability to stop animation on buddy icons, restart animation,
- hide certain buddy icons, and save people's buddy icons, all
+ hide certain buddy icons, and save people's buddy icons, all
through a right-click menu
* Event handlers in perl passed arguments as elements of
an array rather than all concatenated as a string, making
@@ -1511,7 +1519,7 @@
* Add buddy dialog now lets you select which protocol
to add the buddy to
* Pressing 'signon' on the first screen for accounts that
- do not require passwords no longer incorrectly displays
+ do not require passwords no longer incorrectly displays
an error message.
version 0.45 (10/04/2001):
@@ -1740,7 +1748,7 @@
MSN (plugins/msn)
version 0.11.0-pre2 (12/04/2000):
- * Fixed a segfault with a bad util.c
+ * Fixed a segfault with a bad util.c
version 0.11.0-pre1 (12/03/2000):
* Multiple connections
@@ -1782,7 +1790,7 @@
* A third conversation window display preference.
* Better support for things like Sawfish
-version 0.10.0 (09/11/2000):
+version 0.10.0 (09/11/2000):
* New Smiley Faces and Pixmaps added.
* Smiley faces now properly wrap in the conversation windows.
* Smiley dialog
@@ -1796,7 +1804,7 @@
* Redesigned preferences dialog
* Redesigned conversation dialog
* Removed the Lag-O-Meter (Lag-O-Meter is now a plugin)
- * Socks 4/5 Proxy works
+ * SOCKS 4a/5 proxy works
* Buddy Pounces are now saved in .gaimrc
* Buddy Chats are now saved in .gaimrc
* Ability to merge gaim, aim2, aim4 buddylists. Thanks again bmiller!
@@ -1804,8 +1812,8 @@
as. For example, if your buddy's SN is 'CouldntGetMyName', you can
alias him as 'Loser'.
* Compile with GNOME bits if available
- * Added GNOME Url Handler as an available web-browser
- * Added the S html tag.
+ * Added GNOME Url Handler as an available web-browser
+ * Added the S html tag.
* Optionally Ignore TiK's Automated Messages
* Option to beep instead of play sound
* New icons for panel (depends on some GNOME pixmaps)
@@ -1817,11 +1825,11 @@
* More plugin events, more plugin features
* Run-time OSCAR support
* Added buddy list ticker (See prefs/Appearance). Clicking on a
- name will cause a new or previous IM window to display for
- that screenname
+ name will cause a new or previous IM window to display for
+ that screenname
* "You are sending messages too quickly" error is now fixed
when you have a large buddylist.
- * Fixed the LC_ALL compile problem on Solaris boxes
+ * Fixed the LC_ALL compile problem on Solaris boxes
* Fixed PPC and ARM compile problem with oscar.c
* Smileys work better, and don't cause font attributes to drop
* Dialog windows are now prettier
@@ -1844,7 +1852,7 @@
* Double error bug when sending message to an offline user is
fixed.
* Pressing enter once again sends a message in buddy chatrooms (oops)
- * More fixes for the change on the AOL sign-on process.
+ * More fixes for the change on the AOL sign-on process.
* Fixed bug where Gaim sometimes doesn't find a font to use.
* Per-conversation font and color dialogs (thanks fflewddur)
* Chat in oscar works (somewhat)
@@ -1859,14 +1867,14 @@
* Paned buddy chat window (Thanks Syd)
* Buddy lists (and changes) are cached to ~/.gaim/<sn>.blist
where <sn> is your screen name. If for some reason, you log
- into the AOL server and the buddy list comes back empty, we
+ into the AOL server and the buddy list comes back empty, we
check for a cache file, and, if we find one, read it in. This
- essentially implements recovery from a server crash at AOL
+ essentially implements recovery from a server crash at AOL
(AOL does not back up machines that contain TOC-based buddy
lists, unfortunately). (Thanks Syd)
- * Font selection dialog
+ * Font selection dialog
* Small changes to the Oscar/libfaim stuff (see libfaim/README.gaim)
- * SOCKS v4 Proxy support
+ * SOCKS 4a proxy support
* Better proxy support overall (you can get people's info now! :) )
* Two-way file transfer (you can get and send files, but you still
can't initiate either)
@@ -1910,13 +1918,13 @@
* GNOME Applet support works better
(thanks to Eric Warmenhoven for the patch)
* Support for displaying true type fonts
- * Lag-O-Meter does not send lag-test if not selected
+ * Lag-O-Meter does not send lag-test if not selected
* Fixed problem with saving away messages which contain spaces
and numbers.
- * Various GNOME Applet Enhancements (thanks AGAIN to
- Eric. Someone needs to stop this boy :-) )
+ * Various GNOME Applet Enhancements (thanks AGAIN to
+ Eric. Someone needs to stop this boy :-) )
* A lot of random, obscure bugs fixed
- * All of the major and I believe all of the minor memory leaks are
+ * All of the major and I believe all of the minor memory leaks are
now fixed
(Thanks to Peter Teichman, Larry Ewing, Jeramey Crawford, and me)
@@ -1926,9 +1934,9 @@
* New .gaimrc format
* Better support for multiple screen names
* Font Properties
- * Saving of buddylist window position
+ * Saving of buddylist window position
* Fixed a problem with Gaim and the Netscape-branded version
- of Mozilla
+ of Mozilla
* New Sound Properties
* More General Properties
* Bigger Text-Entry field (Thanks to CrazyDavy for this one)
@@ -1958,8 +1966,8 @@
* Some logging fixes and improvements
* configurable host/port selection
* Clickable Links in buddy chat
- * New Gaim Logo
- * Display Signon/Signoff messages in conversation windows
+ * New Gaim Logo
+ * Display Signon/Signoff messages in conversation windows
* Option to strip HTML from logged messages
* GNOME cleanups (It might work now haha)
* When viewing user info, URLS are converted to clickable links
@@ -2033,7 +2041,7 @@
* `Blocking' on conversation window
* Add/Remove buddy from conversation window
* Scroll-Wheel Mice work in Conversation Window
- * Fixed WindowMaker Appicon
+ * Fixed WindowMaker Appicon
* Version Number in About Box
* Gaim Slogan in about box :)
- * Created Changelog File :)
+ * Created Changelog File :)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-01-19 17:40:22
|
Revision: 18168
http://svn.sourceforge.net/gaim/?rev=18168&view=rev
Author: thekingant
Date: 2007-01-19 09:40:19 -0800 (Fri, 19 Jan 2007)
Log Message:
-----------
Aliens look real good in futuristic
Modified Paths:
--------------
web/htdocs/news.txt
Modified: web/htdocs/news.txt
===================================================================
--- web/htdocs/news.txt 2007-01-19 16:47:29 UTC (rev 18167)
+++ web/htdocs/news.txt 2007-01-19 17:40:19 UTC (rev 18168)
@@ -1,5 +1,5 @@
2.0.0beta6
-January 19th, 2006 - 8:46AM PST
+January 19th, 2007 - 8:46AM PST
Greetings Earth people. We have watched your planet from afar for 17 years. And much like the Magicicada of your planet, we have emerged to make lots of loud noises. Also, we heard that <a href="http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=479631">Gaim 2.0.0 beta 6 has been released</a> and we wanted to let everyone know. We consider this release to be reasonably stable. With a little luck dragon, 2.0.0 final is just around the corner.
#
2.0.0beta5
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
6 messages has been excluded from this view by a project administrator.
