/pidgin/main: 056387b04a25: Merge heads

[Tomasz Wasilczyk]

Changeset: 056387b04a25935be71cd5aa30a7193885819c7d
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-07-19 14:04 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/056387b04a25

Description:

Merge heads

diffstat:

 po/POTFILES.in |  2 --
 po/de.po       |  6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (42 lines):

diff --git a/po/POTFILES.in b/po/POTFILES.in
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -53,7 +53,6 @@ libpurple/http.c
 libpurple/keyring.c
 libpurple/log.c
 libpurple/media/backend-fs2.c
-libpurple/obsolete.c
 libpurple/plugin.c
 libpurple/plugins/autoaccept.c
 libpurple/plugins/buddynote.c
@@ -139,7 +138,6 @@ libpurple/protocols/msn/switchboard.c
 libpurple/protocols/msn/userlist.c
 libpurple/protocols/mxit/actions.c
 libpurple/protocols/mxit/filexfer.c
-libpurple/protocols/mxit/http.c
 libpurple/protocols/mxit/login.c
 libpurple/protocols/mxit/multimx.c
 libpurple/protocols/mxit/mxit.c
diff --git a/po/de.po b/po/de.po
--- a/po/de.po
+++ b/po/de.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 12:00+0100\n"
-"PO-Revision-Date: 2013-02-27 11:58+0100\n"
+"POT-Creation-Date: 2013-07-18 21:40+0200\n"
+"PO-Revision-Date: 2013-07-18 21:38+0200\n"
 "Last-Translator: Jochen Kemnade <jochenkemnade at web.de>\n"
 "Language-Team: German <de at li.org>\n"
 "Language: de\n"
@@ -2966,7 +2966,7 @@ msgid "Buddy Goes _Idle"
 msgstr "Buddy _untätig wird"
 
 msgid "Buddy _Signs On/Off"
-msgstr "Buddy hat_sich an- oder abgemeldet"
+msgstr "Buddy _sich an- oder abgemeldet hat"
 
 #. *< type
 #. *< ui_requirement