pidgin/pidgin

Clean merge.
release-2.x.y
2014-01-28, Mark Doliner
dcd4c2fc9691
Parents 643cf2b5c9238e4afe007978
Children 46987daba8b496bbcfb2ab53
Clean merge.
3 files changed, 63 insertions(+), 4 deletions(-)
  • +1 -1
    pidgin/plugins/unity.c
  • +1 -1
    po/POTFILES.in
  • +61 -2
    po/de.po
    • --- a/pidgin/plugins/unity.c Fri Jan 24 19:34:39 2014 +0000
    +++ b/pidgin/plugins/unity.c Tue Jan 28 07:36:37 2014 -0800
    @@ -466,7 +466,7 @@
    G_CALLBACK(launcher_config_cb), GUINT_TO_POINTER(LAUNCHER_COUNT_MESSAGES));
    toggle = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(toggle),
    - _("Show number of unread _conversations on launcher icon"));
    + _("Show number of unread co_nversations on launcher icon"));
    gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),
    purple_prefs_get_int("/plugins/gtk/unity/launcher_count") == LAUNCHER_COUNT_SOURCES);
    --- a/po/POTFILES.in Fri Jan 24 19:34:39 2014 +0000
    +++ b/po/POTFILES.in Tue Jan 28 07:36:37 2014 -0800
    @@ -258,9 +258,9 @@
    pidgin/plugins/ticker/ticker.c
    pidgin/plugins/timestamp.c
    pidgin/plugins/timestamp_format.c
    +pidgin/plugins/unity.c
    pidgin/plugins/vvconfig.c
    pidgin/plugins/win32/transparency/win2ktrans.c
    pidgin/plugins/win32/winprefs/winprefs.c
    -pidgin/plugins/unity.c
    pidgin/plugins/xmppconsole.c
    pidgin/win32/nsis/nsis_translations.desktop.in
    --- a/po/de.po Fri Jan 24 19:34:39 2014 +0000
    +++ b/po/de.po Tue Jan 28 07:36:37 2014 -0800
    @@ -12,8 +12,8 @@
    msgstr ""
    "Project-Id-Version: de\n"
    "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2014-01-21 19:13+0100\n"
    -"PO-Revision-Date: 2014-01-21 19:10+0100\n"
    +"POT-Creation-Date: 2014-01-25 19:02+0100\n"
    +"PO-Revision-Date: 2014-01-25 19:02+0100\n"
    "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
    "Language-Team: German <de@li.org>\n"
    "Language: de\n"
    @@ -3523,6 +3523,12 @@
    msgid "Nick"
    msgstr "Spitzname"
    +msgid "Login name"
    +msgstr "Anmeldename"
    +
    +msgid "Host name"
    +msgstr "Rechnername"
    +
    msgid "Currently on"
    msgstr "Im Moment in"
    @@ -14904,6 +14910,59 @@
    "Dieses Plugin erlaubt es dem Benutzer die Zeitstempel in Unterhaltungen und "
    "im Mitschnitt anzupassen."
    +#. Alerts
    +msgid "Chatroom alerts"
    +msgstr "Chatraum-Alarme"
    +
    +msgid "Chatroom message alerts _only where someone says your username"
    +msgstr "Chatraum-Alarme nur dann, wenn j_emand Ihren Namen sagt"
    +
    +#. Launcher integration
    +msgid "Launcher Icon"
    +msgstr "Starter-Icon"
    +
    +msgid "_Disable launcher integration"
    +msgstr "_Starter-Integration deaktivieren"
    +
    +msgid "Show number of unread _messages on launcher icon"
    +msgstr "Zeige Zahl der ungelesenen Nac_hrichten auf dem Starter-Icon"
    +
    +msgid "Show number of unread co_nversations on launcher icon"
    +msgstr "Zeige Zahl der ungelesenen U_nterhaltungen auf dem Starter-Icon"
    +
    +#. Messaging menu integration
    +msgid "Messaging Menu"
    +msgstr "Benachrichtigungsfeld"
    +
    +msgid "Show number of _unread messages for conversations in messaging menu"
    +msgstr "Zeige Zahl der _ungelesenen Nachrichten im Benachrichtigungsfeld"
    +
    +msgid "Show _elapsed time for unread conversations in messaging menu"
    +msgstr ""
    +"Zeige die _abgelaufene Zeit für ungelesene Nachrichten im "
    +"Benachrichtigungsfeld"
    +
    +#. *< type
    +#. *< ui_requirement
    +#. *< flags
    +#. *< dependencies
    +#. *< priority
    +#. *< id
    +msgid "Unity Integration"
    +msgstr "Unity-Integration"
    +
    +#. *< name
    +#. *< version
    +#. * summary
    +msgid "Provides integration with Unity."
    +msgstr "Erlaubt die Integration mit Unity."
    +
    +#. * description
    +msgid "Provides integration with Unity's messaging menu and launcher."
    +msgstr ""
    +"Erlaubt die Integration mit Unity's Benachrichtigungsfeld und dem Unity-"
    +"Starter."
    +
    msgid "Audio"
    msgstr "Audio"