Merge branch 'tobiasd-master'

1 files changed, 36 insertions, 13 deletions

diff --git a/view/de/strings.php b/view/de/strings.php
index bc31fab78..ef6892e8d 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -57,6 +57,18 @@ $a->strings['December'] = 'Dezember';
 $a->strings['Birthdays this week:'] = 'Geburtstage diese Woche:';
 $a->strings["\x28Adjusted for local time\x29"] = "\x28an die lokale Zeit angepasst\x29";
 $a->strings['[today]'] = '[heute]';
+$a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
+$a->strings['Empty post discarded.'] = 'Empty post discarded.';
+$a->strings['Wall Photos'] = 'Wall Photos';
+$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['System error. Post not saved.'] = 'System error. Post not saved.';
+$a->strings['This message was sent to you by '] = 'This message was sent to you by ';
+$a->strings[', a member of the Friendika social network.'] = ', a member of the Friendika social network.';
+$a->strings['You may visit them online at'] = 'You may visit them online at';
+$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.';
+$a->strings['posted an update.'] = 'posted an update.';
+$a->strings['Item not found.'] = 'Item not found.';
 $a->strings["Invite Friends"] = "Freunde einladen";
 $a->strings['Connect/Follow [profile address]'] = 'Kontaktiere/Folge [Profil Adresse]';
 $a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Beispiel: bob@example.com, http://example.com/barbara';
@@ -76,6 +88,9 @@ $a->strings['Contact not found.'] = 'Kontakt nicht gefunden.';
 $a->strings['Mutual Friendship'] = 'Beidseitige Freundschaft';
 $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['Never'] = 'Niemals';
+$a->strings["\x28Update was successful\x29"] = "\x28Aktualisierung war erfolgreich\x29";
+$a->strings["\x28Update was not successful\x29"] = "\x28Aktualisierung war nicht erfolgreich\x29";
 $a->strings['Contact Editor'] = 'Kontakt Editor';
 $a->strings['Visit $name\'s profile'] = 'Besuche das Profil von $name';
 $a->strings['Block/Unblock contact'] = 'Kontakt blockieren/freischalten';
@@ -83,7 +98,6 @@ $a->strings['Ignore contact'] = 'Ignoriere den Kontakt';
 $a->strings['Delete contact'] = 'Lösche den Kontakt';
 $a->strings['Last updated: '] = 'Letzte Aktualisierung: ';
 $a->strings['Update public posts: '] = 'Aktualisierung öffentlicher Nachrichten: ';
-$a->strings['Never'] = 'Niemals';
 $a->strings['Update now'] = 'Jetzt aktualisieren';
 $a->strings['Unblock this contact'] = 'Blockade dieses Kontakts aufheben';
 $a->strings['Block this contact'] = 'Diesen Kontakt blockieren';
@@ -159,7 +173,6 @@ $a->strings['Your profile address:'] = 'Deine Profiladresse:';
 $a->strings['Submit Request'] = 'Anfrage abschicken';
 $a->strings['Cancel'] = 'Abbrechen';
 $a->strings['Global Directory'] = 'Weltweites Verzeichnis';
-$a->strings['Item not found.'] = 'Eintrag nicht gefunden.';
 $a->strings['Private Message'] = 'Private Nachricht';
 $a->strings['This is you'] = 'Das bist du';
 $a->strings['View $name\'s profile'] = 'Profile von $name';
@@ -215,16 +228,6 @@ $a->strings['Your message:'] = 'Deine Nachricht:';
 $a->strings['Please join my social network on '] = 'Bitte trete meinem sozialen Netzwerk bei ';
 $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['Wall Photos'] = 'Pinnwand Fotos';
-$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['This message was sent to you by '] = 'This message was sent to you by ';
-$a->strings[', a member of the Friendika social network.'] = ', a member of the Friendika social network.';
-$a->strings['You may visit them online at'] = 'You may visit them online at';
-$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.';
-$a->strings['posted an update.'] = 'posted an update.';
 $a->strings['photo'] = 'Foto';
 $a->strings['status'] = 'Status';
 $a->strings['likes'] = 'mag das';
@@ -356,7 +359,9 @@ $a->strings['Register'] = 'Registrieren';
 $a->strings['Please login.'] = 'Bitte melde dich an.';
 $a->strings['Registration revoked for '] = 'Registration zurückgezogen ';
 $a->strings['Account approved.'] = 'Account freigegeben.';
-$a->strings['View in context'] = 'Im Kontext betrachten';
+$a->strings['Remove My Account'] = 'Remove My Account';
+$a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'This will completely remove your account. Once this has been done it is not recoverable.';
+$a->strings['Please enter your password for verification:'] = 'Please enter your password for verification:';
 $a->strings['Passwords do not match. Password unchanged.'] = 'Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.';
 $a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.';
 $a->strings['Password changed.'] = 'Passwort ändern.';
@@ -364,6 +369,7 @@ $a->strings['Password update failed. Please try again.'] = 'Aktualisierung des P
 $a->strings[' Please use a shorter name.'] = ' Bitte verwende einen kürzeren Namen.';
 $a->strings[' Name too short.'] = ' Name ist zu kurz.';
 $a->strings[' Not valid email.'] = ' Keine gültige EMail.';
+$a->strings[' Cannot change to that email.'] = ' Cannot change to that email.';
 $a->strings['Settings updated.'] = 'Einstellungen aktualisiert.';
 $a->strings['Plugin Settings'] = 'Plugin Einstellungen';
 $a->strings['Account Settings'] = 'Account Einstellungen';
@@ -487,6 +493,23 @@ $a->strings['File has an invalid extension, it should be one of '] = 'Die Dateie
 $a->strings['Upload was cancelled, or server error encountered'] = 'Upload abgebrochen oder Serverfehler aufgetreten';
 $a->strings['Randplace Settings'] = 'Randplace Settings';
 $a->strings['Enable Randplace Plugin'] = 'Randplace Erweiterung aktivieren';
+$a->strings['No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'] = 'No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.';
+$a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key';
+$a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret';
+$a->strings['Base API Path (remember the trailing /] = 'Base API Path (remember the trailing /;
+$a->strings['To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.'] = 'To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.';
+$a->strings['Log in with StatusNet'] = 'Log in with StatusNet';
+$a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here';
+$a->strings['Currently connected to: '] = 'Currently connected to: ';
+$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.';
+$a->strings['Send public postings to StatusNet'] = 'Send public postings to StatusNet';
+$a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration';
+$a->strings['Twitter Posting Settings'] = 'Twitter Posting Settings';
+$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.';
+$a->strings['At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.'] = 'At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.';
+$a->strings['Copy the PIN from Twitter here'] = 'Copy the PIN from Twitter here';
+$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.';
+$a->strings['Send public postings to Twitter'] = 'Send public postings to Twitter';
 $a->strings['Africa/Abidjan'] = 'Africa/Abidjan';
 $a->strings['Africa/Accra'] = 'Africa/Accra';
 $a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa';