# HG changeset patch # User John Bailey # Date 1254602942 0 # Node ID 89a523641c6476e878a42ab3a1b6d87b55301006 # Parent a6b08260d631adb2a20b98211e742d3806b07128 This change is probably going to be unpopular, but I ask that people give it a chance before blindly reverting it. This shortens and changes a bunch of the text from the About box. I think it's better this way, as the text we had before was insanely long when this shorter text gets the same message across. This also reorganizes some of the help resources we listed (IRC channel, FAQ, etc). This should finish addressing the complaints that prompted me to start looking at this dialog and chopping stuff out of it. diff -r a6b08260d631 -r 89a523641c64 pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c Sat Oct 03 19:18:18 2009 +0000 +++ b/pidgin/gtkdialogs.c Sat Oct 03 20:49:02 2009 +0000 @@ -473,40 +473,37 @@ str = g_string_sized_new(4096); g_string_append_printf(str, - "
%s %s

(libpurple %s)
%s

", PIDGIN_NAME, DISPLAY_VERSION, purple_core_get_version(), REVISION); + "
%s %s
(libpurple %s)" + "
%s

", PIDGIN_NAME, DISPLAY_VERSION, + purple_core_get_version(), REVISION); + + g_string_append_printf(str, + _("%s is a messaging client based on libpurple which is capable of " + "connecting to multiple messaging services at once. %s is written " + "in C using GTK+. %s is released, and may be modified and " + "redistributed, under the terms of the GPL version 2 (or later). " + "A copy of the GPL is distributed with %s. %s is copyrighted by " + "its contributors, a list of whom is also distributed with %s. " + "There is no warranty for %s.

"), PIDGIN_NAME, PIDGIN_NAME, + PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME); g_string_append_printf(str, - _("%s is a graphical modular messaging client based on " - "libpurple which is capable of connecting to " - "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, " - "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, " - "MySpaceIM, Gadu-Gadu, and QQ all at once. " - "It is written using GTK+.

" - "You may modify and redistribute the program under " - "the terms of the GPL (version 2 or later). A copy of the GPL is " - "contained in the 'COPYING' file distributed with %s. " - "%s is copyrighted by its contributors. See the 'COPYRIGHT' " - "file for the complete list of contributors. We provide no " - "warranty for this program.

"), PIDGIN_NAME, PIDGIN_NAME, PIDGIN_NAME); - - g_string_append(str, "URL: " PURPLE_WEBSITE "

"); - g_string_append_printf(str, _("FAQ: " - "http://developer.pidgin.im/wiki/FAQ

")); + _("Helpful Resources
\tWebsite
\tFrequently Asked " + "Questions
\tIRC Channel: #pidgin on irc.freenode.net
" + "\tXMPP MUC: devel@conference.pidgin.im

"), PURPLE_WEBSITE, + "http://developer.pidgin.im/wiki/FAQ"); + g_string_append_printf(str, - _("Help from other Pidgin users: " - "support@pidgin.im
" - "This is a public mailing list! " - "(archive)
" - "We can't help with 3rd party protocols or plugins!
" - "This list's primary language is English. You are " - "welcome to post in another language, but the responses may " - "be less helpful.

")); - g_string_append_printf(str, _("IRC Channel: " - "#pidgin on irc.freenode.net

")); - g_string_append_printf(str, _("XMPP MUC: " - "devel@conference.pidgin.im

")); + _("Help from other Pidgin users is " + "available by e-mailing support@pidgin.im
" + "This is a public mailing list! " + "(archive)
" + "We can't help with third-party protocols or plugins!
" + "This list's primary language is English. You are " + "welcome to post in another language, but the responses may " + "be less helpful.

")); gtk_imhtml_append_text(GTK_IMHTML(text), str->str, GTK_IMHTML_NO_SCROLL); @@ -566,7 +563,7 @@ str = g_string_sized_new(4096); g_string_append_printf(str, - "%s %s
(libpurple %s)
%s

", PIDGIN_NAME, DISPLAY_VERSION, purple_core_get_version(), REVISION); + "%s %s (libpurple %s)
%s

", PIDGIN_NAME, DISPLAY_VERSION, purple_core_get_version(), REVISION); g_string_append_printf(str, "%s
", _("Build Information"));