Merge remote-tracking branch 'upstream/master'

Conflicts:
	view/de/strings.php

diff --cc view/de/strings.php
index 30e2d740f6e6c49cb4f77d6aa7a9bad3243403fd,23d050336484302b542f5058868b6e9251d1b724..e97ae297fd9731e4c9605fee56a945bfb6451b91
--- 1/view/de/strings.php
--- 2/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";