aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-02 19:27:21 -0700
committerFriendika <info@friendika.com>2011-09-02 19:27:21 -0700
commit887d06cf5edda2ae390c15abf0ec33b39d74e589 (patch)
tree49ee8affabd89932eb544b00a60f26ee3cefd858
parent9e9b6a3dd1dd6f364ee0448a37bc0d3df71b2977 (diff)
parent508a13da00e639ca871fa099affe5e73d0b0d6b6 (diff)
downloadvolse-hubzilla-887d06cf5edda2ae390c15abf0ec33b39d74e589.tar.gz
volse-hubzilla-887d06cf5edda2ae390c15abf0ec33b39d74e589.tar.bz2
volse-hubzilla-887d06cf5edda2ae390c15abf0ec33b39d74e589.zip
Merge pull request #168 from Erkan-Yilmaz/master
typo in German page: admin > log
-rw-r--r--addon/facebook/README4
-rw-r--r--view/de/strings.php2
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";