From 0b938a8f916fa98a851d9864cd7728c0576e8720 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 7 Jul 2017 08:46:56 +0200 Subject: [PATCH 1/4] ES translation of the superblock addon THX juanman --- superblock/lang/es/messages.po | 52 ++++++++++++++-------------------- superblock/lang/es/strings.php | 12 ++++---- 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/superblock/lang/es/messages.po b/superblock/lang/es/messages.po index 33f8e000..5f81fef8 100644 --- a/superblock/lang/es/messages.po +++ b/superblock/lang/es/messages.po @@ -1,17 +1,18 @@ -# ADDON blockem +# ADDON superblock # Copyright (C) -# This file is distributed under the same license as the Friendica blockem addon package. +# This file is distributed under the same license as the Friendica superblock addon package. # # # Translators: # Albert, 2016 +# juanman , 2017 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: 2016-11-18 11:53+0000\n" -"Last-Translator: Albert\n" +"POT-Creation-Date: 2017-04-21 08:45+0200\n" +"PO-Revision-Date: 2017-07-04 16:27+0000\n" +"Last-Translator: juanman \n" "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,35 +20,26 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: blockem.php:51 -msgid "\"Blockem\" Settings" -msgstr "Ajustes de \"Blockem\"" +#: superblock.php:53 superblock.php:57 +msgid "\"Superblock\"" +msgstr "" -#: blockem.php:53 +#: superblock.php:60 msgid "Comma separated profile URLS to block" msgstr "Perfil de URLS a bloque separado por comas" -#: blockem.php:57 -msgid "Submit" -msgstr "Enviar" +#: superblock.php:64 +msgid "Save Settings" +msgstr "Guardar configuración" -#: blockem.php:70 -msgid "BLOCKEM Settings saved." -msgstr "Ajustes de BLOCKEM guardados." +#: superblock.php:76 +msgid "SUPERBLOCK Settings saved." +msgstr "" -#: blockem.php:105 -#, php-format -msgid "Blocked %s - Click to open/close" -msgstr "%s bloqueados - Click para abrir/cerrar" +#: superblock.php:148 +msgid "Block Completely" +msgstr "Bloquear completamente" -#: blockem.php:160 -msgid "Unblock Author" -msgstr "Desbloquear Autor" - -#: blockem.php:162 -msgid "Block Author" -msgstr "Bloquear autor" - -#: blockem.php:194 -msgid "blockem settings updated" -msgstr "Ajustes de Blockem actualizados" +#: superblock.php:168 +msgid "superblock settings updated" +msgstr "" diff --git a/superblock/lang/es/strings.php b/superblock/lang/es/strings.php index 2d9cef8c..cb80c96e 100644 --- a/superblock/lang/es/strings.php +++ b/superblock/lang/es/strings.php @@ -5,11 +5,9 @@ function string_plural_select_es($n){ return ($n != 1);; }} ; -$a->strings["\"Blockem\" Settings"] = "Ajustes de \"Blockem\""; +$a->strings["\"Superblock\""] = ""; $a->strings["Comma separated profile URLS to block"] = "Perfil de URLS a bloque separado por comas"; -$a->strings["Submit"] = "Enviar"; -$a->strings["BLOCKEM Settings saved."] = "Ajustes de BLOCKEM guardados."; -$a->strings["Blocked %s - Click to open/close"] = "%s bloqueados - Click para abrir/cerrar"; -$a->strings["Unblock Author"] = "Desbloquear Autor"; -$a->strings["Block Author"] = "Bloquear autor"; -$a->strings["blockem settings updated"] = "Ajustes de Blockem actualizados"; +$a->strings["Save Settings"] = "Guardar configuración"; +$a->strings["SUPERBLOCK Settings saved."] = ""; +$a->strings["Block Completely"] = "Bloquear completamente"; +$a->strings["superblock settings updated"] = ""; -- 2.45.3 From 59229fa7d54d0ffe1ac586b5bca18a549e65e0a0 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 29 Jul 2017 08:01:02 +0000 Subject: [PATCH 2/4] Using a whitelist for "leistungsschutzrecht" --- leistungsschutzrecht/leistungsschutzrecht.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php index ec633b1d..c58c707f 100644 --- a/leistungsschutzrecht/leistungsschutzrecht.php +++ b/leistungsschutzrecht/leistungsschutzrecht.php @@ -71,9 +71,13 @@ function leistungsschutzrecht_fetchsites() { $sitelist = fetch_url($url); $siteurls = explode(',', $sitelist); + $whitelist = array('tagesschau.de', 'heute.de', 'wdr.de'); + $sites = array(); foreach ($siteurls AS $site) { - $sites[$site] = $site; + if (!in_array($site, $whitelist)) { + $sites[$site] = $site; + } } // I would prefer parsing the list from the original site, but I haven't found a list. -- 2.45.3 From 43087289c962534ce53b784ca43b3272dd0fd850 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 18 Aug 2017 07:48:04 +0000 Subject: [PATCH 3/4] Retriever is deactivated, see issue 3482 --- retriever/retriever.php | 1 + 1 file changed, 1 insertion(+) diff --git a/retriever/retriever.php b/retriever/retriever.php index a05e2e3f..72e327b3 100644 --- a/retriever/retriever.php +++ b/retriever/retriever.php @@ -4,6 +4,7 @@ * Description: Follow the permalink of RSS/Atom feed items and replace the summary with the full content. * Version: 1.0 * Author: Matthew Exon + * Status: Unsupported */ require_once('include/html2bbcode.php'); -- 2.45.3 From 27222a7e3ba79cd8639073a7a8489fab2dccf806 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 19 Aug 2017 09:59:49 +0000 Subject: [PATCH 4/4] README added --- retriever/README | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 retriever/README diff --git a/retriever/README b/retriever/README new file mode 100644 index 00000000..b9728151 --- /dev/null +++ b/retriever/README @@ -0,0 +1,5 @@ +"retriever" is deactivated since it has side effects for all received posts. + +It was created in a time when the option 'Fetch further information for feeds' didn't exist. + +To activate it, please go to the list of your contacts, edit the contact and then select between the different options. -- 2.45.3