From: Michael Vogel <icarus@dabo.de>
Date: Wed, 19 Dec 2012 11:24:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cb3586a2807b98f77fa1cb075ff15d981e473c21;p=friendica.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	view/de/strings.php
---

cb3586a2807b98f77fa1cb075ff15d981e473c21
diff --cc view/de/strings.php
index 30e2d740f6,23d0503364..e97ae297fd
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@@ -2081,5 -2097,5 +2097,7 @@@ $a->strings["Post to Drupal by default"
  $a->strings["OEmbed settings updated"] = "OEmbed Einstellungen aktualisiert.";
  $a->strings["Use OEmbed for YouTube videos"] = "OEmbed für Youtube Videos verwenden";
  $a->strings["URL to embed:"] = "URL zum Einbetten:";
 +$a->strings['<span><a href="%s" target="external-link">%s</a> wrote the following <a href="%s" target="external-link">post</a>:</span>'] = 
 +            '<span><a href="%s" target="external-link">%s</a> hat diesen <a href="%s" target="external-link">Beitrag</a> ursprünglich gepostet:</span>';
+ $a->strings["Tumblr login"] = "Tumblr Login";
+ $a->strings["Tumblr password"] = "Tumblr Passwort";