Merge remote-tracking branch 'upstream/master'

5 files changed, 204 insertions, 175 deletions

diff --git a/include/features.php b/include/features.php
index 4e962b00e..b02d912cf 100644
--- a/include/features.php
+++ b/include/features.php
@@ -5,12 +5,19 @@
  */
 
 
+
+
+
 function feature_enabled($uid,$feature) {
-	$x = get_pconfig($uid,'feature',$feature);
+
+	$x = get_config('feature_lock',$feature);
 	if($x === false) {
-		$x = get_config('feature',$feature);
-		if($x === false)
-			$x = get_feature_default($feature);
+		$x = get_pconfig($uid,'feature',$feature);
+		if($x === false) {
+			$x = get_config('feature',$feature);
+			if($x === false)
+				$x = get_feature_default($feature);
+		}
 	}
 	$arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);
 	call_hooks('feature_enabled',$arr);
@@ -36,59 +43,78 @@ function get_features() {
 		// General
 		'general' => array(
 			t('General Features'),
-// This is per post, and different from fixed expiration 'expire' which isn't working yet
-			array('content_expire',      t('Content Expiration'),     t('Remove posts/comments and/or private messages at a future time'), false),
-			array('multi_profiles',      t('Multiple Profiles'),      t('Ability to create multiple profiles'), false),
-			array('advanced_profiles',   t('Advanced Profiles'),      t('Additional profile sections and selections'),false),
-			array('profile_export',      t('Profile Import/Export'),  t('Save and load profile details across sites/channels'),false),
-			array('webpages',            t('Web Pages'),              t('Provide managed web pages on your channel'),false),
-			array('private_notes',       t('Private Notes'),          t('Enables a tool to store notes and reminders'),false),
-			array('nav_channel_select',  t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false),
-			array('photo_location',       t('Photo Location'),          t('If location data is available on uploaded photos, link this to a map.'),false),
-
-			array('expert',       t('Expert Mode'),                 t('Enable Expert Mode to provide advanced configuration options'),false),
-			array('premium_channel', t('Premium Channel'), t('Allows you to set restrictions and terms on those that connect with your channel'),false),
+			// This is per post, and different from fixed expiration 'expire' which isn't working yet
+			array('content_expire',      t('Content Expiration'),     t('Remove posts/comments and/or private messages at a future time'), false, get_config('feature_lock','content_expire')),
+			array('multi_profiles',      t('Multiple Profiles'),      t('Ability to create multiple profiles'), false, get_config('feature_lock','multi_profiles')),
+			array('advanced_profiles',   t('Advanced Profiles'),      t('Additional profile sections and selections'),false,get_config('feature_lock','advanced_profiles')),
+			array('profile_export',      t('Profile Import/Export'),  t('Save and load profile details across sites/channels'),false,get_config('feature_lock','profile_export')),
+			array('webpages',            t('Web Pages'),              t('Provide managed web pages on your channel'),false,get_config('feature_lock','webpages')),
+			array('private_notes',       t('Private Notes'),          t('Enables a tool to store notes and reminders'),false,get_config('feature_lock','private_notes')),
+			array('nav_channel_select',  t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')),
+			array('photo_location',       t('Photo Location'),          t('If location data is available on uploaded photos, link this to a map.'),false,get_config('feature_lock','photo_location')),
+
+			array('expert',       t('Expert Mode'),                 t('Enable Expert Mode to provide advanced configuration options'),false,get_config('feature_lock','expert')),
+			array('premium_channel', t('Premium Channel'), t('Allows you to set restrictions and terms on those that connect with your channel'),false,get_config('feature_lock','premium_channel')),
 		),
 
 		// Post composition
 		'composition' => array(
 			t('Post Composition Features'),
-//			array('richtext',       t('Richtext Editor'),			t('Enable richtext editor'),false),
-			array('markdown',       t('Use Markdown'),              t('Allow use of "Markdown" to format posts'),false),
-			array('large_photos',   t('Large Photos'),              t('Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails'),false),
-			array('channel_sources', t('Channel Sources'),          t('Automatically import channel content from other channels or feeds'),false),
-			array('content_encrypt', t('Even More Encryption'),          t('Allow optional encryption of content end-to-end with a shared secret key'),false),
-			array('consensus_tools', t('Enable Voting Tools'),      t('Provide a class of post which others can vote on'),false),
-			array('delayed_posting', t('Delayed Posting'),      t('Allow posts to be published at a later date'),false),
-			array('suppress_duplicates', t('Suppress Duplicate Posts/Comments'),  t('Prevent posts with identical content to be published with less than two minutes in between submissions.'),true),
+//			array('richtext',       t('Richtext Editor'),			t('Enable richtext editor'),falseget_config('feature_lock','richtext')),
+			array('markdown',       t('Use Markdown'),              t('Allow use of "Markdown" to format posts'),false,get_config('feature_lock','markdown')),
+			array('large_photos',   t('Large Photos'),              t('Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails'),false,get_config('feature_lock','large_photos')),
+			array('channel_sources', t('Channel Sources'),          t('Automatically import channel content from other channels or feeds'),false,get_config('feature_lock','channel_sources')),
+			array('content_encrypt', t('Even More Encryption'),          t('Allow optional encryption of content end-to-end with a shared secret key'),false,get_config('feature_lock','content_encrypt')),
+			array('consensus_tools', t('Enable Voting Tools'),      t('Provide a class of post which others can vote on'),false,get_config('feature_lock','consensus_tools')),
+			array('delayed_posting', t('Delayed Posting'),      t('Allow posts to be published at a later date'),false,get_config('feature_lock','delayed_posting')),
+			array('suppress_duplicates', t('Suppress Duplicate Posts/Comments'),  t('Prevent posts with identical content to be published with less than two minutes in between submissions.'),true,get_config('feature_lock','suppress_duplicates')),
 
 		),
 
 		// Network Tools
 		'net_module' => array(
 			t('Network and Stream Filtering'),
-			array('archives',       t('Search by Date'),			t('Ability to select posts by date ranges'),false),
-			array('groups',    		t('Collections Filter'),		t('Enable widget to display Network posts only from selected collections'),false),
-			array('savedsearch',    t('Saved Searches'),			t('Save search terms for re-use'),false),
-			array('personal_tab',   t('Network Personal Tab'),		t('Enable tab to display only Network posts that you\'ve interacted on'),false),
-			array('new_tab',   		t('Network New Tab'),			t('Enable tab to display all new Network activity'),false),
-			array('affinity',       t('Affinity Tool'),			    t('Filter stream activity by depth of relationships'),false),
-			array('connfilter',     t('Connection Filtering'),      t('Filter incoming posts from connections based on keywords/content')),
-			array('suggest',    	t('Suggest Channels'),			t('Show channel suggestions'),false),
+			array('archives',       t('Search by Date'),			t('Ability to select posts by date ranges'),false,get_config('feature_lock','archives')),
+			array('groups',    		t('Collections Filter'),		t('Enable widget to display Network posts only from selected collections'),false,get_config('feature_lock','groups')),
+			array('savedsearch',    t('Saved Searches'),			t('Save search terms for re-use'),false,get_config('feature_lock','savedsearch')),
+			array('personal_tab',   t('Network Personal Tab'),		t('Enable tab to display only Network posts that you\'ve interacted on'),false,get_config('feature_lock','personal_tab')),
+			array('new_tab',   		t('Network New Tab'),			t('Enable tab to display all new Network activity'),false,get_config('feature_lock','new_tab')),
+			array('affinity',       t('Affinity Tool'),			    t('Filter stream activity by depth of relationships'),false,get_config('feature_lock','affinity')),
+			array('connfilter',     t('Connection Filtering'),      t('Filter incoming posts from connections based on keywords/content'),false,get_config('feature_lock','connfilter')),
+			array('suggest',    	t('Suggest Channels'),			t('Show channel suggestions'),false,get_config('feature_lock','suggest')),
 		),
 
 		// Item tools
 		'tools' => array(
 			t('Post/Comment Tools'),
-			array('commtag',        t('Tagging'),					t('Ability to tag existing posts'),false),
-			array('categories',     t('Post Categories'),			t('Add categories to your posts'),false),
-			array('filing',         t('Saved Folders'),				t('Ability to file posts under folders'),false),
-			array('dislike',        t('Dislike Posts'),				t('Ability to dislike posts/comments'),false),
-			array('star_posts',     t('Star Posts'),				t('Ability to mark special posts with a star indicator'),false),
-			array('tagadelic',      t('Tag Cloud'),				    t('Provide a personal tag cloud on your channel page'),false),
+			array('commtag',        t('Community Tagging'),					t('Ability to tag existing posts'),false,get_config('feature_lock','commtag')),
+			array('categories',     t('Post Categories'),			t('Add categories to your posts'),false,get_config('feature_lock','categories')),
+			array('filing',         t('Saved Folders'),				t('Ability to file posts under folders'),false,get_config('feature_lock','filing')),
+			array('dislike',        t('Dislike Posts'),				t('Ability to dislike posts/comments'),false,get_config('feature_lock','dislike')),
+			array('star_posts',     t('Star Posts'),				t('Ability to mark special posts with a star indicator'),false,get_config('feature_lock','star_posts')),
+			array('tagadelic',      t('Tag Cloud'),				    t('Provide a personal tag cloud on your channel page'),false,get_config('feature_lock','tagedelic')),
 		),
 	);
 
+	// removed any locked features and remove the entire category if this makes it empty
+
+	foreach($arr as $k => $x) {
+		$has_items = false;
+		for($y = 0; $y < count($arr[$k]); $y ++) {	
+			if(is_array($arr[$k][$y])) {
+				if($arr[$k][$y][4] === false) {
+					$has_items = true;
+				}
+				else {
+					unset($arr[$k][$y]);
+				}
+			}
+		}
+		if(! $has_items) {
+			unset($arr[$k]);
+		}
+	}
+
 	call_hooks('get_features',$arr);
 	return $arr;
 }
diff --git a/include/widgets.php b/include/widgets.php
index 4b14d6c94..0f170fd52 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -493,38 +493,41 @@ function widget_settings_menu($arr) {
 			'selected'	=> ((argv(1) === 'channel') ? 'active' : ''),
 		),
 
-		array(
-			'label'	=> t('Additional features'),
-			'url' 	=> $a->get_baseurl(true).'/settings/features',
-			'selected'	=> ((argv(1) === 'features') ? 'active' : ''),
-		),
+	);
 
-		array(
-			'label'	=> t('Feature/Addon settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/featured',
-			'selected'	=> ((argv(1) === 'featured') ? 'active' : ''),
-		),
+	if(get_features()) {
+		$tabs[] = 	array(
+				'label'	=> t('Additional features'),
+				'url' 	=> $a->get_baseurl(true).'/settings/features',
+				'selected'	=> ((argv(1) === 'features') ? 'active' : ''),
+		);
+	}
 
-		array(
-			'label'	=> t('Display settings'),
-			'url' 	=> $a->get_baseurl(true).'/settings/display',
-			'selected'	=> ((argv(1) === 'display') ? 'active' : ''),
-		),	
+	$tabs[] =	array(
+		'label'	=> t('Feature/Addon settings'),
+		'url' 	=> $a->get_baseurl(true).'/settings/featured',
+		'selected'	=> ((argv(1) === 'featured') ? 'active' : ''),
+	);
 
-		array(
-			'label' => t('Connected apps'),
-			'url' => $a->get_baseurl(true) . '/settings/oauth',
-			'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
-		),
+	$tabs[] =	array(
+		'label'	=> t('Display settings'),
+		'url' 	=> $a->get_baseurl(true).'/settings/display',
+		'selected'	=> ((argv(1) === 'display') ? 'active' : ''),
+	);	
 
-		array(
-			'label' => t('Export channel'),
-			'url' => $a->get_baseurl(true) . '/uexport',
-			'selected' => ''
-		),
+	$tabs[] =	array(
+		'label' => t('Connected apps'),
+		'url' => $a->get_baseurl(true) . '/settings/oauth',
+		'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
+	);
 
+	$tabs[] =	array(
+		'label' => t('Export channel'),
+		'url' => $a->get_baseurl(true) . '/uexport',
+		'selected' => ''
 	);
 
+
 	if($role === false || $role === 'custom') {
 		$tabs[] = array(
 			'label' => t('Connection Default Permissions'),
diff --git a/version.inc b/version.inc
index 479ab9124..8a363fc45 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-01.1264
+2016-01-04.1268H
diff --git a/view/it/hmessages.po b/view/it/hmessages.po
index be521f738..5ce6260bf 100644
--- a/view/it/hmessages.po
+++ b/view/it/hmessages.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Davide Pesenti <mrjive@mrjive.it>, 2015
-# Paolo Wave <pynolo@tarine.net>, 2015
+# Paolo Wave <pynolo@tarine.net>, 2015-2016
 # Paolo Wave <pynolo@tarine.net>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-18 00:03-0800\n"
-"PO-Revision-Date: 2015-12-20 09:00+0000\n"
+"POT-Creation-Date: 2016-01-01 00:03-0800\n"
+"PO-Revision-Date: 2016-01-03 12:40+0000\n"
 "Last-Translator: Paolo Wave <pynolo@tarine.net>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/red-matrix/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -146,358 +146,358 @@ msgstr "più recenti"
 msgid "newer"
 msgstr "più nuovi"
 
-#: ../../include/text.php:785
+#: ../../include/text.php:803
 msgid "No connections"
 msgstr "Nessun contatto"
 
-#: ../../include/text.php:797
+#: ../../include/text.php:815
 #, php-format
 msgid "%d Connection"
 msgid_plural "%d Connections"
 msgstr[0] "%d contatto"
 msgstr[1] "%d contatti"
 
-#: ../../include/text.php:810 ../../mod/viewconnections.php:101
+#: ../../include/text.php:828 ../../mod/viewconnections.php:101
 msgid "View Connections"
 msgstr "Elenco contatti"
 
-#: ../../include/text.php:867 ../../include/text.php:879
+#: ../../include/text.php:885 ../../include/text.php:897
 #: ../../include/nav.php:159 ../../include/apps.php:147
 #: ../../mod/search.php:40
 msgid "Search"
 msgstr "Cerca"
 
-#: ../../include/text.php:868 ../../include/text.php:880
+#: ../../include/text.php:886 ../../include/text.php:898
 #: ../../include/widgets.php:192 ../../mod/rbmark.php:28
 #: ../../mod/rbmark.php:100 ../../mod/admin.php:1454 ../../mod/admin.php:1474
 #: ../../mod/filer.php:49
 msgid "Save"
 msgstr "Salva"
 
-#: ../../include/text.php:954
+#: ../../include/text.php:972
 msgid "poke"
 msgstr "poke"
 
-#: ../../include/text.php:954 ../../include/conversation.php:243
+#: ../../include/text.php:972 ../../include/conversation.php:243
 msgid "poked"
 msgstr "ha ricevuto un poke"
 
-#: ../../include/text.php:955
+#: ../../include/text.php:973
 msgid "ping"
 msgstr "ping"
 
-#: ../../include/text.php:955
+#: ../../include/text.php:973
 msgid "pinged"
 msgstr "ha ricevuto un ping"
 
-#: ../../include/text.php:956
+#: ../../include/text.php:974
 msgid "prod"
 msgstr "spintone"
 
-#: ../../include/text.php:956
+#: ../../include/text.php:974
 msgid "prodded"
 msgstr "ha ricevuto uno spintone"
 
-#: ../../include/text.php:957
+#: ../../include/text.php:975
 msgid "slap"
 msgstr "schiaffo"
 
-#: ../../include/text.php:957
+#: ../../include/text.php:975
 msgid "slapped"
 msgstr "ha ricevuto uno schiaffo"
 
-#: ../../include/text.php:958
+#: ../../include/text.php:976
 msgid "finger"
 msgstr "finger"
 
-#: ../../include/text.php:958
+#: ../../include/text.php:976
 msgid "fingered"
 msgstr "ha ricevuto un finger"
 
-#: ../../include/text.php:959
+#: ../../include/text.php:977
 msgid "rebuff"
 msgstr "rifiuto"
 
-#: ../../include/text.php:959
+#: ../../include/text.php:977
 msgid "rebuffed"
 msgstr "ha ricevuto un rifiuto"
 
-#: ../../include/text.php:969
+#: ../../include/text.php:987
 msgid "happy"
 msgstr "felice"
 
-#: ../../include/text.php:970
+#: ../../include/text.php:988
 msgid "sad"
 msgstr "triste"
 
-#: ../../include/text.php:971
+#: ../../include/text.php:989
 msgid "mellow"
 msgstr "calmo"
 
-#: ../../include/text.php:972
+#: ../../include/text.php:990
 msgid "tired"
 msgstr "stanco"
 
-#: ../../include/text.php:973
+#: ../../include/text.php:991
 msgid "perky"
 msgstr "vivace"
 
-#: ../../include/text.php:974
+#: ../../include/text.php:992
 msgid "angry"
 msgstr "arrabbiato"
 
-#: ../../include/text.php:975
-msgid "stupified"
-msgstr "stordito"
+#: ../../include/text.php:993
+msgid "stupefied"
+msgstr "stupito"
 
-#: ../../include/text.php:976
+#: ../../include/text.php:994
 msgid "puzzled"
 msgstr "confuso"
 
-#: ../../include/text.php:977
+#: ../../include/text.php:995
 msgid "interested"
 msgstr "attento"
 
-#: ../../include/text.php:978
+#: ../../include/text.php:996
 msgid "bitter"
 msgstr "amaro"
 
-#: ../../include/text.php:979
+#: ../../include/text.php:997
 msgid "cheerful"
 msgstr "allegro"
 
-#: ../../include/text.php:980
+#: ../../include/text.php:998
 msgid "alive"
 msgstr "vivace"
 
-#: ../../include/text.php:981
+#: ../../include/text.php:999
 msgid "annoyed"
 msgstr "seccato"
 
-#: ../../include/text.php:982
+#: ../../include/text.php:1000
 msgid "anxious"
 msgstr "ansioso"
 
-#: ../../include/text.php:983
+#: ../../include/text.php:1001
 msgid "cranky"
 msgstr "irritabile"
 
-#: ../../include/text.php:984
+#: ../../include/text.php:1002
 msgid "disturbed"
 msgstr "turbato"
 
-#: ../../include/text.php:985
+#: ../../include/text.php:1003
 msgid "frustrated"
 msgstr "frustrato"
 
-#: ../../include/text.php:986
+#: ../../include/text.php:1004
 msgid "depressed"
 msgstr "in depressione"
 
-#: ../../include/text.php:987
+#: ../../include/text.php:1005
 msgid "motivated"
 msgstr "motivato"
 
-#: ../../include/text.php:988
+#: ../../include/text.php:1006
 msgid "relaxed"
 msgstr "rilassato"
 
-#: ../../include/text.php:989
+#: ../../include/text.php:1007
 msgid "surprised"
 msgstr "sorpreso"
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:70
+#: ../../include/text.php:1179 ../../include/js_strings.php:70
 msgid "Monday"
 msgstr "lunedì"
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:71
+#: ../../include/text.php:1179 ../../include/js_strings.php:71
 msgid "Tuesday"
 msgstr "martedì"
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:72
+#: ../../include/text.php:1179 ../../include/js_strings.php:72
 msgid "Wednesday"
 msgstr "mercoledì"
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:73
+#: ../../include/text.php:1179 ../../include/js_strings.php:73
 msgid "Thursday"
 msgstr "giovedì"
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:74
+#: ../../include/text.php:1179 ../../include/js_strings.php:74
 msgid "Friday"
 msgstr "venerdì"
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:75
+#: ../../include/text.php:1179 ../../include/js_strings.php:75
 msgid "Saturday"
 msgstr "sabato"
 
-#: ../../include/text.php:1161 ../../include/js_strings.php:69
+#: ../../include/text.php:1179 ../../include/js_strings.php:69
 msgid "Sunday"
 msgstr "domenica"
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:45
+#: ../../include/text.php:1183 ../../include/js_strings.php:45
 msgid "January"
 msgstr "gennaio"
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:46
+#: ../../include/text.php:1183 ../../include/js_strings.php:46
 msgid "February"
 msgstr "febbraio"
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:47
+#: ../../include/text.php:1183 ../../include/js_strings.php:47
 msgid "March"
 msgstr "marzo"
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:48
+#: ../../include/text.php:1183 ../../include/js_strings.php:48
 msgid "April"
 msgstr "aprile"
 
-#: ../../include/text.php:1165
+#: ../../include/text.php:1183
 msgid "May"
 msgstr "Mag"
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:50
+#: ../../include/text.php:1183 ../../include/js_strings.php:50
 msgid "June"
 msgstr "giugno"
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:51
+#: ../../include/text.php:1183 ../../include/js_strings.php:51
 msgid "July"
 msgstr "luglio"
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:52
+#: ../../include/text.php:1183 ../../include/js_strings.php:52
 msgid "August"
 msgstr "agosto"
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:53
+#: ../../include/text.php:1183 ../../include/js_strings.php:53
 msgid "September"
 msgstr "settembre"
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:54
+#: ../../include/text.php:1183 ../../include/js_strings.php:54
 msgid "October"
 msgstr "ottobre"
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:55
+#: ../../include/text.php:1183 ../../include/js_strings.php:55
 msgid "November"
 msgstr "novembre"
 
-#: ../../include/text.php:1165 ../../include/js_strings.php:56
+#: ../../include/text.php:1183 ../../include/js_strings.php:56
 msgid "December"
 msgstr "dicembre"
 
-#: ../../include/text.php:1242 ../../include/text.php:1246
+#: ../../include/text.php:1260 ../../include/text.php:1264
 msgid "Unknown Attachment"
 msgstr "Allegato non riconoscuto"
 
-#: ../../include/text.php:1248 ../../include/RedDAV/RedBrowser.php:237
+#: ../../include/text.php:1266 ../../include/RedDAV/RedBrowser.php:237
 #: ../../mod/sharedwithme.php:97
 msgid "Size"
 msgstr "Dimensione"
 
-#: ../../include/text.php:1248
+#: ../../include/text.php:1266
 msgid "unknown"
 msgstr "sconosciuta"
 
-#: ../../include/text.php:1284
+#: ../../include/text.php:1302
 msgid "remove category"
 msgstr "rimuovi la categoria"
 
-#: ../../include/text.php:1361
+#: ../../include/text.php:1379
 msgid "remove from file"
 msgstr "rimuovi dal file"
 
-#: ../../include/text.php:1392 ../../include/event.php:22
+#: ../../include/text.php:1410 ../../include/event.php:22
 #: ../../include/bb2diaspora.php:465
 msgid "l F d, Y \\@ g:i A"
 msgstr "l d F Y \\@ G:i"
 
-#: ../../include/text.php:1396 ../../include/event.php:30
+#: ../../include/text.php:1414 ../../include/event.php:30
 #: ../../include/bb2diaspora.php:471
 msgid "Starts:"
 msgstr "Inizio:"
 
-#: ../../include/text.php:1400 ../../include/event.php:40
+#: ../../include/text.php:1418 ../../include/event.php:40
 #: ../../include/bb2diaspora.php:479
 msgid "Finishes:"
 msgstr "Fine:"
 
-#: ../../include/text.php:1407 ../../include/event.php:52
+#: ../../include/text.php:1425 ../../include/event.php:52
 #: ../../include/identity.php:998 ../../include/bb2diaspora.php:487
 #: ../../mod/directory.php:304
 msgid "Location:"
 msgstr "Luogo:"
 
-#: ../../include/text.php:1503 ../../include/text.php:1514
+#: ../../include/text.php:1521 ../../include/text.php:1532
 msgid "Click to open/close"
 msgstr "Clicca per aprire/chiudere"
 
-#: ../../include/text.php:1698 ../../mod/events.php:623
+#: ../../include/text.php:1716 ../../mod/events.php:623
 msgid "Link to Source"
 msgstr "Link al sito d'origine"
 
-#: ../../include/text.php:1719 ../../include/text.php:1791
+#: ../../include/text.php:1737 ../../include/text.php:1809
 msgid "default"
 msgstr "predefinito"
 
-#: ../../include/text.php:1727
+#: ../../include/text.php:1745
 msgid "Page layout"
 msgstr "Layout della pagina"
 
-#: ../../include/text.php:1727
+#: ../../include/text.php:1745
 msgid "You can create your own with the layouts tool"
 msgstr "Puoi creare un tuo layout dalla configurazione delle pagine web"
 
-#: ../../include/text.php:1769
+#: ../../include/text.php:1787
 msgid "Page content type"
 msgstr "Tipo di contenuto della pagina"
 
-#: ../../include/text.php:1803
+#: ../../include/text.php:1821
 msgid "Select an alternate language"
 msgstr "Seleziona una lingua diversa"
 
-#: ../../include/text.php:1922 ../../include/conversation.php:120
+#: ../../include/text.php:1940 ../../include/conversation.php:120
 #: ../../mod/tagger.php:43 ../../mod/like.php:361 ../../mod/subthread.php:83
 msgid "photo"
 msgstr "la foto"
 
-#: ../../include/text.php:1925 ../../include/event.php:904
+#: ../../include/text.php:1943 ../../include/event.php:904
 #: ../../include/conversation.php:123 ../../mod/tagger.php:47
 #: ../../mod/like.php:363 ../../mod/events.php:249
 msgid "event"
 msgstr "l'evento"
 
-#: ../../include/text.php:1928 ../../include/conversation.php:148
+#: ../../include/text.php:1946 ../../include/conversation.php:148
 #: ../../mod/like.php:361 ../../mod/subthread.php:83
 msgid "status"
 msgstr "il messaggio di stato"
 
-#: ../../include/text.php:1930 ../../include/conversation.php:150
+#: ../../include/text.php:1948 ../../include/conversation.php:150
 #: ../../mod/tagger.php:53
 msgid "comment"
 msgstr "il commento"
 
-#: ../../include/text.php:1935
+#: ../../include/text.php:1953
 msgid "activity"
 msgstr "l'attività"
 
-#: ../../include/text.php:2230
+#: ../../include/text.php:2248
 msgid "Design Tools"
 msgstr "Strumenti di design"
 
-#: ../../include/text.php:2233 ../../mod/blocks.php:147
+#: ../../include/text.php:2251 ../../mod/blocks.php:147
 msgid "Blocks"
 msgstr "Block"
 
-#: ../../include/text.php:2234 ../../mod/menu.php:103
+#: ../../include/text.php:2252 ../../mod/menu.php:103
 msgid "Menus"
 msgstr "Menù"
 
-#: ../../include/text.php:2235 ../../mod/layouts.php:174
+#: ../../include/text.php:2253 ../../mod/layouts.php:174
 msgid "Layouts"
 msgstr "Layout"
 
-#: ../../include/text.php:2236
+#: ../../include/text.php:2254
 msgid "Pages"
 msgstr "Pagine"
 
-#: ../../include/text.php:2588 ../../include/RedDAV/RedBrowser.php:131
+#: ../../include/text.php:2606 ../../include/RedDAV/RedBrowser.php:131
 msgid "Collection"
 msgstr "Cartella"
 
@@ -1357,29 +1357,29 @@ msgstr "Album foto"
 msgid "Upload New Photos"
 msgstr "Carica nuove foto"
 
-#: ../../include/acl_selectors.php:240
+#: ../../include/acl_selectors.php:218
 msgid "Visible to your default audience"
 msgstr "Visibile secondo le impostazioni predefinite"
 
-#: ../../include/acl_selectors.php:241
+#: ../../include/acl_selectors.php:243
 msgid "Show"
 msgstr "Mostra"
 
-#: ../../include/acl_selectors.php:242
+#: ../../include/acl_selectors.php:244
 msgid "Don't show"
 msgstr "Non mostrare"
 
-#: ../../include/acl_selectors.php:247
+#: ../../include/acl_selectors.php:249
 msgid "Other networks and post services"
 msgstr "Invio ad altre reti o a siti esterni"
 
-#: ../../include/acl_selectors.php:249 ../../mod/filestorage.php:147
+#: ../../include/acl_selectors.php:251 ../../mod/filestorage.php:147
 #: ../../mod/thing.php:310 ../../mod/thing.php:356 ../../mod/photos.php:631
 #: ../../mod/photos.php:998 ../../mod/chat.php:211
 msgid "Permissions"
 msgstr "Permessi"
 
-#: ../../include/acl_selectors.php:250 ../../include/ItemObject.php:384
+#: ../../include/acl_selectors.php:252 ../../include/ItemObject.php:384
 #: ../../mod/photos.php:1215
 msgid "Close"
 msgstr "Chiudi"
@@ -2878,7 +2878,7 @@ msgstr "Contenuti pubblici importati"
 
 #: ../../include/conversation.php:1511
 msgid "Commented Order"
-msgstr "Ultimi commenti"
+msgstr "Commenti recenti"
 
 #: ../../include/conversation.php:1514
 msgid "Sort by Comment Date"
@@ -2886,7 +2886,7 @@ msgstr "Per data del commento"
 
 #: ../../include/conversation.php:1518
 msgid "Posted Order"
-msgstr "Ultimi post"
+msgstr "Post recenti"
 
 #: ../../include/conversation.php:1521
 msgid "Sort by Post Date"
@@ -3437,19 +3437,19 @@ msgstr "La risposta dal canale non è completa."
 msgid "Channel was deleted and no longer exists."
 msgstr "Il canale è stato rimosso e non esiste più."
 
-#: ../../include/follow.php:152 ../../include/follow.php:181
+#: ../../include/follow.php:153 ../../include/follow.php:183
 msgid "Protocol disabled."
 msgstr "Protocollo disabilitato."
 
-#: ../../include/follow.php:171
+#: ../../include/follow.php:173
 msgid "Channel discovery failed."
 msgstr "La ricerca del canale non ha avuto successo."
 
-#: ../../include/follow.php:197
+#: ../../include/follow.php:199
 msgid "local account not found."
 msgstr "l'account locale non è stato trovato."
 
-#: ../../include/follow.php:221
+#: ../../include/follow.php:224
 msgid "Cannot connect to yourself."
 msgstr "Non puoi connetterti a te stesso."
 
@@ -6615,6 +6615,10 @@ msgstr "forum"
 msgid "Search Results For:"
 msgstr "Cerca risultati con:"
 
+#: ../../mod/network.php:169 ../../mod/channel.php:131 ../../mod/rpost.php:114
+msgid "Public"
+msgstr "Pubblico"
+
 #: ../../mod/network.php:207
 msgid "Collection is empty"
 msgstr "L'insieme di canali è vuoto"
@@ -7019,7 +7023,7 @@ msgstr "Suggerisci contenuti pubblici della rete Hubzilla"
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
-msgstr "Suggerisci e visualizza i contenuti pubblici presenti su altri siti Hubzilla. Attenzione: i contenuti saranno importati senza moderazione e potrebbero essere inappropriati."
+msgstr "Suggerisci e visualizza i post pubblici presenti su altri siti Hubzilla. Attenzione: i contenuti potrebbero essere inappropriati perché non sottoposti a moderazione."
 
 #: ../../mod/admin.php:478
 msgid "login on Homepage"
@@ -9183,10 +9187,6 @@ msgstr "Modifica l'elemento del menù"
 msgid "Link text"
 msgstr "Testo del link"
 
-#: ../../mod/wholikesme.php:13
-msgid "Who likes me?"
-msgstr "Chi mi ha dato un \"Mi piace\"?"
-
 #: ../../mod/sharedwithme.php:94
 msgid "Files: shared with me"
 msgstr "File: condivisi con me"
diff --git a/view/it/hstrings.php b/view/it/hstrings.php
index fcc70dce7..aafedbdf6 100644
--- a/view/it/hstrings.php
+++ b/view/it/hstrings.php
@@ -51,7 +51,7 @@ $a->strings["mellow"] = "calmo";
 $a->strings["tired"] = "stanco";
 $a->strings["perky"] = "vivace";
 $a->strings["angry"] = "arrabbiato";
-$a->strings["stupified"] = "stordito";
+$a->strings["stupefied"] = "stupito";
 $a->strings["puzzled"] = "confuso";
 $a->strings["interested"] = "attento";
 $a->strings["bitter"] = "amaro";
@@ -661,9 +661,9 @@ $a->strings["OK"] = "OK";
 $a->strings["Cancel"] = "Annulla";
 $a->strings["Discover"] = "Scopri";
 $a->strings["Imported public streams"] = "Contenuti pubblici importati";
-$a->strings["Commented Order"] = "Ultimi commenti";
+$a->strings["Commented Order"] = "Commenti recenti";
 $a->strings["Sort by Comment Date"] = "Per data del commento";
-$a->strings["Posted Order"] = "Ultimi post";
+$a->strings["Posted Order"] = "Post recenti";
 $a->strings["Sort by Post Date"] = "Per data di creazione";
 $a->strings["Posts that mention or involve you"] = "Post che ti riguardano";
 $a->strings["New"] = "Novità";
@@ -1546,6 +1546,7 @@ $a->strings["No such group"] = "Impossibile trovare l'insieme";
 $a->strings["No such channel"] = "Canale sconosciuto";
 $a->strings["forum"] = "forum";
 $a->strings["Search Results For:"] = "Cerca risultati con:";
+$a->strings["Public"] = "Pubblico";
 $a->strings["Collection is empty"] = "L'insieme di canali è vuoto";
 $a->strings["Collection: "] = "Insieme:";
 $a->strings["Invalid connection."] = "Contatto non valido.";
@@ -1637,7 +1638,7 @@ $a->strings["Check to verify email addresses used in account registration (recom
 $a->strings["Force publish"] = "Forza la publicazione del profilo";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Seleziona per pubblicare sui directory server <strong>tutti</strong> i profili registrati su questo sito.";
 $a->strings["Import Public Streams"] = "Suggerisci contenuti pubblici della rete Hubzilla";
-$a->strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Suggerisci e visualizza i contenuti pubblici presenti su altri siti Hubzilla. Attenzione: i contenuti saranno importati senza moderazione e potrebbero essere inappropriati.";
+$a->strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Suggerisci e visualizza i post pubblici presenti su altri siti Hubzilla. Attenzione: i contenuti potrebbero essere inappropriati perché non sottoposti a moderazione.";
 $a->strings["login on Homepage"] = "Mostra il login sulla homepage";
 $a->strings["Present a login box to visitors on the home page if no other content has been configured."] = "Presenta il modulo di login ai visitatori sulla homepage in mancanza di altri contenuti.";
 $a->strings["Directory Server URL"] = "URL del directory server";
@@ -2164,7 +2165,6 @@ $a->strings["Menu item deleted."] = "L'elemento del menù è stato eliminato.";
 $a->strings["Menu item could not be deleted."] = "L'elemento del menù non può essere eliminato.";
 $a->strings["Edit Menu Element"] = "Modifica l'elemento del menù";
 $a->strings["Link text"] = "Testo del link";
-$a->strings["Who likes me?"] = "Chi mi ha dato un \"Mi piace\"?";
 $a->strings["Files: shared with me"] = "File: condivisi con me";
 $a->strings["NEW"] = "NOVITÀ";
 $a->strings["Remove all files"] = "Elimina tutti i file";