Merge branch '3.6-rc'

This commit is contained in:
Tobias Diekershoff 2018-03-23 08:00:37 +01:00
commit 39dd3dffe0
733 changed files with 10943 additions and 8237 deletions

View file

@ -9,29 +9,31 @@
*
*"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere
*/
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
function krynn_install() {
/**
*
* Our demo plugin will attach in three places.
*
* Our demo addon will attach in three places.
* The first is just prior to storing a local post.
*
*/
register_hook('post_local', 'addon/krynn/krynn.php', 'krynn_post_hook');
Addon::registerHook('post_local', 'addon/krynn/krynn.php', 'krynn_post_hook');
/**
*
* Then we'll attach into the plugin settings page, and also the
* Then we'll attach into the addon settings page, and also the
* settings post hook so that we can create and update
* user preferences.
*
*/
register_hook('plugin_settings', 'addon/krynn/krynn.php', 'krynn_settings');
register_hook('plugin_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post');
Addon::registerHook('addon_settings', 'addon/krynn/krynn.php', 'krynn_settings');
Addon::registerHook('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post');
logger("installed krynn");
}
@ -47,9 +49,9 @@ function krynn_uninstall() {
*
*/
unregister_hook('post_local', 'addon/krynn/krynn.php', 'krynn_post_hook');
unregister_hook('plugin_settings', 'addon/krynn/krynn.php', 'krynn_settings');
unregister_hook('plugin_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post');
Addon::unregisterHook('post_local', 'addon/krynn/krynn.php', 'krynn_post_hook');
Addon::unregisterHook('addon_settings', 'addon/krynn/krynn.php', 'krynn_settings');
Addon::unregisterHook('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post');
logger("removed krynn");
@ -64,7 +66,7 @@ function krynn_post_hook($a, &$item) {
* An item was posted on the local system.
* We are going to look for specific items:
* - A status post by a profile owner
* - The profile owner must have allowed our plugin
* - The profile owner must have allowed our addon
*
*/
@ -125,7 +127,7 @@ function krynn_settings_post($a,$post) {
/**
*
* Called from the Plugin Setting form.
* Called from the addon Setting form.
* Add our own settings info to the page.
*
*/
@ -150,23 +152,23 @@ function krynn_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '<span id="settings_krynn_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_krynn_expanded\'); openClose(\'settings_krynn_inflated\');">';
$s .= '<h3>' . t('Krynn') . '</h3>';
$s .= '<h3>' . L10n::t('Krynn') . '</h3>';
$s .= '</span>';
$s .= '<div id="settings_krynn_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_krynn_expanded\'); openClose(\'settings_krynn_inflated\');">';
$s .= '<h3>' . t('Krynn') . '</h3>';
$s .= '<h3>' . L10n::t('Krynn') . '</h3>';
$s .= '</span>';
$s .= '<div class="settings-block">';
$s .= '<h3>' . t('Krynn Settings') . '</h3>';
$s .= '<h3>' . L10n::t('Krynn Settings') . '</h3>';
$s .= '<div id="krynn-enable-wrapper">';
$s .= '<label id="krynn-enable-label" for="krynn-checkbox">' . t('Enable Krynn Plugin') . '</label>';
$s .= '<label id="krynn-enable-label" for="krynn-checkbox">' . L10n::t('Enable Krynn Addon') . '</label>';
$s .= '<input id="krynn-checkbox" type="checkbox" name="krynn" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="krynn-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="krynn-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
}

View file

@ -22,7 +22,7 @@ msgid "Krynn Settings"
msgstr ""
#: krynn.php:152
msgid "Enable Krynn Plugin"
msgid "Enable Krynn Addon"
msgstr ""
#: krynn.php:158

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Krynn Settings"] = "Ajustos de Krynn";
$a->strings["Enable Krynn Plugin"] = "Activa Plugin de Krynn";
$a->strings["Enable Krynn Addon"] = "Activa Addon de Krynn";
$a->strings["Submit"] = "Enviar";

View file

@ -24,8 +24,8 @@ msgid "Krynn Settings"
msgstr "Krynn Nastavení"
#: krynn.php:152
msgid "Enable Krynn Plugin"
msgstr "Povolit Krynn plugin"
msgid "Enable Krynn Addon"
msgstr "Povolit Krynn addon"
#: krynn.php:158
msgid "Submit"

View file

@ -6,5 +6,5 @@ function string_plural_select_cs($n){
}}
;
$a->strings["Krynn Settings"] = "Krynn Nastavení";
$a->strings["Enable Krynn Plugin"] = "Povolit Krynn plugin";
$a->strings["Enable Krynn Addon"] = "Povolit Krynn addon";
$a->strings["Submit"] = "Odeslat";

View file

@ -25,8 +25,8 @@ msgid "Krynn Settings"
msgstr "Planeten Einstellungen"
#: Krynn.php:152
msgid "Enable Krynn Plugin"
msgstr "Planeten-Plugin aktivieren"
msgid "Enable Krynn Addon"
msgstr "Planeten-Addon aktivieren"
#: Krynn.php:158
msgid "Submit"

View file

@ -6,5 +6,5 @@ function string_plural_select_de($n){
}}
;
$a->strings["Krynn Settings"] = "Krynn Einstellungen";
$a->strings["Enable Krynn Plugin"] = "Krynn-Plugin aktivieren";
$a->strings["Enable Krynn Addon"] = "Krynn-Addon aktivieren";
$a->strings["Submit"] = "Senden";

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Krynn Settings"] = "Agordo pri Krynn";
$a->strings["Enable Krynn Plugin"] = "Ŝalti la Krynn kromprogamon";
$a->strings["Enable Krynn Addon"] = "Ŝalti la Krynn kromprogamon";
$a->strings["Submit"] = "Sendi";

View file

@ -24,8 +24,8 @@ msgid "Krynn Settings"
msgstr "Ajustes de Krynn"
#: krynn.php:152
msgid "Enable Krynn Plugin"
msgstr "Habilitar Plugin de Krynn"
msgid "Enable Krynn Addon"
msgstr "Habilitar Addon de Krynn"
#: krynn.php:158
msgid "Submit"

View file

@ -6,5 +6,5 @@ function string_plural_select_es($n){
}}
;
$a->strings["Krynn Settings"] = "Ajustes de Krynn";
$a->strings["Enable Krynn Plugin"] = "Habilitar Plugin de Krynn";
$a->strings["Enable Krynn Addon"] = "Habilitar Addon de Krynn";
$a->strings["Submit"] = "Enviar";

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Krynn Settings"] = "Réglages des Krynn";
$a->strings["Enable Krynn Plugin"] = "Activer Krynn";
$a->strings["Enable Krynn Addon"] = "Activer Krynn";
$a->strings["Submit"] = "Envoyer";

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Krynn Settings"] = "";
$a->strings["Enable Krynn Plugin"] = "";
$a->strings["Enable Krynn Addon"] = "";
$a->strings["Submit"] = "Senda inn";

View file

@ -4,13 +4,13 @@
#
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2015
# fabrixxm <fabrix.xm@gmail.com>, 2015,2018
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-27 05:01-0500\n"
"PO-Revision-Date: 2015-08-31 11:55+0000\n"
"PO-Revision-Date: 2018-03-19 13:22+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n"
@ -24,8 +24,8 @@ msgid "Krynn Settings"
msgstr "Impostazioni Krynn"
#: krynn.php:152
msgid "Enable Krynn Plugin"
msgstr "Abilita plugin Krynn"
msgid "Enable Krynn Addon"
msgstr "Abilita componente aggiuntivo Krynn"
#: krynn.php:158
msgid "Submit"

View file

@ -6,5 +6,5 @@ function string_plural_select_it($n){
}}
;
$a->strings["Krynn Settings"] = "Impostazioni Krynn";
$a->strings["Enable Krynn Plugin"] = "Abilita plugin Krynn";
$a->strings["Enable Krynn Addon"] = "Abilita componente aggiuntivo Krynn";
$a->strings["Submit"] = "Invia";

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Krynn Settings"] = "";
$a->strings["Enable Krynn Plugin"] = "";
$a->strings["Enable Krynn Addon"] = "";
$a->strings["Submit"] = "Lagre";

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Krynn Settings"] = "";
$a->strings["Enable Krynn Plugin"] = "";
$a->strings["Enable Krynn Addon"] = "";
$a->strings["Submit"] = "Potwierdź";

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Krynn Settings"] = "Configuração dos Krynn";
$a->strings["Enable Krynn Plugin"] = "Habilita configuração dos Krynn";
$a->strings["Enable Krynn Addon"] = "Habilita configuração dos Krynn";
$a->strings["Submit"] = "Enviar";

View file

@ -24,7 +24,7 @@ msgid "Krynn Settings"
msgstr "Configurări Krynn"
#: krynn.php:152
msgid "Enable Krynn Plugin"
msgid "Enable Krynn Addon"
msgstr "Activare Modul Krynn"
#: krynn.php:158

View file

@ -6,5 +6,5 @@ function string_plural_select_ro($n){
}}
;
$a->strings["Krynn Settings"] = "Configurări Krynn";
$a->strings["Enable Krynn Plugin"] = "Activare Modul Krynn";
$a->strings["Enable Krynn Addon"] = "Activare Modul Krynn";
$a->strings["Submit"] = "Trimite";

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Krynn Settings"] = "";
$a->strings["Enable Krynn Plugin"] = "";
$a->strings["Enable Krynn Addon"] = "";
$a->strings["Submit"] = "Подтвердить";

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Krynn Settings"] = "行星设置";
$a->strings["Enable Krynn Plugin"] = "使行星插件可用";
$a->strings["Enable Krynn Addon"] = "使行星插件可用";
$a->strings["Submit"] = "提交";