Merge branch 'master' of git://github.com/tobiasd/friendika

2 files changed, 22 insertions, 22 deletions

diff --git a/view/de/contact_edit.tpl b/view/de/contact_edit.tpl
index 28ed8b213..8455db30c 100644
--- a/view/de/contact_edit.tpl
+++ b/view/de/contact_edit.tpl
@@ -70,7 +70,7 @@ $rating
 </div>
 <div id="contact-edit-rating-explain">
 <p>
-Bitte numm dir einen Moment um deine Auswahl zu kommentieren wenn du meinst das
+Bitte nimm dir einen Moment um deine Auswahl zu kommentieren wenn du meinst das
 könnte anderen weiter helfen.
 </p>
 <textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
diff --git a/view/de/strings.php b/view/de/strings.php
index 7148a7cd2..701293edf 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -22,8 +22,8 @@ $a->strings['don\'t like this.'] = 'mögen dies nicht.';
 $a->strings['and'] = 'und';
 $a->strings[', and '] = ' und ';
 $a->strings[' other people'] = ' andere Leute';
-$a->strings[' like this.'] = ' mag dies.';
-$a->strings[' don\'t like this.'] = ' mag dies nicht.';
+$a->strings[' like this.'] = ' mögen dies.';
+$a->strings[' don\'t like this.'] = ' mögen dies nicht.';
 $a->strings['No contacts'] = 'Keine Kontakte';
 $a->strings['Contacts'] = 'Kontakte';
 $a->strings['View Contacts'] = 'Kontakte anzeigen';
@@ -56,7 +56,7 @@ $a->strings['is a fan of yours'] = 'ist ein Fan von dir';
 $a->strings['you are a fan of'] = 'du bist Fan von';
 $a->strings['Contact Editor'] = 'Kontakt Editor';
 $a->strings['Visit $name\'s profile'] = 'Besuche das Profil von $name';
-$a->strings['Block/Unblock contact'] = 'Block/Unblock contact';
+$a->strings['Block/Unblock contact'] = 'Kontakt blockieren/freischalten';
 $a->strings['Ignore contact'] = 'Ignoriere den Kontakt';
 $a->strings['Delete contact'] = 'Lösche den Kontakt';
 $a->strings['Last updated: '] = 'Letzte Aktualisierung: ';
@@ -181,27 +181,27 @@ $a->strings['If not, you may be required to perform a manual installation. Pleas
 $a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.';
 $a->strings['Errors encountered creating database tables.'] = 'Errors encountered creating database tables.';
 $a->strings[' : '] = ' : ';
-$a->strings['Not a valid email address.'] = 'Not a valid email address.';
+$a->strings['Not a valid email address.'] = 'Keine gültige EMail Adresse.';
 $a->strings['Please join my network on '] = 'Please join my network on ';
-$a->strings['Message delivery failed.'] = 'Message delivery failed.';
-$a->strings[' messages sent.'] = ' messages sent.';
-$a->strings['Send invitations'] = 'Send invitations';
-$a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:';
-$a->strings['Your message:'] = 'Your message:';
+$a->strings['Message delivery failed.'] = 'Zustellung der Nachricht fehlgeschlagen.';
+$a->strings[' messages sent.'] = ' Nachrichten gesendet.';
+$a->strings['Send invitations'] = 'Einladungen senden';
+$a->strings['Enter email addresses, one per line:'] = 'EMail Adressen eingeben, eine pro Zeile:';
+$a->strings['Your message:'] = 'Deine Nachricht:';
 $a->strings['Please join my social network on '] = 'Please join my social network on ';
 $a->strings["\r\n"] = "\r\n";
-$a->strings['To accept this invitation, please visit:'] = 'To accept this invitation, please visit:';
-$a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:';
-$a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
-$a->strings['Empty post discarded.'] = 'Empty post discarded.';
-$a->strings[" commented on your item at "] = " commented on your item at ";
-$a->strings[" posted on your profile wall at "] = " posted on your profile wall at ";
-$a->strings['photo'] = 'photo';
-$a->strings['status'] = 'status';
-$a->strings['likes'] = 'likes';
-$a->strings['doesn\'t like'] = 'doesn\'t like';
+$a->strings['To accept this invitation, please visit:'] = 'Um diese Einladung anzunehmen beuche bitte:';
+$a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Sobald du registriert bist kontaktiere mich bitte auf meiner Profilseite:';
+$a->strings['Unable to locate original post.'] = 'Konnte das original Posting nicht finden.';
+$a->strings['Empty post discarded.'] = 'Leere Nachricht verworfen.';
+$a->strings[" commented on your item at "] = " kommentierte eines deiner Postings auf ";
+$a->strings[" posted on your profile wall at "] = " schrieb an deine Profilwand auf ";
+$a->strings['photo'] = 'Foto';
+$a->strings['status'] = 'Status';
+$a->strings['likes'] = 'mag es';
+$a->strings['doesn\'t like'] = 'mag es nicht';
 $a->strings['\'s'] = '\'s';
-$a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.';
+$a->strings['Remote privacy information not available.'] = 'Entfernte Privatsphäreneinstellungen nicht verfügbar.';
 $a->strings['Visible to:'] = 'Sichtbar für:';
 $a->strings['Password reset requested at '] = 'Password reset requested at ';
 $a->strings['No recipient selected.'] = 'Kein Empfänger gewählt.';
@@ -330,7 +330,7 @@ $a->strings[' Please use a shorter name.'] = ' Bitte verwende einen kürzeren Na
 $a->strings[' Name too short.'] = ' Name ist zu kurz.';
 $a->strings[' Not valid email.'] = ' Keine gültige EMail.';
 $a->strings['Settings updated.'] = 'Einstellungen aktualisiert.';
-$a->strings['Plugin Settings'] = 'Plubin Einstellungen';
+$a->strings['Plugin Settings'] = 'Plugin Einstellungen';
 $a->strings['Account Settings'] = 'Account Einstellungen';
 $a->strings['No Plugin settings configured'] = 'Keine Erweiterungen konfiguriert';
 $a->strings['OpenID: '] = 'OpenID: ';