Mercurial > pidgin
changeset 23525:5dafc77b169e
propagate from branch 'im.pidgin.pidgin' (head 3fc4df7332983d84a3632b6372c6f7c894b529a3)
to branch 'im.pidgin.cpw.qulogic.msn' (head 52e1d7af9c625e154c0c5cb4d4c124396e878dd1)
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 12 Jul 2008 07:32:05 +0000 |
| parents | 35673f4abf46 (diff) a2f06797a1b0 (current diff) |
| children | af2cfc9a42b3 |
| files | libpurple/protocols/msn/soap2.c libpurple/protocols/msn/soap2.h |
| diffstat | 2 files changed, 6 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/irc/msgs.c Sat Jul 12 07:29:56 2008 +0000 +++ b/libpurple/protocols/irc/msgs.c Sat Jul 12 07:32:05 2008 +0000 @@ -215,10 +215,8 @@ /* This is an extended syntax, not in RFC 1459 */ int t1 = atoi(args[4]); time_t t2 = time(NULL); - msg = g_strdup_printf(ngettext("Ban on %s by %s, set %ld second ago", - "Ban on %s by %s, set %ld seconds ago", - t2 - t1), - args[2], args[3], t2 - t1); + msg = g_strdup_printf(_("Ban on %s by %s, set %s ago"), + args[2], args[3], purple_str_seconds_to_string(t2 - t1)); } else { msg = g_strdup_printf(_("Ban on %s"), args[2]); }
--- a/po/de.po Sat Jul 12 07:29:56 2008 +0000 +++ b/po/de.po Sat Jul 12 07:32:05 2008 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-06 14:20+0200\n" -"PO-Revision-Date: 2008-07-06 14:20+0200\n" +"POT-Creation-Date: 2008-07-11 17:26+0200\n" +"PO-Revision-Date: 2008-07-11 17:25+0200\n" "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" @@ -3232,10 +3232,8 @@ msgstr "Falscher Modus" #, c-format -msgid "Ban on %s by %s, set %ld second ago" -msgid_plural "Ban on %s by %s, set %ld seconds ago" -msgstr[0] "Verbot zu %s von %s, gesetzt vor %ld Sekunde" -msgstr[1] "Verbot zu %s von %s, gesetzt vor %ld Sekunden" +msgid "Ban on %s by %s, set %s ago" +msgstr "Verbot zu %s von %s, gesetzt vor %s" #, c-format msgid "Ban on %s"