# HG changeset patch # User Richard Laager # Date 1178392087 0 # Node ID 56042b2f8b645a63c22b6381999de0fc172b3ea5 # Parent 11a0f2b4ac83b82616eb34b60bde712dc6cbb004 s/Jabber/XMPP in user-visible places. This is the same as the changes in c0c4c168411c9fbc5ccb9790a43e21a62f6dcd55, except without the sedding of the .po files. diff -r 11a0f2b4ac83 -r 56042b2f8b64 AUTHORS --- a/AUTHORS Sat May 05 18:29:49 2007 +0000 +++ b/AUTHORS Sat May 05 19:08:07 2007 +0000 @@ -14,7 +14,7 @@ ICQ: 96642211 Yahoo: SeanEgn MSN: seanegn@hotmail.com - Jabber: seanegn@jabber.org + XMPP: seanegn@jabber.org Gadu-Gadu: 1511497 Daniel 'datallah' Atallah - Developer @@ -55,7 +55,7 @@ Rob Flynn - maintainer Adam Fritzler - libfaim maintainer Syd Logan - hacker and designated driver [lazy bum] -Jim Seymour - Jabber developer +Jim Seymour - XMPP developer Mark Spencer - original author Eric Warmenhoven - lead developer diff -r 11a0f2b4ac83 -r 56042b2f8b64 README --- a/README Sat May 05 18:29:49 2007 +0000 +++ b/README Sat May 05 19:08:07 2007 +0000 @@ -4,7 +4,7 @@ libpurple is a library intended to be used by programmers seeking to write an IM client that connects to many IM networks. It supports -AIM, ICQ, Jabber, MSN and Yahoo!, among others. +AIM, ICQ, XMPP, MSN and Yahoo!, among others. Pidgin is an graphical IM client written in C which uses the GTK+ toolkit. diff -r 11a0f2b4ac83 -r 56042b2f8b64 doc/finch.1.in --- a/doc/finch.1.in Sat May 05 18:29:49 2007 +0000 +++ b/doc/finch.1.in Sat May 05 19:08:07 2007 +0000 @@ -30,7 +30,7 @@ .SH DESCRIPTION .PP \fBfinch\fR is a console-based modular messaging client capable of using -AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, +AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has many common features found in other clients, as well as many unique features. Finch is not endorsed by or affiliated with America Online, ICQ, Microsoft, or Yahoo. diff -r 11a0f2b4ac83 -r 56042b2f8b64 doc/pidgin.1.in --- a/doc/pidgin.1.in Sat May 05 18:29:49 2007 +0000 +++ b/doc/pidgin.1.in Sat May 05 19:08:07 2007 +0000 @@ -28,7 +28,7 @@ .SH DESCRIPTION .PP -Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, +Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at once. It has many common features found in other clients, as well as many unique features. Pidgin is not endorsed by or diff -r 11a0f2b4ac83 -r 56042b2f8b64 libpurple/plugins/psychic.c --- a/libpurple/plugins/psychic.c Sat May 05 18:29:49 2007 +0000 +++ b/libpurple/plugins/psychic.c Sat May 05 19:08:07 2007 +0000 @@ -21,7 +21,7 @@ #define PLUGIN_SUMMARY N_("Psychic mode for incoming conversation") #define PLUGIN_DESC N_("Causes conversation windows to appear as other" \ " users begin to message you. This works for" \ - " AIM, ICQ, Jabber, Sametime, and Yahoo!") + " AIM, ICQ, XMPP, Sametime, and Yahoo!") #define PLUGIN_AUTHOR "Christopher O'Brien " diff -r 11a0f2b4ac83 -r 56042b2f8b64 libpurple/protocols/bonjour/bonjour.c --- a/libpurple/protocols/bonjour/bonjour.c Sat May 05 18:29:49 2007 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Sat May 05 19:08:07 2007 +0000 @@ -602,7 +602,7 @@ option = purple_account_option_string_new(_("AIM Account"), "AIM", ""); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = purple_account_option_string_new(_("Jabber Account"), "jid", ""); + option = purple_account_option_string_new(_("XMPP Account"), "jid", ""); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); my_protocol = plugin; diff -r 11a0f2b4ac83 -r 56042b2f8b64 libpurple/protocols/jabber/buddy.c --- a/libpurple/protocols/jabber/buddy.c Sat May 05 18:29:49 2007 +0000 +++ b/libpurple/protocols/jabber/buddy.c Sat May 05 19:08:07 2007 +0000 @@ -575,8 +575,8 @@ if(x_vc_data != NULL) xmlnode_free(x_vc_data); - purple_request_fields(gc, _("Edit Jabber vCard"), - _("Edit Jabber vCard"), + purple_request_fields(gc, _("Edit XMPP vCard"), + _("Edit XMPP vCard"), _("All items below are optional. Enter only the " "information with which you feel comfortable."), fields, @@ -1729,7 +1729,7 @@ if(!instructions) { instructions = g_strdup(_("Fill in one or more fields to search " - "for any matching Jabber users.")); + "for any matching XMPP users.")); } if(xmlnode_get_child(query, "first")) { @@ -1757,8 +1757,8 @@ usi->js = js; usi->directory_server = g_strdup(from); - purple_request_fields(js->gc, _("Search for Jabber users"), - _("Search for Jabber users"), instructions, fields, + purple_request_fields(js->gc, _("Search for XMPP users"), + _("Search for XMPP users"), instructions, fields, _("Search"), G_CALLBACK(user_search_cb), _("Cancel"), G_CALLBACK(user_search_cancel_cb), NULL, NULL, NULL, diff -r 11a0f2b4ac83 -r 56042b2f8b64 libpurple/protocols/jabber/jabber.c --- a/libpurple/protocols/jabber/jabber.c Sat May 05 18:29:49 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sat May 05 19:08:07 2007 +0000 @@ -562,7 +562,7 @@ js->write_buffer = purple_circ_buffer_new(512); if(!js->user) { - purple_connection_error(gc, _("Invalid Jabber ID")); + purple_connection_error(gc, _("Invalid XMPP ID")); return; } @@ -868,8 +868,8 @@ instructions = g_strdup(_("Please fill out the information below " "to register your new account.")); - purple_request_fields(js->gc, _("Register New Jabber Account"), - _("Register New Jabber Account"), instructions, fields, + purple_request_fields(js->gc, _("Register New XMPP Account"), + _("Register New XMPP Account"), instructions, fields, _("Register"), G_CALLBACK(jabber_register_cb), _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), purple_connection_get_account(js->gc), NULL, NULL, @@ -907,7 +907,7 @@ js->next_id = g_random_int(); if(!js->user) { - purple_connection_error(gc, _("Invalid Jabber ID")); + purple_connection_error(gc, _("Invalid XMPP ID")); return; } @@ -1374,8 +1374,8 @@ purple_request_field_string_set_masked(field, TRUE); purple_request_field_group_add_field(group, field); - purple_request_fields(js->gc, _("Change Jabber Password"), - _("Change Jabber Password"), _("Please enter your new password"), + purple_request_fields(js->gc, _("Change XMPP Password"), + _("Change XMPP Password"), _("Please enter your new password"), fields, _("OK"), G_CALLBACK(jabber_password_change_cb), _("Cancel"), NULL, purple_connection_get_account(gc), NULL, NULL, @@ -1489,7 +1489,7 @@ } else if(xmlnode_get_child(error, "item-not-found")) { text = _("Item Not Found"); } else if(xmlnode_get_child(error, "jid-malformed")) { - text = _("Malformed Jabber ID"); + text = _("Malformed XMPP ID"); } else if(xmlnode_get_child(error, "not-acceptable")) { text = _("Not Acceptable"); } else if(xmlnode_get_child(error, "not-allowed")) { diff -r 11a0f2b4ac83 -r 56042b2f8b64 libpurple/protocols/jabber/libxmpp.c --- a/libpurple/protocols/jabber/libxmpp.c Sat May 05 18:29:49 2007 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Sat May 05 19:08:07 2007 +0000 @@ -163,9 +163,9 @@ "XMPP", /**< name */ VERSION, /**< version */ /** summary */ - N_("Jabber Protocol Plugin"), + N_("XMPP Protocol Plugin"), /** description */ - N_("Jabber Protocol Plugin"), + N_("XMPP Protocol Plugin"), NULL, /**< author */ PURPLE_WEBSITE, /**< homepage */ diff -r 11a0f2b4ac83 -r 56042b2f8b64 libpurple/protocols/jabber/message.c --- a/libpurple/protocols/jabber/message.c Sat May 05 18:29:49 2007 +0000 +++ b/libpurple/protocols/jabber/message.c Sat May 05 19:08:07 2007 +0000 @@ -267,7 +267,7 @@ buf = g_strdup_printf(_("Message delivery to %s failed: %s"), jm->from, jm->error ? jm->error : ""); - purple_notify_formatted(jm->js->gc, _("Jabber Message Error"), _("Jabber Message Error"), buf, + purple_notify_formatted(jm->js->gc, _("XMPP Message Error"), _("XMPP Message Error"), buf, jm->xhtml ? jm->xhtml : jm->body, NULL, NULL); g_free(buf); diff -r 11a0f2b4ac83 -r 56042b2f8b64 libpurple/prpl.h --- a/libpurple/prpl.h Sat May 05 18:29:49 2007 +0000 +++ b/libpurple/prpl.h Sat May 05 19:08:07 2007 +0000 @@ -99,7 +99,7 @@ /** * Use a unique name, not an alias, for chat rooms. * - * Jabber lets you choose what name you want for chat. + * XMPP lets you choose what name you want for chat. * So it shouldn't be pulling the alias for when you're in chat; * it gets annoying. */ @@ -108,7 +108,7 @@ /** * Chat rooms have topics. * - * IRC and Jabber support this. + * IRC and XMPP support this. */ OPT_PROTO_CHAT_TOPIC = 0x00000008, @@ -145,7 +145,7 @@ /** * Allows font size to be specified in sane point size * - * Probably just Jabber and Y!M + * Probably just XMPP and Y!M */ OPT_PROTO_USE_POINTSIZE = 0x00000100, diff -r 11a0f2b4ac83 -r 56042b2f8b64 pidgin.apspec.in --- a/pidgin.apspec.in Sat May 05 18:29:49 2007 +0000 +++ b/pidgin.apspec.in Sat May 05 19:08:07 2007 +0000 @@ -14,7 +14,7 @@ [Description] Pidgin allows you to talk to anyone using a variety of messaging protocols, -including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, Jabber, +including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, XMPP, Gadu-Gadu, and Zephyr. These protocols are implemented using a modular, easy to use design. To use a protocol, just add an account using the account editor. diff -r 11a0f2b4ac83 -r 56042b2f8b64 pidgin.spec.in --- a/pidgin.spec.in Sat May 05 18:29:49 2007 +0000 +++ b/pidgin.spec.in Sat May 05 19:08:07 2007 +0000 @@ -132,7 +132,7 @@ %description Pidgin allows you to talk to anyone using a variety of messaging -protocols including AIM, MSN, Yahoo!, Jabber, Bonjour, Gadu-Gadu, +protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and Zephyr. These protocols are implemented using a modular, easy to use design. To use a protocol, just add an account using the @@ -154,7 +154,7 @@ and Finch. libpurple supports a variety of messaging protocols including AIM, MSN, -Yahoo!, Jabber, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ, +Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and Zephyr. %description -n libpurple-devel diff -r 11a0f2b4ac83 -r 56042b2f8b64 pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c Sat May 05 18:29:49 2007 +0000 +++ b/pidgin/gtkdialogs.c Sat May 05 19:08:07 2007 +0000 @@ -112,7 +112,7 @@ {"Adam Fritzler", N_("libfaim maintainer"), NULL}, /* If "lazy bum" translates literally into a serious insult, use something else or omit it. */ {"Syd Logan", N_("hacker and designated driver [lazy bum]"), NULL}, - {"Jim Seymour", N_("Jabber developer"), NULL}, + {"Jim Seymour", N_("XMPP developer"), NULL}, {"Mark Spencer", N_("original author"), "markster@marko.net"}, {"Eric Warmenhoven", N_("lead developer"), "warmenhoven@yahoo.com"}, {NULL, NULL, NULL} @@ -361,7 +361,7 @@ g_string_append_printf(str, _("%s is a modular messaging client capable of using " - "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, " + "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, " "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, " "Gadu-Gadu, and QQ all at once. " "It is written using GTK+.

" diff -r 11a0f2b4ac83 -r 56042b2f8b64 pidgin/plugins/raw.c --- a/pidgin/plugins/raw.c Sat May 05 18:29:49 2007 +0000 +++ b/pidgin/plugins/raw.c Sat May 05 19:08:07 2007 +0000 @@ -175,7 +175,7 @@ N_("Raw"), VERSION, N_("Lets you send raw input to text-based protocols."), - N_("Lets you send raw input to text-based protocols (Jabber, MSN, IRC, " + N_("Lets you send raw input to text-based protocols (XMPP, MSN, IRC, " "TOC). Hit 'Enter' in the entry box to send. Watch the debug window."), "Eric Warmenhoven ", PURPLE_WEBSITE,