Merge remote-tracking branch 'upstream/develop' into develop

.tx/config

@@ -1,12 +1,6 @@
 [main]
 host = https://www.transifex.com
 
-[friendica.addon_appnet_messagespo]
-file_filter = appnet/lang/<lang>/messages.po
-source_file = appnet/lang/C/messages.po
-source_lang = en
-type = PO
-
 [friendica.addon_blackout_messagespo]
 file_filter = blackout/lang/<lang>/messages.po
 source_file = blackout/lang/C/messages.po
@@ -37,12 +31,6 @@ source_file = buglink/lang/C/messages.po
 source_lang = en
 type = PO
 
-[friendica.addon_cal_messagespo]
-file_filter = cal/lang/<lang>/messages.po
-source_file = cal/lang/C/messages.po
-source_lang = en
-type = PO
-
 [friendica.addon_communityhome_messagespo]
 file_filter = communityhome/lang/<lang>/messages.po
 source_file = communityhome/lang/C/messages.po
@@ -73,24 +61,12 @@ source_file = dwpost/lang/C/messages.po
 source_lang = en
 type = PO
 
-[friendica.addon_editplain_messagespo]
-file_filter = editplain/lang/<lang>/messages.po
-source_file = editplain/lang/C/messages.po
-source_lang = en
-type = PO
-
 [friendica.addon_forumdirectory_messagespo]
 file_filter = forumdirectory/lang/<lang>/messages.po
 source_file = forumdirectory/lang/C/messages.po
 source_lang = en
 type = PO
 
-[friendica.addon_forumlist_messagespo]
-file_filter = forumlist/lang/<lang>/messages.po
-source_file = forumlist/lang/C/messages.po
-source_lang = en
-type = PO
-
 [friendica.addon_fromapp_messagespo]
 file_filter = fromapp/lang/<lang>/messages.po
 source_file = fromapp/lang/C/messages.po
@@ -115,12 +91,6 @@ source_file = gnot/lang/C/messages.po
 source_lang = en
 type = PO
 
-[friendica.addon_gpluspost_messagespo]
-file_filter = gpluspost/lang/<lang>/messages.po
-source_file = gpluspost/lang/C/messages.po
-source_lang = en
-type = PO
-
 [friendica.addon_gravatar_messagespo]
 file_filter = gravatar/lang/<lang>/messages.po
 source_file = gravatar/lang/C/messages.po
@@ -301,6 +271,12 @@ source_file = rendertime/lang/C/messages.po
 source_lang = en
 type = PO
 
+[friendica.addon_securemail_messagespo]
+file_filter = securemail/lang/<lang>/messages.po
+source_file = securemail/lang/C/messages.po
+source_lang = en
+type = PO
+
 [friendica.addon_showmore_messagespo]
 file_filter = showmore/lang/<lang>/messages.po
 source_file = showmore/lang/C/messages.po
@@ -313,12 +289,6 @@ source_file = smileybutton/lang/C/messages.po
 source_lang = en
 type = PO
 
-[friendica.addon_snautofollow_messagespo]
-file_filter = snautofollow/lang/<lang>/messages.po
-source_file = snautofollow/lang/C/messages.po
-source_lang = en
-type = PO
-
 [friendica.addon_startpage_messagespo]
 file_filter = startpage/lang/<lang>/messages.po
 source_file = startpage/lang/C/messages.po
@@ -361,9 +331,9 @@ source_file = twitter/lang/C/messages.po
 source_lang = en
 type = PO
 
-[friendica.addon_uhremotestorage_messagespo]
+[friendica.addon_viewsrc_messagespo]
-file_filter = uhremotestorage/lang/<lang>/messages.po
+file_filter = viewsrc/lang/<lang>/messages.po
-source_file = uhremotestorage/lang/C/messages.po
+source_file = viewsrc/lang/C/messages.po
 source_lang = en
 type = PO
 
@@ -385,6 +355,12 @@ source_file = wppost/lang/C/messages.po
 source_lang = en
 type = PO
 
+[friendica.addon_xmpp_messagespo]
+file_filter = xmpp/lang/<lang>/messages.po
+source_file = xmpp/lang/C/messages.po
+source_lang = en
+type = PO
+
 [friendica.addon_yourls_messagespo]
 file_filter = yourls/lang/<lang>/messages.po
 source_file = yourls/lang/C/messages.po

INSTALL.txt

@@ -5,7 +5,7 @@
 To install all addons using git, cd into your top level Friendica directory and
 
 	git clone https://github.com/friendica/friendica-addons.git addon
-	util/composer.phar install -d addon
+	bin/composer.phar install -d addon
 
 This will clone the entire repository in a directory called addon. They can now be activated in the addons section of your admin panel.
 

blackout/lang/it/messages.po

@@ -4,13 +4,13 @@
 # 
 # 
 # Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
+# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-09-10 10:22+0000\n"
+"PO-Revision-Date: 2018-03-19 19:50+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"

blockem/lang/en-gb/messages.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-09 13:00+0100\n"
-"PO-Revision-Date: 2018-02-17 11:24+0000\n"
+"PO-Revision-Date: 2018-03-15 14:10+0000\n"
 "Last-Translator: Andy H3 <andy@hubup.pro>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr "Blockem settings saved."
 #: blockem.php:140
 #, php-format
 msgid "Hidden content by %s - Click to open/close"
-msgstr "Hidden content by %s - Show/hide"
+msgstr "Hidden content by %s - Reveal/hide"
 
 #: blockem.php:193
 msgid "Unblock Author"

blockem/lang/en-gb/strings.php

@@ -10,7 +10,7 @@ $a->strings["Hides user's content by collapsing posts. Also replaces their avata
 $a->strings["Comma separated profile URLS:"] = "Comma separated profile URLs:";
 $a->strings["Save Settings"] = "Save settings";
 $a->strings["BLOCKEM Settings saved."] = "Blockem settings saved.";
-$a->strings["Hidden content by %s - Click to open/close"] = "Hidden content by %s - Show/hide";
+$a->strings["Hidden content by %s - Click to open/close"] = "Hidden content by %s - Reveal/hide";
 $a->strings["Unblock Author"] = "Unblock author";
 $a->strings["Block Author"] = "Block author";
 $a->strings["blockem settings updated"] = "Blockem settings updated";

blockem/lang/en-us/messages.po

@@ -0,0 +1,59 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Andy H3 <andy@hubup.pro>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-02-09 13:00+0100\n"
+"PO-Revision-Date: 2018-03-15 14:14+0000\n"
+"Last-Translator: Andy H3 <andy@hubup.pro>\n"
+"Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:51 blockem.php:55
+msgid "\"Blockem\""
+msgstr "\"Blockem\""
+
+#: blockem.php:59
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Hides user's content by collapsing posts. Also replaces their avatar with generic image."
+
+#: blockem.php:60
+msgid "Comma separated profile URLS:"
+msgstr "Comma separated profile URLs:"
+
+#: blockem.php:64
+msgid "Save Settings"
+msgstr "Save settings"
+
+#: blockem.php:77
+msgid "BLOCKEM Settings saved."
+msgstr "Blockem settings saved."
+
+#: blockem.php:140
+#, php-format
+msgid "Hidden content by %s - Click to open/close"
+msgstr "Hidden content by %s - Reveal/hide"
+
+#: blockem.php:193
+msgid "Unblock Author"
+msgstr "Unblock author"
+
+#: blockem.php:195
+msgid "Block Author"
+msgstr "Block author"
+
+#: blockem.php:227
+msgid "blockem settings updated"
+msgstr "Blockem settings updated"

blockem/lang/en-us/strings.php

@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_en_us")) {
+function string_plural_select_en_us($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Blockem\""] = "\"Blockem\"";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Hides user's content by collapsing posts. Also replaces their avatar with generic image.";
+$a->strings["Comma separated profile URLS:"] = "Comma separated profile URLs:";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["BLOCKEM Settings saved."] = "Blockem settings saved.";
+$a->strings["Hidden content by %s - Click to open/close"] = "Hidden content by %s - Reveal/hide";
+$a->strings["Unblock Author"] = "Unblock author";
+$a->strings["Block Author"] = "Block author";
+$a->strings["blockem settings updated"] = "Blockem settings updated";

blockem/lang/it/messages.po

@@ -4,13 +4,13 @@
 # 
 # 
 # Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
+# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"POT-Creation-Date: 2018-02-09 13:00+0100\n"
-"PO-Revision-Date: 2014-09-10 10:23+0000\n"
+"PO-Revision-Date: 2018-03-19 13:14+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"
@@ -19,35 +19,41 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: blockem.php:53 blockem.php:57
+#: blockem.php:51 blockem.php:55
 msgid "\"Blockem\""
 msgstr "\"Blockem\""
 
-#: blockem.php:61
+#: blockem.php:59
-msgid "Comma separated profile URLS to block"
+msgid ""
-msgstr "Lista, separata da virgola, di indirizzi da bloccare"
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Nascondi il contenuto degli utenti collassando i messaggi. Sostituisce anche gli avatar con un'immagine generica."
 
-#: blockem.php:65
+#: blockem.php:60
+msgid "Comma separated profile URLS:"
+msgstr "URL profili separati da virgola:"
+
+#: blockem.php:64
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: blockem.php:78
+#: blockem.php:77
 msgid "BLOCKEM Settings saved."
 msgstr "Impostazioni BLOCKEM salvate."
 
-#: blockem.php:142
+#: blockem.php:140
 #, php-format
-msgid "Blocked %s - Click to open/close"
+msgid "Hidden content by %s - Click to open/close"
-msgstr "%s bloccato - Clicca per aprire/chiudere"
+msgstr "Contenuto di %s nascosto - Clicca per aprire/chiudere"
 
-#: blockem.php:197
+#: blockem.php:193
 msgid "Unblock Author"
 msgstr "Sblocca autore"
 
-#: blockem.php:199
+#: blockem.php:195
 msgid "Block Author"
 msgstr "Blocca autore"
 
-#: blockem.php:231
+#: blockem.php:227
 msgid "blockem settings updated"
 msgstr "Impostazioni 'blockem' aggiornate."

blockem/lang/it/strings.php

@@ -6,10 +6,11 @@ function string_plural_select_it($n){
 }}
 ;
 $a->strings["\"Blockem\""] = "\"Blockem\"";
-$a->strings["Comma separated profile URLS to block"] = "Lista, separata da virgola, di indirizzi da bloccare";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Nascondi il contenuto degli utenti collassando i messaggi. Sostituisce anche gli avatar con un'immagine generica.";
+$a->strings["Comma separated profile URLS:"] = "URL profili separati da virgola:";
 $a->strings["Save Settings"] = "Salva Impostazioni";
 $a->strings["BLOCKEM Settings saved."] = "Impostazioni BLOCKEM salvate.";
-$a->strings["Blocked %s - Click to open/close"] = "%s bloccato - Clicca per aprire/chiudere";
+$a->strings["Hidden content by %s - Click to open/close"] = "Contenuto di %s nascosto - Clicca per aprire/chiudere";
 $a->strings["Unblock Author"] = "Sblocca autore";
 $a->strings["Block Author"] = "Blocca autore";
 $a->strings["blockem settings updated"] = "Impostazioni 'blockem' aggiornate.";

blogger/lang/it/messages.po

@@ -4,13 +4,13 @@
 # 
 # 
 # Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
+# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-09-10 10:24+0000\n"
+"PO-Revision-Date: 2018-03-19 13:21+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"
@@ -29,7 +29,7 @@ msgstr "Esporta Blogger"
 
 #: blogger.php:82
 msgid "Enable Blogger Post Addon"
-msgstr "Abilita il addon di invio a Blogger"
+msgstr "Abilita il componente aggiuntivo di invio a Blogger"
 
 #: blogger.php:87
 msgid "Blogger username"

blogger/lang/it/strings.php

@@ -7,7 +7,7 @@ function string_plural_select_it($n){
 ;
 $a->strings["Post to blogger"] = "Invia a Blogger";
 $a->strings["Blogger Export"] = "Esporta Blogger";
-$a->strings["Enable Blogger Post Addon"] = "Abilita il addon di invio a Blogger";
+$a->strings["Enable Blogger Post Addon"] = "Abilita il componente aggiuntivo di invio a Blogger";
 $a->strings["Blogger username"] = "Nome utente Blogger";
 $a->strings["Blogger password"] = "Password Blogger";
 $a->strings["Blogger API URL"] = "Indirizzo API Blogger";

buffer/lang/it/messages.po

@@ -4,15 +4,15 @@
 # 
 # 
 # Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
+# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
 # Sandro Santilli <strk@kbt.io>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2015-11-01 11:05+0000\n"
+"PO-Revision-Date: 2018-03-19 13:21+0000\n"
-"Last-Translator: Sandro Santilli <strk@kbt.io>\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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +62,7 @@ msgstr "Autentica la tua connessione a Buffer"
 
 #: buffer.php:146
 msgid "Enable Buffer Post Addon"
-msgstr "Abilita il addon di invio a Buffer"
+msgstr "Abilita il componente aggiuntivo di invio a Buffer"
 
 #: buffer.php:151
 msgid "Post to Buffer by default"

buffer/lang/it/strings.php

@@ -15,7 +15,7 @@ $a->strings["return to the connector page"] = "ritorna alla pagina del connettor
 $a->strings["Post to Buffer"] = "Invia a Buffer";
 $a->strings["Buffer Export"] = "Esporta Buffer";
 $a->strings["Authenticate your Buffer connection"] = "Autentica la tua connessione a Buffer";
-$a->strings["Enable Buffer Post Addon"] = "Abilita il addon di invio a Buffer";
+$a->strings["Enable Buffer Post Addon"] = "Abilita il componente aggiuntivo di invio a Buffer";
 $a->strings["Post to Buffer by default"] = "Invia sempre a Buffer";
 $a->strings["Check to delete this preset"] = "Seleziona per eliminare questo preset";
 $a->strings["Posts are going to all accounts that are enabled by default:"] = "I messaggi andranno a tutti gli account che sono abilitati:";

buglink/lang/it/messages.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-09-10 10:27+0000\n"
+"PO-Revision-Date: 2017-09-20 06:07+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"

communityhome/README.md

@@ -1,34 +1,17 @@
 Community Home
 --------------
 
-This addon overwrites the default home page shown to not logged users.
+This addon overwrites the default home page shown to anonymous users.
-On sidebar there are the login form, last ten users (if they have 
+On the sidebar there are the login form, last ten users (if they chose
-choosed to be in site directory), last ten public photos and last ten
+to be in the site directory), last ten public photos and last ten
-"likes" sent by a site user or about a site user's item
+"likes" sent by a site user or about a site user's item.
 
-In main content is shown the community stream. This addon doesn't 
+In the main content is shown the community stream. This addon doesn't
-honour your community page visibility site setting: the community 
+honor your community page visibility site setting: the community
 stream is shown also if you have choose to not show the community page.
 
-If 'home.html' is found in your friendica root, its content is inserted 
+If 'home.html' is found in your friendica root, its content is inserted
 before community stream
 
-Each elements can be show or not. At the moment, there is no admin page
+By default no features are enabled, you can edit this addon's settings
-for settings, so this settings must be added to yout .htconfig.php
+through the admin panel.
-
-
-    $a->config['communityhome']['showcommunitystream'] = true;
-    $a->config['communityhome']['showlastlike'] = true;
-    $a->config['communityhome']['showlastphotos'] = true;
-    $a->config['communityhome']['showactiveusers'] = true;
-    $a->config['communityhome']['showlastusers'] = true;
-
-If you don't want to show something, set it to false.
-
-Note:
------
-
-- Default is "false". With no settings in .htconfig.php, nothing is 
-shown, except login form and content of 'home.html'
-
-- Active users query can be heavy for db, and on some system don't work

communityhome/communityhome.php

@@ -1,40 +1,45 @@
 <?php
+
 /**
  * Name: Community home
  * Description: Show last community activity in homepage
  * Version: 2.0
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Status: Unsupported
  */
+
+use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Module\Login;
 
-require_once('mod/community.php');
+require_once 'mod/community.php';
 
-
+function communityhome_install()
-function communityhome_install() {
+{
 	Addon::registerHook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home');
 	logger("installed communityhome");
 }
 
-function communityhome_uninstall() {
+function communityhome_uninstall()
+{
 	Addon::unregisterHook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home');
 	logger("removed communityhome");
 }
 
-function communityhome_getopts() {
+function communityhome_getopts()
+{
 	return [
-		'hidelogin'=>L10n::t('Hide login form'),
+		'hidelogin' => L10n::t('Hide login form'),
-		'showlastusers'=>L10n::t('Show last new users'),
+		'showlastusers' => L10n::t('Show last new users'),
-		'showactiveusers'=>L10n::t('Show last active users'),
+		'showlastphotos' => L10n::t('Show last photos'),
-		'showlastphotos'=>L10n::t('Show last photos'),
+		'showlastlike' => L10n::t('Show last liked items'),
-		'showlastlike'=>L10n::t('Show last liked items'),
+		'showcommunitystream' => L10n::t('Show community stream')
-		'showcommunitystream'=>L10n::t('Show community stream')
 	];
 }
 
-function communityhome_addon_admin(&$a, &$o)
+function communityhome_addon_admin(App $a, &$o)
 {
 	$tpl = get_markup_template('settings.tpl', 'addon/communityhome/');
 
@@ -45,37 +50,37 @@ function communityhome_addon_admin(&$a, &$o)
 	];
 
 	foreach ($opts as $k => $v) {
-		$ctx['fields'][] = ['communityhome_'.$k, $v, Config::get('communityhome', $k)];
+		$ctx['fields'][] = ['communityhome_' . $k, $v, Config::get('communityhome', $k)];
 	}
 	$o = replace_macros($tpl, $ctx);
 }
 
-function communityhome_addon_admin_post(&$a, &$b)
+function communityhome_addon_admin_post(App $a)
 {
 	if (x($_POST, 'communityhome-submit')) {
 		$opts = communityhome_getopts();
 		foreach ($opts as $k => $v) {
-			Config::set('communityhome', $k, x($_POST, 'communityhome_'.$k));
+			Config::set('communityhome', $k, x($_POST, 'communityhome_' . $k));
 		}
 	}
 }
 
-
+function communityhome_home(App $a, &$o)
-function communityhome_home(&$a, &$o){
+{
 	// custom css
-	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/communityhome/communityhome.css" media="all" />';
+	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/communityhome/communityhome.css" media="all" />';
 
-	if (!Config::get('communityhome','hidelogin')){
+	if (!Config::get('communityhome', 'hidelogin')) {
 		$aside = [
 			'$tab_1' => L10n::t('Login'),
 			'$tab_2' => L10n::t('OpenID'),
-			'$noOid' => Config::get('system','no_openid'),
+			'$noOid' => Config::get('system', 'no_openid'),
 		];
 
 		// login form
-		$aside['$login_title'] =  L10n::t('Login');
+		$aside['$login_title'] = L10n::t('Login');
 		$aside['$login_form'] = Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? false : true);
-	} else  {
+	} else {
 		$aside = [
 			//'$tab_1' => L10n::t('Login'),
 			//'$tab_2' => L10n::t('OpenID'),
@@ -84,26 +89,26 @@ function communityhome_home(&$a, &$o){
 	}
 
 	// last 12 users
-	if (Config::get('communityhome','showlastusers')){
+	if (Config::get('communityhome', 'showlastusers')) {
 		$aside['$lastusers_title'] = L10n::t('Latest users');
 		$aside['$lastusers_items'] = [];
 		$sql_extra = "";
-		$publish = (Config::get('system','publish_all') ? '' : " AND `publish` = 1 " );
+		$publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 " );
 		$order = " ORDER BY `register_date` DESC ";
 
 		$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
 				FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
+				WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d, %d ",
 			0,
 			12
 		);
-	#	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		#	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
-		$tpl = get_markup_template( 'directory_item.tpl', 'addon/communityhome/' );
+		$tpl = get_markup_template('directory_item.tpl', 'addon/communityhome/');
-		if(count($r)) {
+		if (count($r)) {
 			$photo = 'thumb';
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-				$entry = replace_macros($tpl,[
+				$entry = replace_macros($tpl, [
 					'$id' => $rr['id'],
 					'$profile_link' => $profile_link,
 					'$photo' => $rr[$photo],
@@ -113,41 +118,9 @@ function communityhome_home(&$a, &$o){
 			}
 		}
 	}
-	// 12 most active users (by posts and contacts)
-	// this query don't work on some mysql versions
-	if (Config::get('communityhome','showactiveusers')){
-		$r = q("SELECT `uni`.`contacts`,`uni`.`items`, `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`  FROM
-				(SELECT COUNT(*) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`,
-				(SELECT COUNT(*) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`,
-				(
-				SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid`
-				UNION ALL
-				SELECT `contacts`,`items`,`con`.`uid` FROM `con` LEFT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid`
-				) AS `uni`, `user`, `profile`
-				WHERE `uni`.`uid`=`user`.`uid`
-				AND `uni`.`uid`=`profile`.`uid` AND `profile`.`publish`=1
-				GROUP BY `uid`
-				ORDER BY `items` DESC,`contacts` DESC
-				LIMIT 0,10");
-		if($r && count($r)) {
-			$aside['$activeusers_title']  = L10n::t('Most active users');
-			$aside['$activeusers_items']  = [];
 
-			$photo = 'thumb';
-			foreach($r as $rr) {
-				$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-				$entry = replace_macros($tpl,[
-					'$id' => $rr['id'],
-					'$profile_link' => $profile_link,
-					'$photo' => $rr[$photo],
-					'$photo_user' => sprintf("%s (%s posts, %s contacts)",$rr['name'], ($rr['items']?$rr['items']:'0'), ($rr['contacts']?$rr['contacts']:'0'))
-				]);
-				$aside['$activeusers_items'][] = $entry;
-			}
-		}
-	}
 	// last 12 photos
-	if (Config::get('communityhome','showlastphotos')){
+	if (Config::get('communityhome', 'showlastphotos')) {
 		$aside['$photos_title'] = L10n::t('Latest photos');
 		$aside['$photos_items'] = [];
 		$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM
@@ -161,19 +134,19 @@ function communityhome_home(&$a, &$o){
 					AND `user`.`hidewall` = 0
 					ORDER BY `photo`.`edited` DESC
 					LIMIT 0, 12",
-					dbesc(L10n::t('Contact Photos')),
+			dbesc(L10n::t('Contact Photos')),
-					dbesc(L10n::t('Profile Photos'))
+			dbesc(L10n::t('Profile Photos'))
-					);
+		);
 
 
-		if(count($r)) {
+		if (count($r)) {
-	#		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+			#		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
-			$tpl = get_markup_template( 'directory_item.tpl', 'addon/communityhome/' );
+			$tpl = get_markup_template('directory_item.tpl', 'addon/communityhome/');
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
-				$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
+				$photo_url  = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg';
 
-				$entry = replace_macros($tpl,[
+				$entry = replace_macros($tpl, [
 					'$id' => $rr['id'],
 					'$profile_link' => $photo_page,
 					'$photo' => $photo_url,
@@ -187,7 +160,7 @@ function communityhome_home(&$a, &$o){
 	}
 
 	// last 10 liked items
-	if (Config::get('communityhome','showlastlike')){
+	if (Config::get('communityhome', 'showlastlike')) {
 		$aside['$like_title'] = L10n::t('Latest likes');
 		$aside['$like_items'] = [];
 		$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM
@@ -198,17 +171,18 @@ function communityhome_home(&$a, &$o){
 				GROUP BY `uri`
 				ORDER BY `T1`.`created` DESC
 				LIMIT 0,10",
-				$a->get_baseurl(),$a->get_baseurl()
+			$a->get_baseurl(),
-				);
+			$a->get_baseurl()
+		);
 
 		foreach ($r as $rr) {
-			$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
+			$author = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
-			$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
+			$objauthor = '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
 
 			//var_dump($rr['verb'],$rr['object-type']); killme();
-			switch($rr['verb']){
+			switch ($rr['verb']) {
 				case 'http://activitystrea.ms/schema/1.0/post':
-					switch ($rr['object-type']){
+					switch ($rr['object-type']) {
 						case 'http://activitystrea.ms/schema/1.0/event':
 							$post_type = L10n::t('event');
 							break;
@@ -217,9 +191,10 @@ function communityhome_home(&$a, &$o){
 					}
 					break;
 				default:
-					if ($rr['resource-id']){
+					if ($rr['resource-id']) {
 						$post_type = L10n::t('photo');
-						$m=[];	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
+						$m = [];
+						preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
 						$rr['plink'] = $m[1];
 					} else {
 						$post_type = L10n::t('status');
@@ -228,7 +203,6 @@ function communityhome_home(&$a, &$o){
 			$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
 
 			$aside['$like_items'][] = L10n::t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink);
-
 		}
 	}
 
@@ -236,19 +210,16 @@ function communityhome_home(&$a, &$o){
 	$tpl = get_markup_template('communityhome.tpl', 'addon/communityhome/');
 	$a->page['aside'] = replace_macros($tpl, $aside);
 
-	$o = '<h1>' . ((x($a->config,'sitename')) ? L10n::t("Welcome to %s", $a->config['sitename']) : "" ) . '</h1>';
+	$o = '<h1>' . ((x($a->config, 'sitename')) ? L10n::t("Welcome to %s", $a->config['sitename']) : "" ) . '</h1>';
 
-	if(file_exists('home.html'))
+	if (file_exists('home.html')) $o = file_get_contents('home.html');
- 		$o = file_get_contents('home.html');
 
-	if (Config::get('communityhome','showcommunitystream')){
+	if (Config::get('communityhome', 'showcommunitystream')) {
-		$oldset = Config::get('system','community_page_style');
+		$oldset = Config::get('system', 'community_page_style');
-		if ($oldset == CP_NO_COMMUNITY_PAGE)
+		if ($oldset == CP_NO_COMMUNITY_PAGE) Config::set('system', 'community_page_style', CP_USERS_ON_SERVER);
-			Config::set('system','community_page_style', CP_USERS_ON_SERVER);
 
-		$o .= community_content($a,1);
+		$o .= community_content($a, 1);
 
-		if ($oldset == CP_NO_COMMUNITY_PAGE)
+		if ($oldset == CP_NO_COMMUNITY_PAGE) Config::set('system', 'community_page_style', $oldset);
-			Config::set('system','community_page_style', $oldset);
 	}
 }

communityhome/lang/it/messages.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-09-10 10:30+0000\n"
+"PO-Revision-Date: 2017-09-20 06:07+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"

communityhome/templates/communityhome.tpl

@@ -15,9 +15,9 @@
 			$("#tab_1").removeClass("active");
 			e.preventDefault();
 			return false;
-			
+
 		});
-		
+
 	});
 </script>
 {{if $noOid}}
@@ -41,15 +41,6 @@
 {{/if}}
 
 
-{{if $activeusers_title}}
-<h3>{{$activeusers_title}}</h3>
-<div class='items-wrapper'>
-{{foreach $activeusers_items as $i}}
-	{{$i}}
-{{/foreach}}
-</div>
-{{/if}}
-
 {{if $photos_title}}
 <h3>{{$photos_title}}</h3>
 <div class='items-wrapper'>

curweather/lang/it/messages.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-25 17:17+0200\n"
-"PO-Revision-Date: 2016-11-22 06:43+0000\n"
+"PO-Revision-Date: 2017-09-20 06:07+0000\n"
 "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"

dav/lang/it/messages.po

@@ -4,13 +4,13 @@
 # 
 # 
 # Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
+# fabrixxm <fabrix.xm@gmail.com>, 2014,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-12-14 11:10+0000\n"
+"PO-Revision-Date: 2018-03-19 13:21+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"
@@ -188,7 +188,7 @@ msgid ""
 "The current version of this addon has not been set up correctly. Please "
 "contact the system administrator of your installation of friendica to fix "
 "this."
-msgstr "La versione corrente di questo addon non è stata configurata correttamente. Contatta l'amministratore."
+msgstr "La versione corrente di questo componente aggiuntivo non è stata configurata correttamente. Contatta l'amministratore."
 
 #: friendica/main.php:239 common/wdcal_edit.inc.php:146
 msgid "Calendar"

dav/lang/it/strings.php

@@ -45,7 +45,7 @@ $a->strings["Warning"] = "Attenzione";
 $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sincronizzazione (iPhone, Thunderbird Lightning, Android, ...)";
 $a->strings["Synchronizing this calendar with the iPhone"] = "Sincronizzare questo calendario con l'iPhone";
 $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronizzare i tuoi contatti di Friendica con l'iPhone";
-$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La versione corrente di questo addon non è stata configurata correttamente. Contatta l'amministratore.";
+$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La versione corrente di questo componente aggiuntivo non è stata configurata correttamente. Contatta l'amministratore.";
 $a->strings["Calendar"] = "Calendario";
 $a->strings["Extended calendar with CalDAV-support"] = "Calendario esteso con supporto CalDAV";
 $a->strings["noreply"] = "nonrispondere";

diaspora/diaspora.php

@@ -9,6 +9,7 @@
 
 require_once 'addon/diaspora/Diaspora_Connection.php';
 
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -303,10 +304,8 @@ function diaspora_send(&$a,&$b) {
 	$aspect = PConfig::get($b['uid'],'diaspora','aspect');
 
 	if ($handle && $password) {
-
 		logger('diaspora_send: all values seem to be okay', LOGGER_DEBUG);
 
-		require_once('include/bb2diaspora.php');
 		$tag_arr = [];
 		$tags = '';
 		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
@@ -338,7 +337,7 @@ function diaspora_send(&$a,&$b) {
                 } while ($oldbody != $body);
 
 		// convert to markdown
-		$body = bb2diaspora($body);
+		$body = BBCode::toMarkdown($body);
 
 		// Adding the title
 		if(strlen($title))

diaspora/lang/it/messages.po

@@ -4,13 +4,13 @@
 # 
 # 
 # Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
+# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-09-10 11:57+0000\n"
+"PO-Revision-Date: 2018-03-19 13:21+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"
@@ -35,7 +35,7 @@ msgstr "Esporta Diaspora"
 
 #: diaspora.php:163
 msgid "Enable Diaspora Post Addon"
-msgstr "Abilita il addon di invio a Diaspora"
+msgstr "Abilita il componente aggiuntivo di invio a Diaspora"
 
 #: diaspora.php:168
 msgid "Diaspora username"

diaspora/lang/it/strings.php

@@ -8,7 +8,7 @@ function string_plural_select_it($n){
 $a->strings["Post to Diaspora"] = "Invia a Diaspora";
 $a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Non riesco ad autenticarmi con il tuo account Diaspora. Controlla il nome utente e la password e assicurati di aver usato l'indirizzo completo (compreso \"http\" o \"https\")";
 $a->strings["Diaspora Export"] = "Esporta Diaspora";
-$a->strings["Enable Diaspora Post Addon"] = "Abilita il addon di invio a Diaspora";
+$a->strings["Enable Diaspora Post Addon"] = "Abilita il componente aggiuntivo di invio a Diaspora";
 $a->strings["Diaspora username"] = "Nome utente Diaspora";
 $a->strings["Diaspora password"] = "Password Diaspora";
 $a->strings["Diaspora site URL"] = "Indirizzo sito Diaspora";

dwpost/lang/it/messages.po

@@ -4,13 +4,13 @@
 # 
 # 
 # Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
+# fabrixxm <fabrix.xm@gmail.com>, 2014,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: 2014-10-22 07:54+0000\n"
+"PO-Revision-Date: 2018-03-19 13:21+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"
@@ -21,15 +21,15 @@ msgstr ""
 
 #: dwpost.php:39
 msgid "Post to Dreamwidth"
-msgstr "Posta su Dreamwidth"
+msgstr "Invia a Dreamwidth"
 
 #: dwpost.php:70
 msgid "Dreamwidth Post Settings"
-msgstr "Impostazioni di invio a Dreamwidth"
+msgstr "Impostazioni Invio a Dreeamwidth"
 
 #: dwpost.php:72
 msgid "Enable dreamwidth Post Addon"
-msgstr "Abilita il addon di invio a Dreamwidth"
+msgstr "Abilita il componente aggiuntivo di invio a Dreamwidth"
 
 #: dwpost.php:77
 msgid "dreamwidth username"
@@ -45,4 +45,4 @@ msgstr "Invia sempre a Dreamwidth"
 
 #: dwpost.php:93
 msgid "Submit"
-msgstr "Invia"
+msgstr "Salva"

dwpost/lang/it/strings.php

@@ -5,10 +5,10 @@ function string_plural_select_it($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Post to Dreamwidth"] = "Posta su Dreamwidth";
+$a->strings["Post to Dreamwidth"] = "Invia a Dreamwidth";
-$a->strings["Dreamwidth Post Settings"] = "Impostazioni di invio a Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Impostazioni Invio a Dreeamwidth";
-$a->strings["Enable dreamwidth Post Addon"] = "Abilita il addon di invio a Dreamwidth";
+$a->strings["Enable dreamwidth Post Addon"] = "Abilita il componente aggiuntivo di invio a Dreamwidth";
 $a->strings["dreamwidth username"] = "Nome utente Dreamwidth";
 $a->strings["dreamwidth password"] = "password Dreamwidth";
 $a->strings["Post to dreamwidth by default"] = "Invia sempre a Dreamwidth";
-$a->strings["Submit"] = "Invia";
+$a->strings["Submit"] = "Salva";

forumdirectory/lang/it/messages.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-09-10 12:04+0000\n"
+"PO-Revision-Date: 2017-09-20 06:07+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"

fromapp/lang/it/messages.po

@@ -10,7 +10,7 @@ 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:11+0000\n"
+"PO-Revision-Date: 2017-09-20 06:07+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"

fromgplus/lang/it/messages.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-11-12 16:52+0000\n"
-"PO-Revision-Date: 2017-01-18 10:38+0000\n"
+"PO-Revision-Date: 2017-09-20 06:07+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"

geonames/lang/it/messages.po

@@ -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"
@@ -29,7 +29,7 @@ msgstr "Impostazioni Geonames"
 
 #: geonames.php:181
 msgid "Enable Geonames Addon"
-msgstr "Abilita addon Geonames"
+msgstr "Abilita componente aggiuntivo Geonames"
 
 #: geonames.php:187
 msgid "Submit"

geonames/lang/it/strings.php

@@ -7,5 +7,5 @@ function string_plural_select_it($n){
 ;
 $a->strings["Geonames settings updated."] = "Impostazioni di Geonames aggiornate.";
 $a->strings["Geonames Settings"] = "Impostazioni Geonames";
-$a->strings["Enable Geonames Addon"] = "Abilita addon Geonames";
+$a->strings["Enable Geonames Addon"] = "Abilita componente aggiuntivo Geonames";
 $a->strings["Submit"] = "Invia";

gnot/lang/it/messages.po

@@ -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"
@@ -35,7 +35,7 @@ msgstr "Permetti di raggruppare le notifiche dei commenti in thread su Gmail e a
 
 #: gnot.php:82
 msgid "Enable this addon?"
-msgstr "Abilita questo addon?"
+msgstr "Abilita questo componente aggiuntivo?"
 
 #: gnot.php:88
 msgid "Submit"

gnot/lang/it/strings.php

@@ -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 addon?"] = "Abilita questo addon?";
+$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";

gravatar/lang/it/messages.po

@@ -10,7 +10,7 @@ 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: 2017-09-20 06:08+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"

group_text/lang/it/messages.po

@@ -10,7 +10,7 @@ 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: 2017-09-20 06:08+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"

ijpost/lang/it/messages.po

@@ -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:15+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"
@@ -29,7 +29,7 @@ msgstr "Impostazioni post InsaneJournal"
 
 #: ijpost.php:72
 msgid "Enable InsaneJournal Post Addon"
-msgstr "Abilita iladdondi invio a InsaneJournal"
+msgstr "Abilita il componente aggiuntivo di invio a InsaneJournal"
 
 #: ijpost.php:77
 msgid "InsaneJournal username"

ijpost/lang/it/strings.php

@@ -7,7 +7,7 @@ function string_plural_select_it($n){
 ;
 $a->strings["Post to Insanejournal"] = "Invia a InsaneJournal";
 $a->strings["InsaneJournal Post Settings"] = "Impostazioni post InsaneJournal";
-$a->strings["Enable InsaneJournal Post Addon"] = "Abilita il addon di invio a InsaneJournal";
+$a->strings["Enable InsaneJournal Post Addon"] = "Abilita il componente aggiuntivo di invio a InsaneJournal";
 $a->strings["InsaneJournal username"] = "Nome utente InsaneJournal";
 $a->strings["InsaneJournal password"] = "Password InsaneJournal";
 $a->strings["Post to InsaneJournal by default"] = "Invia sempre a InsaneJournal";

impressum/lang/it/messages.po

@@ -10,7 +10,7 @@ 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:15+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"
@@ -40,7 +40,7 @@ msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
-msgstr "IladdonColophon deve essere configurato!<br>Aggiungi almeno il Proprietario del sito."
+msgstr "Il plugin Colophon deve essere configurato!<br>Aggiungi almeno il Proprietario del sito."
 
 #: impressum.php:78
 msgid "Settings updated."

impressum/lang/it/strings.php

@@ -9,7 +9,7 @@ $a->strings["Impressum"] = "Colophon";
 $a->strings["Site Owner"] = "Proprietario del sito";
 $a->strings["Email Address"] = "Indirizzo email";
 $a->strings["Postal Address"] = "Indirizzo";
-$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Il addon Colophon deve essere configurato!<br>Aggiungi almeno il Proprietario del sito.";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Il plugin Colophon deve essere configurato!<br>Aggiungi almeno il Proprietario del sito.";
 $a->strings["Settings updated."] = "Impostazioni aggiornate.";
 $a->strings["Submit"] = "Invia";
 $a->strings["The page operators name."] = "Nome del gestore della pagina.";

infiniteimprobabilitydrive/lang/it/messages.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-09-10 12:23+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

irc/lang/it/messages.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-07-08 13:17+0200\n"
-"PO-Revision-Date: 2015-08-31 10:17+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

jappixmini/lang/it/messages.po

@@ -10,7 +10,7 @@ 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:18+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: jappixmini.php:266
 msgid "Jappix Mini addon settings"
-msgstr "ImpostazioniaddonJappix Mini"
+msgstr "Impostazioni plugin Jappix Mini"
 
 #: jappixmini.php:268
 msgid "Activate addon"
-msgstr "Abilita addon"
+msgstr "Abilita plugin"
 
 #: jappixmini.php:271
 msgid ""

jappixmini/lang/it/strings.php

@@ -5,8 +5,8 @@ function string_plural_select_it($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Jappix Mini addon settings"] = "Impostazioni addon Jappix Mini";
+$a->strings["Jappix Mini addon settings"] = "Impostazioni plugin Jappix Mini";
-$a->strings["Activate addon"] = "Abilita addon";
+$a->strings["Activate addon"] = "Abilita plugin";
 $a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "Non inserire Jappixmini nell'intrerfaccia web";
 $a->strings["Jabber username"] = "Nome utente Jabber";
 $a->strings["Jabber server"] = "Server Jabber";

js_upload/lang/it/messages.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-09-10 12:26+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

krynn/lang/it/messages.po

@@ -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"
@@ -25,7 +25,7 @@ msgstr "Impostazioni Krynn"
 
 #: krynn.php:152
 msgid "Enable Krynn Addon"
-msgstr "AbilitaaddonKrynn"
+msgstr "Abilita componente aggiuntivo Krynn"
 
 #: krynn.php:158
 msgid "Submit"

krynn/lang/it/strings.php

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

langfilter/lang/it/messages.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-22 15:18+0200\n"
-"PO-Revision-Date: 2015-12-14 10:47+0000\n"
+"PO-Revision-Date: 2017-09-22 12:16+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"
@@ -30,7 +30,7 @@ msgid ""
 "match any language spoken by you (see below) the posting will be collapsed. "
 "Remember detecting the language is not perfect, especially with short "
 "postings."
-msgstr "Questo addon prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti."
+msgstr "Questo plugin prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti."
 
 #: langfilter.php:46
 msgid "Use the language filter"

langfilter/lang/it/strings.php

@@ -6,7 +6,7 @@ function string_plural_select_it($n){
 }}
 ;
 $a->strings["Language Filter"] = "Filtro Lingua";
-$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Questo addon prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti.";
+$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Questo plugin prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti.";
 $a->strings["Use the language filter"] = "Usa il filtro lingua";
 $a->strings["I speak"] = "Parlo";
 $a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lista di abbreviazioni (codici iso2) per le lingue che parli, separate da virgola. Per esempio \"it,de\"";

langfilter/lang/nl/messages.po

@@ -0,0 +1,70 @@
+# ADDON langfilter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica langfilter addon package.
+# 
+# 
+# Translators:
+# Karel Vandecandelaere <karel@dasrakel.eu>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-22 15:18+0200\n"
+"PO-Revision-Date: 2018-03-20 13:46+0000\n"
+"Last-Translator: Karel Vandecandelaere <karel@dasrakel.eu>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: langfilter.php:44
+msgid "Language Filter"
+msgstr "Taalfilter"
+
+#: langfilter.php:45
+msgid ""
+"This addon tries to identify the language of a postings. If it does not "
+"match any language spoken by you (see below) the posting will be collapsed. "
+"Remember detecting the language is not perfect, especially with short "
+"postings."
+msgstr "Deze addon probeert de taal van berichten automatisch te bepalen. Als het niet overeenkomt met een taal die jij spreekt (zie verder) zal het bericht worden verborgen. Onthoudt hierbij wel dat taaldetectie niet perfect is, vooral bij korte berichten."
+
+#: langfilter.php:46
+msgid "Use the language filter"
+msgstr "Gebruik de taalfilter"
+
+#: langfilter.php:47
+msgid "I speak"
+msgstr "Ik spreek"
+
+#: langfilter.php:47
+msgid ""
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "Lijst van afkortingen (ISO2 codes) voor talen die jij spreekt, door komma's gescheiden. Bijvoorbeeld \"de,it\"."
+
+#: langfilter.php:48
+msgid "Minimum confidence in language detection"
+msgstr ""
+
+#: langfilter.php:48
+msgid ""
+"Minimum confidence in language detection being correct, from 0 to 100. Posts"
+" will not be filtered when the confidence of language detection is below "
+"this percent value."
+msgstr ""
+
+#: langfilter.php:49
+msgid "Save Settings"
+msgstr "Instellingen opslaan"
+
+#: langfilter.php:73
+msgid "Language Filter Settings saved."
+msgstr "Taalfilter-instellingen bijgewerkt."
+
+#: langfilter.php:123
+#, php-format
+msgid "unspoken language %s - Click to open/close"
+msgstr "niet gesproken taal %s - Klik om open/dicht te klappen"

langfilter/lang/nl/strings.php

@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Language Filter"] = "Taalfilter";
+$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Deze addon probeert de taal van berichten automatisch te bepalen. Als het niet overeenkomt met een taal die jij spreekt (zie verder) zal het bericht worden verborgen. Onthoudt hierbij wel dat taaldetectie niet perfect is, vooral bij korte berichten.";
+$a->strings["Use the language filter"] = "Gebruik de taalfilter";
+$a->strings["I speak"] = "Ik spreek";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lijst van afkortingen (ISO2 codes) voor talen die jij spreekt, door komma's gescheiden. Bijvoorbeeld \"de,it\".";
+$a->strings["Minimum confidence in language detection"] = "";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Language Filter Settings saved."] = "Taalfilter-instellingen bijgewerkt.";
+$a->strings["unspoken language %s - Click to open/close"] = "niet gesproken taal %s - Klik om open/dicht te klappen";

libertree/lang/it/messages.po

@@ -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:18+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"
@@ -29,7 +29,7 @@ msgstr "Impostazioni di invio a Libertree"
 
 #: libertree.php:69
 msgid "Enable Libertree Post Addon"
-msgstr "Abilita iladdondi invio a Libertree"
+msgstr "Abilita il componente aggiuntivo di invio a Libertree"
 
 #: libertree.php:74
 msgid "Libertree API token"

libertree/lang/it/strings.php

@@ -7,7 +7,7 @@ function string_plural_select_it($n){
 ;
 $a->strings["Post to libertree"] = "Invia a Libertree";
 $a->strings["libertree Post Settings"] = "Impostazioni di invio a Libertree";
-$a->strings["Enable Libertree Post Addon"] = "Abilita il addon di invio a Libertree";
+$a->strings["Enable Libertree Post Addon"] = "Abilita il componente aggiuntivo di invio a Libertree";
 $a->strings["Libertree API token"] = "Token API Libertree";
 $a->strings["Libertree site URL"] = "Indirizzo sito Libertree";
 $a->strings["Post to Libertree by default"] = "Invia sempre a Libertree";

libertree/libertree.php

@@ -5,6 +5,8 @@
  * Version: 1.0
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
  */
+
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -184,8 +186,6 @@ function libertree_send(&$a,&$b) {
 		$ltree_source .= " (".$b['app'].")";
 
 	if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
-
-		require_once('include/bb2diaspora.php');
 		$tag_arr = [];
 		$tags = '';
 		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
@@ -217,7 +217,7 @@ function libertree_send(&$a,&$b) {
                 } while ($oldbody != $body);
 
 		// convert to markdown
-		$body = bb2diaspora($body, false);
+		$body = BBCode::toMarkdown($body, false);
 
 		// Adding the title
 		if(strlen($title))

libravatar/lang/it/messages.po

@@ -10,7 +10,7 @@ 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:19+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

ljpost/lang/it/messages.po

@@ -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:19+0000\n"
+"PO-Revision-Date: 2018-03-19 13:23+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"
@@ -29,7 +29,7 @@ msgstr "Impostazioni invio a LiveJournal"
 
 #: ljpost.php:72
 msgid "Enable LiveJournal Post Addon"
-msgstr "Abilita il addon di invio a LiveJournal"
+msgstr "Abilita il componente aggiuntivo di invio a LiveJournal"
 
 #: ljpost.php:77
 msgid "LiveJournal username"

ljpost/lang/it/strings.php

@@ -7,7 +7,7 @@ function string_plural_select_it($n){
 ;
 $a->strings["Post to LiveJournal"] = "Invia a LiveJournal";
 $a->strings["LiveJournal Post Settings"] = "Impostazioni invio a LiveJournal";
-$a->strings["Enable LiveJournal Post Addon"] = "Abilita il addon di invio a LiveJournal";
+$a->strings["Enable LiveJournal Post Addon"] = "Abilita il componente aggiuntivo di invio a LiveJournal";
 $a->strings["LiveJournal username"] = "Nome utente LiveJournal";
 $a->strings["LiveJournal password"] = "Password LiveJournal";
 $a->strings["Post to LiveJournal by default"] = "Invia sempre a LiveJournal";

mailstream/lang/C/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"POT-Creation-Date: 2018-03-11 19:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,62 +17,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mailstream.php:55
+#: mailstream.php:77
 msgid "From Address"
 msgstr ""
 
-#: mailstream.php:57
+#: mailstream.php:79
 msgid "Email address that stream items will appear to be from."
 msgstr ""
 
-#: mailstream.php:60 mailstream.php:282
+#: mailstream.php:82 mailstream.php:380
 msgid "Save Settings"
 msgstr ""
 
-#: mailstream.php:165
+#: mailstream.php:223
 msgid "Re:"
 msgstr ""
 
-#: mailstream.php:173
+#: mailstream.php:231
 msgid "Friendica post"
 msgstr ""
 
-#: mailstream.php:176
+#: mailstream.php:234
 msgid "Diaspora post"
 msgstr ""
 
-#: mailstream.php:183
+#: mailstream.php:244
 msgid "Feed item"
 msgstr ""
 
-#: mailstream.php:186
+#: mailstream.php:247
 msgid "Email"
 msgstr ""
 
-#: mailstream.php:188
+#: mailstream.php:249
 msgid "Friendica Item"
 msgstr ""
 
-#: mailstream.php:229
+#: mailstream.php:293
 msgid "Upstream"
 msgstr ""
 
-#: mailstream.php:230
+#: mailstream.php:294
 msgid "Local"
 msgstr ""
 
-#: mailstream.php:274
+#: mailstream.php:362
-msgid "Email Address"
-msgstr ""
-
-#: mailstream.php:276
-msgid "Leave blank to use your account email address"
-msgstr ""
-
-#: mailstream.php:279
 msgid "Enabled"
 msgstr ""
 
-#: mailstream.php:281
+#: mailstream.php:366
+msgid "Email Address"
+msgstr ""
+
+#: mailstream.php:368
+msgid "Leave blank to use your account email address"
+msgstr ""
+
+#: mailstream.php:371
+msgid "Exclude Likes"
+msgstr ""
+
+#: mailstream.php:373
+msgid "Check this to omit mailing \"Like\" notifications"
+msgstr ""
+
+#: mailstream.php:376
+msgid "Attach Images"
+msgstr ""
+
+#: mailstream.php:378
+msgid ""
+"Download images in posts and attach them to the email.  Useful for reading "
+"email while offline."
+msgstr ""
+
+#: mailstream.php:379
 msgid "Mail Stream Settings"
 msgstr ""

mailstream/lang/de/messages.po

@@ -4,77 +4,96 @@
 # 
 # 
 # Translators:
-# Abrax <webmaster@a-zwenkau.de>, 2014
+# Andreas H., 2014
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"POT-Creation-Date: 2018-03-11 19:13+0100\n"
-"PO-Revision-Date: 2014-10-14 09:25+0000\n"
+"PO-Revision-Date: 2018-03-16 07:45+0000\n"
-"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mailstream.php:55
+#: mailstream.php:77
 msgid "From Address"
 msgstr "Absender"
 
-#: mailstream.php:57
+#: mailstream.php:79
 msgid "Email address that stream items will appear to be from."
 msgstr "E-Mail-Adresse, die in hochgeladenen Artikeln erscheint."
 
-#: mailstream.php:60 mailstream.php:282
+#: mailstream.php:82 mailstream.php:380
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: mailstream.php:165
+#: mailstream.php:223
 msgid "Re:"
 msgstr "Re:"
 
-#: mailstream.php:173
+#: mailstream.php:231
 msgid "Friendica post"
 msgstr "Friendica Veröffentlichung"
 
-#: mailstream.php:176
+#: mailstream.php:234
 msgid "Diaspora post"
 msgstr "Diaspora Veröffentlichung"
 
-#: mailstream.php:183
+#: mailstream.php:244
 msgid "Feed item"
 msgstr "Artikel-Feed"
 
-#: mailstream.php:186
+#: mailstream.php:247
 msgid "Email"
 msgstr "E-Mail"
 
-#: mailstream.php:188
+#: mailstream.php:249
 msgid "Friendica Item"
 msgstr "Friendica Artikel"
 
-#: mailstream.php:229
+#: mailstream.php:293
 msgid "Upstream"
 msgstr "Upstream"
 
-#: mailstream.php:230
+#: mailstream.php:294
 msgid "Local"
 msgstr "Lokal"
 
-#: mailstream.php:274
+#: mailstream.php:362
-msgid "Email Address"
-msgstr "E-Mail-Adresse"
-
-#: mailstream.php:276
-msgid "Leave blank to use your account email address"
-msgstr "Leer lassen für Deine Konto-E-Mail-Addresse"
-
-#: mailstream.php:279
 msgid "Enabled"
 msgstr "eingeschaltet"
 
-#: mailstream.php:281
+#: mailstream.php:366
+msgid "Email Address"
+msgstr "E-Mail-Adresse"
+
+#: mailstream.php:368
+msgid "Leave blank to use your account email address"
+msgstr "Leer lassen für Deine Konto-E-Mail-Addresse"
+
+#: mailstream.php:371
+msgid "Exclude Likes"
+msgstr "Likes ignorieren"
+
+#: mailstream.php:373
+msgid "Check this to omit mailing \"Like\" notifications"
+msgstr "Diese Option verhindert das versenden von \"Like\"-Benachrichtigungen per E-Mail."
+
+#: mailstream.php:376
+msgid "Attach Images"
+msgstr "Bolder anhängen"
+
+#: mailstream.php:378
+msgid ""
+"Download images in posts and attach them to the email.  Useful for reading "
+"email while offline."
+msgstr "Sollen Bilder die im Beitrag eingebettet sind als Dateianhang in den E-Mails mit verschickt werden?"
+
+#: mailstream.php:379
 msgid "Mail Stream Settings"
 msgstr "Mail-Nachrichten Einstellungen"

mailstream/lang/de/strings.php

@@ -16,7 +16,11 @@ $a->strings["Email"] = "E-Mail";
 $a->strings["Friendica Item"] = "Friendica Artikel";
 $a->strings["Upstream"] = "Upstream";
 $a->strings["Local"] = "Lokal";
+$a->strings["Enabled"] = "eingeschaltet";
 $a->strings["Email Address"] = "E-Mail-Adresse";
 $a->strings["Leave blank to use your account email address"] = "Leer lassen für Deine Konto-E-Mail-Addresse";
-$a->strings["Enabled"] = "eingeschaltet";
+$a->strings["Exclude Likes"] = "Likes ignorieren";
+$a->strings["Check this to omit mailing \"Like\" notifications"] = "Diese Option verhindert das versenden von \"Like\"-Benachrichtigungen per E-Mail.";
+$a->strings["Attach Images"] = "Bolder anhängen";
+$a->strings["Download images in posts and attach them to the email.  Useful for reading email while offline."] = "Sollen Bilder die im Beitrag eingebettet sind als Dateianhang in den E-Mails mit verschickt werden?";
 $a->strings["Mail Stream Settings"] = "Mail-Nachrichten Einstellungen";

mailstream/lang/it/messages.po

@@ -4,13 +4,13 @@
 # 
 # 
 # Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
+# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"POT-Creation-Date: 2018-03-11 19:13+0100\n"
-"PO-Revision-Date: 2014-09-10 13:02+0000\n"
+"PO-Revision-Date: 2018-03-19 13:12+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"
@@ -19,62 +19,80 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mailstream.php:55
+#: mailstream.php:77
 msgid "From Address"
 msgstr "Indirizzo di invio"
 
-#: mailstream.php:57
+#: mailstream.php:79
 msgid "Email address that stream items will appear to be from."
 msgstr "Indirizzo email da cui i messaggi appariranno inviati"
 
-#: mailstream.php:60 mailstream.php:282
+#: mailstream.php:82 mailstream.php:380
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: mailstream.php:165
+#: mailstream.php:223
 msgid "Re:"
 msgstr "R:"
 
-#: mailstream.php:173
+#: mailstream.php:231
 msgid "Friendica post"
 msgstr "Messaggio Friendica"
 
-#: mailstream.php:176
+#: mailstream.php:234
 msgid "Diaspora post"
 msgstr "Messaggio Diaspora"
 
-#: mailstream.php:183
+#: mailstream.php:244
 msgid "Feed item"
 msgstr "Elemento da feed"
 
-#: mailstream.php:186
+#: mailstream.php:247
 msgid "Email"
 msgstr "Email"
 
-#: mailstream.php:188
+#: mailstream.php:249
 msgid "Friendica Item"
 msgstr "Elemento da Friendica"
 
-#: mailstream.php:229
+#: mailstream.php:293
 msgid "Upstream"
 msgstr "Upstream"
 
-#: mailstream.php:230
+#: mailstream.php:294
 msgid "Local"
 msgstr "Locale"
 
-#: mailstream.php:274
+#: mailstream.php:362
-msgid "Email Address"
-msgstr "Indirizzo Email"
-
-#: mailstream.php:276
-msgid "Leave blank to use your account email address"
-msgstr "Lascia in bianco per usare l'indirizzo email del tuo account"
-
-#: mailstream.php:279
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: mailstream.php:281
+#: mailstream.php:366
+msgid "Email Address"
+msgstr "Indirizzo Email"
+
+#: mailstream.php:368
+msgid "Leave blank to use your account email address"
+msgstr "Lascia in bianco per usare l'indirizzo email del tuo account"
+
+#: mailstream.php:371
+msgid "Exclude Likes"
+msgstr "Escludi \"Mi Piace\""
+
+#: mailstream.php:373
+msgid "Check this to omit mailing \"Like\" notifications"
+msgstr "Seleziona per evitare di inviare notifiche per \"Mi Piace\""
+
+#: mailstream.php:376
+msgid "Attach Images"
+msgstr "Allega Immagini"
+
+#: mailstream.php:378
+msgid ""
+"Download images in posts and attach them to the email.  Useful for reading "
+"email while offline."
+msgstr "Scarica le immagini nei messaggi e le allega alle email. Utile per leggere le email mentre si è offline."
+
+#: mailstream.php:379
 msgid "Mail Stream Settings"
 msgstr "Impostazioni Mail Stream"

mailstream/lang/it/strings.php

@@ -16,7 +16,11 @@ $a->strings["Email"] = "Email";
 $a->strings["Friendica Item"] = "Elemento da Friendica";
 $a->strings["Upstream"] = "Upstream";
 $a->strings["Local"] = "Locale";
+$a->strings["Enabled"] = "Abilitato";
 $a->strings["Email Address"] = "Indirizzo Email";
 $a->strings["Leave blank to use your account email address"] = "Lascia in bianco per usare l'indirizzo email del tuo account";
-$a->strings["Enabled"] = "Abilitato";
+$a->strings["Exclude Likes"] = "Escludi \"Mi Piace\"";
+$a->strings["Check this to omit mailing \"Like\" notifications"] = "Seleziona per evitare di inviare notifiche per \"Mi Piace\"";
+$a->strings["Attach Images"] = "Allega Immagini";
+$a->strings["Download images in posts and attach them to the email.  Useful for reading email while offline."] = "Scarica le immagini nei messaggi e le allega alle email. Utile per leggere le email mentre si è offline.";
 $a->strings["Mail Stream Settings"] = "Impostazioni Mail Stream";

mailstream/templates/settings.tpl

@@ -1,5 +1,10 @@
-<div class="settings-block">
+<span id="settings_mailstream_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
-  <h3>{{$title}}</h3>
+	<h3>{{$title}}</h3>
+</span>
+<div id="settings_mailstream_expanded" class="settings-block" style="display: none;">
+	<span class="fakelink" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
+		<h3>{{$title}}</h3>
+	</span>
 {{include file="field_checkbox.tpl" field=$enabled}}
 {{include file="field_input.tpl" field=$address}}
 {{include file="field_checkbox.tpl" field=$nolikes}}

mathjax/lang/it/strings.php

@@ -6,7 +6,7 @@ function string_plural_select_it($n){
 }}
 ;
 $a->strings["Settings"] = "Impostazioni";
-$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Il addon \"MatJax\" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati.";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Iladdon\"MatJax\" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati.";
 $a->strings["Use the MathJax renderer"] = "Usa il render MathJax";
 $a->strings["Submit"] = "Invia";
 $a->strings["Settings updated."] = "Impostazioni aggiornate.";

morepokes/lang/it/messages.po

@@ -10,7 +10,7 @@ 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:20+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

newmemberwidget/README.md

@@ -19,7 +19,7 @@ You want to test it, but you don't want to create a new account? Take your fav
 text editor (yeah emacs will do as well) and edit the newmemberwidget.php file.
 In line 21 you will find a if clause, just add a ! infront of the
 
-	x(!_SESSION 
+	x(!_SESSION
 
 that will negate the requirement of being a new member, so don't forget the
 remove that ! again after testing ;-)
@@ -31,7 +31,7 @@ and copy it to lang/XX/message.po where XX is the language you want to
 translate for (i.e. de, fr, nb-no). After you translated the content go to the
 root of your friendica directory and run
 
-	php util/po2php.php addon/newmember/lang/XX/message.po
+	php bin/console po2php addon/newmember/lang/XX/message.po
 
 to translate the message.po file into the strings.php file needed by friendica
 to catch your translations.
@@ -55,7 +55,7 @@ This addon is licensed under the [MIT License](http://opensource.org/licenses/MI
 > Copyright (c) 2014 Tobias Diekershoff
 
 > Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-> 
+>
 > The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-> 
+>
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

newmemberwidget/lang/it/messages.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-01 14:12+0200\n"
-"PO-Revision-Date: 2014-09-10 14:12+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

notimeline/lang/it/messages.po

@@ -10,7 +10,7 @@ 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:21+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

nsfw/lang/C/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2018-03-15 17:54+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,41 +17,39 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: nsfw.php:78
+#: nsfw.php:77 nsfw.php:81
-msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgid "Content Filter (NSFW and more)"
 msgstr ""
 
-#: nsfw.php:80
+#: nsfw.php:85
 msgid ""
-"This addon looks in posts for the words/text you specify below, and "
+"This addon searches for specified words/text in posts and collapses them. It "
-"collapses any content containing those keywords so it is not displayed at "
+"can be used to filter content tagged with for instance #NSFW that may be "
-"inappropriate times, such as sexual innuendo that may be improper in a work "
+"deemed inappropriate at certain times or places, such as being at work. It "
-"setting. It is polite and recommended to tag any content containing nudity "
+"is also useful for hiding irrelevant or annoying content from direct view."
-"with #NSFW.  This filter can also match any other word/text you specify, and "
-"can thereby be used as a general purpose content filter."
 msgstr ""
 
-#: nsfw.php:81
+#: nsfw.php:86
 msgid "Enable Content filter"
 msgstr ""
 
-#: nsfw.php:84
+#: nsfw.php:89
 msgid "Comma separated list of keywords to hide"
 msgstr ""
 
-#: nsfw.php:88
+#: nsfw.php:93
-msgid "Submit"
+msgid "Save Settings"
 msgstr ""
 
-#: nsfw.php:89
+#: nsfw.php:94
 msgid "Use /expression/ to provide regular expressions"
 msgstr ""
 
-#: nsfw.php:105
+#: nsfw.php:109
 msgid "NSFW Settings saved."
 msgstr ""
 
-#: nsfw.php:157
+#: nsfw.php:167
 #, php-format
 msgid "%s - Click to open/close"
 msgstr ""

nsfw/lang/de/messages.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2018-03-15 17:54+0700\n"
-"PO-Revision-Date: 2018-01-24 16:10+0000\n"
+"PO-Revision-Date: 2018-03-16 19:59+0000\n"
 "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -21,41 +21,39 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: nsfw.php:78
+#: nsfw.php:77 nsfw.php:81
-msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgid "Content Filter (NSFW and more)"
-msgstr "Not Safe for Work (Filter für ungewollte Inhalte) Einstellungen:"
+msgstr "Inhaltsfilter (NSFW und mehr)"
 
-#: nsfw.php:80
+#: nsfw.php:85
 msgid ""
-"This addon looks in posts for the words/text you specify below, and "
+"This addon searches for specified words/text in posts and collapses them. It"
-"collapses any content containing those keywords so it is not displayed at "
+" can be used to filter content tagged with for instance #NSFW that may be "
-"inappropriate times, such as sexual innuendo that may be improper in a work "
+"deemed inappropriate at certain times or places, such as being at work. It "
-"setting. It is polite and recommended to tag any content containing nudity "
+"is also useful for hiding irrelevant or annoying content from direct view."
-"with #NSFW.  This filter can also match any other word/text you specify, and"
+msgstr "Dieses Addon sucht nach von dir definierten Wörtern bzw. Texten in Beiträgen und kollabiert diese wenn die Wörter gefunden werden. Damit können z.B. Inhalte gefiltert werden, die mit #NSFW (nicht für die Arbeit geeignet) gekennzeichnet sind. Außerdem ist es nützlich um irrelevante oder lästige Inhalte zu verbergen."
-" can thereby be used as a general purpose content filter."
-msgstr "Dieses Addon sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Du kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."
 
-#: nsfw.php:81
+#: nsfw.php:86
 msgid "Enable Content filter"
 msgstr "Aktiviere den Inhaltsfilter"
 
-#: nsfw.php:84
+#: nsfw.php:89
 msgid "Comma separated list of keywords to hide"
 msgstr "Durch Kommata getrennte Liste von Schlüsselwörtern die verborgen werden sollen"
 
-#: nsfw.php:88
+#: nsfw.php:93
-msgid "Submit"
+msgid "Save Settings"
-msgstr "Senden"
+msgstr "Einstellungen speichern"
 
-#: nsfw.php:89
+#: nsfw.php:94
 msgid "Use /expression/ to provide regular expressions"
 msgstr "Verwende /expression/ um Reguläre Ausdrücke zu verwenden"
 
-#: nsfw.php:105
+#: nsfw.php:109
 msgid "NSFW Settings saved."
 msgstr "NSFW-Einstellungen gespeichert"
 
-#: nsfw.php:157
+#: nsfw.php:167
 #, php-format
 msgid "%s - Click to open/close"
 msgstr "%s – Zum Öffnen/Schließen klicken"

nsfw/lang/de/strings.php

@@ -5,11 +5,11 @@ function string_plural_select_de($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe for Work (Filter für ungewollte Inhalte) Einstellungen:";
+$a->strings["Content Filter (NSFW and more)"] = "Inhaltsfilter (NSFW und mehr)";
-$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Addon sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Du kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden.";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "Dieses Addon sucht nach von dir definierten Wörtern bzw. Texten in Beiträgen und kollabiert diese wenn die Wörter gefunden werden. Damit können z.B. Inhalte gefiltert werden, die mit #NSFW (nicht für die Arbeit geeignet) gekennzeichnet sind. Außerdem ist es nützlich um irrelevante oder lästige Inhalte zu verbergen.";
 $a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter";
 $a->strings["Comma separated list of keywords to hide"] = "Durch Kommata getrennte Liste von Schlüsselwörtern die verborgen werden sollen";
-$a->strings["Submit"] = "Senden";
+$a->strings["Save Settings"] = "Einstellungen speichern";
 $a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um Reguläre Ausdrücke zu verwenden";
 $a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert";
 $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken";

nsfw/lang/en-gb/messages.po

@@ -0,0 +1,57 @@
+# ADDON nsfw
+# Copyright (C)
+# This file is distributed under the same license as the Friendica nsfw addon package.
+# 
+# 
+# Translators:
+# Andy H3 <andy@hubup.pro>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-03-15 17:54+0700\n"
+"PO-Revision-Date: 2018-03-16 16:07+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: nsfw.php:77 nsfw.php:81
+msgid "Content Filter (NSFW and more)"
+msgstr ""
+
+#: nsfw.php:85
+msgid ""
+"This addon searches for specified words/text in posts and collapses them. It"
+" can be used to filter content tagged with for instance #NSFW that may be "
+"deemed inappropriate at certain times or places, such as being at work. It "
+"is also useful for hiding irrelevant or annoying content from direct view."
+msgstr ""
+
+#: nsfw.php:86
+msgid "Enable Content filter"
+msgstr "Enable content filter"
+
+#: nsfw.php:89
+msgid "Comma separated list of keywords to hide"
+msgstr "Comma separated list of keywords"
+
+#: nsfw.php:93
+msgid "Save Settings"
+msgstr ""
+
+#: nsfw.php:94
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Use /expression/ for regular expressions."
+
+#: nsfw.php:109
+msgid "NSFW Settings saved."
+msgstr "NSFW settings saved."
+
+#: nsfw.php:167
+#, php-format
+msgid "%s - Click to open/close"
+msgstr "%s - Reveal/hide"

nsfw/lang/en-gb/strings.php

@@ -0,0 +1,15 @@
+<?php
+
+if(! function_exists("string_plural_select_en_gb")) {
+function string_plural_select_en_gb($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Content Filter (NSFW and more)"] = "";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "";
+$a->strings["Enable Content filter"] = "Enable content filter";
+$a->strings["Comma separated list of keywords to hide"] = "Comma separated list of keywords";
+$a->strings["Save Settings"] = "";
+$a->strings["Use /expression/ to provide regular expressions"] = "Use /expression/ for regular expressions.";
+$a->strings["NSFW Settings saved."] = "NSFW settings saved.";
+$a->strings["%s - Click to open/close"] = "%s - Reveal/hide";

nsfw/lang/en-us/messages.po

@@ -0,0 +1,57 @@
+# ADDON nsfw
+# Copyright (C)
+# This file is distributed under the same license as the Friendica nsfw addon package.
+# 
+# 
+# Translators:
+# Andy H3 <andy@hubup.pro>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-03-15 17:54+0700\n"
+"PO-Revision-Date: 2018-03-16 16:07+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: nsfw.php:77 nsfw.php:81
+msgid "Content Filter (NSFW and more)"
+msgstr ""
+
+#: nsfw.php:85
+msgid ""
+"This addon searches for specified words/text in posts and collapses them. It"
+" can be used to filter content tagged with for instance #NSFW that may be "
+"deemed inappropriate at certain times or places, such as being at work. It "
+"is also useful for hiding irrelevant or annoying content from direct view."
+msgstr ""
+
+#: nsfw.php:86
+msgid "Enable Content filter"
+msgstr "Enable content filter"
+
+#: nsfw.php:89
+msgid "Comma separated list of keywords to hide"
+msgstr "Comma separated list of keywords"
+
+#: nsfw.php:93
+msgid "Save Settings"
+msgstr ""
+
+#: nsfw.php:94
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Use /expression/ for regular expressions."
+
+#: nsfw.php:109
+msgid "NSFW Settings saved."
+msgstr "NSFW settings saved."
+
+#: nsfw.php:167
+#, php-format
+msgid "%s - Click to open/close"
+msgstr "%s - Reveal/hide"

nsfw/lang/en-us/strings.php

@@ -0,0 +1,15 @@
+<?php
+
+if(! function_exists("string_plural_select_en_us")) {
+function string_plural_select_en_us($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Content Filter (NSFW and more)"] = "";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "";
+$a->strings["Enable Content filter"] = "Enable content filter";
+$a->strings["Comma separated list of keywords to hide"] = "Comma separated list of keywords";
+$a->strings["Save Settings"] = "";
+$a->strings["Use /expression/ to provide regular expressions"] = "Use /expression/ for regular expressions.";
+$a->strings["NSFW Settings saved."] = "NSFW settings saved.";
+$a->strings["%s - Click to open/close"] = "%s - Reveal/hide";

nsfw/lang/it/messages.po

@@ -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"
+"POT-Creation-Date: 2018-03-15 17:54+0700\n"
-"PO-Revision-Date: 2015-08-31 10:21+0000\n"
+"PO-Revision-Date: 2018-03-19 13:18+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"
@@ -19,41 +19,39 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: nsfw.php:78
+#: nsfw.php:77 nsfw.php:81
-msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgid "Content Filter (NSFW and more)"
-msgstr "Impostazioni per NSWF (Filtro Contenuti Generico)"
+msgstr "Filtro Contenuto (NSFW e altro)"
 
-#: nsfw.php:80
+#: nsfw.php:85
 msgid ""
-"This addon looks in posts for the words/text you specify below, and "
+"This addon searches for specified words/text in posts and collapses them. It"
-"collapses any content containing those keywords so it is not displayed at "
+" can be used to filter content tagged with for instance #NSFW that may be "
-"inappropriate times, such as sexual innuendo that may be improper in a work "
+"deemed inappropriate at certain times or places, such as being at work. It "
-"setting. It is polite and recommended to tag any content containing nudity "
+"is also useful for hiding irrelevant or annoying content from direct view."
-"with #NSFW.  This filter can also match any other word/text you specify, and"
+msgstr "Questo componente aggiuntivo cerca per le parole specificate nei messaggi e li collassa. Può essere usato per filtrare contenuto taggato, per esempio, #NSFW (non sicuro per il lavoro), che puo' risultare inappropriato in certi orari o in certi luoghi, come appunto al lavoro. È anche utile per nascondere contenuto irrilevante o fastidioso."
-" can thereby be used as a general purpose content filter."
-msgstr "Questo addon cerca nei messagi le parole/testo che inserisci qui sotto, e collassa i messaggi che li contengono, per non mostrare contenuto inappropriato nel momento sbagliato, come contenuto a sfondo sessuale che può essere inappropriato in un ambiente di lavoro. E' educato (e consigliato) taggare i messaggi che contengono nudità con #NSFW (Not Safe For Work: Non Sicuro Per il Lavoro). Questo filtro può cercare anche qualsiasi parola che inserisci, quindi può essere usato come filtro di contenuti generico."
 
-#: nsfw.php:81
+#: nsfw.php:86
 msgid "Enable Content filter"
 msgstr "Abilita il Filtro Contenuti"
 
-#: nsfw.php:84
+#: nsfw.php:89
 msgid "Comma separated list of keywords to hide"
 msgstr "Elenco separato da virgole di parole da nascondere"
 
-#: nsfw.php:88
+#: nsfw.php:93
-msgid "Submit"
+msgid "Save Settings"
-msgstr "Invia"
+msgstr "Salva Impostazioni"
 
-#: nsfw.php:89
+#: nsfw.php:94
 msgid "Use /expression/ to provide regular expressions"
 msgstr "Utilizza /espressione/ per inserire espressioni regolari"
 
-#: nsfw.php:105
+#: nsfw.php:109
 msgid "NSFW Settings saved."
 msgstr "Impostazioni NSFW salvate."
 
-#: nsfw.php:157
+#: nsfw.php:167
 #, php-format
 msgid "%s - Click to open/close"
 msgstr "%s - Clicca per aprire / chiudere"

nsfw/lang/it/strings.php

@@ -5,11 +5,11 @@ function string_plural_select_it($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Impostazioni per NSWF (Filtro Contenuti Generico)";
+$a->strings["Content Filter (NSFW and more)"] = "Filtro Contenuto (NSFW e altro)";
-$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Questo addon cerca nei messagi le parole/testo che inserisci qui sotto, e collassa i messaggi che li contengono, per non mostrare contenuto inappropriato nel momento sbagliato, come contenuto a sfondo sessuale che può essere inappropriato in un ambiente di lavoro. E' educato (e consigliato) taggare i messaggi che contengono nudità con #NSFW (Not Safe For Work: Non Sicuro Per il Lavoro). Questo filtro può cercare anche qualsiasi parola che inserisci, quindi può essere usato come filtro di contenuti generico.";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "Questo componente aggiuntivo cerca per le parole specificate nei messaggi e li collassa. Può essere usato per filtrare contenuto taggato, per esempio, #NSFW (non sicuro per il lavoro), che puo' risultare inappropriato in certi orari o in certi luoghi, come appunto al lavoro. È anche utile per nascondere contenuto irrilevante o fastidioso.";
 $a->strings["Enable Content filter"] = "Abilita il Filtro Contenuti";
 $a->strings["Comma separated list of keywords to hide"] = "Elenco separato da virgole di parole da nascondere";
-$a->strings["Submit"] = "Invia";
+$a->strings["Save Settings"] = "Salva Impostazioni";
 $a->strings["Use /expression/ to provide regular expressions"] = "Utilizza /espressione/ per inserire espressioni regolari";
 $a->strings["NSFW Settings saved."] = "Impostazioni NSFW salvate.";
 $a->strings["%s - Click to open/close"] = "%s - Clicca per aprire / chiudere";

nsfw/nsfw.php

@@ -34,126 +34,125 @@ function nsfw_extract_photos($body)
 {
 	$new_body = '';
 
-	$img_start = strpos($body,'src="data:');
+	$img_start = strpos($body, 'src="data:');
-	$img_end = (($img_start !== false) ? strpos(substr($body,$img_start),'>') : false);
+	$img_end = (($img_start !== false) ? strpos(substr($body, $img_start), '>') : false);
 
 	$cnt = 0;
 
 	while($img_end !== false) {
 		$img_end += $img_start;
-		$new_body = $new_body . substr($body,0,$img_start);
+		$new_body = $new_body . substr($body, 0, $img_start);
 
 		$cnt ++;
-		$body = substr($body,0,$img_end);
+		$body = substr($body, 0, $img_end);
 
-		$img_start = strpos($body,'src="data:');
+		$img_start = strpos($body, 'src="data:');
-		$img_end = (($img_start !== false) ? strpos(substr($body,$img_start),'>') : false);
+		$img_end = (($img_start !== false) ? strpos(substr($body, $img_start), '>') : false);
 
 	}
 
-	if(! $cnt)
+	if (!$cnt) {
 		return $body;
-
+	}
 	return $new_body;
 }
 
-
+function nsfw_addon_settings(&$a, &$s)
-
+{
-
+	if (!local_user()) {
-function nsfw_addon_settings(&$a,&$s) {
-
-
-	if(! local_user())
 		return;
+	}
 
-    /* Add our stylesheet to the page so we can make our settings look nice */
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
 
-	$enable_checked = (intval(PConfig::get(local_user(),'nsfw','disable')) ? '' : ' checked="checked" ');
+	$enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
-	$words = PConfig::get(local_user(),'nsfw','words');
+	$words = PConfig::get(local_user(), 'nsfw', 'words');
-	if(! $words)
+	if (!$words) {
 		$words = 'nsfw,';
+	}
 
-    $s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
+	$s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
-    $s .= '<h3>' . L10n::t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
+	$s .= '<h3>' . L10n::t('Content Filter (NSFW and more)') . '</h3>';
-    $s .= '</span>';
+	$s .= '</span>';
-    $s .= '<div id="settings_nsfw_expanded" class="settings-block" style="display: none;">';
+	$s .= '<div id="settings_nsfw_expanded" class="settings-block" style="display: none;">';
-    $s .= '<span class="fakelink" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
-    $s .= '<h3>' . L10n::t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
+	$s .= '<h3>' . L10n::t('Content Filter (NSFW and more)') . '</h3>';
-    $s .= '</span>';
+	$s .= '</span>';
 
-    $s .= '<div id="nsfw-wrapper">';
+	$s .= '<div id="nsfw-wrapper">';
-    $s .= '<p>' . L10n::t('This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter.') . '</p>';
+	$s .= '<p>' . L10n::t('This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.') . '</p>';
-    $s .= '<label id="nsfw-enable-label" for="nsfw-enable">' . L10n::t('Enable Content filter') . ' </label>';
+	$s .= '<label id="nsfw-enable-label" for="nsfw-enable">' . L10n::t('Enable Content filter') . ' </label>';
-    $s .= '<input id="nsfw-enable" type="checkbox" name="nsfw-enable" value="1"' . $enable_checked . ' />';
+	$s .= '<input id="nsfw-enable" type="checkbox" name="nsfw-enable" value="1"' . $enable_checked . ' />';
 	$s .= '<div class="clear"></div>';
-    $s .= '<label id="nsfw-label" for="nsfw-words">' . L10n::t('Comma separated list of keywords to hide') . ' </label>';
+	$s .= '<label id="nsfw-label" for="nsfw-words">' . L10n::t('Comma separated list of keywords to hide') . ' </label>';
-    $s .= '<textarea id="nsfw-words" type="text" name="nsfw-words">' . $words .'</textarea>';
+	$s .= '<textarea id="nsfw-words" type="text" name="nsfw-words">' . $words .'</textarea>';
-    $s .= '</div><div class="clear"></div>';
+	$s .= '</div><div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
 	$s .= '<div class="nsfw-desc">' . L10n::t('Use /expression/ to provide regular expressions') . '</div></div>';
-
 	return;
-
 }
 
-function nsfw_addon_settings_post(&$a,&$b) {
+function nsfw_addon_settings_post(&$a, &$b)
-
+{
-	if(! local_user())
+	if (!local_user()) {
 		return;
+	}
 
-	if($_POST['nsfw-submit']) {
+	if ($_POST['nsfw-submit']) {
-		PConfig::set(local_user(),'nsfw','words',trim($_POST['nsfw-words']));
+		PConfig::set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words']));
-		$enable = ((x($_POST,'nsfw-enable')) ? intval($_POST['nsfw-enable']) : 0);
+		$enable = (x($_POST,'nsfw-enable') ? intval($_POST['nsfw-enable']) : 0);
 		$disable = 1-$enable;
-		PConfig::set(local_user(),'nsfw','disable', $disable);
+		PConfig::set(local_user(), 'nsfw', 'disable', $disable);
 		info(L10n::t('NSFW Settings saved.') . EOL);
 	}
 }
 
-function nsfw_prepare_body(&$a,&$b) {
+function nsfw_prepare_body(&$a, &$b)
-
+{
+	// Don't do the check when there is a content warning
+	if (!empty($b['item']['content-warning'])) {
+		return;
+	}
 
 	$words = null;
-	if(PConfig::get(local_user(),'nsfw','disable'))
+	if (PConfig::get(local_user(), 'nsfw', 'disable')) {
 		return;
+	}
 
-	if(local_user()) {
+	if (local_user()) {
-		$words = PConfig::get(local_user(),'nsfw','words');
+		$words = PConfig::get(local_user(), 'nsfw', 'words');
 	}
-	if($words) {
+	if ($words) {
-		$arr = explode(',',$words);
+		$arr = explode(',', $words);
-	}
+	} else {
-	else {
 		$arr = ['nsfw'];
 	}
 
 	$found = false;
-	if(count($arr)) {
+	if (count($arr)) {
-
 		$body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
 
-		foreach($arr as $word) {
+		foreach ($arr as $word) {
 			$word = trim($word);
-			if(! strlen($word)) {
+			if (!strlen($word)) {
 				continue;
 			}
-			if(strpos($word,'/') === 0) {
+			if (strpos($word,'/') === 0) {
-				if(preg_match($word,$body)) {
+				if (preg_match($word, $body)) {
 					$found = true;
 					break;
 				}
-			}
+			} else {
-			else {
+				if (stristr($body, $word)) {
-				if(stristr($body,$word)) {
 					$found = true;
 					break;
 				}
-				if(is_array($b['item']['tags']) && count($b['item']['tags'])) {
+				if (is_array($b['item']['tags']) && count($b['item']['tags'])) {
-					foreach($b['item']['tags'] as $t) {
+					foreach ($b['item']['tags'] as $t) {
-						if(stristr($t, '>' . $word . '<' )) {
+						if (stristr($t, '>' . $word . '<')) {
 							$found = true;
 							break;
 						}

numfriends/lang/it/messages.po

@@ -10,7 +10,7 @@ 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:21+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

openstreetmap/lang/it/messages.po

@@ -10,7 +10,7 @@ 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:21+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

openstreetmap/openstreetmap.php

@@ -12,13 +12,20 @@ use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\System;
 use Friendica\Util\Network;
 
+const OSM_TMS = 'http://www.openstreetmap.org';
+const OSM_NOM = 'http://nominatim.openstreetmap.org/search.php';
+const OSM_ZOOM = 16;
+const OSM_MARKER = 0;
+
 function openstreetmap_install()
 {
 	Addon::registerHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
 	Addon::registerHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
 	Addon::registerHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
+	Addon::registerHook('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
 	Addon::registerHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
 	logger("installed openstreetmap");
@@ -29,6 +36,7 @@ function openstreetmap_uninstall()
 	Addon::unregisterHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
 	Addon::unregisterHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
 	Addon::unregisterHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
+	Addon::unregisterHook('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
 	Addon::unregisterHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
 	logger("removed openstreetmap");
@@ -49,9 +57,9 @@ function openstreetmap_alterheader($a, &$navHtml)
  * @param mixed $a
  * @param array& $item
  */
-function openstreetmap_location($a, &$item) {
+function openstreetmap_location($a, &$item)
-
+{
-	if(! (strlen($item['location']) || strlen($item['coord']))) {
+	if (!(strlen($item['location']) || strlen($item['coord']))) {
 		return;
 	}
 
@@ -63,34 +71,25 @@ function openstreetmap_location($a, &$item) {
 	 * ?mlat=lat&mlon=lon for markers.
 	 */
 
-	$tmsserver = Config::get('openstreetmap', 'tmsserver');
+	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
-	if(! $tmsserver) {
+	$nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
-		$tmsserver = 'http://www.openstreetmap.org';
+	$zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
-	}
+	$marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
 
-	$nomserver = Config::get('openstreetmap', 'nomserver');
+	// This is needed since we stored an empty string in the config in previous versions
-	if(! $nomserver) {
+	if (empty($nomserver)) {
-		$nomserver = 'http://nominatim.openstreetmap.org/search.php';
+		$nomserver = OSM_NOM;
-	}
-
-	$zoom = Config::get('openstreetmap', 'zoom');
-	if(! $zoom) {
-		$zoom = 16;
-	}
-
-	$marker = Config::get('openstreetmap', 'marker');
-	if(! $marker) {
-		$marker = 0;
 	}
 
 	if ($item['coord'] != "") {
 		$coords = explode(' ', $item['coord']);
-		if(count($coords) > 1) {
+		if (count($coords) > 1) {
 			$lat = urlencode(round($coords[0], 5));
 			$lon = urlencode(round($coords[1], 5));
 			$target = $tmsserver;
-			if($marker > 0)
+			if ($marker > 0) {
-				$target .= '?mlat='.$lat.'&mlon='.$lon;
+				$target .= '?mlat=' . $lat . '&mlon=' . $lon;
+			}
 			$target .= '#map='.intval($zoom).'/'.$lat.'/'.$lon;
 		}
 	}
@@ -108,46 +107,53 @@ function openstreetmap_location($a, &$item) {
 	$item['html'] = '<a target="map" title="'.$title.'" href= "'.$target.'">'.$title.'</a>';
 }
 
+function openstreetmap_get_coordinates($a, &$b)
+{
+	$nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
+
+	// This is needed since we stored an empty string in the config in previous versions
+	if (empty($nomserver)) {
+		$nomserver = OSM_NOM;
+	}
+
+	$args = '?q=' . urlencode($b['location']) . '&format=json';
+
+	$cachekey = "openstreetmap:" . $b['location'];
+	$j = Cache::get($cachekey);
+
+	if (is_null($j)) {
+		$x = Network::curl($nomserver . $args);
+		if ($x['success']) {
+			$j = json_decode($x['body'], true);
+			Cache::set($cachekey, $j, CACHE_MONTH);
+		}
+	}
+
+	if (!empty($j[0]['lat']) && !empty($j[0]['lon'])) {
+		$b['lat'] = $j[0]['lat'];
+		$b['lon'] = $j[0]['lon'];
+	}
+}
 
 function openstreetmap_generate_named_map(&$a, &$b)
 {
-	$nomserver = Config::get('openstreetmap', 'nomserver');
+	openstreetmap_get_coordinates($a, $b);
-	if(! $nomserver)
-		$nomserver = 'http://nominatim.openstreetmap.org/search.php';
-	$args = '?q=' . urlencode($b['location']) . '&format=json';
 
-	$x = Network::curl($nomserver . $args);
+	if (!empty($b['lat']) && !empty($b['lon'])) {
-	if($x['success']) {
+		openstreetmap_generate_map($a, $b);
-		$j = json_decode($x['body'],true);
-
-		if($j && is_array($j) && $j[0]['lat'] && $j[0]['lon']) {
-			$arr = ['lat' => $j[0]['lat'],'lon' => $j[0]['lon'],'location' => $b['location'], 'html' => ''];
-			openstreetmap_generate_map($a,$arr);
-			$b['html'] = $arr['html'];
-		}
 	}
 }
 
 function openstreetmap_generate_map(&$a, &$b)
 {
-	$tmsserver = Config::get('openstreetmap', 'tmsserver');
+	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
-	if(! $tmsserver) {
+
-		$tmsserver = 'http://www.openstreetmap.org';
+	if (strpos(z_root(), 'https:') !== false) {
-	}
-	if(strpos(z_root(),'https:') !== false) {
 		$tmsserver = str_replace('http:','https:',$tmsserver);
 	}
 
-
+	$zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
-	$zoom = Config::get('openstreetmap', 'zoom');
+	$marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
-	if (!$zoom) {
-		$zoom = 16;
-	}
-
-	$marker = Config::get('openstreetmap', 'marker');
-	if (!$marker) {
-		$marker = 0;
-	}
 
 	$lat = $b['lat']; // round($b['lat'], 5);
 	$lon = $b['lon']; // round($b['lon'], 5);
@@ -155,10 +161,21 @@ function openstreetmap_generate_map(&$a, &$b)
 	logger('lat: ' . $lat, LOGGER_DATA);
 	logger('lon: ' . $lon, LOGGER_DATA);
 
+	$cardlink = '<a href="' . $tmsserver;
 
-	$b['html'] = '<iframe style="width:100%; height:300px; border:1px solid #ccc" src="' . $tmsserver . '/export/embed.html?bbox=' . ($lon - 0.01) . '%2C' . ($lat - 0.01) . '%2C' . ($lon + 0.01) . '%2C' . ($lat + 0.01) ;
+	if ($marker > 0) {
+		$cardlink .= '?mlat=' . $lat . '&mlon=' . $lon;
+	}
 
-	$b['html'] .=  '&amp;layer=mapnik&amp;marker=' . $lat . '%2C' . $lon . '" style="border: 1px solid black"></iframe><br/><small><a href="' . $tmsserver . '/?mlat=' . $lat . '&mlon=' . $lon . '#map=16/' . $lat . '/' . $lon . '">' . (($b['location']) ? escape_tags($b['location']) : L10n::t('View Larger')) . '</a></small>';
+	$cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ? escape_tags($b['location']) : L10n::t('View Larger')) . '</a>';
+	if (empty($b['mode'])) {
+		$b['html'] = '<iframe style="width:100%; height:300px; border:1px solid #ccc" src="' . $tmsserver .
+				'/export/embed.html?bbox=' . ($lon - 0.01) . '%2C' . ($lat - 0.01) . '%2C' . ($lon + 0.01) . '%2C' . ($lat + 0.01) .
+				'&amp;layer=mapnik&amp;marker=' . $lat . '%2C' . $lon . '" style="border: 1px solid black"></iframe>' .
+				'<br/><small>' . $cardlink . '</small>';
+	} else {
+		$b['html'] .= '<br/>' . $cardlink;
+	}
 
 	logger('generate_map: ' . $b['html'], LOGGER_DATA);
 }
@@ -166,21 +183,14 @@ function openstreetmap_generate_map(&$a, &$b)
 function openstreetmap_addon_admin(&$a, &$o)
 {
 	$t = get_markup_template("admin.tpl", "addon/openstreetmap/");
-	$tmsserver = Config::get('openstreetmap', 'tmsserver');
+	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
-	if (!$tmsserver) {
+	$nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
-		$tmsserver = 'http://www.openstreetmap.org';
+	$zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
-	}
+	$marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
-	$nomserver = Config::get('openstreetmap', 'nomserver');
+
-	if (!$nomserver) {
+	// This is needed since we stored an empty string in the config in previous versions
-		$nomserver = 'http://nominatim.openstreetmap.org/search.php';
+	if (empty($nomserver)) {
-	}
+		$nomserver = OSM_NOM;
-	$zoom = Config::get('openstreetmap', 'zoom');
-	if (!$zoom) {
-		$zoom = 16;
-	}
-	$marker = Config::get('openstreetmap', 'marker');
-	if (!$marker) {
-		$marker = 0;
 	}
 
 	$o = replace_macros($t, [
@@ -194,13 +204,15 @@ function openstreetmap_addon_admin(&$a, &$o)
 
 function openstreetmap_addon_admin_post(&$a)
 {
-	$urltms = ((x($_POST, 'tmsserver')) ? notags(trim($_POST['tmsserver'])) : '');
+	$urltms = defaults($_POST, 'tmsserver', OSM_TMS);
-	$urlnom = ((x($_POST, 'nomserver')) ? notags(trim($_POST['nomserver'])) : '');
+	$urlnom = defaults($_POST, 'nomserver', OSM_NOM);
-	$zoom = ((x($_POST, 'zoom')) ? intval(trim($_POST['zoom'])) : '16');
+	$zoom = defaults($_POST, 'zoom', OSM_ZOOM);
-	$marker = ((x($_POST, 'marker')) ? intval(trim($_POST['marker'])) : '0');
+	$marker = defaults($_POST, 'marker', OSM_MARKER);
+
 	Config::set('openstreetmap', 'tmsserver', $urltms);
 	Config::set('openstreetmap', 'nomserver', $urlnom);
 	Config::set('openstreetmap', 'zoom', $zoom);
 	Config::set('openstreetmap', 'marker', $marker);
+
 	info(L10n::t('Settings updated.') . EOL);
 }

openstreetmap/templates/admin.tpl

@@ -1,5 +1,5 @@
 {{include file="field_input.tpl" field=$tmsserver}}
-<!-- {{include file="field_input.tpl" field=$nomserver}}-->
+{{include file="field_input.tpl" field=$nomserver}}
 {{include file="field_input.tpl" field=$zoom}}
 {{include file="field_checkbox.tpl" field=$marker}}
 <div class="submit"><input type="submit" name="openstreetmap" value="{{$submit}}"></div>

pageheader/lang/C/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2018-03-11 18:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pageheader.php:50
+#: pageheader.php:53
 msgid "\"pageheader\" Settings"
 msgstr ""
 
-#: pageheader.php:55
+#: pageheader.php:54
-msgid "Submit"
+msgid "Message"
 msgstr ""
 
-#: pageheader.php:68
+#: pageheader.php:54
+msgid ""
+"Message to display on every page on this server (or put a pageheader.html "
+"file in your docroot)"
+msgstr ""
+
+#: pageheader.php:55
+msgid "Save Settings"
+msgstr ""
+
+#: pageheader.php:69
 msgid "pageheader Settings saved."
 msgstr ""

pageheader/lang/de/messages.po

@@ -4,30 +4,41 @@
 # 
 # 
 # Translators:
-# Abrax <webmaster@a-zwenkau.de>, 2014
+# Andreas H., 2014
-# bavatar <tobias.diekershoff@gmx.net>, 2014
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2018-03-11 18:52+0100\n"
-"PO-Revision-Date: 2014-10-15 12:32+0000\n"
+"PO-Revision-Date: 2018-03-16 07:42+0000\n"
-"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pageheader.php:50
+#: pageheader.php:53
 msgid "\"pageheader\" Settings"
 msgstr "\"pageheader\"-Einstellungen"
 
-#: pageheader.php:55
+#: pageheader.php:54
-msgid "Submit"
+msgid "Message"
-msgstr "Senden"
+msgstr "Mitteilung"
 
-#: pageheader.php:68
+#: pageheader.php:54
+msgid ""
+"Message to display on every page on this server (or put a pageheader.html "
+"file in your docroot)"
+msgstr "Die Mitteilung, die auf jeder Seite dieses Knotens angezeigt werden soll (alternativ kann die Datei pageheader.html im Stammverzeichnis der Friendica Installation angelegt werden)."
+
+#: pageheader.php:55
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: pageheader.php:69
 msgid "pageheader Settings saved."
 msgstr "pageheader-Einstellungen gespeichert."

pageheader/lang/de/strings.php

@@ -6,5 +6,7 @@ function string_plural_select_de($n){
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
-$a->strings["Submit"] = "Senden";
+$a->strings["Message"] = "Mitteilung";
+$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Die Mitteilung, die auf jeder Seite dieses Knotens angezeigt werden soll (alternativ kann die Datei pageheader.html im Stammverzeichnis der Friendica Installation angelegt werden).";
+$a->strings["Save Settings"] = "Einstellungen speichern";
 $a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert.";

pageheader/lang/it/messages.po

@@ -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"
+"POT-Creation-Date: 2018-03-11 18:52+0100\n"
-"PO-Revision-Date: 2015-08-31 10:21+0000\n"
+"PO-Revision-Date: 2018-03-19 13:19+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"
@@ -19,14 +19,24 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pageheader.php:50
+#: pageheader.php:53
 msgid "\"pageheader\" Settings"
 msgstr "Impostazioni \"Intestazione pagina\""
 
-#: pageheader.php:55
+#: pageheader.php:54
-msgid "Submit"
+msgid "Message"
-msgstr "Invia"
+msgstr "Messaggio"
 
-#: pageheader.php:68
+#: pageheader.php:54
+msgid ""
+"Message to display on every page on this server (or put a pageheader.html "
+"file in your docroot)"
+msgstr "Il messaggio da mostrare su ogni pagina di questo server (puoi anche aggiungere un file pageheader.html nella root)"
+
+#: pageheader.php:55
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: pageheader.php:69
 msgid "pageheader Settings saved."
 msgstr "Impostazioni \"Intestazione pagina\" salvate."

pageheader/lang/it/strings.php

@@ -6,5 +6,7 @@ function string_plural_select_it($n){
 }}
 ;
 $a->strings["\"pageheader\" Settings"] = "Impostazioni \"Intestazione pagina\"";
-$a->strings["Submit"] = "Invia";
+$a->strings["Message"] = "Messaggio";
+$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Il messaggio da mostrare su ogni pagina di questo server (puoi anche aggiungere un file pageheader.html nella root)";
+$a->strings["Save Settings"] = "Salva Impostazioni";
 $a->strings["pageheader Settings saved."] = "Impostazioni \"Intestazione pagina\" salvate.";

pageheader/pageheader.php

@@ -48,14 +48,12 @@ function pageheader_addon_settings(&$a,&$s) {
 	if(! $words)
 		$words = '';
 
-    $s .= '<div class="settings-block">';
+	$t = get_markup_template("settings.tpl", "addon/pageheader/");
-    $s .= '<h3>' . L10n::t('"pageheader" Settings') . '</h3>';
+	$s .= replace_macros($t, [
-    $s .= '<div id="pageheader-wrapper">';
+					'$title' => L10n::t('"pageheader" Settings'),
-    $s .= '<label id="pageheader-label" for="pageheader-words">' . L10n::t('Message to display on every page on this server (or put a pageheader.html file in your docroot)') . ' </label>';
+					'$phwords' => ['pageheader-words', L10n::t('Message'), $words, L10n::t('Message to display on every page on this server (or put a pageheader.html file in your docroot)')],
-    $s .= '<textarea id="pageheader-words" type="text" name="pageheader-words">' . $words . '</textarea>';
+					'$submit' => L10n::t('Save Settings')
-    $s .= '</div><div class="clear"></div>';
+	]);
-
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
 	return;
 

pageheader/templates/settings.tpl

@@ -0,0 +1,14 @@
+<span id="settings_pageheader_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_pageheader_expanded'); openClose('settings_pageheader_inflated');">
+	<h3>{{$title}}</h3>
+</span>
+<div id="settings_pageheader_expanded" class="settings-block" style="display: none;">
+	<span class="fakelink" onclick="openClose('settings_pageheader_expanded'); openClose('settings_pageheader_inflated');">
+		<h3>{{$title}}</h3>
+	</span>
+	{{include file="field_textarea.tpl" field=$phwords}}
+
+	<div class="settings-submit-wrapper" >
+		<input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="{{$submit}}" />
+	</div>
+</div>
+<div class="clear"></div>

piwik/lang/it/messages.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-07-26 12:49+0200\n"
-"PO-Revision-Date: 2015-08-31 10:22+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

planets/lang/it/messages.po

@@ -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"
@@ -25,7 +25,7 @@ msgstr "Impostazioni \"Pianeti\""
 
 #: planets.php:152
 msgid "Enable Planets Addon"
-msgstr "Abilita il addon\"Pianeti\""
+msgstr "Abilita il componente aggiuntivo Pianeti"
 
 #: planets.php:158
 msgid "Submit"

planets/lang/it/strings.php

@@ -6,5 +6,5 @@ function string_plural_select_it($n){
 }}
 ;
 $a->strings["Planets Settings"] = "Impostazioni \"Pianeti\"";
-$a->strings["Enable Planets Addon"] = "Abilita il addon \"Pianeti\"";
+$a->strings["Enable Planets Addon"] = "Abilita il componente aggiuntivo Pianeti";
 $a->strings["Submit"] = "Invia";

public_server/lang/it/messages.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-10-15 09:02+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

pumpio/lang/it/messages.po

@@ -4,13 +4,13 @@
 # 
 # 
 # Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
+# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2015-11-01 11:05+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"
@@ -62,7 +62,7 @@ msgstr "Importa la timeline remota"
 
 #: pumpio.php:255
 msgid "Enable pump.io Post Addon"
-msgstr "Abilita iladdondi invio ad pump.io"
+msgstr "Abilita il componente aggiuntivo di invio ad pump.io"
 
 #: pumpio.php:260
 msgid "Post to pump.io by default"

pumpio/lang/it/strings.php

@@ -15,7 +15,7 @@ $a->strings["pump.io username (without the servername)"] = "nome utente pump.io
 $a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "nome del server pump.io (senza \"http://\" o \"https://\")";
 $a->strings["Authenticate your pump.io connection"] = "Autentica la tua connessione pump.io";
 $a->strings["Import the remote timeline"] = "Importa la timeline remota";
-$a->strings["Enable pump.io Post Addon"] = "Abilita il addon di invio ad pump.io";
+$a->strings["Enable pump.io Post Addon"] = "Abilita il componente aggiuntivo di invio ad pump.io";
 $a->strings["Post to pump.io by default"] = "Invia sempre a pump.io";
 $a->strings["Should posts be public?"] = "I messaggi devono essere pubblici?";
 $a->strings["Mirror all public posts"] = "Clona tutti i messaggi pubblici";

pumpio/pumpio.php

@@ -7,6 +7,7 @@
  */
 
 use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -782,8 +783,6 @@ function pumpio_fetchtimeline(&$a, $uid) {
 						$public = true;
 
 			if ($public && !stristr($post->generator->displayName, $application_name)) {
-				require_once('include/html2bbcode.php');
-
 				$_SESSION["authenticated"] = true;
 				$_SESSION["uid"] = $uid;
 
@@ -798,11 +797,11 @@ function pumpio_fetchtimeline(&$a, $uid) {
 				}
 
 				if ($post->object->displayName != "")
-					$_REQUEST["title"] = html2bbcode($post->object->displayName);
+					$_REQUEST["title"] = HTML::toBBCode($post->object->displayName);
 				else
 					$_REQUEST["title"] = "";
 
-				$_REQUEST["body"] = html2bbcode($post->object->content);
+				$_REQUEST["body"] = HTML::toBBCode($post->object->content);
 
 				// To-Do: Picture has to be cached and stored locally
 				if ($post->object->fullImage->url != "") {
@@ -1062,7 +1061,6 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) {
 
 function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) {
 	require_once('include/items.php');
-	require_once('include/html2bbcode.php');
 
 	if (($post->verb == "like") || ($post->verb == "favorite"))
 		return pumpio_dolike($a, $uid, $self, $post, $own_id);
@@ -1191,7 +1189,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 	$postarray['author-avatar'] = $post->actor->image->url;
 	$postarray['plink'] = $post->object->url;
 	$postarray['app'] = $post->generator->displayName;
-	$postarray['body'] = html2bbcode($post->object->content);
+	$postarray['body'] = HTML::toBBCode($post->object->content);
 	$postarray['object'] = json_encode($post);
 
 	if ($post->object->fullImage->url != "")

qcomment/lang/it/messages.po

@@ -10,7 +10,7 @@ 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: 2017-09-20 06:08+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"

randplace/lang/it/messages.po

@@ -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"
@@ -25,7 +25,7 @@ msgstr "Impostazioni \"Posizione casuale\""
 
 #: randplace.php:171
 msgid "Enable Randplace Addon"
-msgstr "Abilita il addon \"Posizione casuale\""
+msgstr "Abilita il componente aggiuntivo Posizione Casuale"
 
 #: randplace.php:177
 msgid "Submit"

randplace/lang/it/strings.php

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

remote_permissions/lang/it/messages.po

@@ -10,7 +10,7 @@ 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:23+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"

rendertime/lang/it/messages.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-09-10 14:32+0000\n"
+"PO-Revision-Date: 2017-09-20 06:08+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"