pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

[Gaim-commits] SF.net SVN: gaim: [17733] trunk/libgaim/util.c

[<lsc...@us...>]

Revision: 17733
          http://svn.sourceforge.net/gaim/?rev=17733&view=rev
Author:   lschiere
Date:     2006-11-10 06:30:45 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
(09:20:58) Err: LSchiere: http://garand.ipx.ath.cx/~jtb/gaim_inline_function.patch  <-- this fixes the bug that Alver and I just discussed
(09:21:07) Alver: Right, fixed it.
(09:28:41) Err: it's a one-liner - it shouldn't break anything, ever (bold words)

Modified Paths:
--------------
    trunk/libgaim/util.c

Modified: trunk/libgaim/util.c
===================================================================
--- trunk/libgaim/util.c	2006-11-10 13:53:04 UTC (rev 17732)
+++ trunk/libgaim/util.c	2006-11-10 14:30:45 UTC (rev 17733)
@@ -2577,7 +2577,7 @@
 #endif
 }
 
-inline gboolean
+gboolean
 gaim_running_osx(void)
 {
 #if defined(__APPLE__)	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17732] trunk/libgaim/proxy.c

[<fac...@us...>]

Revision: 17732
          http://svn.sourceforge.net/gaim/?rev=17732&view=rev
Author:   faceprint
Date:     2006-11-10 05:53:04 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
fix jabber ft

Modified Paths:
--------------
    trunk/libgaim/proxy.c

Modified: trunk/libgaim/proxy.c
===================================================================
--- trunk/libgaim/proxy.c	2006-11-10 10:02:00 UTC (rev 17731)
+++ trunk/libgaim/proxy.c	2006-11-10 13:53:04 UTC (rev 17732)
@@ -1822,7 +1822,7 @@
 	GaimProxyConnectData *connect_data;
 
 	g_return_val_if_fail(host       != NULL, NULL);
-	g_return_val_if_fail(port       >  0,    NULL);
+	g_return_val_if_fail(port       >= 0,    NULL);
 	g_return_val_if_fail(connect_cb != NULL, NULL);
 
 	connect_data = g_new0(GaimProxyConnectData, 1);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17731] web/htdocs

[<the...@us...>]

Revision: 17731
          http://svn.sourceforge.net/gaim/?rev=17731&view=rev
Author:   thekingant
Date:     2006-11-10 02:02:00 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
New posting for beta 5.  Could someone cool please build some
Windows packages?  Once that's done we should svn up the website
and make this public.

Modified Paths:
--------------
    web/htdocs/ChangeLog
    web/htdocs/news.txt

Modified: web/htdocs/ChangeLog
===================================================================
--- web/htdocs/ChangeLog	2006-11-10 09:06:39 UTC (rev 17730)
+++ web/htdocs/ChangeLog	2006-11-10 10:02:00 UTC (rev 17731)
@@ -1,6 +1,17 @@
 Gaim: The Pimpin' Penguin IM Client that's good for the soul!
 
 version 2.0.0:
+	Build Changes:
+	* With the Core/UI split completed, it is now possible to build Gaim
+	  without any UIs, creating a libgaim library upon which other UIs
+	  may be constructed
+	* A new ncurses-based console UI called gaim-text is now available
+	  (Sadrul Habib Chowdhury, Google Summer of Code)
+	* Reorganized the source tree to split apart the code for the UI
+	  changes and libgaim targets
+	* libxml2 is now required.  We switched from gmarkup to libxml2 for
+	  more correct XML parsing.
+
 	Status System:
 	* The code dealing with buddy and account status, away messages,
 	  away states, online/offline, etc has been completely rewritten.
@@ -12,6 +23,8 @@
 	  becomes idle, load the "Buddy State Notification" plugin
 
 	Buddy List:
+	* Performance when manipulating and displaying the buddy list has
+	  been significantly improved (Aaron Sheldon, Google Summer of Code)
 	* Buddy icons are now shown in tooltips (Felipe Contreras)
 	* Tooltips now contain additional information about a "Person" that
 	  contains multiple online buddies
@@ -20,6 +33,11 @@
 	* If Gaim is exited with the buddy list hidden in the docklet, it
 	  will remain hidden when Gaim is started again (Scott Shedden)
 	* Improved buddy list searching with CTRL+F
+	* Ability to set a buddy icon for all of your accounts at once via
+	  the buddy list (You can still set per-account icons via the
+	  account editor)
+	* The space wasted by the group expanders has been eliminated and
+	  the expander setting in .gtkrc-2.0 is no longer needed
 
 	Conversations and Chats:
 	* Timestamps honor the locale.  To use the traditional style,
@@ -53,10 +71,12 @@
 	  (There are known issues with pasting formatted text.  Either use "Paste
 	   as Plain Text", hit Ctrl-R after pasting, or use the Clear Formatting
 	   button on the toolbar.)
+	* Performance while joining large chat rooms has been significantly
+	  improved (Aaron Sheldon, Google Summer of Code)
 
 	Sounds:
 	* Beautiful new default sounds (Brad Turcotte)
-	* Use libao for playing sounds via NAS instead of accessing NAS directly
+	* Use GStreamer for playing sounds, instead of libao
 	* A volume control in the preferences (Casey Harkins)
 
 	Log Viewer:
@@ -99,6 +119,13 @@
 	  removed.
 	* 'Highlight when nick said' option added to Message Notification
 	  plugin.
+	* The system tray icon is now transparent (Dan Winship)
+	* New Log Reader plugin that can read and display logs from Adium,
+	  MSN Messenger, and Trillian in the log viewer
+	* New Contact Availability plugin that attempts to predict the
+	  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)
 
 	MSN Features:
 	* Custom smiley receiving support (Irving Cordova & Francesco Fracassi)
@@ -130,6 +157,7 @@
 	  channel or change your nick
 	* Added /nickserv, /memoserv, /chanserv and /operserv
 	  commands (Joao Luís Marques Pinto)
+	* Added CTCP VERSION via /version (Andrej Krivulčík)
 
 	Jabber Features:
 	* Support for SRV lookups
@@ -151,6 +179,8 @@
 	* SIP/SIMPLE support (Thomas Butter, Google Summer of Code)
 	* Sametime protocol support
 	  Requires the meanwhile library: http://meanwhile.sourceforge.net
+	* QQ protocol support (Mark Huetsch, Google Summer of Code)
+	* Removed support for the Napster and TOC protocols
 
 	Other Noteworthy Changes:
 	* UPnP and NAT traversal support (Adam J. Warrington, Google Summer of

Modified: web/htdocs/news.txt
===================================================================
--- web/htdocs/news.txt	2006-11-10 09:06:39 UTC (rev 17730)
+++ web/htdocs/news.txt	2006-11-10 10:02:00 UTC (rev 17731)
@@ -1,3 +1,7 @@
+2.0.0beta5
+November 10th, 2006 - 8:27AM PST
+Annyong!  We fixed a bunch of buglets from the last beta.  We recommend this release to anyone using the earlier betas, and to anyone having problems with a Gaim 1.x.x release.  You can <a href="http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=462444">download packages from here</a>.
+#
 2.0.0beta4
 October 18th, 2006 - 4:06 PDT
 Hey, party people. Today we put out Gaim 2.0.0beta4. This one has a whole slew of cool new changes. I've written about some of them at the new <a href="http://gaim.sf.net/planet">Planet Gaim</a> I announced in the previous post. All sorts of packages can be found <a href='http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=456679'>here</a>. Enjoy!


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17730] trunk/gtk/gtkdialogs.c

[<the...@us...>]

Revision: 17730
          http://svn.sourceforge.net/gaim/?rev=17730&view=rev
Author:   thekingant
Date:     2006-11-10 01:06:39 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
Change email address for a translator

Modified Paths:
--------------
    trunk/gtk/gtkdialogs.c

Modified: trunk/gtk/gtkdialogs.c
===================================================================
--- trunk/gtk/gtkdialogs.c	2006-11-10 08:27:42 UTC (rev 17729)
+++ trunk/gtk/gtkdialogs.c	2006-11-10 09:06:39 UTC (rev 17730)
@@ -167,7 +167,7 @@
 	{N_("Serbian"),             "sr", "Danilo Šegan", "ds...@gm..."},
 	{N_("Serbian"),             "sr", "Aleksandar Urosevic", "ur...@us..."},
 	{N_("Slovak"),              "sk", "Richard Golier", "go...@gm..."},
-	{N_("Slovenian"),           "sl", "Martin Srebotnjak", "fi...@us..."},
+	{N_("Slovenian"),           "sl", "Martin Srebotnjak", "miles @ filmsi . net"},
 	{N_("Albanian"),            "sq", "Besnik Bleta", "be...@pr..."},
 	{N_("Swedish"),             "sv", "Tore Lundqvist", "tl...@mi..."},
 	{N_("Tamil"),               "ta", "Viveka Nathan K", "viv...@us..."},


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17729] trunk

[<the...@us...>]

Revision: 17729
          http://svn.sourceforge.net/gaim/?rev=17729&view=rev
Author:   thekingant
Date:     2006-11-10 00:27:42 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
Beta 5 is tagged n' stuff

Modified Paths:
--------------
    trunk/configure.ac
    trunk/gaim.spec.in

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-11-10 07:43:09 UTC (rev 17728)
+++ trunk/configure.ac	2006-11-10 08:27:42 UTC (rev 17729)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gaim], [2.0.0beta5], [gai...@li...])
+AC_INIT([gaim], [2.0.0dev], [gai...@li...])
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-11-10 07:43:09 UTC (rev 17728)
+++ trunk/gaim.spec.in	2006-11-10 08:27:42 UTC (rev 17729)
@@ -6,7 +6,7 @@
 # When not doing betas comment this out
 # NOTE: %defines in spec files are evaluated in comments so the correct
 #       way to comment it out is to replace the % with #
-%define beta 5
+#%define beta 6
 
 %if 0%{?beta}
 %define gaimver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17728] tags/v2_0_0beta4/trunk/

[<the...@us...>]

Revision: 17728
          http://svn.sourceforge.net/gaim/?rev=17728&view=rev
Author:   thekingant
Date:     2006-11-09 23:43:09 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Accidentally copied stuff here, too

Removed Paths:
-------------
    tags/v2_0_0beta4/trunk/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17727] tags/v2_0_0beta5/trunk/

[<the...@us...>]

Revision: 17727
          http://svn.sourceforge.net/gaim/?rev=17727&view=rev
Author:   thekingant
Date:     2006-11-09 23:42:43 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Accidentally copied this twice

Removed Paths:
-------------
    tags/v2_0_0beta5/trunk/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17726] tags/v2_0_0beta5/trunk/

[<the...@us...>]

Revision: 17726
          http://svn.sourceforge.net/gaim/?rev=17726&view=rev
Author:   thekingant
Date:     2006-11-09 23:22:18 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Tagging Gaim release 2.0.0beta5

Added Paths:
-----------
    tags/v2_0_0beta5/trunk/

Copied: tags/v2_0_0beta5/trunk (from rev 17725, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17725] tags/v2_0_0beta5/

[<the...@us...>]

Revision: 17725
          http://svn.sourceforge.net/gaim/?rev=17725&view=rev
Author:   thekingant
Date:     2006-11-09 23:21:42 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Tagging Gaim release 2.0.0beta5

Added Paths:
-----------
    tags/v2_0_0beta5/

Copied: tags/v2_0_0beta5 (from rev 17724, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17724] tags/v2_0_0beta4/trunk/

[<the...@us...>]

Revision: 17724
          http://svn.sourceforge.net/gaim/?rev=17724&view=rev
Author:   thekingant
Date:     2006-11-09 23:19:54 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Tagging Gaim release 2.0.0beta4

Added Paths:
-----------
    tags/v2_0_0beta4/trunk/

Copied: tags/v2_0_0beta4/trunk (from rev 17723, trunk)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17723] trunk/console/libgnt/gntwm.h

[<the...@us...>]

Revision: 17723
          http://svn.sourceforge.net/gaim/?rev=17723&view=rev
Author:   thekingant
Date:     2006-11-09 23:01:13 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
This fixes by console Gaim compile errors:

gntwm.c: In function 'reverse_char':
gntwm.c:574: error: implicit declaration of function 'mvwin_wch'
gntwm.c:578: error: implicit declaration of function 'mvwadd_wch'


What was happening was, gntwm.h #includes <panel.h> before
<ncurses.h> gets #included.  And on my system
/usr/ncursesw/panel.h #includes <ncurses/curses.h>, which
doesn't have mvwin_wch or wvmadd_wch.

So basically ncurses.h needs to be the first ncurses include.
Otherwise we might get the wrong ncurses.h

Modified Paths:
--------------
    trunk/console/libgnt/gntwm.h

Modified: trunk/console/libgnt/gntwm.h
===================================================================
--- trunk/console/libgnt/gntwm.h	2006-11-10 06:37:06 UTC (rev 17722)
+++ trunk/console/libgnt/gntwm.h	2006-11-10 07:01:13 UTC (rev 17723)
@@ -1,8 +1,9 @@
-#include <panel.h>
 
 #include "gntwidget.h"
 #include "gntmenu.h"
 
+#include <panel.h>
+
 #define GNT_TYPE_WM				(gnt_wm_get_gtype())
 #define GNT_WM(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_WM, GntWM))
 #define GNT_WM_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_WM, GntWMClass))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17722] trunk/gaim.spec.in

[<the...@us...>]

Revision: 17722
          http://svn.sourceforge.net/gaim/?rev=17722&view=rev
Author:   thekingant
Date:     2006-11-09 22:37:06 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Preparation for beta 5

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-11-10 06:36:24 UTC (rev 17721)
+++ trunk/gaim.spec.in	2006-11-10 06:37:06 UTC (rev 17722)
@@ -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 4
+%define beta 5
 
 %if 0%{?beta}
 %define gaimver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17721] trunk/doc/FAQ

[<the...@us...>]

Revision: 17721
          http://svn.sourceforge.net/gaim/?rev=17721&view=rev
Author:   thekingant
Date:     2006-11-09 22:36:24 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Updated faq

Modified Paths:
--------------
    trunk/doc/FAQ

Modified: trunk/doc/FAQ
===================================================================
--- trunk/doc/FAQ	2006-11-10 06:33:22 UTC (rev 17720)
+++ trunk/doc/FAQ	2006-11-10 06:36:24 UTC (rev 17721)
@@ -15,183 +15,168 @@
                key?
          1.8.  Can I use Gaim for GTK+ 1.2?
          1.9.  Can I run Gaim on IRIX?
-         1.10. Can I run gaim on MacOSX?
-         1.11. How do I apply the patch "something.diff"?
-         1.12. Why is gaim crashing when I start it?
-         1.13. Gaim <non-current version> is buggy. Gaim CVS is buggy. Why?
-         1.14. Why do you always say not to use CVS?
+         1.10. Can I run Gaim on HPUX?
+         1.11. Can I run Gaim on MacOSX?
+         1.12. How do I apply the patch "something.diff"?
+         1.13. Why is Gaim crashing when I start it?
+         1.14. Gaim <non-current version> is buggy. Gaim SVN is buggy. Why?
+         1.15. Why do you always say not to use SVN?
 
 2. Using Gaim
 
          2.1.  How do I register for a new account?
          2.2.  How do I use AIM, MSN, Yahoo!, Jabber, ICQ, or any other
                protocol?
-         2.3.  How do I change the font Gaim uses?
-         2.4.  How do I make gaim use emacs-like keybindings?
-         2.5.  How do I use smiley themes?
-         2.6.  Why are the status icons so big?
-         2.7.  Why do the emblems move around the status icon?
-         2.8.  How do I get sound to work correctly?
-         2.9.  How do I make Gaim use ALSA or OSS for playing sounds? What does
+         2.3.  How do I use Google Talk?
+         2.4.  How do I change the font Gaim uses? The empty left padding? The
+               background color?
+         2.5.  Where did my ability to use Ctrl-Enter to send a message go?
+         2.6.  When I click the status selector, I see blank space and have to
+               scroll. What can I do about this?
+         2.7.  The status selector has extra padding in it. How can I make it
+               smaller?
+         2.8.  How do I make gaim use emacs-like keybindings, or assign a
+               custom hotkey?
+         2.9.  How do I make Escape close the conversation window?
+         2.10. How do I use smiley themes?
+         2.11. Why are the status icons so big?
+         2.12. Why do the emblems move around the status icon?
+         2.13. How do I get sound to work correctly?
+         2.14. How do I make Gaim use ALSA or OSS for playing sounds? What does
                the "Automatic" option do?
                Why does Gaim use the same WM_CLASS for every window? It makes
-         2.10. it impossible to control window size and placement for the buddy
+         2.15. it impossible to control window size and placement for the buddy
                list separately from the conversations.
-         2.11. I blocked someone accidentally, how can I unblock them?
-         2.12. What is a "Buddy Pounce"?
-         2.13. Where does gaim store its logs?
-         2.14. How can I see my own status with Gaim?
-         2.15. Can I use Gaim for e-mail, blogging, an RSS feed, or something
+         2.16. I blocked someone accidentally, how can I unblock them?
+         2.17. What is a "Buddy Pounce"?
+         2.18. Where does gaim store its logs?
+         2.19. Can I use Gaim for e-mail, blogging, an RSS feed, or something
                else that isn't IM-related?
 
 3. Features
 
          3.1. Does Gaim support file transfer?
-         3.2. Is there a Gaim tray icon, or docklet, or gnome applet, or panel
-              icon, or something?
+         3.2. Can I turn the tray icon off?
          3.3. What do those colors in the conversation tab mean?
-         3.4. Will Gaim save my buddy list to the server?
-         3.5. Can I import or export my buddy list?
-         3.6. Does Gaim support animated smileys?
-         3.7. Can I make Gaim group screen names by the person that owns them?
+         3.4. Can I import or export my buddy list?
+         3.5. Does Gaim support animated smileys?
+         3.6. Can I make Gaim group screen names by the person that owns them?
               You know, like Trillian's Meta Contacts?
-         3.8. How do I get the old logging back?
-         3.9. How can I convert my old logs to the new format?
+         3.7. What happened to my timestamps? Can I change them?
+         3.8. How does Gaim decide which saved statuses to show in the status
+              selector?
+         3.9. Why are no states listed when I go to set a state for Auto Away?
 
-4. ICQ Protocol
+4. AIM/ICQ (OSCAR) Protocol
 
-         4.1. How do I use ICQ?
-         4.2. Can I send SMS messages?
+         4.1. Can I set my profile?
+         4.2. Can I set a buddy icon?
+         4.3. I just changed my buddy icon, and I can't see the new one.
+         4.4. Some of my buddies are not showing up as online, why is that?
+         4.5. Can I use AIM URI's such as "aim:goim?screenname=robflynn"?
+         4.6. Does Gaim support DirectIM and IM Image?
+         4.7. Can I send SMS messages?
+         4.8. Can I add SMS numbers to my buddy list?
 
-5. TOC Protocol
+5. IRC Protocol
 
-         5.1. What is the TOC protocol?
-
-6. AIM/ICQ (OSCAR) Protocol
-
-         6.1.  Can I set my profile?
-         6.2.  Can I set a buddy icon?
-         6.3.  Some of my buddies are not showing up as online, why is that?
-         6.4.  Can I use AIM URI's such as "aim:goim?screenname=robflynn"?
-         6.5.  I just changed my buddy icon, and I can't see the new one.
-         6.6.  Does Gaim support DirectIM and IM Image?
-         6.7.  Can I send SMS messages?
-         6.8.  Can I add SMS numbers to my buddy list?
-         6.9.  I heard AOL is combining ICQ and AIM, does that mean I can send
-               a message from an AIM account to an ICQ account and vice-versa?
-         6.10. Why can't I connect via either Oscar or TOC?
-         6.11. English is not my native language, and some of my friends have
-               trouble seeing my IMs/I have trouble seeing my friends' IMs. How
-               do I use a native language character set with ICQ?
-         6.12. Can I set myself invisible?
-
-7. IRC Protocol
-
-         7.1. How do I join a channel with the IRC plugin?
-         7.2. Is there a way to make Gaim automatically identify me and/or join
+         5.1. How do I join a channel with the IRC plugin?
+         5.2. Is there a way to make Gaim automatically identify me and/or join
               IRC chats on login?
-         7.3. Is it possible to change the user name that appears in
+         5.3. Is it possible to change the user name that appears in
               username@hostname?
-         7.4. How can I set/change my real name?
+         5.4. How can I set/change my real name?
 
-8. Jabber Protocol
+6. Jabber Protocol
 
-         8.1. How do I choose which Jabber server to use?
-         8.2. How do I change my Jabber resource to be other than the default
-              of "/Gaim"?
-         8.3. How do I register a new Jabber account?
-         8.4. How do I use invisibility?
-              I've a buddy that I keep removing from my buddy list but the
-         8.5. entry keeps coming back every time I log in again! How can I stop
-              this?
-         8.6. Can I remove a buddy from my Jabber roster entirely?
-         8.7. What does "Cancel Presence Notification" do?
+         6.1. How do I choose which Jabber server to use?
+         6.2. How do I change my Jabber resource to be other than the default
+              of "/Home" (or the old default of "/Gaim")?
+         6.3. Can I remove a buddy from my Jabber roster entirely?
+         6.4. What does "Cancel Presence Notification" do?
 
-9. Y!M (Yahoo) Protocol
+7. Y!M (Yahoo) Protocol
 
-         9.1. I cannot connect to Yahoo! and get "Invalid Password" errors, or
-              I'm using a version of Gaim older than 0.79!
-         9.2. I cannot connect to Yahoo! and I'm behind a firewall or NAT. Why
+         7.1. I cannot connect to Yahoo! and I'm behind a firewall or NAT. Why
               doesn't Gaim have Yahoo's "Firewall with no proxy" option?
-         9.3. I blocked someone, but it doesn't seem to have worked.
-         9.4. Can I get a list of Yahoo! Chat rooms? What about non-US lists?
-         9.5. What protocol does Gaim use to connect to Yahoo!?
+         7.2. I blocked someone, but it doesn't seem to have worked.
+         7.3. Can I get a list of Yahoo! Chat rooms? What about localized
+              lists?
+         7.4. What protocol does Gaim use to connect to Yahoo!?
 
-10. MSN Protocol
+8. MSN Protocol
 
-         10.1.  Why are my file transfers so slow?
-         10.2.  I'm getting lots of "Already in Opposite list" errors on MSN,
-                why?
-         10.3.  Is there a way to invite more than one person to an MSN chat?
-         10.4.  Is MSNP9 (MSN6) going to be supported?
-                Will I be able to use Gaim for MSN after October 15th 2003?
-         10.5.  (The day they're preventing third party clients from
-                connecting)
-         10.6.  I just upgraded Gaim and the MSN plugin will not load. Why?
-         10.7.  The MSN plugin won't load, but I have Mozilla NSS!
-         10.8.  What does "MSN: S: 911 3" in the debug window mean when I
-                cannot connect to MSN?
-         10.9.  How do I set an MSN avatar?
-         10.10. What does "Has you" in the buddy tooltip mean?
-         10.11. How do I set my MSN Friendly Name (the name other users see)?
-         10.12. What does "Error reading from switchboard server" mean?
+         8.1.  Will Gaim support MSN video chat?
+         8.2.  Why are my file transfers so slow?
+         8.3.  Is there a way to invite more than one person to an MSN chat?
+         8.4.  Is MSNP11 (MSN7) going to be supported?
+         8.5.  Why can't I sign on to MSN?
+         8.6.  The MSN plugin won't load, but I have Mozilla NSS!
+         8.7.  What does "MSN: S: 911 3" in the debug window mean when I cannot
+               connect to MSN?
+         8.8.  How do I set an MSN avatar?
+         8.9.  What does "Has you" in the buddy tooltip mean?
+         8.10. How do I set my MSN Friendly Name (the name other users see)?
+         8.11. What does "Error reading from switchboard server" mean?
 
-11. Gadu-Gadu Protocol
+9. Gadu-Gadu Protocol
 
-         11.1. What is Gadu-Gadu?
-         11.2. Why doesn't it work right?
+         9.1. What is Gadu-Gadu?
+         9.2. I compiled Gaim from source and now it doesn't have Gadu-Gadu
+              support. Why?
 
-12. Zephyr Protocol
+10. Zephyr Protocol
 
-         12.1. What is Zephyr?
-         12.2. Other Zephyr clients (zwgc,owl,tzc) work, but Gaim dies with
+         10.1. What is Zephyr?
+         10.2. Other Zephyr clients (zwgc, owl, tzc) work, but Gaim dies with
                "Couldn't initialize zephyr".
-         12.3. Gaim isn't working, but I never got any other Zephyr client
+         10.3. Gaim isn't working, but I never got any other Zephyr client
                working on this machine.
-         12.4. How do I use Zephyr from behind my firewall, or without
+         10.4. How do I use Zephyr from behind my firewall, or without
                recompiling with kerberos support if needed?
 
-13. SILC Protocol
+11. SILC Protocol
 
-         13.1. What is SILC?
+         11.1. What is SILC?
 
-14. Novell Protocol
+12. Novell Protocol
 
-         14.1. Are there any public servers for Novell?
-         14.2. I can't seem to get it to work.
+         12.1. Are there any public servers for Novell?
+         12.2. I can't seem to get it to work.
 
-15. Scripts and Plugins
+13. Scripts and Plugins
 
-         15.1. How do I use perl scripts with Gaim?
-         15.2. How do I compile a plugin for Gaim?
-         15.3. I have a plugin or perl script for Gaim that used to work, but
+         13.1. How do I use perl scripts with Gaim?
+         13.2. How do I compile a plugin for Gaim?
+         13.3. I have a plugin or perl script for Gaim that used to work, but
                does not with the current version.
-         15.4. Where can I find documentation on writing plugins and Perl
+         13.4. Where can I find documentation on writing plugins and Perl
                scripts?
 
-16. Development
+14. Development
 
-         16.1. Can I help?
-         16.2. Gaim never leaves a core file.
-         16.3. Where should I report bugs?
-         16.4. Where should I submit patches?
-         16.5. Did you guys reverse engineer it?
+         14.1. Can I help?
+         14.2. Gaim never leaves a core file.
+         14.3. Will you support features such as voice chat, internet phones,
+               or video chat?
+         14.4. Where should I report bugs?
+         14.5. Where should I submit patches?
+         14.6. Did you guys reverse engineer it?
 
-17. Misc. Questions
+15. Miscellaneous Questions
 
-         17.1. Can I IM you guys?
-         17.2. Hello?
-               Can I give you money/hardware/other expensive things that can be
-         17.3. hocked for cash what with you all being students/
-               full-time-workers and helping to produce this wonderful software
-               instead of studying/sleeping?
-         17.4. Does Gaim support secure instant messaging (encrypted IMs)?
-         17.5. Why are the passwords in accounts.xml not encrypted?
-         17.6. What is gaim-remote?
-         17.7. When will the next version of Gaim be released?
-         17.8. What will the next version be?
-         17.9. So, can I look forward to mega-sexy super functionality with
-               Gaim?
+         15.1.  Can I IM you guys?
+         15.2.  Hello?
+         15.3.  Does Gaim support secure instant messaging (encrypted IMs)?
+         15.4.  Why are the passwords in accounts.xml not encrypted?
+         15.5.  When will the next version of Gaim be released?
+         15.6.  What will the next version be?
+         15.7.  So, can I look forward to mega-sexy super functionality with
+                Gaim?
+         15.8.  How do I change the language for the Highlight Misspelled words
+                option?
+         15.9.  Can I make Gaim transparent/translucent?
+         15.10. Can I "skin" Gaim?
 
 +------------------------------------------------------------------------------
 | 1. Compiling and Installing
@@ -213,9 +198,9 @@
   unable to keep track of what versions will work with what other versions.
 
   If you have Slackware < 9.1, you need to get non-slack packages for autoconf,
-  automake, gettext, and libtool. You also have to copy the contents of /usr/
-  local/share/aclocal to /usr/share/aclocal. This is due to bugs in Slackware
-  and the auto* packages.
+  automake and libtool. You also have to copy the contents of /usr/local/share/
+  aclocal to /usr/share/aclocal. This is due to bugs in Slackware and the auto*
+  packages.
 
   *BSD users may also have problems with libtool and will also have to remove
   the --no-verify from the configure script.
@@ -254,7 +239,7 @@
       plugins.
 
       You'll need to compile any protocols that you specified in
-      --with-static-prpls. Oscar and TOC are defaults.
+      --with-static-prpls. Oscar is the default.
 
    2. Use the --with-dynamic-prpls option to ./configure
 
@@ -277,12 +262,12 @@
  
   Yes, all packages are signed. The signature for the tarball and bzip2 archive
   are provided by separate downloads. The RPMs we provide are signed by either
-  Ethan Blanton, Mark Doliner, or Christian Hammond. Usually the Mandrake and
-  Fedora Core 1 RPMs are signed by Mark Doliner and the Red Hat 8 and 9 RPMs
-  are signed by Ethan Blanton. The keys can be obtained from any key server.
-  http://pgp.mit.edu/ is popular.
+  Ethan Blanton, Mark Doliner, or Stu Tomlinson. Usually the Mandrake RPMs are
+  signed by, Mark Doliner, the Fedora Core RPMs are signed by Stu Tomlinson,
+  and the Red Hat 8 and 9 RPMs are signed by Ethan Blanton. The keys can be
+  obtained from any key server. http://pgp.mit.edu/ is popular.
 
-1.8  Can I use Gaim for GTK+1.2?
+1.8  Can I use Gaim for GTK+ 1.2?
  
   As of version 0.60, Gaim has been completely converted to using GTK+2.0. We
   really really really recommend using the most current version of Gaim and not
@@ -295,24 +280,51 @@
 
 1.9  Can I run Gaim on IRIX?
  
-  It has been done before. Please see http://sourceforge.net/forum/forum.php?
-  thread_id=725839&forum_id=665 at our SourceForge Forum.
+  Sure you can - the amount of effort involved depends on which compiler you
+  use; there is however no official support.
 
-1.10  Can I run gaim on MacOSX?
+  GCC (tested with 3.4 on IRIX 6.5.29): All but one necessary changes were
+  included in the official sources. You will notice GnuTLS will not be included
+  by default, even if the necessary includes and libraries are available; to
+  add SSL support, open the configure script in your favourite editor and
+  replace all instances of "-lnsl" by "-lnsl -lgnutls". Ask no questions :-) it
+  Just Works. Mozilla-NSS wasn't tested.
+
+  MIPSPro CC (tested with 7.4.4m on IRIX 6.5.29): Less trivial for obvious
+  ANSI-tightness reasons. There's an unofficial patch for 2.0.0 beta3 available
+  http://jesuschrist.be/gaim/gaim-2.0.0beta3_irix.patch, which applies (amongst
+  others) the SSL hack described above. You will need to configure WITHOUT the
+  Zephyr protocol plugin.
+
+  NOTE: Jabber crashed gaim when using TLS. This is a bug inside GnuTLS that
+  might or might not be fixed by the time you read this.
+
+1.10  Can I run Gaim on HPUX?
  
-  Yes you can, but we do not provide a package for it. The reason being is that
-  to use gaim on MacOSX, you need to install an X server and gtk, which we are
-  not prepared to support. You can either compile gaim (and its dependencies)
-  yourself, or you can use the fink installer available from http://fink.sf.net
-  . If you would like a native aqua interface or a user-friendly installer, we
-  suggest trying Adium (http://www.adiumx.com/).
+  Yes, you can; with GCC 4.1.1 on HPUX 11.11 at least it worked fine. There is
+  however no official support.
 
-1.11  How do I apply the patch "something.diff"?
+  The build scripts that are shipped with the "official" releases are
+  unfortunately incompatible with the HPUX linker; fetching the svn version and
+  running autogen.sh however gives you a healthy build dir. Configure gaim
+  WITHOUT the X screensaver extension and disable the gtk- and glibtests; no
+  source hacks are needed.
+
+1.11  Can I run Gaim on MacOSX?
  
-  Type patch -p0 < something.diff from inside the gaim directory. If that
+  Yes you can, but we do not provide a package for it. The reason being that in
+  order to use Gaim on MacOSX, you need to install an X server and GTK+, which
+  we are not prepared to support. You can either compile Gaim (and its
+  dependencies) yourself, or you can use the fink installer available from
+  http://fink.sf.net. If you would like a native aqua interface or a
+  user-friendly installer, we suggest trying Adium (http://www.adiumx.com/).
+
+1.12  How do I apply the patch "something.diff"?
+ 
+  Type patch -p0 < something.diff from inside the Gaim directory. If that
   doesn't work, try patch -p1 < something.diff.
 
-1.12  Why is gaim crashing when I start it?
+1.13  Why is Gaim crashing when I start it?
  
   First of all make sure you are using the most recent version of Gaim. If you
   still have problems, try the following:
@@ -321,49 +333,48 @@
       sometimes be useful for determining this.
     • "export GDK_USE_XFT=0" in a terminal and then run Gaim from the same
       terminal.
-    • If gaim is not crashing, but is just sitting there not displaying
+    • If Gaim is not crashing, but is just sitting there not displaying
       anything, try turning off anything else that might be using the sound
-      device (ie xmms) and then starting gaim. If this fixes the problem, it is
-      a libao issue, not a gaim issue, and can be worked around by the use of
+      device (ie xmms) and then starting Gaim. If this fixes the problem, it is
+      a libao issue, not a Gaim issue, and can be worked around by the use of
       esd or arts.
     • Try disabling or deleting any 3rd party plugins, especially anything
       related to encryption.
     • If you use 0.75 or higher on win32, try deleting tcl.dll.
-    • If you have ever installed 0.65, edit your ~/.gaimrc, changing your auto
-      away preference from -1 to 0.
 
-1.13  Gaim <non-current version> is buggy. Gaim CVS is buggy. Why?
+1.14  Gaim <non-current version> is buggy. Gaim SVN is buggy. Why?
  
   Non-current versions have old bugs which may be fixed in the current
-  version--that's why we make new releases. CVS is frequently unusable because
+  version--that's why we make new releases. SVN is frequently unusable because
   of changes in the code. Bugs are introduced during the development process
   and are hopefully fixed before a release is made.
 
-1.14  Why do you always say not to use CVS?
+1.15  Why do you always say not to use SVN?
  
   That's a long story. For starters, see the previous question. It is often the
-  case that Gaim CVS exhibits bad behavior due to features and bugfixes which
+  case that Gaim SVN exhibits bad behavior due to features and bugfixes which
   are in a transitory state or which are not yet well understood. These bad
   behaviors range from the harmless (maybe a graphical glitch in a dialog box)
   to the irritating (a particular protocol may not work), to the downright
-  damaging (recently a bug in CVS destroyed the user's buddy lists). While
+  damaging (recently a bug in SVN destroyed the user's buddy lists). While
   behaviors like this are acceptable to some users (particularly developers,
-  who are used to such things), they tend to cause many Gaim CVS users to
+  who are used to such things), they tend to cause many Gaim SVN users to
   contact Gaim developers and report the same (usually egregious) bug over and
   over - using time which could be better spent fixing the bugs.
 
-  A second major point involves public resources - a CVS checkout is not a
+  A second major point involves public resources - an SVN checkout is not a
   cheap operation. As many Sourceforge users are aware, at various points in
   the recent past Sourceforge CVS has been less than pleasant to work with.
   This is, of course, because Sourceforge hosts dozens and dozens of useful and
-  active projects which use CVS as a primary method of source code
+  active projects which use[ed] CVS as a primary method of source code
   collaboration. Unfortunately, when too many users are poking around in that
   CVS just for the sake of poking around, it prevents other users who are
   trying to do work to improve those very same projects from accomplishing
-  their tasks. It is better for the community if an enterprising individual
-  wishing to fix a particular bug she has seen can get to the code and create a
-  patch, even if this means that some users have to wait a few weeks for the
-  next release to see what new features it might hold.
+  their tasks. Naturally, this could easily become true of Sourceforge's SVN
+  offering as well. It is better for the community if an enterprising
+  individual wishing to fix a particular bug [s]he has seen can get to the code
+  and create a patch, even if this means that some users have to wait a few
+  weeks for the next release to see what new features it might hold.
 
   The third point is not a problem which has yet come up, but it is in the back
   of the mind of the developers who bring you Gaim. As a third-party IM client,
@@ -375,15 +386,15 @@
   hundreds of people are pointing an ill-behaved client at an IM server, the
   server administrators may be forced to take action. (This is particularly
   likely if the buggy behavior is damaging in some way.) Gaim releases
-  represent code which the gaim developers feel is relatively well-behaved and
+  represent code which the Gaim developers feel is relatively well-behaved and
   stable. This includes not only the interface seen by Gaim users, but the
-  traffic seen by IM service providers. Gaim CVS bears no such guarantees.
+  traffic seen by IM service providers. Gaim SVN bears no such guarantees.
 
-  In short, there are a lot of good reasons to not use Gaim CVS if one does not
+  In short, there are a lot of good reasons to not use Gaim SVN if one does not
   wish to develop Gaim, Gaim plugins, or a codebase which interacts with Gaim
-  in some intimate way. There are, however, only a few reasons to use Gaim CVS
+  in some intimate way. There are, however, only a few reasons to use Gaim SVN
   outside of the above. Please weigh these things carefully and decide whether
-  you wish to use Gaim CVS for a good reason which furthers the community, or
+  you wish to use Gaim SVN for a good reason which furthers the community, or
   for selfish reasons which are not entirely important.
 
 +------------------------------------------------------------------------------
@@ -413,59 +424,105 @@
 
 2.2  How do I use AIM, MSN, Yahoo!, Jabber, ICQ, or any other protocol?
  
-  Use the Account Editor (Tools->Accounts, or the Accounts button on the start
-  screen) to add the account of the appropriate messaging service. Use the
-  checkbox in the account editor to sign online.
+  Use the Account Editor (Accounts->Add/Edit) to add the account of the
+  appropriate messaging service. Use the checkbox in the account editor to
+  enable the account.
 
-2.3  How do I change the font Gaim uses?
+2.3  How do I use Google Talk?
  
+  Create a Jabber account as per Google's FAQ. The Audio component is not
+  currently supported and will not be until work on it is finished. We have no
+  time frame for that as yet.
+
+2.4  How do I change the font Gaim uses? The empty left padding? The background
+     color?
+ 
   The font preference in Gaim is used only for the formatting of outgoing
   messages. The display fonts used by the rest of Gaim are those specified by
-  GTK. To change this font you need to edit your ~/.gtkrc-2.0 file. If you need
-  help you can see our example .gtkrc-2.0 (http://gaim.sf.net/gtkrc-2.0) file.
-  On Windows, this file is located at C:\Documents and Settings\username
-  \.themes\Default\gtk-2.0\gtkrc.
+  GTK+. To change this font you need to edit your ~/.gtkrc-2.0 file. If you
+  need help you can see our example .gtkrc-2.0 (http://gaim.sf.net/gtkrc-2.0)
+  file. On Windows, this file is located at C:\Documents and Settings\username
+  \.themes\Default\gtk-2.0\gtkrc. If the file does not exist, create it.
 
   You can also just switch to a different GTK+ theme. You can find GTK+ themes
   (and information on using them) by visiting themes.freshmeat.net,
   art.gnome.org, or searching on Google.
 
-  If you're having a problem with the font size used by a specific person, you
-  can try turning on the Ignore Font Sizes preference in Preferences->Message
-  Text.
+  Similarly, the other font preferences are the defaults for outgoing messages,
+  and gaim's global settings are controled by the gtk theme. Additionally, some
+  settings to specific parts of gaim can be set by a Gtk+ theme.
 
-2.4  How do I make gaim use emacs-like keybindings?
+2.5  Where did my ability to use Ctrl-Enter to send a message go?
  
-  You need to edit your ~/.gtkrc-2.0 to contain the keybindings line from http:
-  //gaim.sf.net/gtkrc-2.0.
+  Gaim used to have an option in the preferences window which let you choose
+  whether to use Enter or Ctrl-Enter to send a message. This was less than
+  optimal for many reasons, not least of which was because it only let you
+  choose between those two options. It also caused large problems for people
+  who required an alternate input method (people who were typing in Chinese or
+  Japanese for example). On top of all this gtk provides an incredibly nice
+  mechanisms which allows keybindings to be set for things via the gtk theme
+  files. Gaim decided to use this gtk interface as a method of allowing people
+  to use Ctrl-Enter to send but to also allow people to use anything else they
+  felt like and to reduce the clutter in the User Interface. The gtk interface
+  is, unfortunately, not as immediately obvious as a simple checkbox, however
+  it is still simple. The example gtkrc file seen http://gaim.sf.net/gtkrc-2.0
+  shows you how to do it (among other things).
 
-2.5  How do I use smiley themes?
+2.6  When I click the status selector, I see blank space and have to scroll.
+     What can I do about this?
  
+  Edit your ~/.gtkrc-2.0 to contain the appropriate lines from http://
+  gaim.sf.net/gtkrc-2.0. Search for "appears-as-list".
+
+2.7  The status selector has extra padding in it. How can I make it smaller?
+ 
+  Edit your ~/.gtkrc-2.0 to contain the appropriate lines from http://
+  gaim.sf.net/gtkrc-2.0. Search for "xthickness". There are two examples. Start
+  by trying the first one. If that makes the status selector look worse, then
+  try the second one.
+
+2.8  How do I make gaim use emacs-like keybindings, or assign a custom hotkey?
+ 
+  You need to edit your ~/.gtkrc-2.0 to contain the appropriate lines from
+  http://gaim.sf.net/gtkrc-2.0. If you are using gtk-can-change-accels = 1,
+  then you hover over the menu item then press your desired key stroke.
+
+2.9  How do I make Escape close the conversation window?
+ 
+  Sadly, you can't use the hover-and-press technique just described for this,
+  because Escape closes the menu. You have to hand-edit ~/.gaim/accels. Close
+  Gaim, and open ~/.gaim/accels in your favorite text editor. Find
+  (gtk_accel_path "<main>/Conversation/Close" "[something]"), remove the
+  semi-colon (which is the comment character) from the start of the line if it
+  is there and replace whatever is between the second pair of quote marks with
+  Escape. Save and close, and restart Gaim.
+
+2.10  How do I use smiley themes?
+ 
   To select a theme, open Gaim's preferences to the "Smiley Themes" page and
   click on whichever theme you want to use. To install a theme, simply drag it
   into the theme selector. You can find themes on the Gaim Smiley Themes (http:
-  //gaim.sf.net/themes.php) page.
+  //sourceforge.net/tracker/?atid=746976&group_id=235&func=browse) tracker.
 
   You can also install themes manually by uncompressing them to their own
   directory in ~/.gaim/smileys/
 
-2.6  Why are the status icons so big?
+2.11  Why are the status icons so big?
  
   We believe that, by adding a second line of text to each buddy list entry,
   we're able to show more information about each buddy on the buddy list. The
-  'Big List,' as we call it, shows status text, idle time, and warning level
-  concisely and attractively. It shows more than one status "emblem" for each
-  buddy, indicating at the same time a mobile user who is away. Most
-  importantly, it puts the buddy icon in the list, making it far easier to
-  locate buddies within a large list where names are harder to pick out than
-  images. Due to the increased usability of this interface, we have made it the
-  default.
+  'Big List,' as we call it, shows status text and idle time concisely and
+  attractively. It shows more than one status "emblem" for each buddy,
+  indicating at the same time a mobile user who is away. Most importantly, it
+  puts the buddy icon in the list, making it far easier to locate buddies
+  within a large list where names are harder to pick out than images. Due to
+  the increased usability of this interface, we have made it the default.
 
   We are aware that some people feel more comfortable using an interface more
   similar to IM clients they may have used in the past. The 'Big List' can be
-  disabled by un-checking "Show buddy icons" in the Buddy List preferences.
+  disabled by un-checking "Show buddy details" in the Buddies menu.
 
-2.7  Why do the emblems move around the status icon?
+2.12  Why do the emblems move around the status icon?
  
   The four corners of the icon have different precedence. The lower-right is
   the highest, lower-left is second-highest, etc. The most important emblem is
@@ -476,41 +533,23 @@
   emblem is the only emblem that shows up when "Small list" is on, as only one
   emblem would fit.
 
-2.8  How do I get sound to work correctly?
+2.13  How do I get sound to work correctly?
  
-  Gaim uses libao to play sounds. Playing sounds directly through esound or
+  Gaim uses gstreamer to play sounds. Playing sounds directly through esound or
   arts is no longer supported.
 
-  `Libao is a cross-platform library that allows programs to output PCM audio
-  data to the native audio devices on a wide variety of platforms. It currently
-  supports OSS (Open Sound System), ESD (ESounD), ALSA (Advanced Linux Sound
-  Architecture), Sun audio system (used in Solaris, OpenBSD, and NetBSD), aRts
-  (Analog Realtime Synthesizer). '
+  To compile Gaim with support for gstreamer you need libgstreamer0.10-dev and
+  its dependencies. If you do not wish to install these packages you can also
+  just change your sound playing method in preferences to Command and use
+  esdplay %s or artsplay %s.
 
-  To compile Gaim with support for libao you need libao-devel and
-  audiofile-devel. To use libao you need libao and audiofile. If you do not
-  wish to install these packages you can also just change your sound playing
-  method in preferences to Command and use esdplay %s or artsplay %s.
-
-2.9  How do I make Gaim use ALSA or OSS for playing sounds? What does the
-     "Automatic" option do?
+2.14  How do I make Gaim use ALSA or OSS for playing sounds? What does the
+      "Automatic" option do?
  
-  If you choose "Automatic", "ESD", or "Arts", Gaim uses libao to play sounds.
-  Choosing "ESD" or "Arts" forces libao to play sounds using that method, while
-  choosing "Automatic" lets it decide for itself.
+  The "Automatic" option lets gstreamer pick how the sounds are played. You can
+  use the gstreamer-properties tool to control this.
 
-  If you choose "Automatic", you can create a file, either /etc/libao.conf or ~
-  /.libao, and put one of the following lines in it:
-
-  default_driver=alsa
-
-  default_driver=oss
-
-  Other drivers, like alsa09, arts, esd, irix, macosx, and sun might also be
-  supported, depending on your platform and how libao was compiled. See also
-  man 5 libao.conf.
-
-2.10  Why does Gaim use the same WM_CLASS for every window? It makes it
+2.15  Why does Gaim use the same WM_CLASS for every window? It makes it
       impossible to control window size and placement for the buddy list
       separately from the conversations.
  
@@ -521,18 +560,18 @@
   client has multiple windows with identical WM_CLASS and WM_NAME properties,
   then it should provide a WM_WINDOW_ROLE property."
 
-  GTK+ sets these WM_CLASS values for us so that they are unique for Gaim
+  Gtk+ sets these WM_CLASS values for us so that they are unique for Gaim
   instances, and the documentation for the gtk_window_set_wmclass function says
   explicitly not to use it for anything else. Gaim uses the WM_WINDOW_ROLE hint
   to differentiate windows. If your window manager is having problems
   differentiating between Gaim windows, please ensure that it uses the
   WM_WINDOW_ROLE hint per the ICCCM.
 
-2.11  I blocked someone accidentally, how can I unblock them?
+2.16  I blocked someone accidentally, how can I unblock them?
  
   See the "Privacy" option under the "Tools" menu of the Buddy List.
 
-2.12  What is a "Buddy Pounce"?
+2.17  What is a "Buddy Pounce"?
  
   Gaim introduced buddy pounces a few releases before AOL came out with "Buddy
   Alerts." Despite this though, you could think of a buddy pounce as an Alert
@@ -545,20 +584,14 @@
   occur the next time gaim detects the event, ie the next time the person in
   your buddy list who you have pounced signs on.
 
-2.13  Where does gaim store its logs?
+2.18  Where does gaim store its logs?
  
-  On unix, they are in ~/.gaim/logs, on win32 they are in the $drive\Documents
-  and Settings\user\Application Data\.gaim\logs directory. In either case, new
-  logs (new as of 0.73) are in subdirectories that correspond to protocol/
-  yourscreenname/theirscreenname.
+  On unix, they are in ~/.gaim/logs, on win32 they are in the C:\Documents and
+  Settings\user\Application Data\.gaim\logs directory. (NOTE: Application Data
+  is a hidden directory.) In either case, new logs (new as of 0.73) are in
+  subdirectories that correspond to protocol/yourscreenname/theirscreenname.
 
-2.14  How can I see my own status with Gaim?
- 
-  Currently the only supported method to see your own status is to add yourself
-  to your buddy list. This works with Aim, ICQ, Y!M, IRC, and some of the
-  others, and is mimiced by gaim for MSN and Jabber.
-
-2.15  Can I use Gaim for e-mail, blogging, an RSS feed, or something else that
+2.19  Can I use Gaim for e-mail, blogging, an RSS feed, or something else that
       isn't IM-related?
  
   No, you can't. We get requests for this often, but Gaim is indeed a messaging
@@ -575,38 +608,25 @@
 
 3.1  Does Gaim support file transfer?
  
-  Somewhat, yeah. As of 0.79 the following is supported:
+  Somewhat, yeah. As of 1.2.1 The following is supported:
 
-    • Sending and receiving files on AIM (although it might be a bit buggy)
+    • Sending and receiving files on AIM/ICQ (although it might be a bit buggy)
     • Sending and receiving files on IRC
     • Sending and receiving files on Jabber
     • Sending and receiving files on MSN
     • Sending and receiving files on SILC
-    • Sending and receiving files on Yahoo (sending is limited to 1Mb)
+    • Sending and receiving files on Yahoo when not using an HTTP proxy
+      (sending is limited to an unknown file size)
 
   Most of the protocols themselves support file transfer, but Gaim has not been
   written to support it yet. If you would like file transfer to work better or
-  be more complete, get CVS and submit a patch using the generic file transfer
+  be more complete, get SVN and submit a patch using the generic file transfer
   API.
 
-3.2  Is there a Gaim tray icon, or docklet, or gnome applet, or panel icon, or
-     something?
+3.2  Can I turn the tray icon off?
  
-  Yeah, Gaim supports what is called a system tray icon that conforms to the
-  standards at www.freedesktop.org. This tray icon is supported by Windows, KDE
-  3.1, Gnome 2.2, and Red Hat Gnome 2.0. All you have to do is load the "System
-  Tray Icon" plugin by going to Preferences and then Plugins.
+  Sorry, no. The tray icon will load if you have a Notification Area.
 
-  If you're using Gnome you need to make sure that your panel has a
-  Notification Area on it. To add one, right click on the panel, select Add To
-  Panel->Utility->Notification Area. Gaim will insert the tray icon in any
-  System Tray implementation that conforms to these standards, so feel free to
-  write one for your window manager of choice.
-
-  Due to a flaw in these specs, KDE users may experience trouble with the
-  background color of the docklet. There is unfortunately nothing we can do
-  about this.
-
 3.3  What do those colors in the conversation tab mean?
  
     • Red - A message is waiting for you
@@ -616,24 +636,17 @@
     • Gray - There has been a join or a part in that chat, or the buddy has
       signed off
 
-3.4  Will Gaim save my buddy list to the server?
+3.4  Can I import or export my buddy list?
  
-  Yes, Gaim saves your buddy list to the server for AIM, ICQ, Jabber, MSN,
-  Novell and Yahoo!.
+  The plugin pack hosted at http://guifications.sourceforge.net/PluginPack has
+  a plugin to do this.
 
-3.5  Can I import or export my buddy list?
+3.5  Does Gaim support animated smileys?
  
-  Sorry, no. Old versions of Gaim supported this, but new versions do not. All
-  the code for saving and loading buddy lists was rewritten, and support for
-  importing and exporting buddy lists was never re-added. However, with all
-  major protocols storing their buddy lists on the server, this feature is less
-  useful today than in the past.
+  Yes, but there is a bug which can cause animation to be lost if gaim has to
+  resize the image.
 
-3.6  Does Gaim support animated smileys?
- 
-  Yes, as of version 0.70 Gaim supports animated smileys.
-
-3.7  Can I make Gaim group screen names by the person that owns them? You know,
+3.6  Can I make Gaim group screen names by the person that owns them? You know,
      like Trillian's Meta Contacts?
  
   Sure! Right click a buddy on your list and at the bottom of the menu click
@@ -645,94 +658,59 @@
   You may need to turn off the preference option to automatically expand
   Contacts in order to be able to edit an existing Contact.
 
-3.8  How do I get the old logging back?
+3.7  What happened to my timestamps? Can I change them?
  
-  The old logging was removed because it was deficient in many ways. There is
-  no way in Gaim itself to revert to the old logging, but the new logging is so
-  good you could implement something similar to the old logging as a plugin.
+  As of 2.0.0, timestamps follow the system locale. This is a significant
+  difference from previous versions of gaim, and though it was requested more
+  than once, we know it will prove to be a controversial decision. Fortunately
+  for all of you out there, we also provide plugins to change it.
 
-3.9  How can I convert my old logs to the new format?
- 
-  It's not possible to perfectly convert from the old format to the new format
-  because the old format is missing some information necessary to do that (eg.
-  which account the messages were sent from).
+  As of 2.0.0, there are two plugins that relate to timestamps. One, the
+  "Timestamp" plugin, has existed for some time. It allows you to have iChat
+  style timestamps, though implemented to behave slightly differently. The
+  other plugin is new. The "Message Timestamp Formats" plugin allows you to
+  manipulate your timestamps in a couple different ways. Notably, you can
+  restore the 1.x timestamp format, and/or cause all timestamps to have dates
+  in them.
 
-  It shouldn't be too difficult to do a rough conversion using a small script,
-  or using the old_logger_* functions in gaim itself.
-
-  Peter Johnson has written a python script to do just this, it is available on
-  his website (at the bottom).
-
-+------------------------------------------------------------------------------
-| 4. ICQ Protocol
-+------------------------------------------------------------------------------
-
-4.1  How do I use ICQ?
+3.8  How does Gaim decide which saved statuses to show in the status selector?
  
-  ICQ support is part of the OSCAR protocol, labeled AIM/ICQ in Gaim. To use
-  it, simply put your account number in the "Screen Name" box and your password
-  in the "Password" box. Leave the server settings set to the default
-  (login.oscar.aol.com and port 5190).
+  Gaim shows six "popular" saved statuses in the status selector. These are
+  your six most recently used statuses, offset by a weight. Gaim sorts all your
+  saved statuses by the timestamp when they were last used. And then, for each
+  time you've used a status, the timestamp is increased by one day.
 
-4.2  Can I send SMS messages?
- 
-  Kind of. See our answer to this for the AIM/ICQ Protocol.
+  If you are upgrading from 1.x or lower, gaim is unable to determine which are
+  the most popular states, as these older releases did not save that
+  information. As a result, the initial contents of the menu will be somewhat
+  random. It will settle over the first few uses of (distinct) states into the
+  behavior described above.
 
-+------------------------------------------------------------------------------
-| 5. TOC Protocol
-+------------------------------------------------------------------------------
-
-5.1  What is the TOC protocol?
+3.9  Why are no states listed when I go to set a state for Auto Away?
  
-  It's an AIM protocol used by Quick Buddy and AIM Express. It's recommended
-  that you don't use it. You should use Gaim's OSCAR (AIM/ICQ) protocol
-  instead. We keep TOC around in case OSCAR ever stops working. However, we are
-  not actively supporting this code, and no longer distribute it in binaries.
+  Gaim can only use saved states for this feature. You need to create and save
+  a named state first.
 
 +------------------------------------------------------------------------------
-| 6. AIM/ICQ (OSCAR) Protocol
+| 4. AIM/ICQ (OSCAR) Protocol
 +------------------------------------------------------------------------------
 
-6.1  Can I set my profile?
+4.1  Can I set my profile?
  
-  Yes you can. Go to Tools->Account Actions
+  In AIM, yes, you can. Go to Accounts->account name. Set your ICQ profile is
+  not supported yet.
 
-6.2  Can I set a buddy icon?
+4.2  Can I set a buddy icon?
  
-  Yes. Go to the Account Editor (Tools->Accounts from the buddy list), and
-  click to "Modify" the AIM/ICQ account you wish to have an icon. Enter the
-  full path to the image you wish to use in the box labeled "Buddy Icon File."
-  The file must be below 4KB. It can have any dimensions, and can be in any
-  format. However, if you wish Windows users to see it, it must be in a format
-  Windows understands, such as .bmp, .gif, and .jpg.
+  Yes. Go to the Account Menu, and click to "Modify" the AIM/ICQ account you
+  wish to have an icon. Enter the full path to the image you wish to use in the
+  box labeled "Buddy Icon File." The file must be smaller than 4KB. It can have
+  any dimensions, and can be in any format. However, if you wish Windows users
+  to see it, it must be in a format Windows understands, such as .bmp, .gif,
+  and .jpg.
 
-6.3  Some of my buddies are not showing up as online, why is that?
+4.3  I just changed my buddy icon, and I can't see the new one.
  
-  AOL has set a limit for the maximum number of people you can have in your
-  buddy list. This number is currently 200. If you don't think you are anywhere
-  near that limit, it is possible that your server-stored buddy list is
-  corrupt.
-
-  If you think this might be the case, you can try signing on with an official
-  AIM program from AOL. This will usually correct any problems with the list.
-
-6.4  Can I use AIM URI's such as "aim:goim?screenname=robflynn"?
- 
-  Yes, with Gaim 0.60 and higher, but it can be difficult to set up. You need
-  to pass the entire URI to the gaim-remote program (included with gaim). To do
-  this with Gnome 2, run gnome-file-types-properties or "File Types and
-  Programs" from the preferences menu. Add a service with protocol "aim" and
-  set the program to gaim-remote uri "%s". This will make AIM URIs work in
-  Galeon 2. Also, not all types of AIM URI's are supported. The ones that are
-  supported are goim, addbuddy, and gochat.
-
-  You'll need the "Remote Control" plugin loaded for this to work.
-
-  If you use wingaim, this will not work as gaim-remote has not yet been ported
-  over.
-
-6.5  I just changed my buddy icon, and I can't see the new one.
- 
   First, try IMing yourself a few times. Buddy icons are checked when you IM
   people, so depending on the protocol, that may work. If it still doesn't
   update, check the file size (buddy icons must be smaller than 4kb) and the
@@ -741,83 +719,51 @@
   at all. If all of that checks out and it still doesn't work, and you're sure
   the protocol supports it, try restarting Gaim.
 
-6.6  Does Gaim support DirectIM and IM Image?
+4.4  Some of my buddies are not showing up as online, why is that?
  
-  Yeah, kind of. This tends to be one of the buggier areas of Gaim. If it's not
-  working for you, make sure that at least one person is not behind a firewall.
+  AOL has set a limit for the maximum number of people you can have in your
+  buddy list. This number is currently 500 for AIM, if you don't think you are
+  anywhere near that limit, it is possible that your server-stored buddy list
+  is corrupt.
 
-6.7  Can I send SMS messages?
- 
-  Yep, just send an IM to the person's phone number. For example, if the phone
-  number is (919) 555-1234, you would IM the screen name +19195551234 We think
-  this should work for countries with a country code of 1 (the United States
-  and Canada).
+  If you think this might be the case, you can try signing on with an official
+  AIM program from AOL. This will usually correct any problems with the list.
 
-  Sending SMS messages using "the ICQ method" is not yet supported.
-
-6.8  Can I add SMS numbers to my buddy list?
+4.5  Can I use AIM URI's such as "aim:goim?screenname=robflynn"?
  
-  Not currently. This functionality has been broken since around September
-  2003. There is no ETA for when it will be fixed.
+  Yes, you need to register gaim-url-handler in your browser. This requires
+  that Gaim be built with dbus support.
 
-6.9  I heard AOL is combining ICQ and AIM, does that mean I can send a message
-     from an AIM account to an ICQ account and vice-versa?
+4.6  Does Gaim support DirectIM and IM Image?
  
-  Yes, AOL is slowly letting the two messaging networks interoperate with each
-  other. Messaging between the two protocols works as long as the receiver of
-  the message supports it. Gaim 0.60 supports sending and receiving messages
-  between AIM and ICQ, but the person receiving the message must support this.
-  Gaim, of course, supports this for both ICQ and AIM accounts. Windows AIM
-  version 5.2.3139 supports receiving messages from ICQ users. It is unknown if
-  earlier versions of Windows AIM support this. Windows ICQ build 3800 does not
-  support receiving messages from AIM users. Windows ICQ Lite builds 1150 and
-  later support receiving messages from AIM users and sending messages to AIM
-  users. MacAIM versions 4.6 beta, build 1.1131 and newer support sending and
-  receiving messages to and from ICQ users.
+  Yeah, kind of. This tends to be one of the buggier areas of Gaim. If it's not
+  working for you, make sure that at least one person is not behind a firewall.
 
-  The same clients that support receiving messages from the alternate messaging
-  network will also show up in buddy lists of people using the alternate
-  network. This means that if you can message an ICQ user from an AIM account,
-  then the ICQ user will also show up in your AIM buddy list. So an AIM user
-  using Windows AIM version 5.2.3139 will show up in an ICQ buddy list.
-
-6.10  Why can't I connect via either Oscar or TOC?
+4.7  Can I send SMS messages?
  
-  If you are using Linux, your kernel may be using a network option called
-  "ECN". It seems that the AOL servers are currently dropping packets marked as
-  "ECN-capable". In order to turn this off, run the command
+  Yep, just send an IM to the person's phone number. For example, if the phone
+  number is (919) 555-1234, you would message +19195551234 We think this should
+  work for countries with a country code of 1 (the United States and Canada).
 
-  echo 0 > /proc/sys/net/ipv4/tcp_ecn
+  Sending SMS messages using "the ICQ method" is not yet supported.
 
-  as root, or (if your distribution supports it) put the line
-
-  net.ipv4.tcp_ecn = 0
-
-  in the file /etc/sysctl.conf.
-
-6.11  English is not my native language, and some of my friends have trouble
-      seeing my IMs/I have trouble seeing my friends' IMs. How do I use a
-      native language character set with ICQ?
+4.8  Can I add SMS numbers to my buddy list?
  
-  Gaim 0.82 and higher allow you to specify a character encoding to use when
-  conversing with ICQ users. Use the account editor to set this encoding.
+  Yes. You should be able to add phone numbers to your buddy list using the
+  same format as above.
 
-6.12  Can I set myself invisible?
-
-  Yes. Go to Tools->Away->account->Invisible.
-
 +------------------------------------------------------------------------------
-| 7. IRC Protocol
+| 5. IRC Protocol
 +------------------------------------------------------------------------------
 
-7.1  How do I join a channel with the IRC plugin?
+5.1  How do I join a channel with the IRC plugin?
  
-  First create the account, then sign on. After you have signed on, you can use
-  File->Join A Chat on the buddy list to join a channel. In any window, either
-  a conversation or a chat, in which your IRC user is the sender, you can also
-  use /join to connect to a new channel.
+  Create an IRC account and then sign on. After you have signed on, you can use
+  Buddies->Join A Chat on the buddy list to join a channel. In any window,
+  either a conversation or a chat, in which your IRC user is the sender, you
+  can also use /join to connect to a new channel.
 
-7.2  Is there a way to make Gaim automatically identify me and/or join IRC
+5.2  Is there a way to make Gaim automatically identify me and/or join IRC
      chats on login?
  
   Yes. Add NickServ to your buddy list and place buddy pounces on him/her/it.
@@ -826,90 +772,40 @@
   In version 0.64 or higher, you can add a chat to your buddy list, right click
   it, and tell Gaim to auto-join it.
 
-7.3  Is it possible to change the user name that appears in username@hostname?
+5.3  Is it possible to change the user name that appears in username@hostname?
+ 
+  Yes. Go to the Accounts menu. Select your IRC account and click to edit.
+  Click the Advanced tab. Enter a name in the Username field.
 
-  Yes. Go to Tools->Accounts. Select your IRC account and click Modify. Expand
-  the Show more options section. Enter a name in the Username field.
+5.4  How can I set/change my real name?
+ 
+  Go to the Accounts menu. Select your IRC account and click to edit. Click the
+  Advanced tab. Enter a name in the Real name field.
 
-7.4  How can I set/change my real name?
-
-  Go to Tools->Accounts. Select your IRC account and click modify. Expand the
-  Show more options section. Enter a name in the Real name field.
-
 +------------------------------------------------------------------------------
-| 8. Jabber Protocol
+| 6. Jabber Protocol
 +------------------------------------------------------------------------------
 
-8.1  How do I choose which Jabber server to use?
+6.1  How do I choose which Jabber server to use?
  
   The Jabber server name is part of your Jabber I.D., such as
   som...@se.... So when entering your Jabber "screen name", the server
   is specified as part of your JID.
 
-8.2  How do I change my Jabber resource to be other than the default of "/
-     Gaim"?
+6.2  How do I change my Jabber resource to be other than the default of "/Home"
+     (or the old default of "/Gaim")?
  
-  When you create your account in Gaim, simply append the desired resource
-  identifier to your Jabber I.D. For example: som...@se.../resource
+  In the buddy list window, click the Accounts menu. Next, find your Jabber
+  account and click Edit Account. Change the value in the Resource field. Click
+  Save. Note: This setting cannot be changed while the account is connected.
 
-8.3  How do I register a new Jabber account?
+6.3  Can I remove a buddy from my Jabber roster entirely?
  
-  As of version 0.52 and up:
-
-   1. Click "Tools->Accounts->Add"
-   2. Select "Jabber" for the protocol.
-   3. Fill in screen name and password as you normally would. THIS IS A
-      REQUIRED STEP
-   4. Check the "Register with server" check-box
-   5. Click "OK".
-
-  Note: You are strongly recommended to check the "Remember password" check-box
-  as well, as Gaim presently does no password verification. So if you don't
-  type in what you thought you did, you're hosed.
-
-8.4  How do I use invisibility?
- 
-  Jabber invisibility support is available in Gaim version 0.60 and later.
-
-  There are two ways to use Jabber invisibility: on a per-buddy and on a
-  per-server basis.
-
-  To use per-buddy invisibility: right-click on the buddy on the Online buddy
-  list and select "Temporarily Hide From." You will appear to that buddy to be
-  off-line. To make yourself seen by that buddy again: right-click on the buddy
-  and select "Un-hide From." Note that the menu changes based on whether you're
-  currently invisible to that buddy or not.
-
-      The "Temporarily" part is a dead give-away. Your invisibility to that
-      buddy will last only until the next time you log on or until you set
-      server invisibility (discussed next) on and off.
-
-  To use per-server invisibility: click "Tools -> Away," select the Jabber
-  server login for the server upon which you wish to become invisible (if
-  necessary) and select "Invisible." To become visible again: select anything
-  else from that same menu (such as "Online"), or set your away status or log
-  off the server and back on again.
-
-  You can set yourself invisible per-server and subsequently make yourself
-  visible to selected buddies only.
-
-  Gaim currently does not retain invisibility settings between logins, just as
-  it doesn't currently retain "away" status.
-
-8.5  I've a buddy that I keep removing from my buddy list but the entry keeps
-     coming back every time I log in again! How can I stop this?
- 
-  With Gaim 0.60 or later, it might be continuing to import the old buddy
-  lists. Remove ~/.gaim/*.blist - these are no longer used, the buddy list is
-  now stored in ~/.gaim/blist.xml
-
-8.6  Can I remove a buddy from my Jabber roster entirely?
- 
   With Gaim 0.60 or later, the deletion code will do this. Gaim currently does
   not retain invisibility settings between logins, just as it doesn't currently
   retain "away" status.
 
-8.7  What does "Cancel Presence Notification" do?
+6.4  What does "Cancel Presence Notification" do?
  
   This selection, available in Gaim version 0.60 and later, and found by
   right-clicking on a buddy entry in the buddy list, prevents that Jabber I.D.
@@ -919,15 +815,10 @@
   presence (and you will have to approve it) for them to again see you on-line.
 
 +------------------------------------------------------------------------------
-| 9. Y!M (Yahoo) Protocol
+| 7. Y!M (Yahoo) Protocol
 +------------------------------------------------------------------------------
 
-9.1  I cannot connect to Yahoo! and get "Invalid Password" errors, or I'm using
-     a version of Gaim older than 0.79!
- 
-  Make sure you have at least 0.79.
-
-9.2  I cannot connect to Yahoo! and I'm behind a firewall or NAT. Why doesn't
+7.1  I cannot connect to Yahoo! and I'm behind a firewall or NAT. Why doesn't
      Gaim have Yahoo's "Firewall with no proxy" option?
  
   Yahoo!'s firewall with no proxy option connects to Yahoo! by wrapping the
@@ -939,7 +830,7 @@
   for as many people as actually tunneling through the HTTP protocol would, it
   helps many users.
 
-9.3  I blocked someone, but it doesn't seem to have worked.
+7.2  I blocked someone, but it doesn't seem to have worked.
  
   As of 0.81, this is a known bug in our Yahoo code. We're not sure what
   exactly is wrong, but it seems to fail most often when automatically removing
@@ -952,24 +843,22 @@
   and reblocking them from the Tools->Privacy dialog will often get things
   working.
 
-9.4  Can I get a list of Yahoo! Chat rooms? What about non-US lists?
+7.3  Can I get a list of Yahoo! Chat rooms? What about localized lists?
  
-  Tools->Room List will let you list available Yahoo! Chat rooms. Yahoo! does
-  support hidden and invite-only rooms. If you know the name of the room you
-  wish to join, and it's not invite only, you can join it via Buddies->Join a
-  Chat. You can also create a chat room this way, although we don't support
-  setting the hidden or invite-only type settings.
+  Tools->Room List will let you list available Yahoo! Chat rooms. Yahoo! has
+  currently disabled user-created rooms. The option to create rooms still
+  exists in Gaim but is non-functional unless Yahoo! re-enables user-created
+  rooms.
 
-  To get a non-US room list, you'll need to change the Chat Room List Url in
-  the account editor, under "Show more options". By default this field contains
-  "http://insider.msg.yahoo.com/ycontent/". You can add a country code prefix
-  to the url to fetch the list for another country. For example, for the German
-  list, you would use "http://de.inside...
 
[truncated message content]

[Gaim-commits] SF.net SVN: gaim: [17720] web/scripts/faqgen.pl

[<the...@us...>]

Revision: 17720
          http://svn.sourceforge.net/gaim/?rev=17720&view=rev
Author:   thekingant
Date:     2006-11-09 22:33:22 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Make faqgen.pl executable in the repo

Property Changed:
----------------
    web/scripts/faqgen.pl


Property changes on: web/scripts/faqgen.pl
___________________________________________________________________
Name: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17719] trunk

[<the...@us...>]

Revision: 17719
          http://svn.sourceforge.net/gaim/?rev=17719&view=rev
Author:   thekingant
Date:     2006-11-09 22:23:10 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Some updated translations

Modified Paths:
--------------
    trunk/gtk/gtkdialogs.c
    trunk/po/en_GB.po
    trunk/po/gl.po
    trunk/po/sl.po

Modified: trunk/gtk/gtkdialogs.c
===================================================================
--- trunk/gtk/gtkdialogs.c	2006-11-10 05:18:10 UTC (rev 17718)
+++ trunk/gtk/gtkdialogs.c	2006-11-10 06:23:10 UTC (rev 17719)
@@ -167,7 +167,7 @@
 	{N_("Serbian"),             "sr", "Danilo Šegan", "ds...@gm..."},
 	{N_("Serbian"),             "sr", "Aleksandar Urosevic", "ur...@us..."},
 	{N_("Slovak"),              "sk", "Richard Golier", "go...@gm..."},
-	{N_("Slovenian"),           "sl", "Matjaz Horvat", "ma...@ow..."},
+	{N_("Slovenian"),           "sl", "Martin Srebotnjak", "fi...@us..."},
 	{N_("Albanian"),            "sq", "Besnik Bleta", "be...@pr..."},
 	{N_("Swedish"),             "sv", "Tore Lundqvist", "tl...@mi..."},
 	{N_("Tamil"),               "ta", "Viveka Nathan K", "viv...@us..."},
@@ -212,6 +212,7 @@
 	{N_("Russian"),             "ru", "Alexandre Prokoudine", NULL},
 	{N_("Russian"),             "ru", "Sergey Volozhanin", NULL},
 	{N_("Slovak"),              "sk", "Daniel Režný", NULL},
+	{N_("Slovenian"),           "sl", "Matjaz Horvat", NULL},
 	{N_("Swedish"),             "sv", "Christian Rose", NULL},
 	{N_("Simplified Chinese"),  "zh_CN", "Hashao, Rocky S. Lee", NULL},
 	{N_("Traditional Chinese"), "zh_TW", "Hashao, Rocky S. Lee", NULL},

Modified: trunk/po/en_GB.po
===================================================================
--- trunk/po/en_GB.po	2006-11-10 05:18:10 UTC (rev 17718)
+++ trunk/po/en_GB.po	2006-11-10 06:23:10 UTC (rev 17719)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gaim 1.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-07 12:33+0000\n"
+"POT-Creation-Date: 2006-11-06 12:17+0000\n"
 "PO-Revision-Date: 2006-02-07 13:57+0000\n"
 "Last-Translator: Luke Ross <luk...@sy...>\n"
 "Language-Team:  <en...@li...>\n"
@@ -28,2280 +28,1260 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Send instant messages over multiple protocols"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ciphertest.c:264
-msgid "Cipher Test"
-msgstr "Cipher Test"
+#: ../console/gntaccount.c:119 ../console/gntblist.c:277
+#: ../console/gntblist.c:395 ../console/gntblist.c:408
+#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
+#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
+#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libgaim/protocols/jabber/chat.c:677
+#: ../libgaim/protocols/jabber/chat.c:688
+#: ../libgaim/protocols/jabber/jabber.c:1188
+#: ../libgaim/protocols/qq/group_join.c:322
+#: ../libgaim/protocols/silc/ops.c:1449
+msgid "Error"
+msgstr "Error"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr "Tests the ciphers that ship with gaim."
+#: ../console/gntaccount.c:119
+msgid "Account was not added"
+msgstr "Account was not added"
 
-#: ../plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Buddy is idle"
+#: ../console/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "Screen name of an account must not be empty."
 
-#: ../plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Buddy is away"
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558
+msgid "New mail notifications"
+msgstr "New mail notifications"
 
-#: ../plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "Buddy is away for an extended period"
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487
+msgid "Remember password"
+msgstr "Remember password"
 
-#. Not used yet.
-#: ../plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "Buddy is mobile"
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3797
+msgid "Modify Account"
+msgstr "Modify Account"
 
-#: ../plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Buddy is offline"
+#: ../console/gntaccount.c:474
+msgid "New Account"
+msgstr "New Account"
 
-#: ../plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Point values to use when..."
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protocol:"
 
-#: ../plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-"The buddy with the <i>highest score</i> is the buddy who will have priority "
-"in the contact.\n"
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4942
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Screen name:"
 
-#: ../plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Use last buddy when scores are equal"
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478
+msgid "Password:"
+msgstr "Password:"
 
-#: ../plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Point values to use for account..."
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4963 ../gtk/gtkblist.c:5328
+msgid "Alias:"
+msgstr "Alias:"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Contact Priority"
+#. Cancel
+#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
+#: ../console/gntaccount.c:834 ../console/gntblist.c:318
+#: ../console/gntblist.c:385 ../console/gntblist.c:418
+#: ../console/gntblist.c:747 ../console/gntblist.c:916
+#: ../console/gntblist.c:1007 ../console/gntblist.c:1920
+#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
+#: ../console/gntstatus.c:471 ../console/gntstatus.c:596
+#: ../gtk/gtkaccount.c:1833 ../gtk/gtkaccount.c:2307 ../gtk/gtkblist.c:5384
+#: ../gtk/gtkdialogs.c:681 ../gtk/gtkdialogs.c:818 ../gtk/gtkdialogs.c:909
+#: ../gtk/gtkdialogs.c:928 ../gtk/gtkdialogs.c:950 ../gtk/gtkdialogs.c:970
+#: ../gtk/gtkdialogs.c:1014 ../gtk/gtkdialogs.c:1052 ../gtk/gtkdialogs.c:1106
+#: ../gtk/gtkdialogs.c:1143 ../gtk/gtkdialogs.c:1168
+#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:296
+#: ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
+#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
+#: ../gtk/gtksavedstatuses.c:296 ../libgaim/account.c:964
+#: ../libgaim/account.c:1135 ../libgaim/account.c:1169
+#: ../libgaim/conversation.c:1164 ../libgaim/protocols/gg/gg.c:498
+#: ../libgaim/protocols/gg/gg.c:656 ../libgaim/protocols/gg/gg.c:792
+#: ../libgaim/protocols/gg/gg.c:871 ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1725
+#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libgaim/protocols/jabber/chat.c:780
+#: ../libgaim/protocols/jabber/jabber.c:850
+#: ../libgaim/protocols/jabber/jabber.c:1343
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
+#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
+#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
+#: ../libgaim/protocols/oscar/oscar.c:1389
+#: ../libgaim/protocols/oscar/oscar.c:2153
+#: ../libgaim/protocols/oscar/oscar.c:2192
+#: ../libgaim/protocols/oscar/oscar.c:2240
+#: ../libgaim/protocols/oscar/oscar.c:5734
+#: ../libgaim/protocols/oscar/oscar.c:5786
+#: ../libgaim/protocols/oscar/oscar.c:5938
+#: ../libgaim/protocols/oscar/oscar.c:5963
+#: ../libgaim/protocols/oscar/oscar.c:6019
+#: ../libgaim/protocols/oscar/oscar.c:6088
+#: ../libgaim/protocols/oscar/peer.c:991
+#: ../libgaim/protocols/qq/buddy_info.c:480
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/buddy_opt.c:400 ../libgaim/protocols/qq/group.c:122
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_join.c:357
+#: ../libgaim/protocols/qq/group_opt.c:140
+#: ../libgaim/protocols/qq/group_opt.c:390 ../libgaim/protocols/qq/qq.c:459
+#: ../libgaim/protocols/qq/sendqueue.c:201
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:3361
+#: ../libgaim/protocols/sametime/sametime.c:3446
+#: ../libgaim/protocols/sametime/sametime.c:3616
+#: ../libgaim/protocols/sametime/sametime.c:5311
+#: ../libgaim/protocols/sametime/sametime.c:5400
+#: ../libgaim/protocols/sametime/sametime.c:5524
+#: ../libgaim/protocols/silc/buddy.c:467
+#: ../libgaim/protocols/silc/buddy.c:1078
+#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1910
+#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
+#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
+#: ../libgaim/request.h:1354
+msgid "Cancel"
+msgstr "Cancel"
 
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Allows for controlling the values associated with different buddy states."
+#. Save
+#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
+#: ../console/gntstatus.c:474 ../console/gntstatus.c:584 ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1168
+#: ../libgaim/protocols/jabber/buddy.c:587
+msgid "Save"
+msgstr "Save"
 
-#. *< description
-#: ../plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/crazychat/cc_gaim_plugin.c:146
-msgid "Crazychat"
-msgstr "Crazychat"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/crazychat/cc_gaim_plugin.c:149
-msgid "Plugin to establish a Crazychat session."
-msgstr "Plug-in to establish a Crazychat session."
-
-#. *  description
-#: ../plugins/crazychat/cc_gaim_plugin.c:151
-msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr "Uses Gaim to obtain buddy IPs to connect for a Crazychat session"
-
-#. make the network configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:295
-msgid "Network Configuration"
-msgstr "Network Configuration"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:307
-msgid "TCP port"
-msgstr "TCP port"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:317
-msgid "UDP port"
-msgstr "UDP port"
-
-#. make the feature configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:329
-msgid "Feature Calibration"
-msgstr "Feature Calibration"
-
-#. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
-#: ../src/gtkplugin.c:574
-msgid "Enabled"
-msgstr "Enabled"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:350
-msgid "Disabled"
-msgstr "Disabled"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/dbus-example.c:135
-msgid "DBus"
-msgstr "DBus"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
-msgid "DBus Plugin Example"
-msgstr "DBus Plug-in Example"
-
-#: ../plugins/docklet/docklet.c:154
-msgid "Right-click for more unread messages...\n"
-msgstr "Right-click for more unread messages...\n"
-
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3239
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827
+#: ../gtk/gtksavedstatuses.c:293
 #, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d unread message from %s\n"
-msgstr[1] "%d unread messages from %s\n"
+msgid "Are you sure you want to delete %s?"
+msgstr "Are you sure you want to delete %s?"
 
-#: ../plugins/docklet/docklet.c:432
-msgid "Change Status"
-msgstr "Change Status"
+#. Close any other opened delete window
+#: ../console/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Delete Account"
 
-#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
-#: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2734 ../src/status.c:155
-msgid "Available"
-msgstr "Available"
+#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
+#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
+#: ../gtk/gtkaccount.c:1832 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:295
+msgid "Delete"
+msgstr "Delete"
 
-#. Away stuff
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
-#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7871
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3188
-#: ../src/status.c:158
-msgid "Away"
-msgstr "Away"
-
-#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2728
-#: ../src/status.c:157
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2969
-#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7843 ../src/protocols/yahoo/yahoo.c:2732
-#: ../src/status.c:154
-msgid "Offline"
-msgstr "Offline"
-
-#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
-msgid "New..."
-msgstr "New..."
-
-#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
-msgid "Saved..."
-msgstr "Saved..."
-
-#: ../plugins/docklet/docklet.c:484
-msgid "Show Buddy List"
-msgstr "Show Buddy List"
-
-#: ../plugins/docklet/docklet.c:489
-msgid "Unread Messages"
-msgstr "Unread Messages"
-
-#: ../plugins/docklet/docklet.c:510
-msgid "New Message..."
-msgstr "New Message..."
-
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1841
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2139 ../gtk/gtkdocklet.c:530
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
-msgid "Plugins"
-msgstr "Plug-ins"
+#: ../console/gntaccount.c:650
+msgid "You can enable/disable accounts from the following list."
+msgstr "You can enable/disable accounts from the following list."
 
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
-msgid "Preferences"
-msgstr "Preferences"
+#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
+#: ../console/gntblist.c:318 ../console/gntblist.c:385
+#: ../console/gntblist.c:418 ../console/gntnotify.c:306
+#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2306 ../gtk/gtkblist.c:5383
+#: ../gtk/gtkconv.c:1634 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2431
+#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
+#: ../libgaim/protocols/qq/sys_msg.c:245
+#: ../libgaim/protocols/sametime/sametime.c:5399
+#: ../libgaim/protocols/silc/chat.c:596
+msgid "Add"
+msgstr "Add"
 
-#: ../plugins/docklet/docklet.c:525
-msgid "Mute Sounds"
-msgstr "Mute Sounds"
+#: ../console/gntaccount.c:677
+msgid "Modify"
+msgstr "Modify"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../plugins/docklet/docklet.c:538
-msgid "Quit"
-msgstr "Quit"
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2255
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s has made %s his or her buddy%s%s"
 
-#: ../plugins/docklet/docklet.c:679
-msgid "Blink tray icon for unread..."
-msgstr "Blink tray icon for unread..."
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2304
+msgid "Add buddy to your list?"
+msgstr "Add buddy to your list?"
 
-#: ../plugins/docklet/docklet.c:682
-msgid "_Instant Messages:"
-msgstr "_Instant Messages:"
+#: ../console/gntblist.c:269
+msgid "You must provide a screename for the buddy."
+msgstr "You must provide a screen name for the buddy."
 
-#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
-msgid "Never"
-msgstr "Never"
+#: ../console/gntblist.c:271
+msgid "You must provide a group."
+msgstr "You must provide a group."
 
-#: ../plugins/docklet/docklet.c:685
-msgid "In hidden conversations"
-msgstr "In hidden conversations"
+#: ../console/gntblist.c:273
+msgid "You must select an account."
+msgstr "You must select an account."
 
-#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
-#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
-msgid "Always"
-msgstr "Always"
+#: ../console/gntblist.c:277
+msgid "Error adding buddy"
+msgstr "Error adding buddy"
 
-#: ../plugins/docklet/docklet.c:690
-msgid "C_hat Messages:"
-msgstr "C_hat Messages:"
+#: ../console/gntblist.c:302 ../gtk/gtkaccount.c:1896
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2805
+msgid "Screen Name"
+msgstr "Screen Name"
 
-#: ../plugins/docklet/docklet.c:693
-msgid "When my nick is said"
-msgstr "When my nick is mentioned"
+#: ../console/gntblist.c:305 ../console/gntblist.c:377 ../gtk/gtkdialogs.c:927
+#: ../gtk/gtkdialogs.c:949 ../gtk/gtkdialogs.c:969 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/silc/chat.c:587
+msgid "Alias"
+msgstr "Alias"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/docklet/docklet.c:720
-msgid "System Tray Icon"
-msgstr "System Tray Icon"
+#: ../console/gntblist.c:308 ../console/gntblist.c:380
+msgid "Group"
+msgstr "Group"
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/docklet/docklet.c:723
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Displays an icon for Gaim in the system tray."
+#: ../console/gntblist.c:311 ../console/gntblist.c:368
+#: ../console/gntnotify.c:155 ../console/gntstatus.c:562
+#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
+#: ../gtk/plugins/gevolution/gevolution.c:451 ../libgaim/plugins/idle.c:153
+#: ../libgaim/plugins/idle.c:189
+msgid "Account"
+msgstr "Account"
 
-#. *  description
-#: ../plugins/docklet/docklet.c:725
-msgid ""
-"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list. Also provides options to blink for "
-"unread messages."
-msgstr ""
-"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list. Also provides options to blink for "
-"unread messages."
+#: ../console/gntblist.c:317 ../console/gntblist.c:794 ../gtk/gtkblist.c:4896
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libgaim/protocols/silc/buddy.c:736
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/buddy.c:1075
+#: ../libgaim/protocols/silc/buddy.c:1174
+#: ../libgaim/protocols/yahoo/yahoo.c:3128
+msgid "Add Buddy"
+msgstr "Add Buddy"
 
-#: ../plugins/docklet/eggtrayicon.c:123
-msgid "Orientation"
-msgstr "Orientation"
+#: ../console/gntblist.c:317
+msgid "Please enter buddy information."
+msgstr "Please enter buddy information."
 
-#: ../plugins/docklet/eggtrayicon.c:124
-msgid "The orientation of the tray."
-msgstr "The orientation of the tray."
+#: ../console/gntblist.c:340 ../libgaim/blist.c:1195
+msgid "Chats"
+msgstr "Chats"
 
-#: ../plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "By conversation count"
+#. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
+#: ../console/gntblist.c:374 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
+#: ../gtk/plugins/gevolution/assoc-buddy.c:123
+#: ../libgaim/protocols/jabber/jabber.c:781
+#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
+#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
+msgid "Name"
+msgstr "Name"
 
-#: ../plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Conversation Placement"
+#: ../console/gntblist.c:383 ../console/gntblist.c:796 ../gtk/gtkblist.c:5274
+msgid "Add Chat"
+msgstr "Add Chat"
 
-#: ../plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Number of conversations per window"
+#: ../console/gntblist.c:384
+msgid "You can edit more information from the context menu later."
+msgstr "You can edit more information from the context menu later."
 
-#: ../plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Separate IM and Chat windows when placing by number"
+#: ../console/gntblist.c:395 ../console/gntblist.c:408
+msgid "Error adding group"
+msgstr "Error adding group"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "ExtPlacement"
+#: ../console/gntblist.c:396
+msgid "You must give a name for the group to add."
+msgstr "You must give a name for the group to add."
 
-#. *< name
-#. *< version
-#: ../plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Extra conversation placement options."
+#: ../console/gntblist.c:409
+msgid "A group with the name already exists."
+msgstr "A group with that name already exists."
 
-#. *< summary
-#. *  description
-#: ../plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
+#: ../console/gntblist.c:416 ../console/gntblist.c:798 ../gtk/gtkblist.c:5380
+#: ../libgaim/protocols/sametime/sametime.c:5310
+#: ../libgaim/protocols/sametime/sametime.c:5397
+msgid "Add Group"
+msgstr "Add Group"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/filectl.c:245
-msgid "Gaim File Control"
-msgstr "Gaim File Control"
+#: ../console/gntblist.c:416
+msgid "Enter the name of the group"
+msgstr "Enter the name of the group"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Allows you to control Gaim by entering commands in a file."
+#: ../console/gntblist.c:746
+msgid "Edit Chat"
+msgstr "Edit Chat"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim Demonstration Plug-in"
+#: ../console/gntblist.c:746
+msgid "Please Update the necessary fields."
+msgstr "Please update the necessary fields."
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "An example plug-in that does stuff - see the description."
+#: ../console/gntblist.c:747 ../console/gntstatus.c:196
+msgid "Edit"
+msgstr "Edit"
 
-#. *  description
-#: ../plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"This is a really cool plug-in that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
+#: ../console/gntblist.c:761
+msgid "Auto-join"
+msgstr "Auto-join"
 
-#: ../plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Cursor Colour"
+#: ../console/gntblist.c:770
+msgid "Edit Settings"
+msgstr "Edit Settings"
 
-#: ../plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Secondary Cursor Colour"
+#: ../console/gntblist.c:816 ../libgaim/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "Get Info"
 
-#: ../plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Hyperlink Colour"
+#: ../console/gntblist.c:821
+msgid "Add Buddy Pounce"
+msgstr "Add Buddy Pounce"
 
-#: ../plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView Expander Size"
+#: ../console/gntblist.c:828 ../gtk/gtkconv.c:1582
+#: ../libgaim/protocols/oscar/oscar.c:615
+msgid "Send File"
+msgstr "Send File"
 
-#: ../plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView Horizontal Separation"
+#: ../console/gntblist.c:832
+msgid "View Log"
+msgstr "View Log"
 
-#: ../plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Conversation Entry"
+#: ../console/gntblist.c:912
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Please enter the new name for %s"
 
-#: ../plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Conversation History"
+#: ../console/gntblist.c:914 ../console/gntblist.c:915
+#: ../console/gntblist.c:1084
+msgid "Rename"
+msgstr "Rename"
 
-#: ../plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Log Viewer"
+#: ../console/gntblist.c:914
+msgid "Enter empty string to reset the name."
+msgstr "Enter empty string to reset the name."
 
-#: ../plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "Request Dialog"
+#: ../console/gntblist.c:987
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "Removing this contact will also remove all the buddies in the contact"
 
-#: ../plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Notify Dialog"
+#: ../console/gntblist.c:995
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Removing this group will also remove all the buddies in the group"
 
-#: ../plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView Indent Expanders"
-
-#: ../plugins/gaimrc.c:287
+#: ../console/gntblist.c:1000
 #, c-format
-msgid "Select Color for %s"
-msgstr "Select Colour for %s"
+msgid "Are you sure you want to remove %s?"
+msgstr "Are you sure you want to remove %s?"
 
-#: ../plugins/gaimrc.c:289
-msgid "Select Color"
-msgstr "Select Colour"
+#. XXX: anything to do with the returned ui-handle?
+#: ../console/gntblist.c:1003
+msgid "Confirm Remove"
+msgstr "Confirm Remove"
 
-#: ../plugins/gaimrc.c:324
-#, c-format
-msgid "Select Font for %s"
-msgstr "Select Font for %s"
+#: ../console/gntblist.c:1006 ../console/gntblist.c:1086
+#: ../gtk/gtkblist.c:1039 ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275
+msgid "Remove"
+msgstr "Remove"
 
-#: ../plugins/gaimrc.c:362
-msgid "Select Interface Font"
-msgstr "Select Interface Font"
+#. Buddy List
+#: ../console/gntblist.c:1061 ../console/gntblist.c:1987
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3914
+#: ../gtk/plugins/win32/winprefs/winprefs.c:327
+msgid "Buddy List"
+msgstr "Buddy List"
 
-#: ../plugins/gaimrc.c:415
-msgid "General"
-msgstr "General"
+#: ../console/gntblist.c:1090
+msgid "Place tagged"
+msgstr "Place tagged"
 
-#: ../plugins/gaimrc.c:420
-msgid "GTK+ Interface Font"
-msgstr "GTK+ Interface Font"
+#: ../console/gntblist.c:1093
+msgid "Tag"
+msgstr "Tag"
 
-#: ../plugins/gaimrc.c:440
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ Text Shortcut Theme"
+#: ../console/gntblist.c:1120 ../console/gntblist.c:1221
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Account: %s (%s)"
 
-#: ../plugins/gaimrc.c:475
-msgid "Interface colors"
-msgstr "Interface colours"
-
-#: ../plugins/gaimrc.c:499
-msgid "Widget Sizes"
-msgstr "Widget Sizes"
-
-#: ../plugins/gaimrc.c:520
-msgid "Fonts"
-msgstr "Fonts"
-
-#: ../plugins/gaimrc.c:543
-msgid "Tools"
-msgstr "Tools"
-
-#: ../plugins/gaimrc.c:548
+#: ../console/gntblist.c:1145
 #, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Write settings to %s%sgtkrc-2.0"
-
-#: ../plugins/gaimrc.c:556
-msgid "Re-read gtkrc files"
-msgstr "Re-read gtkrc files"
-
-#: ../plugins/gaimrc.c:583
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+ Theme Control"
-
-#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Provides access to commonly used gtkrc settings."
-
-#. Configuration frame
-#: ../plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Mouse Gestures Configuration"
-
-#: ../plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Middle mouse button"
-
-#: ../plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Right mouse button"
-
-#. "Visual gesture display" checkbox
-#: ../plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "_Visual gesture display"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Mouse Gestures"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "Provides support for mouse gestures"
-
-#. *  description
-#: ../plugins/gestures/gestures.c:294
 msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
 "\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
+"Idle: %s"
 msgstr ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
 "\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
+"Idle: %s"
 
-#. Extract their Name and put it in
-#: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1525
-msgid "Name"
-msgstr "Name"
+#: ../console/gntblist.c:1200
+#, c-format
+msgid "Nickname: %s\n"
+msgstr "Nickname: %s\n"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "Instant Messaging"
-
-#. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:454
-msgid "Select a person from your address book below, or add a new person."
-msgstr "Select a person from your address book below, or add a new person."
-
-#. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:467
-#: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8391
-#: ../src/protocols/sametime/sametime.c:5532
-msgid "Search"
-msgstr "Search"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4535
-#: ../src/gtkblist.c:4899
-msgid "Group:"
-msgstr "Group:"
-
-#. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:574
-#: ../plugins/gevolution/assoc-buddy.c:464
-msgid "New Person"
-msgstr "New Person"
-
-#. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:591
-msgid "Select Buddy"
-msgstr "Select Buddy"
-
-#. Add the label.
-#: ../plugins/gevolution/assoc-buddy.c:340
+#: ../console/gntblist.c:1212
+#, c-format
 msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
+"Online: %d\n"
+"Total: %d"
 msgstr ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
+"Online: %d\n"
+"Total: %d"
 
-#. Add the expander
-#: ../plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-msgstr "User _details"
-
-#. "Associate Buddy" button
-#: ../plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr "_Associate Buddy"
-
-#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1121
-msgid "None"
-msgstr "None"
-
-#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1271 ../src/blist.c:1498
-#: ../src/gtkblist.c:4344 ../src/protocols/jabber/roster.c:65
-msgid "Buddies"
-msgstr "Buddies"
-
-#: ../plugins/gevolution/gevolution.c:262
-#: ../plugins/gevolution/gevolution.c:268
-msgid "Unable to send e-mail"
-msgstr "Unable to send e-mail"
-
-#: ../plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr "The evolution executable was not found in the PATH."
-
-#: ../plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "The specified buddy was not found in the Evolution Contacts."
-
-#: ../plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
-msgstr "Add to Address Book"
-
-#: ../plugins/gevolution/gevolution.c:290
-msgid "Send E-Mail"
-msgstr "Send E-Mail"
-
-#. Configuration frame
-#: ../plugins/gevolution/gevolution.c:417
-msgid "Evolution Integration Configuration"
-msgstr "Evolution Integration Configuration"
-
-#. Label
-#: ../plugins/gevolution/gevolution.c:420
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Select all accounts that buddies should be auto-added to."
-
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
-msgid "Account"
-msgstr "Account"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Evolution Integration"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gevolution/gevolution.c:530
-#: ../plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "Provides integration with Evolution."
-
-#: ../plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the person's information below."
-msgstr "Please enter the person's information below."
-
-#: ../plugins/gevolution/new_person_dialog.c:270
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Please enter the buddy's screen name and account type below."
-
-#: ../plugins/gevolution/new_person_dialog.c:290
-msgid "Account type:"
-msgstr "Account type:"
-
-#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
-msgid "Screen name:"
-msgstr "Screen name:"
-
-#. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
-msgid "Optional information:"
-msgstr "Optional information:"
-
-#. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:699
-msgid "Buddy Icon"
-msgstr "Buddy Icon"
-
-#: ../plugins/gevolution/new_person_dialog.c:349
-msgid "First name:"
-msgstr "Forename"
-
-#: ../plugins/gevolution/new_person_dialog.c:361
-msgid "Last name:"
-msgstr "Surname"
-
-#: ../plugins/gevolution/new_person_dialog.c:381
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK Signals Test"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr "Test to see that all UI signals are working properly."
-
-#: ../plugins/history.c:120
+#: ../console/gntblist.c:1233
 #, c-format
-msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<h1>Conversation with %s on %s:</b><br>"
-
-#: ../plugins/history.c:147
-msgid "History Plugin Requires Logging"
-msgstr "History Plug-in Requires Logging"
-
-#: ../plugins/history.c:148
 msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Last Seen: %s ago"
 msgstr ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Last Seen: %s ago"
 
-#: ../plugins/history.c:188
-msgid "History"
-msgstr "History"
+#: ../console/gntblist.c:1456 ../gtk/gtkdocklet.c:478
+#: ../gtk/gtkstatusbox.c:984
+msgid "New..."
+msgstr "New..."
 
-#: ../plugins/history.c:190
-msgid "Shows recently logged conversations in new conversations."
-msgstr "Shows recently logged conversations in new conversations."
+#: ../console/gntblist.c:1463 ../gtk/gtkdocklet.c:479
+#: ../gtk/gtkstatusbox.c:985
+msgid "Saved..."
+msgstr "Saved..."
 
-#: ../plugins/history.c:191
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr ""
-"When a new conversation is opened this plug-in will insert the last "
-"conversation into the current conversation."
+#: ../console/gntblist.c:1809 ../console/gntplugin.c:231 ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:531 ../gtk/gtkplugin.c:538
+msgid "Plugins"
+msgstr "Plug-ins"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Iconify on Away"
+#: ../console/gntblist.c:1901 ../gtk/gtkdialogs.c:662 ../gtk/gtkdialogs.c:799
+#: ../gtk/gtkdialogs.c:879
+msgid "_Name"
+msgstr "_Name"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Iconifies the buddy list and your conversations when you go away."
+#: ../console/gntblist.c:1906 ../gtk/gtkdialogs.c:667 ../gtk/gtkdialogs.c:804
+#: ../gtk/gtkdialogs.c:884
+msgid "_Account"
+msgstr "_Account"
 
-#: ../plugins/idle.c:152 ../plugins/idle.c:210
-msgid "Minutes"
-msgstr "Minutes"
+#: ../console/gntblist.c:1914 ../gtk/gtkdialogs.c:675
+msgid "New Instant Message"
+msgstr "New Instant Message"
 
-#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
-#: ../plugins/idle.c:306
-msgid "I'dle Mak'er"
-msgstr "I'dle Mak'er"
+#: ../console/gntblist.c:1916 ../gtk/gtkdialogs.c:677
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Please enter the screen name or alias of the person you would like to IM."
 
-#: ../plugins/idle.c:160 ../plugins/idle.c:249
-msgid "Set Account Idle Time"
-msgstr "Set Account Idle Time"
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../console/gntblist.c:1919 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3796
+#: ../gtk/gtkdialogs.c:680 ../gtk/gtkdialogs.c:817 ../gtk/gtkdialogs.c:908
+#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:963 ../libgaim/account.c:1134
+#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1342
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
+#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
+#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1388
+#: ../libgaim/protocols/oscar/oscar.c:2152
+#: ../libgaim/protocols/oscar/oscar.c:2239
+#: ../libgaim/protocols/oscar/oscar.c:5733
+#: ../libgaim/protocols/oscar/oscar.c:5937
+#: ../libgaim/protocols/oscar/oscar.c:5962
+#: ../libgaim/protocols/oscar/oscar.c:6018
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:749
+#: ../libgaim/protocols/yahoo/yahoo.c:3213
+#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+msgid "OK"
+msgstr "OK"
 
-#: ../plugins/idle.c:163 ../plugins/idle.c:221
-msgid "_Set"
-msgstr "_Set"
+#. Create the "Options" frame.
+#: ../console/gntblist.c:1938 ../gtk/gtkpounce.c:766
+msgid "Options"
+msgstr "Options"
 
-#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
-msgid "_Cancel"
-msgstr "_Cancel"
+#: ../console/gntblist.c:1944
+msgid "Send IM..."
+msgstr "Send IM..."
 
-#: ../plugins/idle.c:177
-msgid "None of your accounts are idle."
-msgstr "None of your accounts are idle."
+#: ../console/gntblist.c:1948
+msgid "Toggle offline buddies"
+msgstr "Toggle offline buddies"
 
-#: ../plugins/idle.c:193 ../plugins/idle.c:253
-msgid "Unset Account Idle Time"
-msgstr "Unset Account Idle Time"
+#: ../console/gntblist.c:1952
+msgid "Sort by status"
+msgstr "Sort by status"
 
-#: ../plugins/idle.c:196
-msgid "_Unset"
-msgstr "_Unset"
+#: ../console/gntblist.c:1956
+msgid "Sort alphabetically"
+msgstr "Sort alphabetically"
 
-#: ../plugins/idle.c:218 ../plugins/idle.c:257
-msgid "Set Idle Time for All Accounts"
-msgstr "Set Idle Time for All Accounts"
+#: ../console/gntblist.c:1960
+msgid "Sort by log size"
+msgstr "Sort by log size"
 
-#: ../plugins/idle.c:262
-msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Unset Idle Time For All Idled Accounts"
+#: ../console/gntconn.c:36
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../plugins/idle.c:308 ../plugins/idle.c:309
-msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Allows you to hand-configure how long you've been idle for"
+#: ../console/gntconn.c:39
+#, c-format
+msgid "%s disconnected."
+msgstr "%s disconnected."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr "IPC Test Client"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr "Test plug-in IPC support, as a client."
-
-#. *  description
-#: ../plugins/ipc-test-client.c:92
+#: ../console/gntconn.c:40
+#, c-format
 msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
+"%s was disconnected due to the following error:\n"
+"%s"
 msgstr ""
-"Test plug-in IPC support, as a client. This locates the server plug-in and "
-"calls the commands registered."
+"%s was disconnected because of the following error:\n"
+"%s"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "IPC Test Server"
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3794 ../libgaim/account.c:991
+#: ../libgaim/connection.c:107
+msgid "Connection Error"
+msgstr "Connection Error"
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr "Test plug-in IPC support, as a server."
+#: ../console/gntconv.c:71
+msgid "No such command."
+msgstr "No such command."
 
-#. *  description
-#: ../plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+#: ../console/gntconv.c:75 ../gtk/gtkconv.c:493
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Test plug-in IPC support, as a server. This registers the IPC commands."
+"Syntax Error:  You typed the wrong number of arguments to that command."
 
-#: ../plugins/log_reader.c:1407
-msgid "User is offline."
-msgstr "User is offline."
+#: ../console/gntconv.c:80 ../gtk/gtkconv.c:498
+msgid "Your command failed for an unknown reason."
+msgstr "Your command failed for an unknown reason."
 
-#: ../plugins/log_reader.c:1413
-msgid "Auto-response sent:"
-msgstr "Auto-response sent:"
+#: ../console/gntconv.c:85 ../gtk/gtkconv.c:504
+msgid "That command only works in chats, not IMs."
+msgstr "That command only works in chats, not IMs."
 
-#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
-#: ../plugins/statenotify.c:79
-#, c-format
-msgid "%s has signed off."
-msgstr "%s has signed off."
+#: ../console/gntconv.c:88 ../gtk/gtkconv.c:507
+msgid "That command only works in IMs, not chats."
+msgstr "That command only works in IMs, not chats."
 
-#: ../plugins/log_reader.c:1440
-msgid "One or more messages may have been undeliverable."
-msgstr "One or more messages may not have been delivered."
+#: ../console/gntconv.c:92 ../gtk/gtkconv.c:511
+msgid "That command doesn't work on this protocol."
+msgstr "That command doesn't work on this protocol."
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
-msgid "You were disconnected from the server."
-msgstr "You were disconnected from the server."
+#: ../console/gntconv.c:99
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "Commands are not supported yet. Message was NOT sent."
 
-#: ../plugins/log_reader.c:1458
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
+#: ../console/gntconv.c:198
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
 
-#: ../plugins/log_reader.c:1473
-msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Message could not be sent because the maximum length was exceeded."
+#: ../console/gntconv.c:219
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
 
-#: ../plugins/log_reader.c:1478
-msgid "Message could not be sent."
-msgstr "Message could not be sent."
+#: ../console/gntconv.c:349
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-REPLY> "
 
-#: ../plugins/log_reader.c:1837 ../plugins/log_reader.c:1930
-msgid "Adium"
-msgstr "Adium"
+#. Print the list of users in the room
+#: ../console/gntconv.c:443
+msgid "List of users:\n"
+msgstr "List of users:\n"
 
-#: ../plugins/log_reader.c:1846 ../plugins/log_reader.c:1934
-msgid "Fire"
-msgstr "Fire"
+#: ../console/gntconv.c:567 ../gtk/gtkconv.c:386
+msgid "Supported debug options are:  version"
+msgstr "Supported debug options are:  version"
 
-#: ../plugins/log_reader.c:1855 ../plugins/log_reader.c:1938
-msgid "Messenger Plus!"
-msgstr "Messenger Plus!"
+#: ../console/gntconv.c:602 ../gtk/gtkconv.c:422
+msgid "No such command (in this context)."
+msgstr "No such command (in this context)."
 
-#: ../plugins/log_reader.c:1864 ../plugins/log_reader.c:1942
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#: ../plugins/log_reader.c:1873 ../plugins/log_reader.c:1946
-msgid "Trillian"
-msgstr "Trillian"
-
-#. Add general preferences.
-#: ../plugins/log_reader.c:1912
-msgid "General Log Reading Configuration"
-msgstr "General Log Reading Configuration"
-
-#: ../plugins/log_reader.c:1916
-msgid "Fast size calculations"
-msgstr "Fast size calculations"
-
-#: ../plugins/log_reader.c:1920
-msgid "Use name heuristics"
-msgstr "Use name heuristics"
-
-#. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1926
-msgid "Log Directory"
-msgstr "Log Directory"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/log_reader.c:1969
-msgid "Log Reader"
-msgstr "Log Reader"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/log_reader.c:1973
-msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Includes other IM clients' logs in the log viewer."
-
-#. * description
-#: ../plugins/log_reader.c:1977
+#: ../console/gntconv.c:605 ../gtk/gtkconv.c:425
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
-"Trillian."
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
 msgstr ""
-"When viewing logs, this plug-in will include logs from other IM clients. "
-"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
-"Trillian."
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
 
-#: ../plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Mail Checker"
-
-#: ../plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Checks for new local mail."
-
-#: ../plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Adds a small box to the buddy list that shows if you have new mail."
-
-#: ../plugins/mono/loader/mono.c:213
-msgid "Mono Plugin Loader"
-msgstr "Mono Plug-in Loader"
-
-#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
-msgid "Loads .NET plugins with Mono."
-msgstr "Loads .NET plug-ins with Mono."
-
-#: ../plugins/musicmessaging/musicmessaging.c:44
+#: ../console/gntconv.c:644 ../gtk/gtkconv.c:6732
 msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
 msgstr ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
 
-#: ../plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Music messaging session confirmed."
+#: ../console/gntconv.c:647 ../gtk/gtkconv.c:6735
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 
-#: ../plugins/musicmessaging/musicmessaging.c:414
-msgid "Music Messaging"
-msgstr "Music Messaging"
-
-#: ../plugins/musicmessaging/musicmessaging.c:415
-msgid "There was a conflict in running the command:"
-msgstr "There was a conflict in running the command:"
-
-#: ../plugins/musicmessaging/musicmessaging.c:523
-msgid "Error Running Editor"
-msgstr "Error Running Editor"
-
-#: ../plugins/musicmessaging/musicmessaging.c:524
-msgid "The following error has occured:"
-msgstr "The following error has occurred:"
-
-#. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:623
-msgid "Music Messaging Configuration"
-msgstr "Music Messaging Configuration"
-
-#: ../plugins/musicmessaging/musicmessaging.c:627
-msgid "Score Editor Path"
-msgstr "Score Editor Path"
-
-#: ../plugins/musicmessaging/musicmessaging.c:628
-msgid "_Apply"
-msgstr "_Apply"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../plugins/musicmessaging/musicmessaging.c:663
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Music Messaging Plugin for collaborative composition."
-
-#. *  summary
-#: ../plugins/musicmessaging/musicmessaging.c:665
+#: ../console/gntconv.c:650 ../gtk/gtkconv.c:6738
 msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
 msgstr ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
 
-#. ---------- "Notify For" ----------
-#: ../plugins/notify.c:638
-msgid "Notify For"
-msgstr "Notify For"
+#: ../console/gntconv.c:653 ../gtk/gtkconv.c:6741
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: Clears the conversation scrollback."
 
-#: ../plugins/notify.c:642
-msgid "_IM windows"
-msgstr "_IM windows"
+#: ../console/gntconv.c:656 ../gtk/gtkconv.c:6744
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: ../plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "C_hat windows"
+#: ../console/gntconv.c:661
+msgid "plugins: Show the plugins window."
+msgstr "plugins: Show the plugins window"
 
-#: ../plugins/notify.c:657
-msgid "\t_Only when someone says your nick"
-msgstr "\t_Only when someone says your nick"
+#: ../console/gntconv.c:664
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: Show the buddy list."
 
-#: ../plugins/notify.c:667
-msgid "_Focused windows"
-msgstr "_Focused windows"
+#: ../console/gntconv.c:667
+msgid "accounts: Show the accounts window."
+msgstr "accounts: Show the accounts window."
 
-#. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:675
-msgid "Notification Methods"
-msgstr "Notification Methods"
+#: ../console/gntconv.c:670
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Show the debug window."
 
-#: ../plugins/notify.c:682
-msgid "Prepend _string into window title:"
-msgstr "Prepend _string into window title:"
+#: ../console/gntconv.c:673
+msgid "prefs: Show the preference window."
+msgstr "prefs: Show the preference window."
 
-#. Count method button
-#: ../plugins/notify.c:701
-msgid "Insert c_ount of new messages into window title"
-msgstr "Insert c_ount of new messages into window title"
+#: ../console/gntconv.c:676
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: Show the saved-statuses window."
 
-#. Urgent method button
-#: ../plugins/notify.c:710
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Set window manager \"_URGENT\" hint"
+#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "Debug Window"
 
-#. Raise window method button
-#: ../plugins/notify.c:719
-msgid "R_aise conversation window"
-msgstr "R_aise conversation window"
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
+msgid "Clear"
+msgstr "Clear"
 
-#. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:727
-msgid "Notification Removal"
-msgstr "Notification Removal"
+#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
+msgid "Pause"
+msgstr "Pause"
 
-#. Remove on focus button
-#: ../plugins/notify.c:732
-msgid "Remove when conversation window _gains focus"
-msgstr "Remove when conversation window _gains focus"
+#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "Timestamps"
 
-#. Remove on click button
-#: ../plugins/notify.c:739
-msgid "Remove when conversation window _receives click"
-msgstr "Remove when conversation window _receives click"
-
-#. Remove on type button
-#: ../plugins/notify.c:747
-msgid "Remove when _typing in conversation window"
-msgstr "Remove when _typing in conversation window"
-
-#. Remove on message send button
-#: ../plugins/notify.c:755
-msgid "Remove when a _message gets sent"
-msgstr "Remove when a _message gets sent"
-
-#. Remove on conversation switch button
-#: ../plugins/notify.c:764
-msgid "Remove on switch to conversation ta_b"
-msgstr "Remove on switch to conversation ta_b"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/notify.c:853
-msgid "Message Notification"
-msgstr "Message Notification"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/notify.c:856 ../plugins/notify.c:858
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Provides a variety of ways of notifying you of unread messages."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/perl/perl.c:583
-msgid "Perl Plugin Loader"
-msgstr "Perl Plug-in Loader"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
-msgid "Provides support for loading perl plugins."
-msgstr "Provides support for loading perl plug-ins."
-
-#: ../plugins/psychic.c:22
-msgid "Psychic Mode"
-msgstr "Psychic Mode"
-
-#: ../plugins/psychic.c:23
-msgid "Psychic mode for incoming conversation"
-msgstr "Psychic mode for incoming conversation"
-
-#: ../plugins/psychic.c:24
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-
-#: ../plugins/psychic.c:60
-msgid "You feel a disturbance in the force..."
-msgstr "You have a premonition..."
-
-#: ../plugins/psychic.c:79
-msgid "Only enable for users on the buddy list"
-msgstr "Only enable for users on the buddy list"
-
-#: ../plugins/psychic.c:84
-msgid "Disable when away"
-msgstr "Disable when away"
-
-#: ../plugins/psychic.c:88
-msgid "Display notification message in conversations"
-msgstr "Display notification message in conversations"
-
-#: ../plugins/raw.c:175
-msgid "Raw"
-msgstr "Raw"
-
-#: ../plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "Lets you send raw input to text-based protocols."
-
-#: ../plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-
-#: ../plugins/relnot.c:63
+#: ../console/gntgaim.c:166
 #, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "You are using Gaim version %s.  The current version is %s.<hr>"
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Try `%s -h' for more information.\n"
 
-#: ../plugins/relnot.c:69
+#: ../console/gntgaim.c:168
 #, c-format
 msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
 msgstr ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debug messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
 
-#: ../plugins/relnot.c:74
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"You can get version %s from <br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
+#: ../console/gntnotify.c:146
+msgid "Emails"
+msgstr "Emails"
 
-#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
-msgid "New Version Available"
-msgstr "New Version Available"
+#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+msgid "You have mail!"
+msgstr "You have e-mail!"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/relno...
 
[truncated message content]

[Gaim-commits] SF.net SVN: gaim: [17718] trunk/gtk/gtkdialogs.c

[<de...@us...>]

Revision: 17718
          http://svn.sourceforge.net/gaim/?rev=17718&view=rev
Author:   deryni9
Date:     2006-11-09 21:18:10 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Quality Assurance tends to be QA as far as I know, also compiling is good.

Modified Paths:
--------------
    trunk/gtk/gtkdialogs.c

Modified: trunk/gtk/gtkdialogs.c
===================================================================
--- trunk/gtk/gtkdialogs.c	2006-11-10 04:54:11 UTC (rev 17717)
+++ trunk/gtk/gtkdialogs.c	2006-11-10 05:18:10 UTC (rev 17718)
@@ -77,7 +77,7 @@
 	{"Etan 'deryni' Reisner",       N_("developer"), NULL},
 	{"Tim 'marv' Ringenbach",		N_("developer"), NULL},
 	{"Luke 'LSchiere' Schierer",	N_("support"), "lsc...@us..."},
-	{"Megan 'Cae' Schneider",       N_("support/Q&A") NULL},
+	{"Megan 'Cae' Schneider",       N_("support/QA"), NULL},
 	{"Evan Schoenberg",		N_("developer"), NULL},
 	{"Stu 'nosnilmot' Tomlinson",	N_("developer"), NULL},
 	{"Nathan 'faceprint' Walp",		N_("developer"), NULL},


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17717] trunk/gtk/gtkdialogs.c

[<lsc...@us...>]

Revision: 17717
          http://svn.sourceforge.net/gaim/?rev=17717&view=rev
Author:   lschiere
Date:     2006-11-09 20:54:11 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Credit is a good thing

Modified Paths:
--------------
    trunk/gtk/gtkdialogs.c

Modified: trunk/gtk/gtkdialogs.c
===================================================================
--- trunk/gtk/gtkdialogs.c	2006-11-09 23:12:29 UTC (rev 17716)
+++ trunk/gtk/gtkdialogs.c	2006-11-10 04:54:11 UTC (rev 17717)
@@ -77,6 +77,7 @@
 	{"Etan 'deryni' Reisner",       N_("developer"), NULL},
 	{"Tim 'marv' Ringenbach",		N_("developer"), NULL},
 	{"Luke 'LSchiere' Schierer",	N_("support"), "lsc...@us..."},
+	{"Megan 'Cae' Schneider",       N_("support/Q&A") NULL},
 	{"Evan Schoenberg",		N_("developer"), NULL},
 	{"Stu 'nosnilmot' Tomlinson",	N_("developer"), NULL},
 	{"Nathan 'faceprint' Walp",		N_("developer"), NULL},


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17715] trunk/libgaim/protocols/gg/gg.c

[<bo...@us...>]

Revision: 17715
          http://svn.sourceforge.net/gaim/?rev=17715&view=rev
Author:   boler
Date:     2006-11-09 14:28:56 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
gg: Don't display additional status line if buddy is offline.

Modified Paths:
--------------
    trunk/libgaim/protocols/gg/gg.c

Modified: trunk/libgaim/protocols/gg/gg.c
===================================================================
--- trunk/libgaim/protocols/gg/gg.c	2006-11-09 20:21:13 UTC (rev 17714)
+++ trunk/libgaim/protocols/gg/gg.c	2006-11-09 22:28:56 UTC (rev 17715)
@@ -1565,6 +1565,12 @@
 	char *text;
 	const char *msg, *name;
 
+	g_return_if_fail(b != NULL);
+
+	if (!GAIM_BUDDY_IS_ONLINE(b)) {
+		return;
+	}
+
 	status = gaim_presence_get_active_status(gaim_buddy_get_presence(b));
 	msg = gaim_status_get_attr_string(status, "message");
 	name = gaim_status_get_name(status);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17712] trunk/libgaim/prpl.h

[<rl...@us...>]

Revision: 17712
          http://svn.sourceforge.net/gaim/?rev=17712&view=rev
Author:   rlaager
Date:     2006-11-09 11:58:15 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
SF Patch #1593370 from Will Thompson (resiak)

Adds a missing 'Neither' to the documentation.

Modified Paths:
--------------
    trunk/libgaim/prpl.h

Modified: trunk/libgaim/prpl.h
===================================================================
--- trunk/libgaim/prpl.h	2006-11-09 16:35:06 UTC (rev 17711)
+++ trunk/libgaim/prpl.h	2006-11-09 19:58:15 UTC (rev 17712)
@@ -48,8 +48,8 @@
  */
 typedef struct {
 	char *format;                       /**< This is a comma-delimited list of image formats or NULL if icons are not supported.
-					     * The core nor the prpl will actually check to see if the data it's given matches this, it's entirely
-					     * up to the UI to do what it wants */
+					     * Neither the core nor the prpl will actually check to see if the data it's given matches this; it's
+					     * entirely up to the UI to do what it wants */
 	int min_width;                          /**< The minimum width of this icon  */
 	int min_height;                         /**< The minimum height of this icon */
 	int max_width;                          /**< The maximum width of this icon  */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17711] trunk/libgaim/dbus-server.c

[<ebl...@us...>]

Revision: 17711
          http://svn.sourceforge.net/gaim/?rev=17711&view=rev
Author:   eblanton
Date:     2006-11-09 08:35:06 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
This should prevent D-BUS from having to deal with any non-UTF-8
strings emitted by Gaim signals, which should therefore prevent its
early exit.  Strings will be salvaged via gaim_utf8_salvage before
emission, and an error will be logged.  IRC (and any other protocols
spitting out invalid UTF-8 to signals) should yet be fixed to emit
some sort of binary blob, rather than a UTF-8 string, but this will
make D-BUS robust to any future transgressions.

This is completely untested.

Modified Paths:
--------------
    trunk/libgaim/dbus-server.c

Modified: trunk/libgaim/dbus-server.c
===================================================================
--- trunk/libgaim/dbus-server.c	2006-11-09 05:45:55 UTC (rev 17710)
+++ trunk/libgaim/dbus-server.c	2006-11-09 16:35:06 UTC (rev 17711)
@@ -38,6 +38,7 @@
 #include "core.h"
 #include "internal.h"
 #include "savedstatuses.h"
+#include "util.h"
 #include "value.h"
 #include "xmlnode.h"
 
@@ -667,6 +668,7 @@
 		guint xuint;
 		gboolean xboolean;
 		gpointer ptr = NULL;
+		gboolean allocated = FALSE;
 
 		if (gaim_value_is_outgoing(gaim_values[i]))
 		{
@@ -690,7 +692,14 @@
 			break;
 		case GAIM_TYPE_STRING:
 			str = null_to_empty(my_arg(char*));
+			if (!g_utf8_validate(str, -1, NULL)) {
+				gaim_debug_error("dbus", "Invalid UTF-8 string passed to signal, emitting salvaged string!\n");
+				str = gaim_utf8_salvage(str);
+				allocated = TRUE;
+			}
 			dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str);
+			if (allocated)
+				g_free(str);
 			break;
 		case GAIM_TYPE_SUBTYPE: /* registered pointers only! */
 		case GAIM_TYPE_POINTER:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17706] trunk/libgaim/protocols/irc/parse.c

[<the...@us...>]

Revision: 17706
          http://svn.sourceforge.net/gaim/?rev=17706&view=rev
Author:   thekingant
Date:     2006-11-08 02:22:00 -0800 (Wed, 08 Nov 2006)

Log Message:
-----------
I'm tired

Modified Paths:
--------------
    trunk/libgaim/protocols/irc/parse.c

Modified: trunk/libgaim/protocols/irc/parse.c
===================================================================
--- trunk/libgaim/protocols/irc/parse.c	2006-11-08 10:06:36 UTC (rev 17705)
+++ trunk/libgaim/protocols/irc/parse.c	2006-11-08 10:22:00 UTC (rev 17706)
@@ -538,7 +538,7 @@
 	irc->recv_time = time(NULL);
 
 	/*
-	 * The data based to irc-receiving-text is the raw protocol data.
+	 * The data passed to irc-receiving-text is the raw protocol data.
 	 * TODO: It should be passed as an array of bytes and a length
 	 * instead of a null terminated string.
 	 */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17705] trunk/libgaim/protocols/irc/parse.c

[<the...@us...>]

Revision: 17705
          http://svn.sourceforge.net/gaim/?rev=17705&view=rev
Author:   thekingant
Date:     2006-11-08 02:06:36 -0800 (Wed, 08 Nov 2006)

Log Message:
-----------
Update this comment to reflect what seemed to be a consensus on IRC

Modified Paths:
--------------
    trunk/libgaim/protocols/irc/parse.c

Modified: trunk/libgaim/protocols/irc/parse.c
===================================================================
--- trunk/libgaim/protocols/irc/parse.c	2006-11-08 05:22:38 UTC (rev 17704)
+++ trunk/libgaim/protocols/irc/parse.c	2006-11-08 10:06:36 UTC (rev 17705)
@@ -538,10 +538,9 @@
 	irc->recv_time = time(NULL);
 
 	/*
-	 * ari seems to think that we should convert input to UTF8 before
-	 * emitting it with the signal.  Mark Doliner doesn't know if that
-	 * would be an improvement or not, so he decided to put this
-	 * comment here so that people in the future can decide.
+	 * The data based to irc-receiving-text is the raw protocol data.
+	 * TODO: It should be passed as an array of bytes and a length
+	 * instead of a null terminated string.
 	 */
 	gaim_signal_emit(_irc_plugin, "irc-receiving-text", gaim_account_get_connection(irc->account), &input);
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17702] trunk/gtk/gtkconv.c

[<rl...@us...>]

Revision: 17702
          http://svn.sourceforge.net/gaim/?rev=17702&view=rev
Author:   rlaager
Date:     2006-11-07 20:16:56 -0800 (Tue, 07 Nov 2006)

Log Message:
-----------
Casefold the alias before generating the collation key. This should retain the previous behavior (though maybe the corner case of two nicks that differ only by case will be non-deterministic) while still using strcmp() as documented.

Modified Paths:
--------------
    trunk/gtk/gtkconv.c

Modified: trunk/gtk/gtkconv.c
===================================================================
--- trunk/gtk/gtkconv.c	2006-11-08 04:15:15 UTC (rev 17701)
+++ trunk/gtk/gtkconv.c	2006-11-08 04:16:56 UTC (rev 17702)
@@ -3401,7 +3401,7 @@
 	GtkTreeIter iter;
 	gboolean is_me = FALSE;
 	gboolean is_buddy;
-	gchar *alias_key, *name, *alias;
+	gchar *tmp, *alias_key, *name, *alias;
 	int flags;
 
 	alias = cb->alias;
@@ -3425,7 +3425,9 @@
 
 	is_buddy = (gaim_find_buddy(conv->account, name) != NULL);
 
-	alias_key = g_utf8_collate_key(alias, strlen(alias));
+	tmp = g_utf8_casefold(alias, -1);
+	alias_key = g_utf8_collate_key(tmp, -1);
+	g_free(tmp);
 
 	if (is_me)
 	{
@@ -3802,6 +3804,7 @@
 
 		if (!strcmp(normalized_name, gaim_normalize(conv->account, name))) {
 			const char *alias = name;
+			char *tmp;
 			char *alias_key = NULL;
 			GaimBuddy *buddy2;
 
@@ -3812,7 +3815,9 @@
 					alias = gaim_buddy_get_contact_alias(buddy2);
 				}
 
-				alias_key = g_utf8_collate_key(alias, strlen(alias));
+				tmp = g_utf8_casefold(alias, -1);
+				alias_key = g_utf8_collate_key(tmp, -1);
+				g_free(tmp);
 
 				gtk_list_store_set(GTK_LIST_STORE(model), &iter,
 								CHAT_USERS_ALIAS_COLUMN, alias,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17701] trunk/ChangeLog.API

[<rl...@us...>]

Revision: 17701
          http://svn.sourceforge.net/gaim/?rev=17701&view=rev
Author:   rlaager
Date:     2006-11-07 20:15:15 -0800 (Tue, 07 Nov 2006)

Log Message:
-----------
Document the hiding of _GaimStringref. I missed this file in my last commit.

Modified Paths:
--------------
    trunk/ChangeLog.API

Modified: trunk/ChangeLog.API
===================================================================
--- trunk/ChangeLog.API	2006-11-08 02:04:47 UTC (rev 17700)
+++ trunk/ChangeLog.API	2006-11-08 04:15:15 UTC (rev 17701)
@@ -139,6 +139,8 @@
 	* gaim_find_buddies() returns a list of all buddies in the account if name
 	  is NULL.
 	* gaim_gtk_set_custom_buddy_icon() sets custom icon for a user.
+	* Hid the definition of _GaimStringref, which already had a warning to
+	  avoid accessing it directly.
 
 	Removed:
 	* gaim_gtk_sound_{get,set}_mute() (replaced by the /gaim/gtk/sound/mute


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17700] trunk/gtk/win32/gaimrc.rc.in

[<dat...@us...>]

Revision: 17700
          http://svn.sourceforge.net/gaim/?rev=17700&view=rev
Author:   datallah
Date:     2006-11-07 18:04:47 -0800 (Tue, 07 Nov 2006)

Log Message:
-----------
Display "Gaim" instead of "Gaim Executable" when multiple windows are "stacked" in the taskbar.

Modified Paths:
--------------
    trunk/gtk/win32/gaimrc.rc.in

Modified: trunk/gtk/win32/gaimrc.rc.in
===================================================================
--- trunk/gtk/win32/gaimrc.rc.in	2006-11-07 22:51:58 UTC (rev 17699)
+++ trunk/gtk/win32/gaimrc.rc.in	2006-11-08 02:04:47 UTC (rev 17700)
@@ -18,7 +18,7 @@
       BLOCK "040904B0"
       BEGIN
         VALUE "CompanyName", "The Gaim developer community"
-        VALUE "FileDescription", "Gaim Executable"
+        VALUE "FileDescription", "Gaim"
         VALUE "FileVersion", "@GAIM_VERSION@"
         VALUE "InternalName", "gaim"
         VALUE "LegalCopyright", "Copyright (C) 1998-2006 The Gaim developer community (See the COPYRIGHT file in the source distribution)."


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.