/pidgin/main: dcd4c2fc9691: Clean merge.

[Mark Doliner]

Changeset: dcd4c2fc96914e950b2e93e63c8e70c8b9a7066f
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2014-01-28 07:36 -0800
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/dcd4c2fc9691

Description:

Clean merge.

diffstat:

 pidgin/plugins/unity.c |   2 +-
 po/POTFILES.in         |   2 +-
 po/de.po               |  63 ++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 63 insertions(+), 4 deletions(-)

diffs (113 lines):

diff --git a/pidgin/plugins/unity.c b/pidgin/plugins/unity.c
--- a/pidgin/plugins/unity.c
+++ b/pidgin/plugins/unity.c
@@ -466,7 +466,7 @@ get_config_frame(PurplePlugin *plugin)
 	                 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);
diff --git a/po/POTFILES.in b/po/POTFILES.in
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -258,9 +258,9 @@ pidgin/plugins/themeedit.c
 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
diff --git a/po/de.po b/po/de.po
--- a/po/de.po
+++ b/po/de.po
@@ -12,8 +12,8 @@ msgid ""
 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 at cs.tu-berlin.de>\n"
 "Language-Team: German <de at li.org>\n"
 "Language: de\n"
@@ -3523,6 +3523,12 @@ msgstr " <i>(identifiziert)</i>"
 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 @@ msgstr ""
 "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"