Merge branch 'pull'

2 files changed, 5 insertions, 1 deletions

diff --git a/addon/facebook/README b/addon/facebook/README
index 19c594886..325f18dd1 100644
--- a/addon/facebook/README
+++ b/addon/facebook/README
@@ -33,3 +33,7 @@ long posts truncated - with a link to view the full post.
 Facebook contacts will not be able to view private photos, as they are not able to
 authenticate to your site to establish identity. We will address this 
 in a future release.
+
+Info: please make sure that you understand all aspects due to Friendika's 
+default licence which is: Creative Commons Attribution 3.0 (further info:
+http://creativecommons.org/licenses/by/3.0/ )
diff --git a/view/de/strings.php b/view/de/strings.php
index 56d54a6d3..affae0bfe 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -603,7 +603,7 @@ $a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert.";
 $a->strings["Clear"] = "löschen";
 $a->strings["Debugging"] = "Protokoll führen";
 $a->strings["Log file"] = "Protokolldatei";
-$a->strings["Must be writable by web server. Relative to your Friendika index.php."] = "Muss schreibbar durch den Webserver sein. Angabe relativ zu Friendikas indes.php.";
+$a->strings["Must be writable by web server. Relative to your Friendika index.php."] = "Muss schreibbar durch den Webserver sein. Angabe relativ zu Friendikas index.php.";
 $a->strings["Log level"] = "Protokollevel";
 $a->strings["Close"] = "Schließen";
 $a->strings["FTP Host"] = "FTP Host";