pidgin/pidgin

Clean merge.
release-2.x.y
2014-01-21, Mark Doliner
d74f12469c95
Parents f8f4e40ab1a0e5c1b7f9486d
Children df431b2168c3
Clean merge.
3 files changed, 46 insertions(+), 30 deletions(-)
  • +10 -1
    libpurple/tests/test_util.c
  • +1 -1
    libpurple/util.c
  • +35 -28
    po/de.po
    • --- a/libpurple/tests/test_util.c Mon Jan 20 18:01:01 2014 -0800
    +++ b/libpurple/tests/test_util.c Tue Jan 21 18:33:51 2014 -0800
    @@ -156,10 +156,19 @@
    START_TEST(test_util_str_to_time)
    {
    + struct tm tm;
    + long tz_off;
    + const char *rest;
    + time_t timestamp;
    +
    fail_unless(377182200 == purple_str_to_time("19811214T12:50:00", TRUE, NULL, NULL, NULL));
    fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21", TRUE, NULL, NULL, NULL));
    fail_unless(1282941722 == purple_str_to_time("2010-08-27.204202", TRUE, NULL, NULL, NULL));
    - fail_unless(1282941722 == purple_str_to_time("2010-08-27.134202-0700PDT", FALSE, NULL, NULL, NULL));
    +
    + timestamp = purple_str_to_time("2010-08-27.134202-0700PDT", FALSE, &tm, &tz_off, &rest);
    + fail_unless(1282941722 == timestamp);
    + fail_unless((-7 * 60 * 60) == tz_off);
    + assert_string_equal("PDT", rest);
    }
    END_TEST
    --- a/libpurple/util.c Mon Jan 20 18:01:01 2014 -0800
    +++ b/libpurple/util.c Tue Jan 21 18:33:51 2014 -0800
    @@ -866,7 +866,7 @@
    *tm = t;
    if (tzoff != PURPLE_NO_TZ_OFF)
    - retval += tzoff;
    + retval -= tzoff;
    if (tz_off != NULL)
    *tz_off = tzoff;
    --- a/po/de.po Mon Jan 20 18:01:01 2014 -0800
    +++ b/po/de.po Tue Jan 21 18:33:51 2014 -0800
    @@ -4,7 +4,7 @@
    # Copyright (C) 2002, Karsten Weiss <knweiss@gmx.de>
    # Copyright (C) 2002-2013, Björn Voigt <bjoernv@arcor.de>,
    # Jochen Kemnade <jochenkemnade@web.de>
    -# Copyright (C) 2013, Björn Voigt <bjoernv@arcor.de>,
    +# Copyright (C) 2013-2014, Björn Voigt <bjoernv@arcor.de>
    #
    # This file is distributed under the same license as the Pidgin package.
    #
    @@ -12,8 +12,8 @@
    msgstr ""
    "Project-Id-Version: de\n"
    "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2013-07-18 21:34+0200\n"
    -"PO-Revision-Date: 2013-07-18 21:34+0200\n"
    +"POT-Creation-Date: 2014-01-21 19:13+0100\n"
    +"PO-Revision-Date: 2014-01-21 19:10+0100\n"
    "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
    "Language-Team: German <de@li.org>\n"
    "Language: de\n"
    @@ -3290,18 +3290,6 @@
    msgid "Unable to read from socket"
    msgstr "Socket kann nicht gelesen werden"
    -msgid "Buddy list downloaded"
    -msgstr "Buddy-Liste heruntergeladen"
    -
    -msgid "Your buddy list was downloaded from the server."
    -msgstr "Ihre Buddy-Liste wurde von Server geladen."
    -
    -msgid "Buddy list uploaded"
    -msgstr "Buddy-Liste hochgeladen"
    -
    -msgid "Your buddy list was stored on the server."
    -msgstr "Ihre Buddy-Liste wurde auf dem Server gespeichert."
    -
    #. The session is now set up, ready to be connected. This emits the
    #. * signedOn signal, so clients can now do anything with msimprpl, and
    #. * we're ready for it (session key, userid, username all setup).
    @@ -3341,15 +3329,6 @@
    msgid "Change password..."
    msgstr "Passwort ändern..."
    -msgid "Upload buddylist to Server"
    -msgstr "Buddy-Liste zum Server hochladen"
    -
    -msgid "Download buddylist from Server"
    -msgstr "Buddy-Liste vom Server herunterladen"
    -
    -msgid "Delete buddylist from Server"
    -msgstr "Löschen der Buddy-Liste vom Server"
    -
    msgid "Save buddylist to file..."
    msgstr "Buddy-Liste in Datei speichern..."
    @@ -3491,6 +3470,9 @@
    msgid "Auto-detect incoming UTF-8"
    msgstr "Eingehendes UTF-8 automatisch erkennen"
    +msgid "Ident name"
    +msgstr "Benutzername"
    +
    msgid "Real name"
    msgstr "Echter Name"
    @@ -11880,7 +11862,8 @@
    msgid "win32 port"
    msgstr "Win32 Portierung"
    -#. feel free to not translate this
    +#. Translators: This is a person's name. For most languages we recommend
    +#. not translating it.
    msgid "Ka-Hing Cheung"
    msgstr "Ka-Hing Cheung"
    @@ -12122,6 +12105,9 @@
    msgid "Serbian"
    msgstr "Serbisch"
    +msgid "Serbian Latin"
    +msgstr "Serbisch (Latin)"
    +
    msgid "Sinhala"
    msgstr "Singhalesisch"
    @@ -12140,9 +12126,6 @@
    msgid "Thai"
    msgstr "Thailändisch"
    -msgid "Turkish"
    -msgstr "Türkisch"
    -
    msgid "Ukranian"
    msgstr "Ukrainisch"
    @@ -12164,6 +12147,9 @@
    msgid "Amharic"
    msgstr "Amharisch"
    +msgid "Turkish"
    +msgstr "Türkisch"
    +
    msgid "T.M.Thanh and the Gnome-Vi Team"
    msgstr "T.M.Thanh und das Gnome-Vi Team"
    @@ -15247,6 +15233,27 @@
    msgid "You do not have permission to uninstall this application."
    msgstr "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."
    +#~ msgid "Buddy list downloaded"
    +#~ msgstr "Buddy-Liste heruntergeladen"
    +
    +#~ msgid "Your buddy list was downloaded from the server."
    +#~ msgstr "Ihre Buddy-Liste wurde von Server geladen."
    +
    +#~ msgid "Buddy list uploaded"
    +#~ msgstr "Buddy-Liste hochgeladen"
    +
    +#~ msgid "Your buddy list was stored on the server."
    +#~ msgstr "Ihre Buddy-Liste wurde auf dem Server gespeichert."
    +
    +#~ msgid "Upload buddylist to Server"
    +#~ msgstr "Buddy-Liste zum Server hochladen"
    +
    +#~ msgid "Download buddylist from Server"
    +#~ msgstr "Buddy-Liste vom Server herunterladen"
    +
    +#~ msgid "Delete buddylist from Server"
    +#~ msgstr "Löschen der Buddy-Liste vom Server"
    +
    #~ msgid "Hidden Number"
    #~ msgstr "Versteckte Nummer"