Mercurial > pidgin.yaz
comparison libpurple/protocols/novell/novell.c @ 30089:29df7408df03
Eliminate the name collisions on "Title". I have a few qualms:
* I'm only guessing that Novell and Mxit's "Title" corresponds to
the same thing as Jabber's (i.e. the vCard spec)
* I changed MySpace and MSN's tune names to be in line with XMPP's,
but they seem a bit ugly.
* See the XXX in QQ
Closes #1157, hopefully
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 04 Apr 2010 04:31:54 +0000 |
| parents | fd4878f0aa76 |
| children | 2a436e0ce977 |
comparison
equal
deleted
inserted
replaced
| 30088:97e3a0bc963c | 30089:29df7408df03 |
|---|---|
| 1492 else if (strcmp(tag, "OU") == 0) | 1492 else if (strcmp(tag, "OU") == 0) |
| 1493 return _("Department"); | 1493 return _("Department"); |
| 1494 else if (strcmp(tag, "personalTitle") == 0) | 1494 else if (strcmp(tag, "personalTitle") == 0) |
| 1495 return _("Personal Title"); | 1495 return _("Personal Title"); |
| 1496 else if (strcmp(tag, "Title") == 0) | 1496 else if (strcmp(tag, "Title") == 0) |
| 1497 return _("Title"); | 1497 return _("Job Title"); |
| 1498 else if (strcmp(tag, "mailstop") == 0) | 1498 else if (strcmp(tag, "mailstop") == 0) |
| 1499 return _("Mailstop"); | 1499 return _("Mailstop"); |
| 1500 else if (strcmp(tag, "Internet EMail Address") == 0) | 1500 else if (strcmp(tag, "Internet EMail Address") == 0) |
| 1501 return _("Email Address"); | 1501 return _("Email Address"); |
| 1502 else | 1502 else |