Changeset 2cdd8ce for protocols/jabber

Timestamp:

2005-11-19T15:17:03Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

9c8ae50, b20b32f

Parents:

c998255 (diff), 94281ef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge Wilmer

Location:

protocols/jabber

Files:

• genhash.c (deleted)
• jabber.c (modified) (1 diff)
• jconn.c (deleted)
• karma.c (deleted)
• pproxy.c (deleted)
• rate.c (deleted)
• xhash.c (deleted)
• xstream.c (deleted)

protocols/jabber/jabber.c

@@ -1123 +1123 @@
                  */
                 struct jabber_add_permit *jap = g_new0(struct jabber_add_permit, 1);
-                gchar *msg = g_strdup_printf(_("The user %s wants to add you to their buddy list."),
+                gchar *msg = g_strdup_printf(_("The user %s wants to add you to his/her buddy list."),
                                 Jid);