Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: (21 commits)
  more logging on pubsub callbacks
  provide ability to autofriend ostatus accounts
  ostatus hub subscription issues
  better events-reminder theming
  png support for embedded private photos
  rev update
  png support: update database.sql, fix some typos, fix tinymce image browser
  Add support for PNG images with alpha
  fix a random profile error message
  events: fix select events query select events that starts before display start date and/or ends after display end date.
  more logging on subscribe_to_hub
  admin page untranslated strings, remove empty list element for update
  A few corrections in German translations.
  rev update
  set minchars to 2 for PM lookups too
  set minchars to 2 for contacts search
  contacts search autocomplete
  add email probe logging, limit typo check to main addon files and skip additional support files
  rev update
  named anchors on display page
  ...

1 files changed, 6 insertions, 7 deletions

diff --git a/view/de/strings.php b/view/de/strings.php
index b49df0e80..f3d1f23a7 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -472,7 +472,7 @@ $a->strings["Permit unknown people to send you private mail?"] = "Dürfen dir Un
 $a->strings["Profile is <strong>not published</strong>."] = "Profil ist <strong>nicht veröffentlicht</strong>.";
 $a->strings["or"] = "oder";
 $a->strings["Your Identity Address is"] = "Die Adresse deines Profils lautet:";
-$a->strings["Automatically expire posts after this many days:"] = "Beiträge verfallen automatisch nach dieser Anzahl von Tagen";
+$a->strings["Automatically expire posts after this many days:"] = "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:";
 $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht.";
 $a->strings["Advanced expiration settings"] = "Erweiterte Verfallseinstellungen";
 $a->strings["Advanced Expiration"] = "Erweitertes Verfallen";
@@ -480,7 +480,7 @@ $a->strings["Expire posts:"] = "Beiträge verfallen lassen:";
 $a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:";
 $a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:";
 $a->strings["Expire photos:"] = "Fotos verfallen lassen:";
-$a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen";
+$a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen:";
 $a->strings["Account Settings"] = "Kontoeinstellungen";
 $a->strings["Password Settings"] = "Passwort-Einstellungen";
 $a->strings["New Password:"] = "Neues Passwort:";
@@ -491,7 +491,7 @@ $a->strings["Full Name:"] = "Kompletter Name:";
 $a->strings["Email Address:"] = "E-Mail-Adresse:";
 $a->strings["Your Timezone:"] = "Deine Zeitzone:";
 $a->strings["Default Post Location:"] = "Standardstandort:";
-$a->strings["Use Browser Location:"] = "Verwende den Standort des Browsers:";
+$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
 $a->strings["Security and Privacy Settings"] = "Sicherheits- und Privatsphäre-Einstellungen";
 $a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl von Freundschaftsanfragen/Tag:";
 $a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)";
@@ -866,7 +866,7 @@ $a->strings["Title/Description:"] = "Titel/Beschreibung:";
 $a->strings["Your Gender:"] = "Dein Geschlecht:";
 $a->strings["Birthday (%s):"] = "Geburtstag (%s):";
 $a->strings["Street Address:"] = "Adresse:";
-$a->strings["Locality/City:"] = "Wohnort/Stadt:";
+$a->strings["Locality/City:"] = "Wohnort:";
 $a->strings["Postal/Zip Code:"] = "Postleitzahl:";
 $a->strings["Country:"] = "Land:";
 $a->strings["Region/State:"] = "Region/Bundesstaat:";
@@ -876,7 +876,7 @@ $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiel
 $a->strings["Since [date]:"] = "Seit [Datum]:";
 $a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:";
 $a->strings["Homepage URL:"] = "Adresse der Homepage:";
-$a->strings["Hometown:"] = "Wohnort:";
+$a->strings["Hometown:"] = "Heimatort:";
 $a->strings["Political Views:"] = "Politische Ansichten:";
 $a->strings["Religious Views:"] = "Religiöse Ansichten:";
 $a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:";
@@ -1442,7 +1442,6 @@ $a->strings["post"] = "Beitrag";
 $a->strings["Item filed"] = "Beitrag abgelegt";
 $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
 $a->strings["Attachments:"] = "Anhänge:";
-$a->strings["[Relayed] Comment authored by %s from network %s"] = "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk";
 $a->strings["view full size"] = "Volle Größe anzeigen";
 $a->strings["Embedded content"] = "Eingebetteter Inhalt";
 $a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
@@ -1621,7 +1620,7 @@ $a->strings["%d comment"] = array(
 );
 $a->strings["like"] = "mag ich";
 $a->strings["dislike"] = "mag ich nicht";
-$a->strings["Share this"] = "Teile dieses";
+$a->strings["Share this"] = "Weitersagen";
 $a->strings["share"] = "Teilen";
 $a->strings["Bold"] = "Fett";
 $a->strings["Italic"] = "Kursiv";