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

4 files changed, 20 insertions, 1 deletions

diff --git a/addon/LICENSE b/addon/LICENSE
new file mode 100644
index 000000000..7dd931e30
--- /dev/null
+++ b/addon/LICENSE
@@ -0,0 +1,17 @@
+
+
+Friendika addons/plugins license terms are under the control of the project 
+author or authors. 
+
+Developers are free to set their own license terms on addons/plugins as 
+standalone works. These license terms apply only to the covered addon or
+plugin. 
+
+Addons/plugins may be licensed under copyleft or other license terms. Although 
+these projects may require Friendika to operate, no addon or plugin may 
+mandate any changes to the Friendika project license.
+
+If no license terms are set on an addon/plugin project, the Friendika BSD 
+project license will apply to the work, but with the project author as the 
+license owner and copyright holder.
+ 
diff --git a/mod/settings.php b/mod/settings.php
index 000258db9..273e8baa8 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -193,7 +193,7 @@ function settings_content(&$a) {
 
 		$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
 		if(! count($r))
-			notice('No Plugin settings configured');
+			notice( t('No Plugin settings configured') . EOL);
 
 		call_hooks('plugin_settings', $o);
 		$o .= '</form>';
diff --git a/util/strings.php b/util/strings.php
index f42449690..cf7299cde 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -330,6 +330,7 @@ $a->strings[' Not valid email.'] = ' Not valid email.';
 $a->strings['Settings updated.'] = 'Settings updated.';
 $a->strings['Plugin Settings'] = 'Plugin Settings';
 $a->strings['Account Settings'] = 'Account Settings';
+$a->strings['No Plugin settings configured'] = 'No Plugin settings configured';
 $a->strings['OpenID: '] = 'OpenID: ';
 $a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Optional\x29 Allow this OpenID to login to this account.";
 $a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.';
diff --git a/view/it/strings.php b/view/it/strings.php
index 3640997d9..ca6ec3e92 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -326,6 +326,7 @@ $a->strings[' Not valid email.'] = ' Email non valida.';
 $a->strings['Settings updated.'] = 'Impostazioni aggiornate.';
 $a->strings['Plugin Settings'] = 'Impostazioni Plugin';
 $a->strings['Account Settings'= = 'Impostazioni Account';
+$a->strings['No Plugin settings configured'] = 'Nessuna impostazione Plugin configurato';
 $a->strings['OpenID: '] = 'OpenID: ';
 $a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Opzionale\x29 Permetti a questo OpenID di accedere a questo account.";
 $a->strings['Profile is <strong>not published</strong>.'] = 'Il profilo <strong>non &egrave; pubblicato</strong>.';