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

@ -7,13 +7,15 @@
*
*
*/
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
function gnot_install() {
register_hook('plugin_settings', 'addon/gnot/gnot.php', 'gnot_settings');
register_hook('plugin_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
register_hook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
Addon::registerHook('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings');
Addon::registerHook('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
Addon::registerHook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
logger("installed gnot");
}
@ -21,9 +23,9 @@ function gnot_install() {
function gnot_uninstall() {
unregister_hook('plugin_settings', 'addon/gnot/gnot.php', 'gnot_settings');
unregister_hook('plugin_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
unregister_hook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
Addon::unregisterHook('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings');
Addon::unregisterHook('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
Addon::unregisterHook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
logger("removed gnot");
@ -44,14 +46,14 @@ function gnot_settings_post($a,$post) {
if(! local_user() || (! x($_POST,'gnot-submit')))
return;
set_pconfig(local_user(),'gnot','enable',intval($_POST['gnot']));
info( t('Gnot settings updated.') . EOL);
PConfig::set(local_user(),'gnot','enable',intval($_POST['gnot']));
info(L10n::t('Gnot settings updated.') . EOL);
}
/**
*
* Called from the Plugin Setting form.
* Called from the Addon Setting form.
* Add our own settings info to the page.
*
*/
@ -76,16 +78,16 @@ function gnot_settings(&$a,&$s) {
/* Add some HTML to the existing form */
$s .= '<div class="settings-block">';
$s .= '<h3>' . t('Gnot Settings') . '</h3>';
$s .= '<h3>' . L10n::t('Gnot Settings') . '</h3>';
$s .= '<div id="gnot-wrapper">';
$s .= '<div id="gnot-desc">' . t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") . '</div>';
$s .= '<label id="gnot-label" for="gnot">' . t('Enable this plugin/addon?') . '</label>';
$s .= '<div id="gnot-desc">' . L10n::t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") . '</div>';
$s .= '<label id="gnot-label" for="gnot">' . L10n::t('Enable this addon?') . '</label>';
$s .= '<input id="gnot-input" type="checkbox" name="gnot" value="1"'. $gnot_checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="gnot-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="gnot-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
}
@ -94,6 +96,5 @@ function gnot_enotify_mail(&$a,&$b) {
if((! $b['uid']) || (! intval(get_pconfig($b['uid'], 'gnot','enable'))))
return;
if($b['type'] == NOTIFY_COMMENT)
$b['subject'] = sprintf( t('[Friendica:Notify] Comment to conversation #%d'), $b['parent']);
$b['subject'] = L10n::t('[Friendica:Notify] Comment to conversation #%d', $b['parent']);
}

View file

@ -32,7 +32,7 @@ msgid ""
msgstr ""
#: gnot.php:82
msgid "Enable this plugin/addon?"
msgid "Enable this addon?"
msgstr ""
#: gnot.php:88

View file

@ -3,6 +3,6 @@
$a->strings["Gnot settings updated."] = "Configuració de Gnot actualitzada";
$a->strings["Gnot Settings"] = "Configuració de Gnot";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permet crear fils de les notificacions de comentaris de correu electrònic a Gmail i anonimat de la línia d'assumpte.";
$a->strings["Enable this plugin/addon?"] = "Activar aquest plugin/aplicació?";
$a->strings["Enable this addon?"] = "Activar aquest addon/aplicació?";
$a->strings["Submit"] = "Enviar";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica: Notifica] Conversació comentada #%d";

View file

@ -34,8 +34,8 @@ msgid ""
msgstr "Umožnit řetězení emailových komentářových notifikací na Gmailu a anonymizací řádky předmětu."
#: gnot.php:82
msgid "Enable this plugin/addon?"
msgstr "Povolit tento plugin/rozšíření?"
msgid "Enable this addon?"
msgstr "Povolit tento addon/rozšíření?"
#: gnot.php:88
msgid "Submit"

View file

@ -8,6 +8,6 @@ function string_plural_select_cs($n){
$a->strings["Gnot settings updated."] = "Nastavení Gnot aktualizováno.";
$a->strings["Gnot Settings"] = "Nastavení Gnot";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Umožnit řetězení emailových komentářových notifikací na Gmailu a anonymizací řádky předmětu.";
$a->strings["Enable this plugin/addon?"] = "Povolit tento plugin/rozšíření?";
$a->strings["Enable this addon?"] = "Povolit tento addon/rozšíření?";
$a->strings["Submit"] = "Odeslat";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Upozornění] Komentář ke konverzaci #%d";

View file

@ -35,8 +35,8 @@ msgid ""
msgstr "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff"
#: gnot.php:82
msgid "Enable this plugin/addon?"
msgstr "Dieses Plugin/Addon aktivieren?"
msgid "Enable this addon?"
msgstr "Dieses Addon aktivieren?"
#: gnot.php:88
msgid "Submit"

View file

@ -8,6 +8,6 @@ function string_plural_select_de($n){
$a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert.";
$a->strings["Gnot Settings"] = "Gnot Einstellungen";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff";
$a->strings["Enable this plugin/addon?"] = "Dieses Plugin/Addon aktivieren?";
$a->strings["Enable this addon?"] = "Dieses Addon aktivieren?";
$a->strings["Submit"] = "Senden";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica-Benachrichtigung] Kommentar zum Beitrag #%d";

View file

@ -3,6 +3,6 @@
$a->strings["Gnot settings updated."] = "Ĝisdatigis Gnot agordojn.";
$a->strings["Gnot Settings"] = "Agordoj por Gnot";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permesas la ĉenadon de retpoŝtaj atentigoj pri komentoj ĉe Gmail kan anonimigado de la temlinio.";
$a->strings["Enable this plugin/addon?"] = "Ŝalti tiun kromprogramon?";
$a->strings["Enable this addon?"] = "Ŝalti tiun kromprogramon?";
$a->strings["Submit"] = "Sendi";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Atentigo] Komento pri konversacio #%d";

View file

@ -34,8 +34,8 @@ msgid ""
msgstr "Permite limpiar las notificaciones de comentario de email en Gmail y anonimizar la línea del tema."
#: gnot.php:82
msgid "Enable this plugin/addon?"
msgstr "¿Habilitar este plugin/addon?"
msgid "Enable this addon?"
msgstr "¿Habilitar este addon?"
#: gnot.php:88
msgid "Submit"

View file

@ -8,6 +8,6 @@ function string_plural_select_es($n){
$a->strings["Gnot settings updated."] = "Ajustes de Gnot actualizados.";
$a->strings["Gnot Settings"] = "Ajustes de Gnot";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permite limpiar las notificaciones de comentario de email en Gmail y anonimizar la línea del tema.";
$a->strings["Enable this plugin/addon?"] = "¿Habilitar este plugin/addon?";
$a->strings["Enable this addon?"] = "¿Habilitar este addon?";
$a->strings["Submit"] = "Enviar";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] Comentar en conversación #%d";

View file

@ -3,6 +3,6 @@
$a->strings["Gnot settings updated."] = "Réglages Gnot sauvés.";
$a->strings["Gnot Settings"] = "Réglages Gnot";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Autorise l'arborescence des notifications de commentaires sur GMail, et rend la ligne 'Sujet' anonyme.";
$a->strings["Enable this plugin/addon?"] = "Activer cette extension?";
$a->strings["Enable this addon?"] = "Activer cette extension?";
$a->strings["Submit"] = "Envoyer";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notification] Commentaire sur la conversation #%d";

View file

@ -3,6 +3,6 @@
$a->strings["Gnot settings updated."] = "";
$a->strings["Gnot Settings"] = "";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
$a->strings["Enable this plugin/addon?"] = "";
$a->strings["Enable this addon?"] = "";
$a->strings["Submit"] = "Senda inn";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "";

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:12+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"
@ -34,8 +34,8 @@ msgid ""
msgstr "Permetti di raggruppare le notifiche dei commenti in thread su Gmail e anonimizza l'oggetto"
#: gnot.php:82
msgid "Enable this plugin/addon?"
msgstr "Abilita questo plugin?"
msgid "Enable this addon?"
msgstr "Abilita questo componente aggiuntivo?"
#: gnot.php:88
msgid "Submit"

View file

@ -8,6 +8,6 @@ function string_plural_select_it($n){
$a->strings["Gnot settings updated."] = "Impostazioni di \"Gnot\" aggiornate.";
$a->strings["Gnot Settings"] = "Impostazioni Gnot";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permetti di raggruppare le notifiche dei commenti in thread su Gmail e anonimizza l'oggetto";
$a->strings["Enable this plugin/addon?"] = "Abilita questo plugin?";
$a->strings["Enable this addon?"] = "Abilita questo componente aggiuntivo?";
$a->strings["Submit"] = "Invia";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notifica] Commento alla conversazione n° %d";

View file

@ -3,6 +3,6 @@
$a->strings["Gnot settings updated."] = "";
$a->strings["Gnot Settings"] = "";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
$a->strings["Enable this plugin/addon?"] = "";
$a->strings["Enable this addon?"] = "";
$a->strings["Submit"] = "Lagre";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "";

View file

@ -3,6 +3,6 @@
$a->strings["Gnot settings updated."] = "";
$a->strings["Gnot Settings"] = "";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
$a->strings["Enable this plugin/addon?"] = "Umożliwić tego plugina/wtyczkę?";
$a->strings["Enable this addon?"] = "Umożliwić tego addona/wtyczkę?";
$a->strings["Submit"] = "Potwierdź";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "";

View file

@ -3,6 +3,6 @@
$a->strings["Gnot settings updated."] = "As configurações do Gnot foram atualizadas.";
$a->strings["Gnot Settings"] = "Configurações do Gnot";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permite o encadeamento das notificações por e-mail de comentário no GMail, tornando a a linha de assunto anônima.";
$a->strings["Enable this plugin/addon?"] = "Habilitar este plugin/complemento?";
$a->strings["Enable this addon?"] = "Habilitar este addon/complemento?";
$a->strings["Submit"] = "Enviar";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] Comentário na conversa #%d";

View file

@ -34,7 +34,7 @@ msgid ""
msgstr "Permite înlănțuirea notificărilor prin email a comentariilor, în Gmail și anonimizarea subiectului."
#: gnot.php:82
msgid "Enable this plugin/addon?"
msgid "Enable this addon?"
msgstr "Activați acest modul/supliment?"
#: gnot.php:88

View file

@ -8,6 +8,6 @@ function string_plural_select_ro($n){
$a->strings["Gnot settings updated."] = "Configurările Gnot au fost actualizate.";
$a->strings["Gnot Settings"] = "Configurări Gnot";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permite înlănțuirea notificărilor prin email a comentariilor, în Gmail și anonimizarea subiectului.";
$a->strings["Enable this plugin/addon?"] = "Activați acest modul/supliment?";
$a->strings["Enable this addon?"] = "Activați acest modul/supliment?";
$a->strings["Submit"] = "Trimite";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notificare] Comentariu la conversația # %d";

View file

@ -34,7 +34,7 @@ msgid ""
msgstr "Разрешить нитевание уведомлений о комментариях на Gmail и анонимизировать поле \"Тема\"."
#: gnot.php:82
msgid "Enable this plugin/addon?"
msgid "Enable this addon?"
msgstr "Включить этот плагин/аддон?"
#: gnot.php:88

View file

@ -8,6 +8,6 @@ function string_plural_select_ru($n){
$a->strings["Gnot settings updated."] = "Настройки Gnot обновлены.";
$a->strings["Gnot Settings"] = "Настройки Gnot";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Разрешить нитевание уведомлений о комментариях на Gmail и анонимизировать поле \"Тема\".";
$a->strings["Enable this plugin/addon?"] = "Включить этот плагин/аддон?";
$a->strings["Enable this addon?"] = "Включить этот плагин/аддон?";
$a->strings["Submit"] = "Добавить";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] Комментарий в теме #%d";

View file

@ -3,6 +3,6 @@
$a->strings["Gnot settings updated."] = "Gnot设置更新了。";
$a->strings["Gnot Settings"] = "Gnot设置";
$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "允许邮件评论通知在Gmail和匿名话题行。";
$a->strings["Enable this plugin/addon?"] = "使这个插件/加件可用?";
$a->strings["Enable this addon?"] = "使这个插件/加件可用?";
$a->strings["Submit"] = "提交";
$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify]评论在交流#%d";