# HG changeset patch # User Richard Laager # Date 1178392155 0 # Node ID 1574a35bb98456d074d392ce43ca2b775c2cea41 # Parent 56042b2f8b645a63c22b6381999de0fc172b3ea5 s/Jabber/XMPP/ the English .po files, because I know it's correct. ;) diff -r 56042b2f8b64 -r 1574a35bb984 po/en_AU.po --- a/po/en_AU.po Sat May 05 19:08:07 2007 +0000 +++ b/po/en_AU.po Sat May 05 19:09:15 2007 +0000 @@ -849,10 +849,10 @@ #: plugins/raw.c:154 msgid "" -"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit " +"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." msgstr "" -"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit " +"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." #: plugins/relnot.c:63 @@ -2822,8 +2822,8 @@ #: src/gtkdialogs.c:92 #, fuzzy -msgid "Jabber developer" -msgstr "former Jabber developer" +msgid "XMPP developer" +msgstr "former XMPP developer" #: src/gtkdialogs.c:93 msgid "original author" @@ -2996,11 +2996,11 @@ #, fuzzy msgid "" "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, " -"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " +"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " "at once. It is written using GTK+ and is licensed under the GNU GPL.

" msgstr "" "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, " -"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " +"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " "at once. It is written using Gtk+ and is licensed under the GPL.

" #: src/gtkdialogs.c:235 @@ -5001,7 +5001,7 @@ #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496 #, fuzzy msgid "Register New Gadu-Gadu Account" -msgstr "Register New Jabber Account" +msgstr "Register New XMPP Account" #: src/protocols/gg/gg.c:1497 msgid "Please, fill in the following fields" @@ -5723,8 +5723,8 @@ msgstr "Birthday" #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568 -msgid "Edit Jabber vCard" -msgstr "Edit Jabber vCard" +msgid "Edit XMPP vCard" +msgstr "Edit XMPP vCard" #: src/protocols/jabber/buddy.c:569 msgid "" @@ -5735,8 +5735,8 @@ "comfortable." #: src/protocols/jabber/buddy.c:616 -msgid "Jabber ID" -msgstr "Jabber ID" +msgid "XMPP ID" +msgstr "XMPP ID" #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711 msgid "Resource" @@ -5814,7 +5814,7 @@ msgstr "" #: src/protocols/jabber/buddy.c:1327 -msgid "Fill in one or more fields to search for any matching Jabber users." +msgid "Fill in one or more fields to search for any matching XMPP users." msgstr "" #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653 @@ -5833,7 +5833,7 @@ #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356 #, fuzzy -msgid "Search for Jabber users" +msgid "Search for XMPP users" msgstr "Search for a buddy by e-mail address" #: src/protocols/jabber/buddy.c:1370 @@ -5959,8 +5959,8 @@ msgstr "Unable to create socket" #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740 -msgid "Invalid Jabber ID" -msgstr "Invalid Jabber ID" +msgid "Invalid XMPP ID" +msgstr "Invalid XMPP ID" #: src/protocols/jabber/jabber.c:473 #, c-format @@ -6006,8 +6006,8 @@ msgstr "Please fill out the information below to register your new account." #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705 -msgid "Register New Jabber Account" -msgstr "Register New Jabber Account" +msgid "Register New XMPP Account" +msgstr "Register New XMPP Account" #: src/protocols/jabber/jabber.c:842 msgid "Initializing Stream" @@ -6079,8 +6079,8 @@ msgstr "Password (again)" #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161 -msgid "Change Jabber Password" -msgstr "Change Jabber Password" +msgid "Change XMPP Password" +msgstr "Change XMPP Password" #: src/protocols/jabber/jabber.c:1161 msgid "Please enter your new password" @@ -6130,8 +6130,8 @@ msgstr "Item Not Found" #: src/protocols/jabber/jabber.c:1271 -msgid "Malformed Jabber ID" -msgstr "Malformed Jabber ID" +msgid "Malformed XMPP ID" +msgstr "Malformed XMPP ID" #: src/protocols/jabber/jabber.c:1273 msgid "Not Acceptable" @@ -6377,8 +6377,8 @@ #. * summary #. * description #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688 -msgid "Jabber Protocol Plugin" -msgstr "Jabber Protocol Plugin" +msgid "XMPP Protocol Plugin" +msgstr "XMPP Protocol Plugin" #: src/protocols/jabber/jabber.c:1714 msgid "Use TLS if available" @@ -6428,8 +6428,8 @@ msgstr "Message delivery to %s failed: %s" #: src/protocols/jabber/message.c:233 -msgid "Jabber Message Error" -msgstr "Jabber Message Error" +msgid "XMPP Message Error" +msgstr "XMPP Message Error" #: src/protocols/jabber/message.c:297 #, c-format @@ -12182,8 +12182,8 @@ #~ msgid "Invalid nickname" #~ msgstr "Invalid Username" -#~ msgid "Jabber Profile" -#~ msgstr "Jabber Profile" +#~ msgid "XMPP Profile" +#~ msgstr "XMPP Profile" #~ msgid "Roomlist Error" #~ msgstr "Roomlist Error" diff -r 56042b2f8b64 -r 1574a35bb984 po/en_CA.po --- a/po/en_CA.po Sat May 05 19:08:07 2007 +0000 +++ b/po/en_CA.po Sat May 05 19:09:15 2007 +0000 @@ -849,10 +849,10 @@ #: plugins/raw.c:154 msgid "" -"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit " +"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." msgstr "" -"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit " +"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." #: plugins/relnot.c:63 @@ -2818,8 +2818,8 @@ #: src/gtkdialogs.c:92 #, fuzzy -msgid "Jabber developer" -msgstr "former Jabber developer" +msgid "XMPP developer" +msgstr "former XMPP developer" #: src/gtkdialogs.c:93 msgid "original author" @@ -2992,11 +2992,11 @@ #, fuzzy msgid "" "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, " -"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " +"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " "at once. It is written using GTK+ and is licensed under the GNU GPL.

" msgstr "" "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, " -"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " +"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " "at once. It is written using Gtk+ and is licenced under the GPL.

" #: src/gtkdialogs.c:235 @@ -4996,7 +4996,7 @@ #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496 #, fuzzy msgid "Register New Gadu-Gadu Account" -msgstr "Register New Jabber Account" +msgstr "Register New XMPP Account" #: src/protocols/gg/gg.c:1497 msgid "Please, fill in the following fields" @@ -5717,8 +5717,8 @@ msgstr "Birthday" #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568 -msgid "Edit Jabber vCard" -msgstr "Edit Jabber vCard" +msgid "Edit XMPP vCard" +msgstr "Edit XMPP vCard" #: src/protocols/jabber/buddy.c:569 msgid "" @@ -5729,8 +5729,8 @@ "comfortable." #: src/protocols/jabber/buddy.c:616 -msgid "Jabber ID" -msgstr "Jabber ID" +msgid "XMPP ID" +msgstr "XMPP ID" #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711 msgid "Resource" @@ -5808,7 +5808,7 @@ msgstr "" #: src/protocols/jabber/buddy.c:1327 -msgid "Fill in one or more fields to search for any matching Jabber users." +msgid "Fill in one or more fields to search for any matching XMPP users." msgstr "" #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653 @@ -5827,7 +5827,7 @@ #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356 #, fuzzy -msgid "Search for Jabber users" +msgid "Search for XMPP users" msgstr "Search for a buddy by e-mail address" #: src/protocols/jabber/buddy.c:1370 @@ -5953,8 +5953,8 @@ msgstr "Unable to create socket" #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740 -msgid "Invalid Jabber ID" -msgstr "Invalid Jabber ID" +msgid "Invalid XMPP ID" +msgstr "Invalid XMPP ID" #: src/protocols/jabber/jabber.c:473 #, c-format @@ -6000,8 +6000,8 @@ msgstr "Please fill out the information below to register your new account." #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705 -msgid "Register New Jabber Account" -msgstr "Register New Jabber Account" +msgid "Register New XMPP Account" +msgstr "Register New XMPP Account" #: src/protocols/jabber/jabber.c:842 msgid "Initializing Stream" @@ -6073,8 +6073,8 @@ msgstr "Password (again)" #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161 -msgid "Change Jabber Password" -msgstr "Change Jabber Password" +msgid "Change XMPP Password" +msgstr "Change XMPP Password" #: src/protocols/jabber/jabber.c:1161 msgid "Please enter your new password" @@ -6124,8 +6124,8 @@ msgstr "Item Not Found" #: src/protocols/jabber/jabber.c:1271 -msgid "Malformed Jabber ID" -msgstr "Malformed Jabber ID" +msgid "Malformed XMPP ID" +msgstr "Malformed XMPP ID" #: src/protocols/jabber/jabber.c:1273 msgid "Not Acceptable" @@ -6371,8 +6371,8 @@ #. * summary #. * description #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688 -msgid "Jabber Protocol Plugin" -msgstr "Jabber Protocol Plugin" +msgid "XMPP Protocol Plugin" +msgstr "XMPP Protocol Plugin" #: src/protocols/jabber/jabber.c:1714 msgid "Use TLS if available" @@ -6422,8 +6422,8 @@ msgstr "Message delivery to %s failed: %s" #: src/protocols/jabber/message.c:233 -msgid "Jabber Message Error" -msgstr "Jabber Message Error" +msgid "XMPP Message Error" +msgstr "XMPP Message Error" #: src/protocols/jabber/message.c:297 #, c-format @@ -12162,8 +12162,8 @@ #~ msgid "Invalid nickname" #~ msgstr "Invalid Username" -#~ msgid "Jabber Profile" -#~ msgstr "Jabber Profile" +#~ msgid "XMPP Profile" +#~ msgstr "XMPP Profile" #~ msgid "Roomlist Error" #~ msgstr "Roomlist Error" diff -r 56042b2f8b64 -r 1574a35bb984 po/en_GB.po --- a/po/en_GB.po Sat May 05 19:08:07 2007 +0000 +++ b/po/en_GB.po Sat May 05 19:09:15 2007 +0000 @@ -2744,10 +2744,10 @@ #: ../libpurple/plugins/psychic.c:21 msgid "" "Causes conversation windows to appear as other users begin to message you. " -"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!" +"This works for AIM, ICQ, XMPP, 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!" +"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!" #: ../libpurple/plugins/psychic.c:66 msgid "You feel a disturbance in the force..." @@ -3025,8 +3025,8 @@ msgstr "AIM Account" #: ../libpurple/protocols/bonjour/bonjour.c:583 -msgid "Jabber Account" -msgstr "Jabber Account" +msgid "XMPP Account" +msgstr "XMPP Account" #: ../libpurple/protocols/bonjour/bonjour.h:35 msgid "Bonjour" @@ -4204,8 +4204,8 @@ #: ../libpurple/protocols/jabber/buddy.c:582 #: ../libpurple/protocols/jabber/buddy.c:583 -msgid "Edit Jabber vCard" -msgstr "Edit Jabber vCard" +msgid "Edit XMPP vCard" +msgstr "Edit XMPP vCard" #: ../libpurple/protocols/jabber/buddy.c:584 msgid "" @@ -4320,7 +4320,7 @@ msgid "The following are the results of your search" msgstr "The following are the results of your search" -#. current comment from Jabber User Directory users.jabber.org +#. current comment from XMPP User Directory users.jabber.org #: ../libpurple/protocols/jabber/buddy.c:1674 msgid "" "Find a contact by entering the search criteria in the given fields. Note: " @@ -4345,8 +4345,8 @@ msgstr "Server Instructions: %s" #: ../libpurple/protocols/jabber/buddy.c:1736 -msgid "Fill in one or more fields to search for any matching Jabber users." -msgstr "Fill in one or more fields to search for any matching Jabber users." +msgid "Fill in one or more fields to search for any matching XMPP users." +msgstr "Fill in one or more fields to search for any matching XMPP users." #: ../libpurple/protocols/jabber/buddy.c:1756 #: ../libpurple/protocols/novell/novell.c:1488 @@ -4357,8 +4357,8 @@ #: ../libpurple/protocols/jabber/buddy.c:1765 #: ../libpurple/protocols/jabber/buddy.c:1766 -msgid "Search for Jabber users" -msgstr "Search for Jabber users" +msgid "Search for XMPP users" +msgstr "Search for XMPP users" #. "Search" #: ../libpurple/protocols/jabber/buddy.c:1767 @@ -4501,8 +4501,8 @@ #: ../libpurple/protocols/jabber/jabber.c:567 #: ../libpurple/protocols/jabber/jabber.c:910 -msgid "Invalid Jabber ID" -msgstr "Invalid Jabber ID" +msgid "Invalid XMPP ID" +msgstr "Invalid XMPP ID" #: ../libpurple/protocols/jabber/jabber.c:638 #, c-format @@ -4556,8 +4556,8 @@ #: ../libpurple/protocols/jabber/jabber.c:873 #: ../libpurple/protocols/jabber/jabber.c:874 -msgid "Register New Jabber Account" -msgstr "Register New Jabber Account" +msgid "Register New XMPP Account" +msgstr "Register New XMPP Account" #. Register button #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478 @@ -4631,8 +4631,8 @@ #: ../libpurple/protocols/jabber/jabber.c:1368 #: ../libpurple/protocols/jabber/jabber.c:1369 -msgid "Change Jabber Password" -msgstr "Change Jabber Password" +msgid "Change XMPP Password" +msgstr "Change XMPP Password" #: ../libpurple/protocols/jabber/jabber.c:1369 msgid "Please enter your new password" @@ -4686,8 +4686,8 @@ msgstr "Item Not Found" #: ../libpurple/protocols/jabber/jabber.c:1481 -msgid "Malformed Jabber ID" -msgstr "Malformed Jabber ID" +msgid "Malformed XMPP ID" +msgstr "Malformed XMPP ID" #: ../libpurple/protocols/jabber/jabber.c:1483 msgid "Not Acceptable" @@ -4954,8 +4954,8 @@ #. * description #: ../libpurple/protocols/jabber/jabber.c:1972 #: ../libpurple/protocols/jabber/jabber.c:1974 -msgid "Jabber Protocol Plugin" -msgstr "Jabber Protocol Plug-in" +msgid "XMPP Protocol Plugin" +msgstr "XMPP Protocol Plug-in" #: ../libpurple/protocols/jabber/jabber.c:2000 msgid "Force old (port 5223) SSL" @@ -4997,8 +4997,8 @@ msgstr "Message delivery to %s failed: %s" #: ../libpurple/protocols/jabber/message.c:272 -msgid "Jabber Message Error" -msgstr "Jabber Message Error" +msgid "XMPP Message Error" +msgstr "XMPP Message Error" #: ../libpurple/protocols/jabber/message.c:352 #, c-format @@ -12364,8 +12364,8 @@ msgstr "hacker and designated driver [lazy bum]" #: ../pidgin/gtkdialogs.c:114 -msgid "Jabber developer" -msgstr "Jabber developer" +msgid "XMPP developer" +msgstr "XMPP developer" #: ../pidgin/gtkdialogs.c:115 msgid "original author" @@ -12634,7 +12634,7 @@ #: ../pidgin/gtkdialogs.c:360 #, c-format msgid "" -"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, " +"%s 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 is written using GTK+.

You " "may modify and redistribute the program under the terms of the GPL (version " @@ -12643,7 +12643,7 @@ "'COPYRIGHT' file for the complete list of contributors. We provide no " "warranty for this program.

" msgstr "" -"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, " +"%s 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 is written using GTK+.

You " "may modify and redistribute the program under the terms of the GPL (version " @@ -15035,10 +15035,10 @@ #: ../pidgin/plugins/raw.c:178 msgid "" -"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit " +"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." msgstr "" -"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit " +"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." #: ../pidgin/plugins/relnot.c:71