Merge remote branch 'upstream/master'

[friendica.git] / util / strings.php

diff --git a/util/strings.php b/util/strings.php
old mode 100644 (file)
new mode 100755 (executable)
index ea4b566..d0e3621
--- a/util/strings.php
+++ b/util/strings.php
@@ -495,6 +495,7 @@ $a->strings["Crop Image"] = "";
 $a->strings["Please adjust the image cropping for optimum viewing."] = "";
 $a->strings["Done Editing"] = "";
 $a->strings["Image uploaded successfully."] = "";
+$a->strings["No profile"] = "";
 $a->strings["Remove My Account"] = "";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "";
 $a->strings["Please enter your password for verification:"] = "";
@@ -606,7 +607,6 @@ $a->strings["FTP Host"] = "";
 $a->strings["FTP Path"] = "";
 $a->strings["FTP User"] = "";
 $a->strings["FTP Password"] = "";
-$a->strings["No profile"] = "";
 $a->strings["Access to this profile has been restricted."] = "";
 $a->strings["Tips for New Members"] = "";
 $a->strings["Login failed."] = "";
@@ -618,7 +618,7 @@ $a->strings["No compatible communication protocols or feeds were discovered."] =
 $a->strings["The profile address specified does not provide adequate information."] = "";
 $a->strings["An author or name was not found."] = "";
 $a->strings["No browser URL could be matched to this address."] = "";
-$a->strings["Communication options with this network have been restricted."] = "";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "";
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "";
 $a->strings["Unable to retrieve contact information."] = "";
 $a->strings["following"] = "";
@@ -756,7 +756,6 @@ $a->strings["Drop files here to upload"] = "";
 $a->strings["Failed"] = "";
 $a->strings["No files were uploaded."] = "";
 $a->strings["Uploaded file is empty"] = "";
-$a->strings["Uploaded file is too large"] = "";
 $a->strings["File has an invalid extension, it should be one of "] = "";
 $a->strings["Upload was cancelled, or server error encountered"] = "";
 $a->strings["Impressum"] = "";
@@ -792,6 +791,9 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["Allow posting to StatusNet"] = "";
 $a->strings["Send public postings to StatusNet by default"] = "";
 $a->strings["Clear OAuth configuration"] = "";
+$a->strings["API URL"] = "";
+$a->strings["Consumer Secret"] = "";
+$a->strings["Consumer Key"] = "";
 $a->strings["Piwik Base URL"] = "";
 $a->strings["Site ID"] = "";
 $a->strings["Show opt-out cookie link?"] = "";
@@ -923,6 +925,7 @@ $a->strings["November"] = "";
 $a->strings["December"] = "";
 $a->strings["bytes"] = "";
 $a->strings["Select an alternate language"] = "";
+$a->strings["Sharing notification from Diaspora network"] = "";
 $a->strings["Embedding disabled"] = "";
 $a->strings["Create a new group"] = "";
 $a->strings["Everybody"] = "";