Mercurial > pidgin.yaz
diff po/en_CA.po @ 17319:8a7238fb7905
explicit merge of 'dc4f2ee34039521ae6a198fe7d62f4dca8a84589'
and '9d8bc74c7c13474edcefafedd0af9020b27c9a2f'
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Wed, 30 May 2007 02:56:25 +0000 |
parents | 1574a35bb984 |
children | e5b23336e52f |
line wrap: on
line diff
--- a/po/en_CA.po Wed May 23 04:18:05 2007 +0000 +++ b/po/en_CA.po Wed May 30 02:56:25 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.<BR><BR>" 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.<BR><BR>" #: 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"