clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
root 2010-12-25 19:11:39 +01:00
parent c5cf9de32a 7b51713ba3
commit c6a93d5cec
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addon/LICENSE Normal file
View File

@ -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.

2
mod/settings.php
View File

@ -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>';

1
util/strings.php
View File

@ -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>.';

1
view/it/strings.php
View File

@ -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>.';