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

@ -22,7 +22,7 @@ msgid "Randplace Settings"
msgstr ""
#: randplace.php:171
msgid "Enable Randplace Plugin"
msgid "Enable Randplace Addon"
msgstr ""
#: randplace.php:177

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Randplace Settings"] = "Configuració de Randplace";
$a->strings["Enable Randplace Plugin"] = "Habilitar el Plugin de Randplace";
$a->strings["Enable Randplace Addon"] = "Habilitar el Addon de Randplace";
$a->strings["Submit"] = "Enviar";

View file

@ -24,8 +24,8 @@ msgid "Randplace Settings"
msgstr "Randplace Nastavení"
#: randplace.php:171
msgid "Enable Randplace Plugin"
msgstr "Povolit Randplace Plugin"
msgid "Enable Randplace Addon"
msgstr "Povolit Randplace Addon"
#: randplace.php:177
msgid "Save Settings"

View file

@ -6,5 +6,5 @@ function string_plural_select_cs($n){
}}
;
$a->strings["Randplace Settings"] = "Randplace Nastavení";
$a->strings["Enable Randplace Plugin"] = "Povolit Randplace Plugin";
$a->strings["Enable Randplace Addon"] = "Povolit Randplace Addon";
$a->strings["Save Settings"] = "Uložit Nastavení";

View file

@ -24,8 +24,8 @@ msgid "Randplace Settings"
msgstr "Randplace-Einstellungen"
#: randplace.php:171
msgid "Enable Randplace Plugin"
msgstr "Randplace-Plugin aktivieren"
msgid "Enable Randplace Addon"
msgstr "Randplace-Addon aktivieren"
#: randplace.php:177
msgid "Save Settings"

View file

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

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Randplace Settings"] = "Randplace agordoj.";
$a->strings["Enable Randplace Plugin"] = "Aktivigi la Randplace kromprogramon.";
$a->strings["Enable Randplace Addon"] = "Aktivigi la Randplace kromprogramon.";
$a->strings["Submit"] = "Sendi";

View file

@ -24,8 +24,8 @@ msgid "Randplace Settings"
msgstr "Ajustes de Randplace"
#: randplace.php:171
msgid "Enable Randplace Plugin"
msgstr "Habilitar el Plugin de Randplace"
msgid "Enable Randplace Addon"
msgstr "Habilitar el Addon de Randplace"
#: randplace.php:177
msgid "Submit"

View file

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

View file

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

View file

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

View file

@ -4,13 +4,13 @@
#
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
# fabrixxm <fabrix.xm@gmail.com>, 2014-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 10:22+0000\n"
"PO-Revision-Date: 2018-03-19 13:25+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 "Randplace Settings"
msgstr "Impostazioni \"Posizione casuale\""
#: randplace.php:171
msgid "Enable Randplace Plugin"
msgstr "Abilita il plugin \"Posizione casuale\""
msgid "Enable Randplace Addon"
msgstr "Abilita il componente aggiuntivo Posizione Casuale"
#: randplace.php:177
msgid "Submit"

View file

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

View file

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

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Randplace Settings"] = "Ustawienia Randplace";
$a->strings["Enable Randplace Plugin"] = "Włącz Randplace Plugin";
$a->strings["Enable Randplace Addon"] = "Włącz Randplace Addon";
$a->strings["Submit"] = "Potwierdź";

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Randplace Settings"] = "Configurações do Randplace";
$a->strings["Enable Randplace Plugin"] = "Habilitar o plugin Randplace";
$a->strings["Enable Randplace Addon"] = "Habilitar o addon Randplace";
$a->strings["Submit"] = "Enviar";

View file

@ -23,7 +23,7 @@ msgid "Randplace Settings"
msgstr "Configurări Randplace"
#: randplace.php:171
msgid "Enable Randplace Plugin"
msgid "Enable Randplace Addon"
msgstr "Activare Modul Randplace"
#: randplace.php:177

View file

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

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Randplace Settings"] = "Настройки Случайного места";
$a->strings["Enable Randplace Plugin"] = "Включить Randplace плагин";
$a->strings["Enable Randplace Addon"] = "Включить Randplace плагин";
$a->strings["Submit"] = "Подтвердить";

View file

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

View file

@ -1,5 +1,5 @@
<?php
$a->strings["Randplace Settings"] = "随意下设置";
$a->strings["Enable Randplace Plugin"] = "使随意下插件能用";
$a->strings["Enable Randplace Addon"] = "使随意下插件能用";
$a->strings["Submit"] = "提交";

View file

@ -1,7 +1,7 @@
<?php
/**
* Name: Random place
* Description: Sample Friendica plugin/addon. Set a random place when posting.
* Description: Sample Friendica addon. Set a random place when posting.
* Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*
@ -11,36 +11,38 @@
* Addons are registered with the system through the admin
* panel.
*
* When registration is detected, the system calls the plugin
* When registration is detected, the system calls the addon
* name_install() function, located in 'addon/name/name.php',
* where 'name' is the name of the addon.
* If the addon is removed from the configuration list, the
* system will call the name_uninstall() function.
*
*/
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
function randplace_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/randplace/randplace.php', 'randplace_post_hook');
Addon::registerHook('post_local', 'addon/randplace/randplace.php', 'randplace_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/randplace/randplace.php', 'randplace_settings');
register_hook('plugin_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
Addon::registerHook('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings');
Addon::registerHook('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
logger("installed randplace");
}
@ -56,9 +58,9 @@ function randplace_uninstall() {
*
*/
unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
unregister_hook('plugin_settings', 'addon/randplace/randplace.php', 'randplace_settings');
unregister_hook('plugin_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
Addon::unregisterHook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
Addon::unregisterHook('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings');
Addon::unregisterHook('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
logger("removed randplace");
@ -73,7 +75,7 @@ function randplace_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
*
*/
@ -141,7 +143,7 @@ function randplace_settings_post($a,$post) {
/**
*
* Called from the Plugin Setting form.
* Called from the Addon Setting form.
* Add our own settings info to the page.
*
*/
@ -166,14 +168,14 @@ function randplace_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '<div class="settings-block">';
$s .= '<h3>' . t('Randplace Settings') . '</h3>';
$s .= '<h3>' . L10n::t('Randplace Settings') . '</h3>';
$s .= '<div id="randplace-enable-wrapper">';
$s .= '<label id="randplace-enable-label" for="randplace-checkbox">' . t('Enable Randplace Plugin') . '</label>';
$s .= '<label id="randplace-enable-label" for="randplace-checkbox">' . L10n::t('Enable Randplace Addon') . '</label>';
$s .= '<input id="randplace-checkbox" type="checkbox" name="randplace" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
}