diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-11-19 16:17:03 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2005-11-19 16:17:03 +0100 |
| commit | 2cdd8ce76ce334327c84516ff78f3b00bef5bebf (patch) | |
| tree | a5bdc219317a085c38fbd8d4c3b9242e32f68cde /protocols/jabber | |
| parent | c998255d6aa501281c6266a5f1dce69d4c3afab4 (diff) | |
| parent | 94281efa4280bd3ef1cecb7cd22deca03ecb5935 (diff) | |
Merge Wilmer
Diffstat (limited to 'protocols/jabber')
| -rw-r--r-- | protocols/jabber/genhash.c | 0 | ||||
| -rw-r--r-- | protocols/jabber/jabber.c | 2 | ||||
| -rw-r--r-- | protocols/jabber/jconn.c | 0 | ||||
| -rw-r--r-- | protocols/jabber/karma.c | 0 | ||||
| -rw-r--r-- | protocols/jabber/pproxy.c | 0 | ||||
| -rw-r--r-- | protocols/jabber/rate.c | 0 | ||||
| -rw-r--r-- | protocols/jabber/xhash.c | 0 | ||||
| -rw-r--r-- | protocols/jabber/xstream.c | 0 |
8 files changed, 1 insertions, 1 deletions
diff --git a/protocols/jabber/genhash.c b/protocols/jabber/genhash.c deleted file mode 100644 index e69de29b..00000000 --- a/protocols/jabber/genhash.c +++ /dev/null diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index 25b51ba4..b6dcf4b7 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -1122,7 +1122,7 @@ static void jabber_handles10n(gjconn gjc, jpacket p) * A "subscribe to us" request was received - put up the approval dialog */ 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); jap->gjc = gjc; diff --git a/protocols/jabber/jconn.c b/protocols/jabber/jconn.c deleted file mode 100644 index e69de29b..00000000 --- a/protocols/jabber/jconn.c +++ /dev/null diff --git a/protocols/jabber/karma.c b/protocols/jabber/karma.c deleted file mode 100644 index e69de29b..00000000 --- a/protocols/jabber/karma.c +++ /dev/null diff --git a/protocols/jabber/pproxy.c b/protocols/jabber/pproxy.c deleted file mode 100644 index e69de29b..00000000 --- a/protocols/jabber/pproxy.c +++ /dev/null diff --git a/protocols/jabber/rate.c b/protocols/jabber/rate.c deleted file mode 100644 index e69de29b..00000000 --- a/protocols/jabber/rate.c +++ /dev/null diff --git a/protocols/jabber/xhash.c b/protocols/jabber/xhash.c deleted file mode 100644 index e69de29b..00000000 --- a/protocols/jabber/xhash.c +++ /dev/null diff --git a/protocols/jabber/xstream.c b/protocols/jabber/xstream.c deleted file mode 100644 index e69de29b..00000000 --- a/protocols/jabber/xstream.c +++ /dev/null |