Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

author: zotlabs <mike@macgirvin.com> 2019-05-28 16:16:29 -0700
committer: zotlabs <mike@macgirvin.com> 2019-05-28 16:16:29 -0700
commit: 932b4140637e22e9fb4ff3a91a9c8f186915646b (patch)
tree: c6e6b8c19079d34fda0fa11d3af26ddef69ae2b6
parent: 7c2aafd4ee123f9db1ea2733119e0711f53414cc (diff)
parent: ca8d252ad75306e6d3cd066d5c593e94de1dfbdd (diff)
download: volse-hubzilla-932b4140637e22e9fb4ff3a91a9c8f186915646b.tar.gz
volse-hubzilla-932b4140637e22e9fb4ff3a91a9c8f186915646b.tar.bz2
volse-hubzilla-932b4140637e22e9fb4ff3a91a9c8f186915646b.zip
21 files changed, 1760 insertions, 1462 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 23c1be7d5..534d52320 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,59 @@
+Hubzilla 4.2 (2019-??-??)
+	- Introduce Calendar app which deprecates Events and CalDAV apps and streamlines the featuresets
+	- Update mod cal to reflect changes in the calendar app
+	- Improve timezone detection for CalDAV calendars
+	- Add mention support to event description in channel calendar
+	- Update jgrowl library
+	- Do not try to oembed URLs without embed tags
+	- Optimise pdf oembed processing
+	- Add form security token to mod register
+	- Replace photo URL for gallery on clonned channel post sync
+	- Update justified gallery library
+	- Update bootstrap libraries
+	- Use "cache" flag for bbcode() on content destined for zot6
+	- Improve DB indexing
+	- Drop deprecated columns from channel the table
+	- Replace own image URL in clonned channel posts
+	- Improve DB update handling
+	- Improve item deletion when a contact was removed
+	- Zot6 compatibility for emoji reactions
+	- Add threaded comments support (disabled by default)
+	- Improve xmlify()/unxmlify() performance
+	- Update blueimp/jquery-file-uplad library
+	- Update sabre/vobject library
+	- Various doco updates
+	- Implement remove profile photo button (reset to default photo)
+	- Implement remove cover photo button
+	- Update the homeinstall script
+	- Add command line tool for photo thumbnails storage conversion
+	- Implement option to store photo thumbnails in filesystem instead of DB
+
+	Bugfixes
+	- Fix encoded URLs in code blocks
+	- Fix wiki headers not escaped
+	- Fix possible xchan protocol confusion in new_contact()
+	- Fix xchan_url not displayed if xchan_addr not available
+	- Fix suggestion ordering in mod directory
+	- Fix event attachment delivery to zot6
+
+	Addons
+	- pubcrawl: improve friendica compatibility by adding the nonstandard diaspora:guid field
+	- pubcrawl: initial suport for events
+	- pubcrawl: improve permalink detection
+	- flashcards: fix moving learn buttons if viewport sizes changes
+	- flashcards: Move card details to the bottom of a card
+	- upgrade_info: provide links to changelog
+	- photocache: do not save filename for cached photos
+	- pubcrawl: save local comment activitypub payload in iconfig to be used for relay
+	- flashcards: UI improvements in box settings
+	- pubcrawl: implement profile update messages
+	- pubcrawl: use URI instead of object for actor
+	- flashcards: fix jumping sync button
+	- pubcrawl: add threaded comments support
+	- pubcrawl: ignore target encoding errors
+	- pubcrawl: format photo items for activitypub
+
+
 Hubzilla 4.0.3 (2019-04-26)
 	- Add attachments to zot6 event objects
 	- Add zot6 to federated transports 
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 9bf987027..976ed22fa 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -2766,7 +2766,7 @@ class Libzot {
 
 			$profile['description']   = $p[0]['pdesc'];
 			$profile['birthday']      = $p[0]['dob'];
-			if(($profile['birthday'] != '0000-00-00') && (($bd = z_birthday($p[0]['dob'],$e['channel_timezone'])) !== ''))
+			if(($profile['birthday'] != '0000-00-00') && (($bd = z_birthday($p[0]['dob'],'UTC')) !== ''))
 				$profile['next_birthday'] = $bd;
 
 			if($age = age($p[0]['dob'],$e['channel_timezone'],''))
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php
index 70098a2a1..49489f912 100644
--- a/Zotlabs/Module/Cal.php
+++ b/Zotlabs/Module/Cal.php
@@ -84,6 +84,7 @@ class Cal extends \Zotlabs\Web\Controller {
 			'$module_url' => '/cal/' . $channel['channel_address'],
 			'$modparams' => 2,
 			'$lang' => \App::$language,
+			'$timezone' => date_default_timezone_get(),
 			'$first_day' => $first_day
 		));
 	
@@ -215,8 +216,8 @@ class Cal extends \Zotlabs\Web\Controller {
 				$sql_extra .= " and etype != 'birthday' ";
 
 			if (x($_GET,'id')){
-			  	$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
-	                                from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d $sql_extra limit 1",
+				$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
+					from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d $sql_extra limit 1",
 					intval($channel['channel_id']),
 					intval($_GET['id'])
 				);
@@ -227,12 +228,12 @@ class Cal extends \Zotlabs\Web\Controller {
 				// Noting this for now - it will need to be fixed here and in Friendica.
 				// Ultimately the finish date shouldn't be involved in the query. 
 	
-				$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
-	                              from event left join item on event_hash = resource_id 
-					where resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored 
-					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
-					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) $sql_extra ",
-					intval($channel['channel_id']),
+				$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
+					from event left join item on event.event_hash = item.resource_id 
+					where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored 
+					AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' ) 
+					OR  (  event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )) ",
+					intval(local_channel()),
 					dbesc($start),
 					dbesc($finish),
 					dbesc($adjust_start),
@@ -266,16 +267,23 @@ class Cal extends \Zotlabs\Web\Controller {
 			if($r) {
 	
 				foreach($r as $rr) {
-					
-					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
-					$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt));
+
+					$tz = get_iconfig($rr, 'event', 'timezone');
+
+					if(! $tz)
+						$tz = 'UTC';
+
+					$rr['timezone'] = $tz;
+
+					$j = (($rr['adjust']) ? datetime_convert($tz,date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
+					$d = (($rr['adjust']) ? datetime_convert($tz,date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt));
 					$d = day_translate($d);
 					
-					$start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c'));
+					$start = (($rr['adjust']) ? datetime_convert($tz,date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c'));
 					if ($rr['nofinish']){
 						$end = null;
 					} else {
-						$end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtend'], 'c') : datetime_convert('UTC','UTC',$rr['dtend'],'c'));
+						$end = (($rr['adjust']) ? datetime_convert($tz,date_default_timezone_get(),$rr['dtend'], 'c') : datetime_convert('UTC','UTC',$rr['dtend'],'c'));
 					}
 					
 					
@@ -302,7 +310,7 @@ class Cal extends \Zotlabs\Web\Controller {
 						'start'=> $start,
 						'end' => $end,
 						'drop' => $drop,
-						'allDay' => false,
+						'allDay' => (($rr['adjust']) ? 0 : 1),
 						'title' => $title,
 						
 						'j' => $j,
diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index 6b4f57ea5..de639e281 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -271,11 +271,17 @@ class Cdav extends Controller {
 				if(!cdav_perms($id[0],$calendars,true))
 					return;
 
+				$timezone = ((x($_POST,'timezone_select')) ? escape_tags(trim($_POST['timezone_select'])) : '');
+				$tz = (($timezone) ? $timezone : date_default_timezone_get());
+
+				$allday = $_REQUEST['allday'];
+
 				$title = $_REQUEST['title'];
-				$start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']);
+				$start = datetime_convert($tz, 'UTC', $_REQUEST['dtstart']);
 				$dtstart = new \DateTime($start);
+
 				if($_REQUEST['dtend']) {
-					$end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']);
+					$end = datetime_convert($tz, 'UTC', $_REQUEST['dtend']);
 					$dtend = new \DateTime($end);
 				}
 				$description = $_REQUEST['description'];
@@ -301,16 +307,23 @@ class Cdav extends Controller {
 					'DTSTART' => $dtstart
 				    ]
 				]);
+
 				if($dtend) {
 					$vcalendar->VEVENT->add('DTEND', $dtend);
-					$vcalendar->VEVENT->DTEND['TZID'] = App::$timezone;
+					if($allday)
+						$vcalendar->VEVENT->DTEND['VALUE'] = 'DATE';
+					else
+						$vcalendar->VEVENT->DTEND['TZID'] = $tz;
 				}
 				if($description)
 					$vcalendar->VEVENT->add('DESCRIPTION', $description);
 				if($location)
 					$vcalendar->VEVENT->add('LOCATION', $location);
 
-				$vcalendar->VEVENT->DTSTART['TZID'] = App::$timezone;
+				if($allday)
+					$vcalendar->VEVENT->DTSTART['VALUE'] = 'DATE';
+				else
+					$vcalendar->VEVENT->DTSTART['TZID'] = $tz;
 
 				$calendarData = $vcalendar->serialize();
 
@@ -348,12 +361,17 @@ class Cdav extends Controller {
 				if(!cdav_perms($id[0],$calendars,true))
 					return;
 
+				$timezone = ((x($_POST,'timezone_select')) ? escape_tags(trim($_POST['timezone_select'])) : '');
+				$tz = (($timezone) ? $timezone : date_default_timezone_get());
+
+				$allday = $_REQUEST['allday'];
+
 				$uri = $_REQUEST['uri'];
 				$title = $_REQUEST['title'];
-				$start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']);
+				$start = datetime_convert($tz, 'UTC', $_REQUEST['dtstart']);
 				$dtstart = new \DateTime($start);
 				if($_REQUEST['dtend']) {
-					$end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']);
+					$end = datetime_convert($tz, 'UTC', $_REQUEST['dtend']);
 					$dtend = new \DateTime($end);
 				}
 				$description = $_REQUEST['description'];
@@ -365,12 +383,23 @@ class Cdav extends Controller {
 
 				if($title)
 					$vcalendar->VEVENT->SUMMARY = $title;
-				if($dtstart)
+				if($dtstart) {
 					$vcalendar->VEVENT->DTSTART = $dtstart;
-				if($dtend)
+					if($allday)
+						$vcalendar->VEVENT->DTSTART['VALUE'] = 'DATE';
+					else
+						$vcalendar->VEVENT->DTSTART['TZID'] = $tz;
+				}
+				if($dtend) {
 					$vcalendar->VEVENT->DTEND = $dtend;
+					if($allday)
+						$vcalendar->VEVENT->DTEND['VALUE'] = 'DATE';
+					else
+						$vcalendar->VEVENT->DTEND['TZID'] = $tz;
+				}
 				else
 					unset($vcalendar->VEVENT->DTEND);
+
 				if($description)
 					$vcalendar->VEVENT->DESCRIPTION = $description;
 				if($location)
@@ -406,11 +435,16 @@ class Cdav extends Controller {
 				if(!cdav_perms($id[0],$calendars,true))
 					return;
 
+				$timezone = ((x($_POST,'timezone_select')) ? escape_tags(trim($_POST['timezone_select'])) : '');
+				$tz = (($timezone) ? $timezone : date_default_timezone_get());
+
+				$allday = $_REQUEST['allday'];
+
 				$uri = $_REQUEST['uri'];
-				$start = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtstart']);
+				$start = datetime_convert($tz, 'UTC', $_REQUEST['dtstart']);
 				$dtstart = new \DateTime($start);
 				if($_REQUEST['dtend']) {
-					$end = datetime_convert(App::$timezone, 'UTC', $_REQUEST['dtend']);
+					$end = datetime_convert($tz, 'UTC', $_REQUEST['dtend']);
 					$dtend = new \DateTime($end);
 				}
 
@@ -420,13 +454,20 @@ class Cdav extends Controller {
 
 				if($dtstart) {
 					$vcalendar->VEVENT->DTSTART = $dtstart;
+					if($allday)
+						$vcalendar->VEVENT->DTSTART['VALUE'] = 'DATE';
+					else
+						$vcalendar->VEVENT->DTSTART['TZID'] = $tz;
 				}
 				if($dtend) {
 					$vcalendar->VEVENT->DTEND = $dtend;
+					if($allday)
+						$vcalendar->VEVENT->DTEND['VALUE'] = 'DATE';
+					else
+						$vcalendar->VEVENT->DTEND['TZID'] = $tz;
 				}
-				else {
+				else
 					unset($vcalendar->VEVENT->DTEND);
-				}
 
 				$calendarData = $vcalendar->serialize();
 
@@ -915,8 +956,13 @@ class Cdav extends Controller {
 					xchan_query($r);
 					$r = fetch_post_tags($r,true);
 
-					$r[0]['dtstart'] = (($r[0]['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$r[0]['dtstart'], 'c') : datetime_convert('UTC','UTC',$r[0]['dtstart'],'c'));
-					$r[0]['dtend'] = (($r[0]['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$r[0]['dtend'], 'c') : datetime_convert('UTC','UTC',$r[0]['dtend'],'c'));
+					$tz = get_iconfig($r[0], 'event', 'timezone');
+					if(! $tz)
+						$tz = 'UTC';
+
+					$r[0]['timezone'] = $tz;
+					$r[0]['dtstart'] = (($r[0]['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $r[0]['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $r[0]['dtstart'], 'c'));
+					$r[0]['dtend'] = (($r[0]['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $r[0]['dtend'], 'c') : datetime_convert('UTC', 'UTC' ,$r[0]['dtend'], 'c'));
 
 					$r[0]['plink'] = [$r[0]['plink'], t('Link to source')];
 
@@ -984,9 +1030,11 @@ class Cdav extends Controller {
 			$first_day = feature_enabled(local_channel(), 'cal_first_day');
 			$first_day = (($first_day) ? $first_day : 0);
 
-			$title = ['title', t('Event title')];
+			$title = ['title', t('Event title') ];
 			$dtstart = ['dtstart', t('Start date and time')];
 			$dtend = ['dtend', t('End date and time')];
+			$timezone_select = ['timezone_select' , t('Timezone:'), date_default_timezone_get(), '', get_timezones()];
+
 			$description = ['description', t('Description')];
 			$location = ['location', t('Location')];
 
@@ -1000,14 +1048,13 @@ class Cdav extends Controller {
 			//$acl = (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream')));
 			$acl = populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'));
 
-			//$permissions = ((x($orig_event)) ? $orig_event : $perm_defaults);
-			$permissions = $perm_defaults;
+			$permissions = (($resource_id) ? $resource : $perm_defaults);
 
 			$o .= replace_macros(get_markup_template('cdav_calendar.tpl'), [
 				'$sources' => $sources,
 				'$color' => $color,
 				'$lang' => App::$language,
-				'$timezone' => App::$timezone,
+				'$timezone' => date_default_timezone_get(),
 				'$first_day' => $first_day,
 				'$prev'	=> t('Previous'),
 				'$next'	=> t('Next'),
@@ -1047,7 +1094,8 @@ class Cdav extends Controller {
 				'$categories_label' => t('Categories'),
 
 				'$resource' => json_encode($resource),
-				'$categories' => $categories
+				'$categories' => $categories,
+				'$timezone_select' => ((feature_enabled(local_channel(),'event_tz_select')) ? $timezone_select : '')
 			]);
 
 			return $o;
@@ -1076,8 +1124,8 @@ class Cdav extends Controller {
 			$filters['comp-filters'][0]['time-range']['end'] = $end;
 
 			$uris = $caldavBackend->calendarQuery($id, $filters);
-
 			if($uris) {
+
 				$objects = $caldavBackend->getMultipleCalendarObjects($id, $uris);
 				foreach($objects as $object) {
 
@@ -1096,30 +1144,33 @@ class Cdav extends Controller {
 						$dtend = (string)$vevent->DTEND;
 						$description = (string)$vevent->DESCRIPTION;
 						$location = (string)$vevent->LOCATION;
-						$timezone = (string)$vevent->DTSTART['TZID'];
+						$timezone_str = (string)$vevent->DTSTART['TZID'];
 						$rw = ((cdav_perms($id[0],$calendars,true)) ? true : false);
 						$editable = $rw ? true : false;
 						$recurrent = ((isset($vevent->{'RECURRENCE-ID'})) ? true : false);
 
 						if($recurrent) {
 							$editable = false;
-							$timezone = $recurrent_timezone;
+							$timezone_str = $recurrent_timezone;
 						}
 
-						$allDay = false;
+						// Try to get an usable olson format timezone
+						$timezone_obj = \Sabre\VObject\TimeZoneUtil::getTimeZone($timezone_str, $vcalendar);
+						$timezone = $timezone_obj->getName();
+
+						// If we got nothing fallback to UTC
+						if(! $timezone)
+							$timezone = 'UTC';
 
-						// allDay event rules
-						if(!strpos($dtstart, 'T') && !strpos($dtend, 'T'))
-							$allDay = true;
-						if(strpos($dtstart, 'T000000') && strpos($dtend, 'T000000'))
-							$allDay = true;
+						$allDay = (((string)$vevent->DTSTART['VALUE'] == 'DATE') ? true : false);
 
 						$events[] = [
 							'calendar_id' => $id,
 							'uri' => $object['uri'],
 							'title' => $title,
-							'start' => datetime_convert($timezone, $timezone, $dtstart, 'c'),
-							'end' => (($dtend) ? datetime_convert($timezone, $timezone, $dtend, 'c') : ''),
+							'timezone' => $timezone,
+							'start' => datetime_convert($timezone, date_default_timezone_get(), $dtstart, 'c'),
+							'end' => (($dtend) ? datetime_convert($timezone, date_default_timezone_get(), $dtend, 'c') : ''),
 							'description' => $description,
 							'location' => $location,
 							'allDay' => $allDay,
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index 9229e6eb2..13f879d84 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -22,52 +22,20 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 	
 		$xchan = ((x($_POST,'xchan')) ? dbesc($_POST['xchan']) : '');
 		$uid      = local_channel();
-	
-		$start_text = escape_tags($_REQUEST['dtstart']);
-		$finish_text = escape_tags($_REQUEST['dtend']);
-
-		$adjust   = intval($_POST['adjust']);
-		$nofinish = intval($_POST['nofinish']);
-	
-		$timezone = ((x($_POST,'timezone_select')) ? notags(trim($_POST['timezone_select']))     : '');
-
-		$tz = (($timezone) ? $timezone : date_default_timezone_get());
 
-		$categories = escape_tags(trim($_POST['categories']));
-	
 		// only allow editing your own events. 
-	
 		if(($xchan) && ($xchan !== get_observer_hash()))
 			return;
-	
-		if($start_text) {
-			$start = $start_text;
-		}
-		else {
-			$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
-		}
 
-		if($finish_text) {
-			$finish = $finish_text;
-		}
-		else {
-			$finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
-		}
+		$timezone = ((x($_POST,'timezone_select')) ? escape_tags(trim($_POST['timezone_select'])) : '');
+		$tz = (($timezone) ? $timezone : date_default_timezone_get());
 
-		if($nofinish) {
-			$finish = NULL_DATE;
-		}
+		$categories = escape_tags(trim($_POST['categories']));
+		
+		$adjust = intval($_POST['adjust']);
 
-		if($adjust) {
-			$start = datetime_convert($tz,'UTC',$start);
-			if(! $nofinish)
-				$finish = datetime_convert($tz,'UTC',$finish);
-		}
-		else {
-			$start = datetime_convert('UTC','UTC',$start);
-			if(! $nofinish)
-				$finish = datetime_convert('UTC','UTC',$finish);
-		}
+		$start = (($adjust) ? datetime_convert($tz, 'UTC', escape_tags($_REQUEST['dtstart'])) : datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtstart'])));
+		$finish = (($adjust) ? datetime_convert($tz, 'UTC', escape_tags($_REQUEST['dtend'])) : datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtend'])));
 
 		$summary  = escape_tags(trim($_POST['summary']));
 		$desc     = escape_tags(trim($_POST['desc']));
@@ -176,7 +144,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 		$datarray['location'] = $location;
 		$datarray['etype'] = $type;
 		$datarray['adjust'] = $adjust;
-		$datarray['nofinish'] = $nofinish;
+		$datarray['nofinish'] = 0;
 		$datarray['uid'] = local_channel();
 		$datarray['account'] = get_account_id();
 		$datarray['event_xchan'] = $channel['channel_hash'];
@@ -188,6 +156,8 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 		$datarray['id'] = $event_id;
 		$datarray['created'] = $created;
 		$datarray['edited'] = $edited;
+		$datarray['timezone'] = $tz;
+
 	
 		if(intval($_REQUEST['preview'])) {
 			$html = format_event_html($datarray);
@@ -322,10 +292,9 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 	
 			$start  = datetime_convert('UTC','UTC',$start);
 			$finish = datetime_convert('UTC','UTC',$finish);
-	
 			$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
 			$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
-	
+
 			if (x($_GET,'id')){
 			  	$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
 	                                from event left join item on item.resource_id = event.event_hash
@@ -357,13 +326,11 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 					dbesc($adjust_start),
 					dbesc($adjust_finish)
 				);
-
 			}
 	
 			if($r && ! $export) {
 				xchan_query($r);
 				$r = fetch_post_tags($r,true);
-
 				$r = sort_by_date($r);
 			}
 
@@ -373,17 +340,16 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 	
 				foreach($r as $rr) {
 
-					$start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c'));
+					$tz = get_iconfig($rr, 'event', 'timezone');
+
+					if(! $tz)
+						$tz = 'UTC';
+
+					$start = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtstart'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtstart'], 'c'));
 					if ($rr['nofinish']){
 						$end = null;
 					} else {
-						$end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtend'], 'c') : datetime_convert('UTC','UTC',$rr['dtend'],'c'));
-
-						// give a fake end to birthdays so they get crammed into a 
-						// single day on the calendar
-
-						if($rr['etype'] === 'birthday')
-							$end = null;
+						$end = (($rr['adjust']) ? datetime_convert($tz, date_default_timezone_get(), $rr['dtend'], 'c') : datetime_convert('UTC', 'UTC', $rr['dtend'], 'c'));
 					}
 
 					$catsenabled = feature_enabled(local_channel(),'categories');
@@ -399,14 +365,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 						}
 					}
 
-					$allDay = false;
-
-					// allDay event rules
-					if(!strpos($start, 'T') && !strpos($end, 'T'))
-						$allDay = true;
-					if(strpos($start, 'T00:00:00') && strpos($end, 'T00:00:00'))
-						$allDay = true;
-
 					$edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','') : false);
 	
 					$drop = array(z_root().'/events/drop/'.$rr['event_hash'],t('Delete event'),'','');
@@ -416,13 +374,14 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
 						'rw' => true,
 						'id'=>$rr['id'],
 						'uri' => $rr['event_hash'],
+						'timezone' => $tz,
 						'start'=> $start,
 						'end' => $end,
 						'drop' => $drop,
-						'allDay' => $allDay,
+						'allDay' => (($rr['adjust']) ? 0 : 1),
 						'title' => htmlentities($rr['summary'], ENT_COMPAT, 'UTF-8', false),
 						'editable' => $edit ? true : false,
-						'item'=>$rr,
+						'item' => $rr,
 						'plink' => [$rr['plink'], t('Link to source')],
 						'description' => htmlentities($rr['description'], ENT_COMPAT, 'UTF-8', false),
 						'location' => htmlentities($rr['location'], ENT_COMPAT, 'UTF-8', false),
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 502f96a62..169dc6de1 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -293,9 +293,9 @@ class Wiki extends Controller {
 				}
 
 				//$wikiheaderName = urldecode($wikiUrlName);
-				$wikiheaderName = NativeWiki::name_decode($wikiUrlName);
+				$wikiheaderName = escape_tags(NativeWiki::name_decode($wikiUrlName));
 				//$wikiheaderPage = urldecode($pageUrlName);
-				$wikiheaderPage = NativeWiki::name_decode($pageUrlName);
+				$wikiheaderPage = escape_tags(NativeWiki::name_decode($pageUrlName));
 
 				$renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page'));
 				$sharePage  = t('Share');
@@ -373,13 +373,13 @@ class Wiki extends Controller {
 
 		$placeholder = t('Short description of your changes (optional)');
 
-		$zrl = urlencode( z_root() . '/wiki/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName) . '/' . NativeWiki::name_encode($pageUrlName) );
+		$zrl = z_root() . '/wiki/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName) . '/' . NativeWiki::name_encode($pageUrlName);
 		$o .= replace_macros(get_markup_template('wiki.tpl'),array(
 			'$wikiheaderName' => $wikiheaderName,
 			'$wikiheaderPage' => $wikiheaderPage,
 			'$renamePage' => $renamePage,
 			'$sharePage' => $sharePage,
-			'$shareLink' => '#^[zrl=' . $zrl . ']' . '[ ' . $owner['channel_name'] . ' ] ' . $wikiheaderName . ' - ' . $wikiheaderPage . '[/zrl]',
+			'$shareLink' => urlencode('#^[zrl=' . $zrl . ']' . '[ ' . $owner['channel_name'] . ' ] ' . $wikiheaderName . ' - ' . $wikiheaderPage . '[/zrl]'),
 			'$showPageControls' => $showPageControls,
 			'$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')),
 			'$tools_label' => 'Page Tools',
diff --git a/Zotlabs/Photo/PhotoDriver.php b/Zotlabs/Photo/PhotoDriver.php
index bacf926ff..146ef0ae4 100644
--- a/Zotlabs/Photo/PhotoDriver.php
+++ b/Zotlabs/Photo/PhotoDriver.php
@@ -509,7 +509,7 @@ abstract class PhotoDriver {
 	    $arr['imgscale'] = $scale;
 
 		if(boolval(get_config('system','filesystem_storage_thumbnails', 0)) && $scale > 0) {
-			$channel = \App::get_channel();
+			$channel = channelx_by_n($arr['uid']);
 			$arr['os_storage'] = 1;
 			$arr['os_syspath'] = 'store/' . $channel['channel_address'] . '/' . $arr['os_path'] . '-' . $scale;
 			if(! $this->saveImage($arr['os_syspath']))
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
index 6ac1c48a6..95b349b3d 100644
--- a/Zotlabs/Widget/Notifications.php
+++ b/Zotlabs/Widget/Notifications.php
@@ -69,7 +69,7 @@ class Notifications {
 				'label' => t('New Events'),
 				'title' => t('New Events Notifications'),
 				'viewall' => [
-					'url' => 'events',
+					'url' => 'cdav/calendar',
 					'label' => t('View events')
 				],
 				'markall' => [
diff --git a/boot.php b/boot.php
index 1b13b335a..e76440e10 100755
--- a/boot.php
+++ b/boot.php
@@ -84,7 +84,8 @@ define ( 'DIRECTORY_FALLBACK_MASTER',  'https://zotadel.net');
 
 $DIRECTORY_FALLBACK_SERVERS = array(
 	'https://zotadel.net',
-	'https://zotsite.net'
+	'https://zotsite.net',
+	'https://hub.netzgemeinde.eu'
 );
 
 
diff --git a/include/datetime.php b/include/datetime.php
index 3a07f1ccf..ef0927ea4 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -516,13 +516,14 @@ function update_birthdays() {
 				'event_xchan' => $rr['xchan_hash'],
 				'dtstart'     => datetime_convert('UTC', 'UTC', $rr['abook_dob']),
 				'dtend'       => datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day '),
-				'adjust'      => intval(feature_enabled($rr['abook_channel'],'smart_birthdays')),
+				'adjust'      => 0,
 				'summary'     => sprintf( t('%1$s\'s birthday'), $rr['xchan_name']),
 				'description' => sprintf( t('Happy Birthday %1$s'), '[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]'),
 				'etype'       => 'birthday',
 			];
 
 			$z = event_store_event($ev);
+
 			if ($z) {
 				$item_id = event_store_item($ev, $z);
 				q("update abook set abook_dob = '%s' where abook_id = %d",
diff --git a/include/event.php b/include/event.php
index 471fb7afa..de4e692b8 100644
--- a/include/event.php
+++ b/include/event.php
@@ -27,6 +27,7 @@ function format_event_html($ev) {
 	if(! ((is_array($ev)) && count($ev)))
 		return '';
 
+	$tz = (($ev['timezone']) ? $ev['timezone'] : 'UTC');
 
 	$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8:01 AM
 
@@ -39,7 +40,7 @@ function format_event_html($ev) {
 	$o .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
 		. datetime_convert('UTC', 'UTC', $ev['dtstart'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
 		. '" >'
-		. (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
+		. (($ev['adjust']) ? day_translate(datetime_convert($tz, date_default_timezone_get(),
 			$ev['dtstart'] , $bd_format ))
 			:  day_translate(datetime_convert('UTC', 'UTC',
 			$ev['dtstart'] , $bd_format)))
@@ -49,7 +50,7 @@ function format_event_html($ev) {
 		$o .= '<div class="event-end" ><span class="event-label">' . t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
 			. datetime_convert('UTC','UTC',$ev['dtend'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
 			. '" >'
-			. (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
+			. (($ev['adjust']) ? day_translate(datetime_convert($tz, date_default_timezone_get(),
 				$ev['dtend'] , $bd_format ))
 				:  day_translate(datetime_convert('UTC', 'UTC',
 				$ev['dtend'] , $bd_format )))
@@ -75,17 +76,35 @@ function format_event_obj($jobject) {
 	//ensure compatibility with older items - this check can be removed at a later point
 	if(array_key_exists('description', $object)) {
 
-		$bd_format = t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8:01 AM
+		$tz = (($object['timezone']) ? $object['timezone'] : 'UTC');
+		$allday = (($object['adjust']) ? false : true);
+
+		$dtstart = new DateTime($object['dtstart']);
+		$dtend = new DateTime($object['dtend']);
+		$dtdiff = $dtstart->diff($dtend);
+
+		if($allday && ($dtdiff->days < 2))
+			$oneday = true;
+
+		if($allday && !$oneday) {
+			// Subtract one day from the end date so we can use the "first day - last day" format for display.
+			$dtend->modify('-1 day');
+			$object['dtend'] = datetime_convert('UTC', 'UTC', $dtend->format('Y-m-d H:i:s'));
+		}
+
+		$bd_format = (($allday) ? t('l F d, Y') : t('l F d, Y \@ g:i A')); // Friday January 18, 2011 @ 8:01 AM or Friday January 18, 2011 for allday events
 
 		$event['header'] = replace_macros(get_markup_template('event_item_header.tpl'),array(
 			'$title'	 => zidify_links(smilies(bbcode($object['title']))),
-			'$dtstart_label' => t('Starts:'),
-			'$dtstart_title' => datetime_convert('UTC', 'UTC', $object['dtstart'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )),
-			'$dtstart_dt'	 => (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $object['dtstart'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $object['dtstart'] , $bd_format))),
+			'$dtstart_label' => t('Start:'),
+			'$dtstart_title' => datetime_convert($tz, date_default_timezone_get(), $object['dtstart'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )),
+			'$dtstart_dt'	 => (($object['adjust']) ? day_translate(datetime_convert($tz, date_default_timezone_get(), $object['dtstart'] , $bd_format )) : day_translate(datetime_convert('UTC', 'UTC', $object['dtstart'] , $bd_format))),
 			'$finish'	 => (($object['nofinish']) ? false : true),
-			'$dtend_label'	 => t('Finishes:'),
-			'$dtend_title'	 => datetime_convert('UTC','UTC',$object['dtend'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )),
-			'$dtend_dt'	 => (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $object['dtend'] , $bd_format )) :  day_translate(datetime_convert('UTC', 'UTC', $object['dtend'] , $bd_format )))
+			'$dtend_label'	 => t('End:'),
+			'$dtend_title'	 => datetime_convert($tz, date_default_timezone_get(), $object['dtend'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )),
+			'$dtend_dt'	 => (($object['adjust']) ? day_translate(datetime_convert($tz, date_default_timezone_get(), $object['dtend'] , $bd_format )) :  day_translate(datetime_convert('UTC', 'UTC', $object['dtend'] , $bd_format ))),
+			'$allday'	 => $allday,
+			'$oneday'	 => $oneday
 		));
 
 		$event['content'] = replace_macros(get_markup_template('event_item_content.tpl'),array(
@@ -1042,6 +1061,7 @@ function event_store_item($arr, $event) {
 			'type'    => ACTIVITY_OBJ_EVENT,
 			'id'      => z_root() . '/event/' . $r[0]['resource_id'],
 			'title'   => $arr['summary'],
+			'timezone' => $arr['timezone'],
 			'dtstart' => $arr['dtstart'],
 			'dtend'  => $arr['dtend'],
 			'nofinish'  => $arr['nofinish'],
@@ -1107,6 +1127,8 @@ function event_store_item($arr, $event) {
 		}
 
 		$item_id = $r[0]['id'];
+		set_iconfig($item_id, 'event', 'timezone', $arr['timezone'], true);
+
 		/**
 		 * @hooks event_updated
 		 *   Called when an event record is modified.
@@ -1197,6 +1219,7 @@ function event_store_item($arr, $event) {
 				'type'    => ACTIVITY_OBJ_EVENT,
 				'id'      => z_root() . '/event/' . $event['event_hash'],
 				'title'   => $arr['summary'],
+				'timezone' => $arr['timezone'],
 				'dtstart' => $arr['dtstart'],
 				'dtend'  => $arr['dtend'],
 				'nofinish'  => $arr['nofinish'],
@@ -1223,6 +1246,7 @@ function event_store_item($arr, $event) {
 		// activities refer to the item message_id as the parent. 
 
 		set_iconfig($item_arr, 'system','event_id',$event['event_hash'],true);
+		set_iconfig($item_arr, 'event','timezone',$arr['timezone'],true);
 
 		$res = item_store($item_arr);
 
diff --git a/include/features.php b/include/features.php
index d8607f447..9528d3418 100644
--- a/include/features.php
+++ b/include/features.php
@@ -87,6 +87,14 @@ function get_features($filtered = true, $level = (-1)) {
 				t('Default is Sunday'),
 				false,
 				get_config('feature_lock','cal_first_day')
+			],
+
+			[
+				'event_tz_select',
+				t('Event Timezone Selection'),
+				t('Allow event creation in timezones other than your own.'),
+				false,
+				get_config('feature_lock','event_tz_select'),
 			]
 
 		],
@@ -282,22 +290,6 @@ function get_features($filtered = true, $level = (-1)) {
 				t('Default is Sunday'),
 				false,
 				get_config('feature_lock','events_cal_first_day')
-			],
-
-			[
-				'smart_birthdays',
-				t('Smart Birthdays'),
-				t('Make birthday events timezone aware in case your friends are scattered across the planet.'),
-				true,
-				get_config('feature_lock','smart_birthdays'),
-			],
-
-			[
-				'event_tz_select',
-				t('Event Timezone Selection'),
-				t('Allow event creation in timezones other than your own.'),
-				false,
-				get_config('feature_lock','event_tz_select'),
 			]
 
 		],
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 1a03fbdaf..c916421b8 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -219,8 +219,7 @@ function html2bbcode($message)
 
 	$message = $doc->saveHTML();
 
-	// I'm removing something really disturbing
-	// Don't know exactly what it is
+	// I'm removing the UTF-8 encoding of a NO-BREAK SPACE codepoint
 	$message = str_replace(chr(194).chr(160), ' ', $message);
 
 	$message = str_replace("&nbsp;", " ", $message);
diff --git a/include/markdown.php b/include/markdown.php
index 2513a7d77..7d1f16958 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -76,6 +76,8 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) {
 
 	$s = html2bbcode($s);
 
+	$s = bb_code_protect($s);
+
 	// Convert everything that looks like a link to a link
 	if($use_zrl) {
 		if (strpos($s,'[/img]') !== false) {
@@ -88,6 +90,8 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) {
 		$s = preg_replace("/([^\]\=\{\/]|^)(https?\:\/\/)([a-zA-Z0-9\pL\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ismu", '$1[url=$2$3]$2$3[/url]',$s);
 	}
 
+	$s = bb_code_unprotect($s);
+
 	// remove duplicate adjacent code tags
 	$s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s);
 
diff --git a/include/zot.php b/include/zot.php
index b99eeb1ec..a37b7cdb5 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -4430,7 +4430,7 @@ function zotinfo($arr) {
 
 		$profile['description']   = $p[0]['pdesc'];
 		$profile['birthday']      = $p[0]['dob'];
-		if(($profile['birthday'] != '0000-00-00') && (($bd = z_birthday($p[0]['dob'],$e['channel_timezone'])) !== ''))
+		if(($profile['birthday'] != '0000-00-00') && (($bd = z_birthday($p[0]['dob'],'UTC')) !== ''))
 			$profile['next_birthday'] = $bd;
 
 		if($age = age($p[0]['dob'],$e['channel_timezone'],''))
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index b86c3c737..1444db339 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hubzilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-19 10:11+0100\n"
-"PO-Revision-Date: 2019-02-21 10:14+0000\n"
+"POT-Creation-Date: 2019-05-13 12:07+0200\n"
+"PO-Revision-Date: 2019-05-19 11:03+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@disroot.org>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/hubzilla/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,6 @@ msgstr ""
 "Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
-
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
 msgstr "Pueden verse la actividad y publicaciones de mi canal"
@@ -158,12 +157,12 @@ msgid "Special - Group Repository"
 msgstr "Especial - Repositorio de grupo"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:306
-#: ../../Zotlabs/Module/Cdav.php:1227 ../../Zotlabs/Module/Connedit.php:935
+#: ../../Zotlabs/Module/Cdav.php:1335 ../../Zotlabs/Module/Connedit.php:935
 #: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:60
 #: ../../include/selectors.php:77 ../../include/selectors.php:115
-#: ../../include/selectors.php:151 ../../include/event.php:1327
-#: ../../include/event.php:1334 ../../include/connections.php:703
-#: ../../include/connections.php:710
+#: ../../include/selectors.php:151 ../../include/event.php:1336
+#: ../../include/event.php:1343 ../../include/connections.php:730
+#: ../../include/connections.php:737
 msgid "Other"
 msgstr "Otro"
 
@@ -178,8 +177,8 @@ msgstr "Modo personalizado/experto"
 #: ../../Zotlabs/Module/Menu.php:91 ../../Zotlabs/Module/Layouts.php:31
 #: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Cards.php:42
 #: ../../Zotlabs/Module/Webpages.php:39
-#: ../../Zotlabs/Module/Filestorage.php:51
-#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1253
+#: ../../Zotlabs/Module/Filestorage.php:53
+#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1319
 msgid "Requested profile is not available."
 msgstr "El perfil solicitado no está disponible."
 
@@ -187,14 +186,14 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../Zotlabs/Module/Invite.php:21 ../../Zotlabs/Module/Invite.php:102
 #: ../../Zotlabs/Module/Articles.php:88 ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:168
-#: ../../Zotlabs/Module/Channel.php:335 ../../Zotlabs/Module/Channel.php:374
+#: ../../Zotlabs/Module/Channel.php:331 ../../Zotlabs/Module/Channel.php:370
 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87
 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Events.php:271
 #: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:20
 #: ../../Zotlabs/Module/Article_edit.php:51
 #: ../../Zotlabs/Module/New_channel.php:105
 #: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
+#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:206
 #: ../../Zotlabs/Module/Moderate.php:13
 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280
 #: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341
@@ -205,14 +204,15 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:59
 #: ../../Zotlabs/Module/Wiki.php:285 ../../Zotlabs/Module/Wiki.php:428
 #: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Poke.php:157
-#: ../../Zotlabs/Module/Profile_photo.php:302
-#: ../../Zotlabs/Module/Profile_photo.php:315
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:376
-#: ../../Zotlabs/Module/Item.php:395 ../../Zotlabs/Module/Item.php:405
-#: ../../Zotlabs/Module/Item.php:1281 ../../Zotlabs/Module/Page.php:34
+#: ../../Zotlabs/Module/Profile_photo.php:336
+#: ../../Zotlabs/Module/Profile_photo.php:349
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:397
+#: ../../Zotlabs/Module/Item.php:416 ../../Zotlabs/Module/Item.php:426
+#: ../../Zotlabs/Module/Item.php:1302 ../../Zotlabs/Module/Page.php:34
 #: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:399
 #: ../../Zotlabs/Module/Chat.php:115 ../../Zotlabs/Module/Chat.php:120
 #: ../../Zotlabs/Module/Menu.php:129 ../../Zotlabs/Module/Menu.php:140
+#: ../../Zotlabs/Module/Channel_calendar.php:230
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Cloud.php:40
 #: ../../Zotlabs/Module/Defperms.php:181 ../../Zotlabs/Module/Group.php:14
@@ -227,14 +227,15 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:80
 #: ../../Zotlabs/Module/Like.php:187 ../../Zotlabs/Module/Suggest.php:32
 #: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146
-#: ../../Zotlabs/Module/Register.php:77
-#: ../../Zotlabs/Module/Cover_photo.php:313
-#: ../../Zotlabs/Module/Cover_photo.php:326
-#: ../../Zotlabs/Module/Display.php:446 ../../Zotlabs/Module/Network.php:19
-#: ../../Zotlabs/Module/Filestorage.php:15
-#: ../../Zotlabs/Module/Filestorage.php:70
-#: ../../Zotlabs/Module/Filestorage.php:96
-#: ../../Zotlabs/Module/Filestorage.php:140 ../../Zotlabs/Module/Common.php:38
+#: ../../Zotlabs/Module/Register.php:80
+#: ../../Zotlabs/Module/Cover_photo.php:347
+#: ../../Zotlabs/Module/Cover_photo.php:360
+#: ../../Zotlabs/Module/Display.php:451 ../../Zotlabs/Module/Network.php:19
+#: ../../Zotlabs/Module/Filestorage.php:17
+#: ../../Zotlabs/Module/Filestorage.php:72
+#: ../../Zotlabs/Module/Filestorage.php:90
+#: ../../Zotlabs/Module/Filestorage.php:113
+#: ../../Zotlabs/Module/Filestorage.php:160 ../../Zotlabs/Module/Common.php:38
 #: ../../Zotlabs/Module/Viewconnections.php:28
 #: ../../Zotlabs/Module/Viewconnections.php:33
 #: ../../Zotlabs/Module/Service_limits.php:11
@@ -245,11 +246,11 @@ msgstr "El perfil solicitado no está disponible."
 #: ../../addon/flashcards/Mod_Flashcards.php:167
 #: ../../addon/openid/Mod_Id.php:53 ../../addon/pumpio/pumpio.php:44
 #: ../../include/attach.php:150 ../../include/attach.php:199
-#: ../../include/attach.php:272 ../../include/attach.php:381
-#: ../../include/attach.php:395 ../../include/attach.php:402
-#: ../../include/attach.php:484 ../../include/attach.php:1044
-#: ../../include/attach.php:1118 ../../include/attach.php:1283
-#: ../../include/items.php:3781 ../../include/photos.php:27
+#: ../../include/attach.php:272 ../../include/attach.php:380
+#: ../../include/attach.php:394 ../../include/attach.php:401
+#: ../../include/attach.php:483 ../../include/attach.php:1043
+#: ../../include/attach.php:1117 ../../include/attach.php:1280
+#: ../../include/items.php:3801 ../../include/photos.php:27
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
@@ -258,7 +259,7 @@ msgstr "Acceso denegado."
 msgid "Block Name"
 msgstr "Nombre del bloque"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2534
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2558
 msgid "Blocks"
 msgstr "Bloques"
 
@@ -277,12 +278,13 @@ msgid "Edited"
 msgstr "Editado"
 
 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:116
-#: ../../Zotlabs/Module/Cdav.php:1230 ../../Zotlabs/Module/New_channel.php:189
+#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Cdav.php:1338
+#: ../../Zotlabs/Module/New_channel.php:189
 #: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Menu.php:181
 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798
 #: ../../Zotlabs/Module/Cards.php:113 ../../Zotlabs/Module/Webpages.php:254
-#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:390
-#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165
+#: ../../Zotlabs/Storage/Browser.php:282 ../../Zotlabs/Storage/Browser.php:396
+#: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178
 msgid "Create"
 msgstr "Crear"
 
@@ -290,43 +292,43 @@ msgstr "Crear"
 #: ../../Zotlabs/Module/Article_edit.php:99
 #: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Thing.php:266
 #: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:284
-#: ../../Zotlabs/Module/Connections.php:322
-#: ../../Zotlabs/Module/Connections.php:342 ../../Zotlabs/Module/Wiki.php:211
+#: ../../Zotlabs/Module/Connections.php:298
+#: ../../Zotlabs/Module/Connections.php:336
+#: ../../Zotlabs/Module/Connections.php:356 ../../Zotlabs/Module/Wiki.php:211
 #: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Menu.php:175
 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:252
 #: ../../Zotlabs/Module/Editwebpage.php:142
 #: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Card_edit.php:99
-#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Lib/Apps.php:556
-#: ../../Zotlabs/Lib/ThreadItem.php:147 ../../Zotlabs/Storage/Browser.php:290
-#: ../../Zotlabs/Widget/Cdav.php:126 ../../Zotlabs/Widget/Cdav.php:162
-#: ../../include/channel.php:1352 ../../include/channel.php:1356
+#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Lib/Apps.php:557
+#: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Storage/Browser.php:296
+#: ../../Zotlabs/Widget/Cdav.php:138 ../../Zotlabs/Widget/Cdav.php:175
+#: ../../include/channel.php:1418 ../../include/channel.php:1422
 #: ../../include/menu.php:118
 msgid "Edit"
 msgstr "Editar"
 
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1117
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1075
 #: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194
-#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Widget/Cdav.php:124
+#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Widget/Cdav.php:136
 #: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1392
 msgid "Share"
 msgstr "Compartir"
 
 #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
-#: ../../Zotlabs/Module/Cdav.php:942 ../../Zotlabs/Module/Cdav.php:1232
+#: ../../Zotlabs/Module/Cdav.php:1033 ../../Zotlabs/Module/Cdav.php:1340
 #: ../../Zotlabs/Module/Article_edit.php:129
 #: ../../Zotlabs/Module/Admin/Accounts.php:175
 #: ../../Zotlabs/Module/Admin/Channels.php:149
 #: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Thing.php:267
 #: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connections.php:292
-#: ../../Zotlabs/Module/Photos.php:1220 ../../Zotlabs/Module/Connedit.php:668
+#: ../../Zotlabs/Module/Connections.php:306
+#: ../../Zotlabs/Module/Photos.php:1178 ../../Zotlabs/Module/Connedit.php:668
 #: ../../Zotlabs/Module/Connedit.php:940 ../../Zotlabs/Module/Profiles.php:800
 #: ../../Zotlabs/Module/Editwebpage.php:167
 #: ../../Zotlabs/Module/Webpages.php:257
 #: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Module/Oauth.php:174
-#: ../../Zotlabs/Lib/Apps.php:557 ../../Zotlabs/Lib/ThreadItem.php:167
-#: ../../Zotlabs/Storage/Browser.php:291 ../../include/conversation.php:691
+#: ../../Zotlabs/Lib/Apps.php:558 ../../Zotlabs/Lib/ThreadItem.php:168
+#: ../../Zotlabs/Storage/Browser.php:297 ../../include/conversation.php:691
 #: ../../include/conversation.php:736
 msgid "Delete"
 msgstr "Eliminar"
@@ -373,26 +375,25 @@ msgid "Invite App"
 msgstr "Solicitar una app"
 
 #: ../../Zotlabs/Module/Invite.php:110 ../../Zotlabs/Module/Articles.php:51
-#: ../../Zotlabs/Module/Cdav.php:839 ../../Zotlabs/Module/Cdav.php:848
-#: ../../Zotlabs/Module/Permcats.php:62 ../../Zotlabs/Module/Lang.php:17
-#: ../../Zotlabs/Module/Uexport.php:61 ../../Zotlabs/Module/Pubstream.php:20
-#: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Tokens.php:99
-#: ../../Zotlabs/Module/Oauth2.php:106 ../../Zotlabs/Module/Randprof.php:29
-#: ../../Zotlabs/Module/Mood.php:134 ../../Zotlabs/Module/Bookmarks.php:78
-#: ../../Zotlabs/Module/Wiki.php:52 ../../Zotlabs/Module/Pdledit.php:42
-#: ../../Zotlabs/Module/Poke.php:165 ../../Zotlabs/Module/Chat.php:102
-#: ../../Zotlabs/Module/Notes.php:56 ../../Zotlabs/Module/Affinity.php:52
-#: ../../Zotlabs/Module/Defperms.php:189 ../../Zotlabs/Module/Group.php:106
-#: ../../Zotlabs/Module/Cards.php:51 ../../Zotlabs/Module/Webpages.php:48
-#: ../../Zotlabs/Module/Sources.php:88 ../../Zotlabs/Module/Suggest.php:40
-#: ../../Zotlabs/Module/Probe.php:18 ../../Zotlabs/Module/Oauth.php:100
-#: ../../addon/skeleton/Mod_Skeleton.php:32
+#: ../../Zotlabs/Module/Cdav.php:857 ../../Zotlabs/Module/Permcats.php:62
+#: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Uexport.php:61
+#: ../../Zotlabs/Module/Pubstream.php:20 ../../Zotlabs/Module/Connect.php:104
+#: ../../Zotlabs/Module/Tokens.php:99 ../../Zotlabs/Module/Oauth2.php:106
+#: ../../Zotlabs/Module/Randprof.php:29 ../../Zotlabs/Module/Mood.php:134
+#: ../../Zotlabs/Module/Bookmarks.php:78 ../../Zotlabs/Module/Wiki.php:52
+#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Poke.php:165
+#: ../../Zotlabs/Module/Chat.php:102 ../../Zotlabs/Module/Notes.php:56
+#: ../../Zotlabs/Module/Affinity.php:52 ../../Zotlabs/Module/Defperms.php:189
+#: ../../Zotlabs/Module/Group.php:106 ../../Zotlabs/Module/Cards.php:51
+#: ../../Zotlabs/Module/Webpages.php:48 ../../Zotlabs/Module/Sources.php:88
+#: ../../Zotlabs/Module/Suggest.php:40 ../../Zotlabs/Module/Probe.php:18
+#: ../../Zotlabs/Module/Oauth.php:100 ../../addon/skeleton/Mod_Skeleton.php:32
 #: ../../addon/gnusoc/Mod_Gnusoc.php:22 ../../addon/planets/Mod_Planets.php:20
 #: ../../addon/wppost/Mod_Wppost.php:41 ../../addon/nsfw/Mod_Nsfw.php:33
 #: ../../addon/ijpost/Mod_Ijpost.php:35 ../../addon/dwpost/Mod_Dwpost.php:36
 #: ../../addon/gallery/Mod_Gallery.php:58 ../../addon/ljpost/Mod_Ljpost.php:36
 #: ../../addon/startpage/Mod_Startpage.php:50
-#: ../../addon/diaspora/Mod_Diaspora.php:55
+#: ../../addon/diaspora/Mod_Diaspora.php:57
 #: ../../addon/photocache/Mod_Photocache.php:42
 #: ../../addon/rainbowtag/Mod_Rainbowtag.php:21
 #: ../../addon/nsabait/Mod_Nsabait.php:20
@@ -462,7 +463,7 @@ msgstr "3. Pulse [conectar]"
 #: ../../Zotlabs/Module/Locs.php:121 ../../Zotlabs/Module/Mitem.php:259
 #: ../../Zotlabs/Module/Events.php:495 ../../Zotlabs/Module/Appman.php:155
 #: ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349
+#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
 #: ../../Zotlabs/Module/Connect.php:124
 #: ../../Zotlabs/Module/Admin/Features.php:66
 #: ../../Zotlabs/Module/Admin/Accounts.php:168
@@ -490,10 +491,10 @@ msgstr "3. Pulse [conectar]"
 #: ../../Zotlabs/Module/Settings/Display.php:189
 #: ../../Zotlabs/Module/Settings/Network.php:61
 #: ../../Zotlabs/Module/Tokens.php:188 ../../Zotlabs/Module/Thing.php:326
-#: ../../Zotlabs/Module/Thing.php:379 ../../Zotlabs/Module/Import.php:574
+#: ../../Zotlabs/Module/Thing.php:379 ../../Zotlabs/Module/Import.php:646
 #: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Cal.php:344
-#: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Photos.php:1097
-#: ../../Zotlabs/Module/Photos.php:1138 ../../Zotlabs/Module/Photos.php:1257
+#: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Photos.php:1055
+#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1215
 #: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Pdledit.php:107
 #: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Connedit.php:904
 #: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Module/Chat.php:250
@@ -501,11 +502,11 @@ msgstr "3. Pulse [conectar]"
 #: ../../Zotlabs/Module/Pconfig.php:116 ../../Zotlabs/Module/Affinity.php:87
 #: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Group.php:150
 #: ../../Zotlabs/Module/Group.php:166 ../../Zotlabs/Module/Profiles.php:723
-#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:125
+#: ../../Zotlabs/Module/Editpost.php:86 ../../Zotlabs/Module/Sources.php:125
 #: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:183
+#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:203
 #: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Oauth.php:111
-#: ../../Zotlabs/Lib/ThreadItem.php:795
+#: ../../Zotlabs/Lib/ThreadItem.php:796
 #: ../../Zotlabs/Widget/Eventstools.php:16
 #: ../../Zotlabs/Widget/Wiki_pages.php:42
 #: ../../Zotlabs/Widget/Wiki_pages.php:99
@@ -521,14 +522,16 @@ msgstr "3. Pulse [conectar]"
 #: ../../addon/startpage/Mod_Startpage.php:73
 #: ../../addon/diaspora/Mod_Diaspora.php:99
 #: ../../addon/photocache/Mod_Photocache.php:67
-#: ../../addon/hzfiles/hzfiles.php:84 ../../addon/mailtest/mailtest.php:100
+#: ../../addon/hzfiles/hzfiles.php:86 ../../addon/mailtest/mailtest.php:100
 #: ../../addon/openstreetmap/openstreetmap.php:169
 #: ../../addon/fuzzloc/Mod_Fuzzloc.php:56 ../../addon/rtof/Mod_Rtof.php:72
 #: ../../addon/jappixmini/Mod_Jappixmini.php:261
-#: ../../addon/channelreputation/channelreputation.php:140
+#: ../../addon/channelreputation/channelreputation.php:142
 #: ../../addon/nofed/Mod_Nofed.php:53 ../../addon/redred/Mod_Redred.php:90
-#: ../../addon/logrot/logrot.php:35 ../../addon/frphotos/frphotos.php:97
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:63
+#: ../../addon/logrot/logrot.php:35
+#: ../../addon/content_import/Mod_content_import.php:142
+#: ../../addon/frphotos/frphotos.php:97
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:65
 #: ../../addon/chords/Mod_Chords.php:60
 #: ../../addon/libertree/Mod_Libertree.php:70
 #: ../../addon/flattrwidget/Mod_Flattrwidget.php:92
@@ -562,7 +565,7 @@ msgid "Add Article"
 msgstr "Añadir un artículo"
 
 #: ../../Zotlabs/Module/Articles.php:222 ../../Zotlabs/Lib/Apps.php:324
-#: ../../include/nav.php:512
+#: ../../include/nav.php:514
 msgid "Articles"
 msgstr "Artículos"
 
@@ -590,19 +593,19 @@ msgstr "Descripción de la plantilla (opcional)"
 msgid "Edit Layout"
 msgstr "Modificar la plantilla"
 
-#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:944
-#: ../../Zotlabs/Module/Cdav.php:1233
+#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:1035
+#: ../../Zotlabs/Module/Cdav.php:1341
 #: ../../Zotlabs/Module/Article_edit.php:131
 #: ../../Zotlabs/Module/Admin/Addons.php:426
 #: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145
 #: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:368
 #: ../../Zotlabs/Module/Wiki.php:401
-#: ../../Zotlabs/Module/Profile_photo.php:465
+#: ../../Zotlabs/Module/Profile_photo.php:505
 #: ../../Zotlabs/Module/Connedit.php:941 ../../Zotlabs/Module/Fbrowser.php:66
 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801
 #: ../../Zotlabs/Module/Editwebpage.php:169
-#: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Filer.php:55
-#: ../../Zotlabs/Module/Cover_photo.php:399 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Filer.php:55
+#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Tagrm.php:15
 #: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Card_edit.php:131
 #: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138
 #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258
@@ -613,9 +616,9 @@ msgstr "Cancelar"
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86
 #: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Share.php:71
 #: ../../Zotlabs/Module/Cloud.php:126 ../../Zotlabs/Module/Group.php:98
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:79
+#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82
 #: ../../Zotlabs/Module/Like.php:301 ../../Zotlabs/Web/WebServer.php:122
-#: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73
+#: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:75
 #: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109
 #: ../../include/items.php:416
 msgid "Permission denied"
@@ -629,8 +632,8 @@ msgstr "Identificador del perfil no válido"
 msgid "Profile Visibility Editor"
 msgstr "Editor de visibilidad del perfil"
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:359
-#: ../../include/channel.php:1700
+#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:361
+#: ../../include/channel.php:1766
 msgid "Profile"
 msgstr "Perfil"
 
@@ -643,77 +646,78 @@ msgid "Visible To"
 msgstr "Visible para"
 
 #: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:203
+#: ../../Zotlabs/Module/Connections.php:217
 msgid "All Connections"
 msgstr "Todas las conexiones"
 
-#: ../../Zotlabs/Module/Cdav.php:810
+#: ../../Zotlabs/Module/Cdav.php:765 ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
+msgstr "Entradas de calendario importadas."
+
+#: ../../Zotlabs/Module/Cdav.php:767 ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+msgstr "No se han encontrado entradas de calendario."
+
+#: ../../Zotlabs/Module/Cdav.php:828
 msgid "INVALID EVENT DISMISSED!"
 msgstr "¡EVENTO NO VÁLIDO RECHAZADO!"
 
-#: ../../Zotlabs/Module/Cdav.php:811
+#: ../../Zotlabs/Module/Cdav.php:829
 msgid "Summary: "
 msgstr "Resumen: "
 
-#: ../../Zotlabs/Module/Cdav.php:811 ../../Zotlabs/Module/Cdav.php:812
-#: ../../Zotlabs/Module/Cdav.php:819 ../../Zotlabs/Module/Embedphotos.php:154
-#: ../../Zotlabs/Module/Photos.php:832 ../../Zotlabs/Module/Photos.php:1296
-#: ../../Zotlabs/Lib/Activity.php:1011 ../../Zotlabs/Lib/Apps.php:1113
-#: ../../Zotlabs/Lib/Apps.php:1197 ../../Zotlabs/Storage/Browser.php:164
+#: ../../Zotlabs/Module/Cdav.php:829 ../../Zotlabs/Module/Cdav.php:830
+#: ../../Zotlabs/Module/Cdav.php:837 ../../Zotlabs/Module/Embedphotos.php:174
+#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1254
+#: ../../Zotlabs/Lib/Activity.php:1067 ../../Zotlabs/Lib/Apps.php:1114
+#: ../../Zotlabs/Lib/Apps.php:1198 ../../Zotlabs/Storage/Browser.php:164
 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Album.php:84
-#: ../../addon/pubcrawl/as.php:959 ../../include/conversation.php:1166
+#: ../../addon/pubcrawl/as.php:1009 ../../include/conversation.php:1166
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../../Zotlabs/Module/Cdav.php:812
+#: ../../Zotlabs/Module/Cdav.php:830
 msgid "Date: "
 msgstr "Fecha: "
 
-#: ../../Zotlabs/Module/Cdav.php:813 ../../Zotlabs/Module/Cdav.php:820
+#: ../../Zotlabs/Module/Cdav.php:831 ../../Zotlabs/Module/Cdav.php:838
 msgid "Reason: "
 msgstr "Razón: "
 
-#: ../../Zotlabs/Module/Cdav.php:818
+#: ../../Zotlabs/Module/Cdav.php:836
 msgid "INVALID CARD DISMISSED!"
 msgstr "¡TARJETA NO VÁLIDA RECHAZADA!"
 
-#: ../../Zotlabs/Module/Cdav.php:819
+#: ../../Zotlabs/Module/Cdav.php:837
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../../Zotlabs/Module/Cdav.php:839
-msgid "CalDAV App"
-msgstr "App CalDav"
-
-#: ../../Zotlabs/Module/Cdav.php:840
-msgid "CalDAV capable calendar"
-msgstr "Calendario compatible con CalDAV"
-
-#: ../../Zotlabs/Module/Cdav.php:848
+#: ../../Zotlabs/Module/Cdav.php:857
 msgid "CardDAV App"
 msgstr "App CarDav"
 
-#: ../../Zotlabs/Module/Cdav.php:849
+#: ../../Zotlabs/Module/Cdav.php:858
 msgid "CalDAV capable addressbook"
 msgstr "Libreta de direcciones compatible con CalDav"
 
-#: ../../Zotlabs/Module/Cdav.php:913 ../../Zotlabs/Module/Events.php:462
+#: ../../Zotlabs/Module/Cdav.php:921
+#: ../../Zotlabs/Module/Channel_calendar.php:401
+msgid "Link to source"
+msgstr "Enlace a la fuente"
+
+#: ../../Zotlabs/Module/Cdav.php:987 ../../Zotlabs/Module/Events.php:462
 msgid "Event title"
 msgstr "Título del evento"
 
-#: ../../Zotlabs/Module/Cdav.php:914 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Cdav.php:988 ../../Zotlabs/Module/Events.php:468
 msgid "Start date and time"
 msgstr "Fecha y hora de comienzo"
 
-#: ../../Zotlabs/Module/Cdav.php:914 ../../Zotlabs/Module/Cdav.php:915
-msgid "Example: YYYY-MM-DD HH:mm"
-msgstr "Ejemplo: YYYY-MM-DD HH:mm"
-
-#: ../../Zotlabs/Module/Cdav.php:915
+#: ../../Zotlabs/Module/Cdav.php:989
 msgid "End date and time"
 msgstr "Fecha y hora de finalización"
 
-#: ../../Zotlabs/Module/Cdav.php:916 ../../Zotlabs/Module/Events.php:475
+#: ../../Zotlabs/Module/Cdav.php:990 ../../Zotlabs/Module/Events.php:475
 #: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101
 #: ../../addon/rendezvous/rendezvous.php:173
 #: ../../addon/cart/submodules/manualcat.php:260
@@ -721,76 +725,103 @@ msgstr "Fecha y hora de finalización"
 msgid "Description"
 msgstr "Descripción"
 
-#: ../../Zotlabs/Module/Cdav.php:917 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Cdav.php:991 ../../Zotlabs/Module/Locs.php:117
 #: ../../Zotlabs/Module/Events.php:477 ../../Zotlabs/Module/Profiles.php:509
 #: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52
 #: ../../include/js_strings.php:25
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../../Zotlabs/Module/Cdav.php:924 ../../Zotlabs/Module/Events.php:690
+#: ../../Zotlabs/Module/Cdav.php:1012 ../../Zotlabs/Module/Events.php:690
 #: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Cal.php:338
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Photos.php:986
+#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Photos.php:944
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../../Zotlabs/Module/Cdav.php:925 ../../Zotlabs/Module/Events.php:691
-#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Events.php:691
+#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Setup.php:260
 #: ../../Zotlabs/Module/Cal.php:339 ../../Zotlabs/Module/Cal.php:346
-#: ../../Zotlabs/Module/Photos.php:995
+#: ../../Zotlabs/Module/Photos.php:953
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../../Zotlabs/Module/Cdav.php:926 ../../Zotlabs/Module/Events.php:701
+#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Events.php:701
 #: ../../Zotlabs/Module/Cal.php:347
 msgid "Today"
 msgstr "Hoy"
 
-#: ../../Zotlabs/Module/Cdav.php:927 ../../Zotlabs/Module/Events.php:696
+#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Events.php:696
 msgid "Month"
 msgstr "Mes"
 
-#: ../../Zotlabs/Module/Cdav.php:928 ../../Zotlabs/Module/Events.php:697
+#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Events.php:697
 msgid "Week"
 msgstr "Semana"
 
-#: ../../Zotlabs/Module/Cdav.php:929 ../../Zotlabs/Module/Events.php:698
+#: ../../Zotlabs/Module/Cdav.php:1017 ../../Zotlabs/Module/Events.php:698
 msgid "Day"
 msgstr "Día"
 
-#: ../../Zotlabs/Module/Cdav.php:930
+#: ../../Zotlabs/Module/Cdav.php:1018
 msgid "List month"
 msgstr "Lista mensual"
 
-#: ../../Zotlabs/Module/Cdav.php:931
+#: ../../Zotlabs/Module/Cdav.php:1019
 msgid "List week"
 msgstr "Lista semanal"
 
-#: ../../Zotlabs/Module/Cdav.php:932
+#: ../../Zotlabs/Module/Cdav.php:1020
 msgid "List day"
 msgstr "Lista diaria"
 
-#: ../../Zotlabs/Module/Cdav.php:939
+#: ../../Zotlabs/Module/Cdav.php:1028
 msgid "More"
 msgstr "Más"
 
-#: ../../Zotlabs/Module/Cdav.php:940
+#: ../../Zotlabs/Module/Cdav.php:1029
 msgid "Less"
 msgstr "Menos"
 
-#: ../../Zotlabs/Module/Cdav.php:941
+#: ../../Zotlabs/Module/Cdav.php:1030 ../../Zotlabs/Module/Cdav.php:1339
+#: ../../Zotlabs/Module/Admin/Addons.php:456
+#: ../../Zotlabs/Module/Oauth2.php:58 ../../Zotlabs/Module/Oauth2.php:144
+#: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Profiles.php:799
+#: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137
+#: ../../Zotlabs/Lib/Apps.php:536
+msgid "Update"
+msgstr "Actualizar"
+
+#: ../../Zotlabs/Module/Cdav.php:1031
 msgid "Select calendar"
 msgstr "Seleccionar un calendario"
 
-#: ../../Zotlabs/Module/Cdav.php:943
+#: ../../Zotlabs/Module/Cdav.php:1032 ../../Zotlabs/Widget/Cdav.php:143
+msgid "Channel Calendars"
+msgstr "Calendarios del canal"
+
+#: ../../Zotlabs/Module/Cdav.php:1032 ../../Zotlabs/Widget/Cdav.php:129
+#: ../../Zotlabs/Widget/Cdav.php:143
+msgid "CalDAV Calendars"
+msgstr "Calendarios CalDAV"
+
+#: ../../Zotlabs/Module/Cdav.php:1034
 msgid "Delete all"
 msgstr "Eliminar todos"
 
-#: ../../Zotlabs/Module/Cdav.php:945
+#: ../../Zotlabs/Module/Cdav.php:1037
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado."
 
-#: ../../Zotlabs/Module/Cdav.php:1215
+#: ../../Zotlabs/Module/Cdav.php:1047
+#: ../../Zotlabs/Widget/Appcategories.php:43
+#: ../../include/contact_widgets.php:96 ../../include/contact_widgets.php:139
+#: ../../include/contact_widgets.php:184 ../../include/taxonomy.php:409
+#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511
+#: ../../include/taxonomy.php:532
+msgid "Categories"
+msgstr "Temas"
+
+#: ../../Zotlabs/Module/Cdav.php:1323
 #: ../../Zotlabs/Module/Sharedwithme.php:104
 #: ../../Zotlabs/Module/Admin/Channels.php:159
 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
@@ -798,129 +829,120 @@ msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementa
 #: ../../Zotlabs/Module/Chat.php:259 ../../Zotlabs/Module/Group.php:154
 #: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139
 #: ../../Zotlabs/Lib/NativeWikiPage.php:561
-#: ../../Zotlabs/Storage/Browser.php:285
+#: ../../Zotlabs/Storage/Browser.php:291
 #: ../../Zotlabs/Widget/Wiki_page_history.php:22
 #: ../../addon/rendezvous/rendezvous.php:172
 msgid "Name"
 msgstr "Nombre"
 
-#: ../../Zotlabs/Module/Cdav.php:1216 ../../Zotlabs/Module/Connedit.php:924
+#: ../../Zotlabs/Module/Cdav.php:1324 ../../Zotlabs/Module/Connedit.php:924
 msgid "Organisation"
 msgstr "Organización"
 
-#: ../../Zotlabs/Module/Cdav.php:1217 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Module/Cdav.php:1325 ../../Zotlabs/Module/Connedit.php:925
 msgid "Title"
 msgstr "Título"
 
-#: ../../Zotlabs/Module/Cdav.php:1218 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Zotlabs/Module/Cdav.php:1326 ../../Zotlabs/Module/Connedit.php:926
 #: ../../Zotlabs/Module/Profiles.php:786
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../../Zotlabs/Module/Cdav.php:1219
+#: ../../Zotlabs/Module/Cdav.php:1327
 #: ../../Zotlabs/Module/Admin/Accounts.php:171
 #: ../../Zotlabs/Module/Admin/Accounts.php:183
 #: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:787
 #: ../../addon/openid/MysqlProvider.php:56
 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/Mod_Rtof.php:57
-#: ../../addon/redred/Mod_Redred.php:71 ../../include/network.php:1721
+#: ../../addon/redred/Mod_Redred.php:71 ../../include/network.php:1731
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../../Zotlabs/Module/Cdav.php:1220 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Zotlabs/Module/Cdav.php:1328 ../../Zotlabs/Module/Connedit.php:928
 #: ../../Zotlabs/Module/Profiles.php:788
 msgid "Instant messenger"
 msgstr "Mensajería instantánea"
 
-#: ../../Zotlabs/Module/Cdav.php:1221 ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Cdav.php:1329 ../../Zotlabs/Module/Connedit.php:929
 #: ../../Zotlabs/Module/Profiles.php:789
 msgid "Website"
 msgstr "Sitio web"
 
-#: ../../Zotlabs/Module/Cdav.php:1222 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Cdav.php:1330 ../../Zotlabs/Module/Locs.php:118
 #: ../../Zotlabs/Module/Admin/Channels.php:160
 #: ../../Zotlabs/Module/Connedit.php:930 ../../Zotlabs/Module/Profiles.php:502
 #: ../../Zotlabs/Module/Profiles.php:790
 msgid "Address"
 msgstr "Dirección"
 
-#: ../../Zotlabs/Module/Cdav.php:1223 ../../Zotlabs/Module/Connedit.php:931
+#: ../../Zotlabs/Module/Cdav.php:1331 ../../Zotlabs/Module/Connedit.php:931
 #: ../../Zotlabs/Module/Profiles.php:791
 msgid "Note"
 msgstr "Nota"
 
-#: ../../Zotlabs/Module/Cdav.php:1224 ../../Zotlabs/Module/Connedit.php:932
-#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1320
-#: ../../include/connections.php:696
+#: ../../Zotlabs/Module/Cdav.php:1332 ../../Zotlabs/Module/Connedit.php:932
+#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1329
+#: ../../include/connections.php:723
 msgid "Mobile"
 msgstr "Móvil"
 
-#: ../../Zotlabs/Module/Cdav.php:1225 ../../Zotlabs/Module/Connedit.php:933
-#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1321
-#: ../../include/connections.php:697
+#: ../../Zotlabs/Module/Cdav.php:1333 ../../Zotlabs/Module/Connedit.php:933
+#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1330
+#: ../../include/connections.php:724
 msgid "Home"
 msgstr "Inicio"
 
-#: ../../Zotlabs/Module/Cdav.php:1226 ../../Zotlabs/Module/Connedit.php:934
-#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1324
-#: ../../include/connections.php:700
+#: ../../Zotlabs/Module/Cdav.php:1334 ../../Zotlabs/Module/Connedit.php:934
+#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1333
+#: ../../include/connections.php:727
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../../Zotlabs/Module/Cdav.php:1228 ../../Zotlabs/Module/Connedit.php:936
+#: ../../Zotlabs/Module/Cdav.php:1336 ../../Zotlabs/Module/Connedit.php:936
 #: ../../Zotlabs/Module/Profiles.php:796
 #: ../../addon/jappixmini/Mod_Jappixmini.php:216
 msgid "Add Contact"
 msgstr "Añadir un contacto"
 
-#: ../../Zotlabs/Module/Cdav.php:1229 ../../Zotlabs/Module/Connedit.php:937
+#: ../../Zotlabs/Module/Cdav.php:1337 ../../Zotlabs/Module/Connedit.php:937
 #: ../../Zotlabs/Module/Profiles.php:797
 msgid "Add Field"
 msgstr "Añadir un campo"
 
-#: ../../Zotlabs/Module/Cdav.php:1231
-#: ../../Zotlabs/Module/Admin/Addons.php:456
-#: ../../Zotlabs/Module/Oauth2.php:58 ../../Zotlabs/Module/Oauth2.php:144
-#: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137
-#: ../../Zotlabs/Lib/Apps.php:535
-msgid "Update"
-msgstr "Actualizar"
-
-#: ../../Zotlabs/Module/Cdav.php:1234 ../../Zotlabs/Module/Connedit.php:942
+#: ../../Zotlabs/Module/Cdav.php:1342 ../../Zotlabs/Module/Connedit.php:942
 msgid "P.O. Box"
 msgstr "Buzón de correos"
 
-#: ../../Zotlabs/Module/Cdav.php:1235 ../../Zotlabs/Module/Connedit.php:943
+#: ../../Zotlabs/Module/Cdav.php:1343 ../../Zotlabs/Module/Connedit.php:943
 msgid "Additional"
 msgstr "Adicional"
 
-#: ../../Zotlabs/Module/Cdav.php:1236 ../../Zotlabs/Module/Connedit.php:944
+#: ../../Zotlabs/Module/Cdav.php:1344 ../../Zotlabs/Module/Connedit.php:944
 msgid "Street"
 msgstr "Calle"
 
-#: ../../Zotlabs/Module/Cdav.php:1237 ../../Zotlabs/Module/Connedit.php:945
+#: ../../Zotlabs/Module/Cdav.php:1345 ../../Zotlabs/Module/Connedit.php:945
 msgid "Locality"
 msgstr "Localidad"
 
-#: ../../Zotlabs/Module/Cdav.php:1238 ../../Zotlabs/Module/Connedit.php:946
+#: ../../Zotlabs/Module/Cdav.php:1346 ../../Zotlabs/Module/Connedit.php:946
 msgid "Region"
 msgstr "Provincia, región o estado"
 
-#: ../../Zotlabs/Module/Cdav.php:1239 ../../Zotlabs/Module/Connedit.php:947
+#: ../../Zotlabs/Module/Cdav.php:1347 ../../Zotlabs/Module/Connedit.php:947
 msgid "ZIP Code"
 msgstr "Código postal"
 
-#: ../../Zotlabs/Module/Cdav.php:1240 ../../Zotlabs/Module/Connedit.php:948
+#: ../../Zotlabs/Module/Cdav.php:1348 ../../Zotlabs/Module/Connedit.php:948
 #: ../../Zotlabs/Module/Profiles.php:757
 msgid "Country"
 msgstr "País"
 
-#: ../../Zotlabs/Module/Cdav.php:1287
+#: ../../Zotlabs/Module/Cdav.php:1395
 msgid "Default Calendar"
 msgstr "Calendario por defecto"
 
-#: ../../Zotlabs/Module/Cdav.php:1297
+#: ../../Zotlabs/Module/Cdav.php:1406
 msgid "Default Addressbook"
 msgstr "Agenda de direcciones por defecto"
 
@@ -950,7 +972,7 @@ msgid ""
 "connections."
 msgstr "Utilice este formulario para crear reglas de permiso para varias clases de personas o conexiones."
 
-#: ../../Zotlabs/Module/Permcats.php:112 ../../Zotlabs/Lib/Apps.php:372
+#: ../../Zotlabs/Module/Permcats.php:112 ../../Zotlabs/Lib/Apps.php:373
 msgid "Permission Categories"
 msgstr "Tipos de permisos"
 
@@ -1011,7 +1033,7 @@ msgstr "Buscar resultados para:"
 msgid "Reset form"
 msgstr "Reiniciar el formulario"
 
-#: ../../Zotlabs/Module/Channel.php:476 ../../Zotlabs/Module/Display.php:373
+#: ../../Zotlabs/Module/Channel.php:472 ../../Zotlabs/Module/Display.php:378
 msgid ""
 "You must enable javascript for your browser to be able to view this content."
 msgstr "Debe habilitar javascript para poder ver este contenido en su navegador."
@@ -1098,18 +1120,18 @@ msgstr "¡Bienvenido a Hubzilla!"
 msgid "You have got no unseen posts..."
 msgstr "No tiene ningún mensaje sin leer..."
 
-#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:558
+#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:516
 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:67
 #: ../../Zotlabs/Module/Directory.php:72 ../../Zotlabs/Module/Display.php:29
 #: ../../Zotlabs/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr "Acceso público denegado."
 
-#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:338
-#: ../../Zotlabs/Lib/Apps.php:350 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../Zotlabs/Widget/Activity_filter.php:151 ../../include/text.php:1084
-#: ../../include/text.php:1096 ../../include/acl_selectors.php:118
-#: ../../include/nav.php:183
+#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:352
+#: ../../Zotlabs/Lib/Apps.php:352 ../../Zotlabs/Widget/Sitesearch.php:31
+#: ../../Zotlabs/Widget/Activity_filter.php:151 ../../include/text.php:1103
+#: ../../include/text.php:1115 ../../include/acl_selectors.php:118
+#: ../../include/nav.php:186
 msgid "Search"
 msgstr "Buscar"
 
@@ -1131,7 +1153,7 @@ msgstr "App Stream público"
 msgid "The unmoderated public stream of this hub"
 msgstr "Stream público no moderado de este hub"
 
-#: ../../Zotlabs/Module/Pubstream.php:109 ../../Zotlabs/Lib/Apps.php:374
+#: ../../Zotlabs/Module/Pubstream.php:109 ../../Zotlabs/Lib/Apps.php:375
 #: ../../Zotlabs/Widget/Notifications.php:142
 msgid "Public Stream"
 msgstr "\"Stream\" público"
@@ -1259,19 +1281,19 @@ msgstr "Usar la autenticación mágica si está disponible"
 #: ../../Zotlabs/Module/Admin/Site.php:255
 #: ../../Zotlabs/Module/Settings/Channel.php:309
 #: ../../Zotlabs/Module/Settings/Display.php:89
-#: ../../Zotlabs/Module/Import.php:563 ../../Zotlabs/Module/Import.php:567
-#: ../../Zotlabs/Module/Import.php:568 ../../Zotlabs/Module/Api.php:99
-#: ../../Zotlabs/Module/Photos.php:712 ../../Zotlabs/Module/Wiki.php:227
+#: ../../Zotlabs/Module/Import.php:635 ../../Zotlabs/Module/Import.php:639
+#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Api.php:99
+#: ../../Zotlabs/Module/Photos.php:670 ../../Zotlabs/Module/Wiki.php:227
 #: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:406
 #: ../../Zotlabs/Module/Connedit.php:796 ../../Zotlabs/Module/Menu.php:162
 #: ../../Zotlabs/Module/Menu.php:221 ../../Zotlabs/Module/Defperms.php:197
 #: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Sources.php:124
 #: ../../Zotlabs/Module/Sources.php:159
-#: ../../Zotlabs/Module/Filestorage.php:178
-#: ../../Zotlabs/Module/Filestorage.php:186
+#: ../../Zotlabs/Module/Filestorage.php:198
+#: ../../Zotlabs/Module/Filestorage.php:206
 #: ../../Zotlabs/Lib/Libzotdir.php:162 ../../Zotlabs/Lib/Libzotdir.php:163
-#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Storage/Browser.php:405
-#: ../../boot.php:1634 ../../view/theme/redbasic_c/php/config.php:100
+#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Storage/Browser.php:411
+#: ../../boot.php:1635 ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:99
 #: ../../view/theme/redbasic/php/config.php:116
@@ -1283,8 +1305,11 @@ msgstr "Usar la autenticación mágica si está disponible"
 #: ../../addon/jappixmini/Mod_Jappixmini.php:199
 #: ../../addon/jappixmini/Mod_Jappixmini.php:203
 #: ../../addon/jappixmini/Mod_Jappixmini.php:207
-#: ../../addon/channelreputation/channelreputation.php:108
+#: ../../addon/channelreputation/channelreputation.php:110
 #: ../../addon/nofed/Mod_Nofed.php:42 ../../addon/redred/Mod_Redred.php:63
+#: ../../addon/content_import/Mod_content_import.php:137
+#: ../../addon/content_import/Mod_content_import.php:138
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:45
 #: ../../addon/libertree/Mod_Libertree.php:59
 #: ../../addon/statusnet/Mod_Statusnet.php:260
 #: ../../addon/statusnet/Mod_Statusnet.php:282
@@ -1317,18 +1342,18 @@ msgstr "No"
 #: ../../Zotlabs/Module/Admin/Site.php:257
 #: ../../Zotlabs/Module/Settings/Channel.php:309
 #: ../../Zotlabs/Module/Settings/Display.php:89
-#: ../../Zotlabs/Module/Import.php:563 ../../Zotlabs/Module/Import.php:567
-#: ../../Zotlabs/Module/Import.php:568 ../../Zotlabs/Module/Api.php:98
-#: ../../Zotlabs/Module/Photos.php:712 ../../Zotlabs/Module/Wiki.php:227
+#: ../../Zotlabs/Module/Import.php:635 ../../Zotlabs/Module/Import.php:639
+#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Api.php:98
+#: ../../Zotlabs/Module/Photos.php:670 ../../Zotlabs/Module/Wiki.php:227
 #: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:406
 #: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221
 #: ../../Zotlabs/Module/Defperms.php:197 ../../Zotlabs/Module/Profiles.php:681
 #: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
-#: ../../Zotlabs/Module/Filestorage.php:178
-#: ../../Zotlabs/Module/Filestorage.php:186
+#: ../../Zotlabs/Module/Filestorage.php:198
+#: ../../Zotlabs/Module/Filestorage.php:206
 #: ../../Zotlabs/Lib/Libzotdir.php:162 ../../Zotlabs/Lib/Libzotdir.php:163
-#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Storage/Browser.php:405
-#: ../../boot.php:1634 ../../view/theme/redbasic_c/php/config.php:100
+#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Storage/Browser.php:411
+#: ../../boot.php:1635 ../../view/theme/redbasic_c/php/config.php:100
 #: ../../view/theme/redbasic_c/php/config.php:115
 #: ../../view/theme/redbasic/php/config.php:99
 #: ../../view/theme/redbasic/php/config.php:116
@@ -1340,8 +1365,11 @@ msgstr "No"
 #: ../../addon/jappixmini/Mod_Jappixmini.php:199
 #: ../../addon/jappixmini/Mod_Jappixmini.php:203
 #: ../../addon/jappixmini/Mod_Jappixmini.php:207
-#: ../../addon/channelreputation/channelreputation.php:108
+#: ../../addon/channelreputation/channelreputation.php:110
 #: ../../addon/nofed/Mod_Nofed.php:42 ../../addon/redred/Mod_Redred.php:63
+#: ../../addon/content_import/Mod_content_import.php:137
+#: ../../addon/content_import/Mod_content_import.php:138
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:45
 #: ../../addon/libertree/Mod_Libertree.php:59
 #: ../../addon/statusnet/Mod_Statusnet.php:260
 #: ../../addon/statusnet/Mod_Statusnet.php:282
@@ -1447,34 +1475,35 @@ msgstr "Editar elemento del menú"
 msgid "Link text"
 msgstr "Texto del enlace"
 
-#: ../../Zotlabs/Module/Events.php:25
-msgid "Calendar entries imported."
-msgstr "Entradas de calendario importadas."
-
-#: ../../Zotlabs/Module/Events.php:27
-msgid "No calendar entries found."
-msgstr "No se han encontrado entradas de calendario."
-
 #: ../../Zotlabs/Module/Events.php:110
+#: ../../Zotlabs/Module/Channel_calendar.php:87
 msgid "Event can not end before it has started."
 msgstr "Un evento no puede terminar antes de que haya comenzado."
 
 #: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
 #: ../../Zotlabs/Module/Events.php:143
+#: ../../Zotlabs/Module/Channel_calendar.php:89
+#: ../../Zotlabs/Module/Channel_calendar.php:97
+#: ../../Zotlabs/Module/Channel_calendar.php:114
 msgid "Unable to generate preview."
 msgstr "No se puede crear la vista previa."
 
 #: ../../Zotlabs/Module/Events.php:119
+#: ../../Zotlabs/Module/Channel_calendar.php:95
 msgid "Event title and start time are required."
 msgstr "Se requieren el título del evento y su hora de inicio."
 
 #: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+#: ../../Zotlabs/Module/Channel_calendar.php:112
+#: ../../Zotlabs/Module/Channel_calendar.php:224
 msgid "Event not found."
 msgstr "Evento no encontrado."
 
-#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73
-#: ../../Zotlabs/Module/Like.php:394 ../../include/conversation.php:119
-#: ../../include/text.php:2094 ../../include/event.php:1165
+#: ../../Zotlabs/Module/Events.php:260
+#: ../../Zotlabs/Module/Channel_calendar.php:219
+#: ../../Zotlabs/Module/Tagger.php:73 ../../Zotlabs/Module/Like.php:394
+#: ../../include/conversation.php:119 ../../include/text.php:2118
+#: ../../include/event.php:1169
 msgid "event"
 msgstr "el/su evento"
 
@@ -1535,8 +1564,8 @@ msgstr "Editar la descripción"
 msgid "Edit Location"
 msgstr "Modificar la dirección"
 
-#: ../../Zotlabs/Module/Events.php:480 ../../Zotlabs/Module/Photos.php:1139
-#: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Lib/ThreadItem.php:805
+#: ../../Zotlabs/Module/Events.php:480 ../../Zotlabs/Module/Photos.php:1097
+#: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Lib/ThreadItem.php:806
 #: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1359
 msgid "Preview"
 msgstr "Previsualizar"
@@ -1559,19 +1588,22 @@ msgid "l, F j"
 msgstr "l j F"
 
 #: ../../Zotlabs/Module/Events.php:635
+#: ../../Zotlabs/Module/Channel_calendar.php:385
 msgid "Edit event"
 msgstr "Editar evento"
 
 #: ../../Zotlabs/Module/Events.php:637
+#: ../../Zotlabs/Module/Channel_calendar.php:387
 msgid "Delete event"
 msgstr "Borrar evento"
 
 #: ../../Zotlabs/Module/Events.php:663 ../../Zotlabs/Module/Cal.php:314
-#: ../../include/text.php:1913
+#: ../../include/text.php:1937
 msgid "Link to Source"
 msgstr "Enlazar con la entrada en su ubicación original"
 
 #: ../../Zotlabs/Module/Events.php:670
+#: ../../Zotlabs/Module/Channel_calendar.php:415
 msgid "calendar"
 msgstr "calendario"
 
@@ -1584,7 +1616,7 @@ msgid "Create Event"
 msgstr "Crear un evento"
 
 #: ../../Zotlabs/Module/Events.php:692 ../../Zotlabs/Module/Cal.php:340
-#: ../../include/channel.php:1703
+#: ../../include/channel.php:1769
 msgid "Export"
 msgstr "Exportar"
 
@@ -1593,6 +1625,7 @@ msgid "Event removed"
 msgstr "Evento borrado"
 
 #: ../../Zotlabs/Module/Events.php:735
+#: ../../Zotlabs/Module/Channel_calendar.php:448
 msgid "Failed to remove event"
 msgstr "Error al eliminar el evento"
 
@@ -1657,17 +1690,17 @@ msgid "Hub not found."
 msgstr "Servidor no encontrado"
 
 #: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Module/Tagger.php:69
-#: ../../Zotlabs/Module/Like.php:392 ../../Zotlabs/Lib/Activity.php:1959
+#: ../../Zotlabs/Module/Like.php:392 ../../Zotlabs/Lib/Activity.php:2019
 #: ../../addon/redphotos/redphotohelper.php:71
-#: ../../addon/diaspora/Receiver.php:1551 ../../addon/pubcrawl/as.php:1504
-#: ../../include/conversation.php:116 ../../include/text.php:2091
+#: ../../addon/diaspora/Receiver.php:1565 ../../addon/pubcrawl/as.php:1558
+#: ../../include/conversation.php:116 ../../include/text.php:2115
 msgid "photo"
 msgstr "foto"
 
 #: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Module/Like.php:392
-#: ../../Zotlabs/Lib/Activity.php:1959 ../../addon/diaspora/Receiver.php:1551
-#: ../../addon/pubcrawl/as.php:1504 ../../include/conversation.php:144
-#: ../../include/text.php:2097
+#: ../../Zotlabs/Lib/Activity.php:2019 ../../addon/diaspora/Receiver.php:1565
+#: ../../addon/pubcrawl/as.php:1558 ../../include/conversation.php:144
+#: ../../include/text.php:2121
 msgid "status"
 msgstr "el mensaje de estado "
 
@@ -1697,8 +1730,8 @@ msgid "Insert web link"
 msgstr "Insertar enlace web"
 
 #: ../../Zotlabs/Module/Article_edit.php:117
-#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:713
-#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Module/Card_edit.php:117
+#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:671
+#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Module/Card_edit.php:117
 #: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1427
 msgid "Title (optional)"
 msgstr "Título (opcional)"
@@ -1707,17 +1740,17 @@ msgstr "Título (opcional)"
 msgid "Edit Article"
 msgstr "Editar el artículo"
 
-#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:66
+#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:68
 msgid "Nothing to import."
 msgstr "No hay nada para importar."
 
-#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:81
-#: ../../Zotlabs/Module/Import.php:97
+#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:83
+#: ../../Zotlabs/Module/Import.php:99
 msgid "Unable to download data from old server"
 msgstr "No se han podido descargar datos de su antiguo servidor"
 
 #: ../../Zotlabs/Module/Import_items.php:77
-#: ../../Zotlabs/Module/Import.php:104
+#: ../../Zotlabs/Module/Import.php:106
 msgid "Imported file is empty."
 msgstr "El fichero importado está vacío."
 
@@ -1740,7 +1773,7 @@ msgid ""
 msgstr "Utilice este formulario para importar entradas y contenido desde un archivo de exportación."
 
 #: ../../Zotlabs/Module/Import_items.php:127
-#: ../../Zotlabs/Module/Import.php:557
+#: ../../Zotlabs/Module/Import.php:629
 msgid "File to Upload"
 msgstr "Fichero para subir"
 
@@ -1753,7 +1786,7 @@ msgstr "Ha creado %1$.0f de %2$.0f canales permitidos."
 #: ../../Zotlabs/Module/New_channel.php:157
 #: ../../Zotlabs/Module/New_channel.php:164
 #: ../../Zotlabs/Module/Connedit.php:869 ../../Zotlabs/Module/Defperms.php:256
-#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:323
+#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:326
 msgid "Loading"
 msgstr "Cargando"
 
@@ -1780,13 +1813,13 @@ msgid "Channel name"
 msgstr "Nombre del canal"
 
 #: ../../Zotlabs/Module/New_channel.php:177
-#: ../../Zotlabs/Module/Register.php:260
+#: ../../Zotlabs/Module/Register.php:263
 msgid "Choose a short nickname"
 msgstr "Elija un alias corto"
 
 #: ../../Zotlabs/Module/New_channel.php:178
 #: ../../Zotlabs/Module/Settings/Channel.php:535
-#: ../../Zotlabs/Module/Register.php:261
+#: ../../Zotlabs/Module/Register.php:264
 msgid "Channel role and privacy"
 msgstr "Clase de canal y privacidad"
 
@@ -1797,7 +1830,7 @@ msgid ""
 msgstr "Seleccione unos permisos de rol del canal compatibles con sus necesidades de uso y requisitos de privacidad."
 
 #: ../../Zotlabs/Module/New_channel.php:178
-#: ../../Zotlabs/Module/Register.php:261
+#: ../../Zotlabs/Module/Register.php:264
 msgid "Read more about channel permission roles"
 msgstr "Leer más sobre los roles y permisos"
 
@@ -1876,12 +1909,12 @@ msgid "NEW"
 msgstr "NUEVO"
 
 #: ../../Zotlabs/Module/Sharedwithme.php:106
-#: ../../Zotlabs/Storage/Browser.php:287 ../../include/text.php:1496
+#: ../../Zotlabs/Storage/Browser.php:293 ../../include/text.php:1515
 msgid "Size"
 msgstr "Tamaño"
 
 #: ../../Zotlabs/Module/Sharedwithme.php:107
-#: ../../Zotlabs/Storage/Browser.php:288
+#: ../../Zotlabs/Storage/Browser.php:294
 msgid "Last Modified"
 msgstr "Última modificación"
 
@@ -1893,409 +1926,409 @@ msgstr "Eliminar todos los ficheros"
 msgid "Remove this file"
 msgstr "Eliminar este fichero"
 
-#: ../../Zotlabs/Module/Setup.php:170
+#: ../../Zotlabs/Module/Setup.php:167
 msgid "$Projectname Server - Setup"
 msgstr "Servidor $Projectname  - Instalación"
 
-#: ../../Zotlabs/Module/Setup.php:174
+#: ../../Zotlabs/Module/Setup.php:171
 msgid "Could not connect to database."
 msgstr "No se ha podido conectar a la base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:178
+#: ../../Zotlabs/Module/Setup.php:175
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "No se puede conectar con la dirección del sitio indicada. Podría tratarse de un problema de SSL o DNS."
 
-#: ../../Zotlabs/Module/Setup.php:185
+#: ../../Zotlabs/Module/Setup.php:182
 msgid "Could not create table."
 msgstr "No se puede crear la tabla."
 
-#: ../../Zotlabs/Module/Setup.php:191
+#: ../../Zotlabs/Module/Setup.php:188
 msgid "Your site database has been installed."
 msgstr "La base de datos del sitio ha sido instalada."
 
-#: ../../Zotlabs/Module/Setup.php:197
+#: ../../Zotlabs/Module/Setup.php:194
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "Podría tener que importar manualmente el fichero \"install/schema_xxx.sql\" usando un cliente de base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262
-#: ../../Zotlabs/Module/Setup.php:761
+#: ../../Zotlabs/Module/Setup.php:195 ../../Zotlabs/Module/Setup.php:259
+#: ../../Zotlabs/Module/Setup.php:766
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:259
+#: ../../Zotlabs/Module/Setup.php:256
 msgid "System check"
 msgstr "Verificación del sistema"
 
-#: ../../Zotlabs/Module/Setup.php:264
+#: ../../Zotlabs/Module/Setup.php:261
 msgid "Check again"
 msgstr "Verificar de nuevo"
 
-#: ../../Zotlabs/Module/Setup.php:286
+#: ../../Zotlabs/Module/Setup.php:282
 msgid "Database connection"
 msgstr "Conexión a la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:287
+#: ../../Zotlabs/Module/Setup.php:283
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "Para instalar $Projectname es necesario saber cómo conectar con su base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:288
+#: ../../Zotlabs/Module/Setup.php:284
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Por favor, contacte con el proveedor de servicios o el administrador del sitio si tiene dudas sobre estos ajustes."
 
-#: ../../Zotlabs/Module/Setup.php:289
+#: ../../Zotlabs/Module/Setup.php:285
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "La base de datos que especifique a continuación debe existir ya. Si no es así, por favor, créela antes de seguir."
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Zotlabs/Module/Setup.php:289
 msgid "Database Server Name"
 msgstr "Nombre del servidor de base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Zotlabs/Module/Setup.php:289
 msgid "Default is 127.0.0.1"
 msgstr "De forma predeterminada es 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Zotlabs/Module/Setup.php:290
 msgid "Database Port"
 msgstr "Puerto de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Zotlabs/Module/Setup.php:290
 msgid "Communication port number - use 0 for default"
 msgstr "Número del puerto de comunicaciones - use 0 como valor por defecto"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Zotlabs/Module/Setup.php:291
 msgid "Database Login Name"
 msgstr "Usuario de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:296
+#: ../../Zotlabs/Module/Setup.php:292
 msgid "Database Login Password"
 msgstr "Contraseña de acceso a la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:297
+#: ../../Zotlabs/Module/Setup.php:293
 msgid "Database Name"
 msgstr "Nombre de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:298
+#: ../../Zotlabs/Module/Setup.php:294
 msgid "Database Type"
 msgstr "Tipo de base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Zotlabs/Module/Setup.php:296 ../../Zotlabs/Module/Setup.php:336
 msgid "Site administrator email address"
 msgstr "Dirección de correo electrónico del administrador del sitio"
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:341
+#: ../../Zotlabs/Module/Setup.php:296 ../../Zotlabs/Module/Setup.php:336
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Su cuenta deberá usar la misma dirección de correo electrónico para poder utilizar el panel de administración web."
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Zotlabs/Module/Setup.php:297 ../../Zotlabs/Module/Setup.php:338
 msgid "Website URL"
 msgstr "Dirección del sitio web"
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:343
+#: ../../Zotlabs/Module/Setup.php:297 ../../Zotlabs/Module/Setup.php:338
 msgid "Please use SSL (https) URL if available."
 msgstr "Por favor, use SSL (https) si está disponible."
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:345
+#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:340
 msgid "Please select a default timezone for your website"
 msgstr "Por favor, selecciones el huso horario por defecto de su sitio web"
 
-#: ../../Zotlabs/Module/Setup.php:330
+#: ../../Zotlabs/Module/Setup.php:325
 msgid "Site settings"
 msgstr "Ajustes del sitio"
 
-#: ../../Zotlabs/Module/Setup.php:384
-msgid "PHP version 5.5 or greater is required."
-msgstr "Se requiere la versión 5.5, o superior, de PHP."
+#: ../../Zotlabs/Module/Setup.php:379
+msgid "PHP version 7.1 or greater is required."
+msgstr "Se requiere la versión 7.1 o superior de PHP."
 
-#: ../../Zotlabs/Module/Setup.php:385
+#: ../../Zotlabs/Module/Setup.php:380
 msgid "PHP version"
 msgstr "Versión de PHP"
 
-#: ../../Zotlabs/Module/Setup.php:401
+#: ../../Zotlabs/Module/Setup.php:396
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web."
 
-#: ../../Zotlabs/Module/Setup.php:402
+#: ../../Zotlabs/Module/Setup.php:397
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron."
 msgstr "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá realizar envíos en segundo plano mediante cron."
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Zotlabs/Module/Setup.php:401
 msgid "PHP executable path"
 msgstr "Ruta del ejecutable PHP"
 
-#: ../../Zotlabs/Module/Setup.php:406
+#: ../../Zotlabs/Module/Setup.php:401
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Introducir la ruta completa del ejecutable PHP. Puede dejar la línea en blanco para continuar la instalación."
 
-#: ../../Zotlabs/Module/Setup.php:411
+#: ../../Zotlabs/Module/Setup.php:406
 msgid "Command line PHP"
 msgstr "PHP en línea de comandos"
 
-#: ../../Zotlabs/Module/Setup.php:421
+#: ../../Zotlabs/Module/Setup.php:416
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr "No se puede comprobar la línea de comandos PHP, ya que shell_exec() está deshabilitado. Es necesario que esté activado."
 
-#: ../../Zotlabs/Module/Setup.php:424
+#: ../../Zotlabs/Module/Setup.php:420
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "La línea de comandos PHP de su sistema no tiene activado \"register_argc_argv\"."
 
-#: ../../Zotlabs/Module/Setup.php:425
+#: ../../Zotlabs/Module/Setup.php:421
 msgid "This is required for message delivery to work."
 msgstr "Esto es necesario para que funcione la transmisión de mensajes."
 
-#: ../../Zotlabs/Module/Setup.php:428
+#: ../../Zotlabs/Module/Setup.php:424
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:448
+#: ../../Zotlabs/Module/Setup.php:444
 msgid ""
 "This is not sufficient to upload larger images or files. You should be able "
 "to upload at least 4 MB at once."
 msgstr "Esto no es suficiente para subir imágenes o archivos más grandes. Usted debe ser capaz de subir al menos 4 MB a la vez."
 
-#: ../../Zotlabs/Module/Setup.php:450
+#: ../../Zotlabs/Module/Setup.php:446
 #, php-format
 msgid ""
 "Your max allowed total upload size is set to %s. Maximum size of one file to"
 " upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr "La carga máxima que se le permite subir está establecida en %s. El tamaño máximo de un fichero está establecido en %s. Está permitido subir hasta un máximo de %d ficheros de una sola vez."
 
-#: ../../Zotlabs/Module/Setup.php:456
+#: ../../Zotlabs/Module/Setup.php:452
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Puede ajustar estos valores en el fichero php.ini de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:458
+#: ../../Zotlabs/Module/Setup.php:454
 msgid "PHP upload limits"
 msgstr "Límites PHP de subida"
 
-#: ../../Zotlabs/Module/Setup.php:481
+#: ../../Zotlabs/Module/Setup.php:477
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Error: La función \"openssl_pkey_new\" en este sistema no es capaz de general claves de cifrado."
 
-#: ../../Zotlabs/Module/Setup.php:482
+#: ../../Zotlabs/Module/Setup.php:478
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Si está en un servidor Windows, por favor, lea \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../Zotlabs/Module/Setup.php:485
+#: ../../Zotlabs/Module/Setup.php:481
 msgid "Generate encryption keys"
 msgstr "Generar claves de cifrado"
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Zotlabs/Module/Setup.php:498
 msgid "libCurl PHP module"
 msgstr "módulo libCurl PHP"
 
-#: ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:499
 msgid "GD graphics PHP module"
 msgstr "módulo PHP GD graphics"
 
-#: ../../Zotlabs/Module/Setup.php:504
+#: ../../Zotlabs/Module/Setup.php:500
 msgid "OpenSSL PHP module"
 msgstr "módulo PHP OpenSSL"
 
-#: ../../Zotlabs/Module/Setup.php:505
+#: ../../Zotlabs/Module/Setup.php:501
 msgid "PDO database PHP module"
 msgstr "Módulo PHP de la base de datos PDO "
 
-#: ../../Zotlabs/Module/Setup.php:506
+#: ../../Zotlabs/Module/Setup.php:502
 msgid "mb_string PHP module"
 msgstr "módulo PHP mb_string"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Zotlabs/Module/Setup.php:503
 msgid "xml PHP module"
 msgstr "módulo PHP xml"
 
-#: ../../Zotlabs/Module/Setup.php:508
+#: ../../Zotlabs/Module/Setup.php:504
 msgid "zip PHP module"
 msgstr "Módulo zip PHP"
 
-#: ../../Zotlabs/Module/Setup.php:512 ../../Zotlabs/Module/Setup.php:514
+#: ../../Zotlabs/Module/Setup.php:508 ../../Zotlabs/Module/Setup.php:510
 msgid "Apache mod_rewrite module"
 msgstr "módulo Apache mod_rewrite "
 
-#: ../../Zotlabs/Module/Setup.php:512
+#: ../../Zotlabs/Module/Setup.php:508
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:518 ../../Zotlabs/Module/Setup.php:521
+#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:517
 msgid "exec"
 msgstr "ejecutable"
 
-#: ../../Zotlabs/Module/Setup.php:518
+#: ../../Zotlabs/Module/Setup.php:514
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr "Error: se necesita un ejecutable pero o no se instaló o está deshabilitado en php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:524 ../../Zotlabs/Module/Setup.php:527
+#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523
 msgid "shell_exec"
 msgstr "shell_exec"
 
-#: ../../Zotlabs/Module/Setup.php:524
+#: ../../Zotlabs/Module/Setup.php:520
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Error: se necesita shell_exec pero o no se instaló o está deshabilitado en php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:532
+#: ../../Zotlabs/Module/Setup.php:528
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Error: se necesita el módulo PHP libCURL pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:536
+#: ../../Zotlabs/Module/Setup.php:532
 msgid ""
 "Error: GD PHP module with JPEG support or ImageMagick graphics library "
 "required but not installed."
 msgstr "Error: Se requiere el módulo GD PHP con soporte para JPEG o la biblioteca de gráficos ImageMagick, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:540
+#: ../../Zotlabs/Module/Setup.php:536
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Error: el módulo PHP openssl es necesario, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:546
+#: ../../Zotlabs/Module/Setup.php:542
 msgid ""
 "Error: PDO database PHP module missing a driver for either mysql or pgsql."
 msgstr "Error: El módulo PHP de la base de datos PDO carece de un controlador para mysql o pgsql."
 
-#: ../../Zotlabs/Module/Setup.php:551
+#: ../../Zotlabs/Module/Setup.php:547
 msgid "Error: PDO database PHP module required but not installed."
 msgstr "Error: se necesita el módulo PHP de la base de datos PDO, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:555
+#: ../../Zotlabs/Module/Setup.php:551
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Error: el módulo PHP mb_string es necesario, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:559
+#: ../../Zotlabs/Module/Setup.php:555
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Error: el módulo PHP xml es necesario para DAV, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:563
+#: ../../Zotlabs/Module/Setup.php:559
 msgid "Error: zip PHP module required but not installed."
 msgstr "Error: se requiere el módulo zip PHP pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:582 ../../Zotlabs/Module/Setup.php:591
+#: ../../Zotlabs/Module/Setup.php:578 ../../Zotlabs/Module/Setup.php:587
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:587
+#: ../../Zotlabs/Module/Setup.php:583
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:588
+#: ../../Zotlabs/Module/Setup.php:584
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos."
 
-#: ../../Zotlabs/Module/Setup.php:589
+#: ../../Zotlabs/Module/Setup.php:585
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr "Por favor, consulte install/INSTALL.txt para más información."
 
-#: ../../Zotlabs/Module/Setup.php:605
+#: ../../Zotlabs/Module/Setup.php:601
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr "Este software hace uso del motor de plantillas Smarty3 para diseñar sus plantillas gráficas. Smarty3 compila las plantillas a PHP para acelerar la renderización."
 
-#: ../../Zotlabs/Module/Setup.php:606
+#: ../../Zotlabs/Module/Setup.php:602
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al directorio %s en la carpeta web principal."
 
-#: ../../Zotlabs/Module/Setup.php:607 ../../Zotlabs/Module/Setup.php:628
+#: ../../Zotlabs/Module/Setup.php:603 ../../Zotlabs/Module/Setup.php:624
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Por favor, asegúrese de que el servidor web está siendo ejecutado por un usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, www-data)."
 
-#: ../../Zotlabs/Module/Setup.php:608
+#: ../../Zotlabs/Module/Setup.php:604
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr "Nota: como medida de seguridad, debe dar al servidor web permisos de escritura solo sobre %s - no sobre el fichero de plantilla (.tpl) que contiene."
 
-#: ../../Zotlabs/Module/Setup.php:611
+#: ../../Zotlabs/Module/Setup.php:607
 #, php-format
 msgid "%s is writable"
 msgstr "%s tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:627
+#: ../../Zotlabs/Module/Setup.php:623
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level"
 " web folder"
 msgstr "Este software utiliza el directorio de almacenamiento para guardar los ficheros subidos. El servidor web debe tener acceso de escritura a este directorio en la carpeta de nivel superior"
 
-#: ../../Zotlabs/Module/Setup.php:631
+#: ../../Zotlabs/Module/Setup.php:627
 msgid "store is writable"
 msgstr "\"store\" tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:663
+#: ../../Zotlabs/Module/Setup.php:659
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "El certificado SSL no ha podido ser validado. Corrija este problema o desactive el acceso https a este sitio."
 
-#: ../../Zotlabs/Module/Setup.php:664
+#: ../../Zotlabs/Module/Setup.php:660
 msgid ""
 "If you have https access to your website or allow connections to TCP port "
 "443 (the https: port), you MUST use a browser-valid certificate. You MUST "
 "NOT use self-signed certificates!"
 msgstr "Si su servidor soporta conexiones cifradas SSL o si permite conexiones al puerto TCP 443 (el puerto usado por el protocolo https), debe utilizar un certificado válido. No debe usar un certificado firmado por usted mismo."
 
-#: ../../Zotlabs/Module/Setup.php:665
+#: ../../Zotlabs/Module/Setup.php:661
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Se ha incorporado esta restricción para evitar que sus entradas públicas hagan referencia a imágenes en su propio servidor."
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Zotlabs/Module/Setup.php:662
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "Si su certificado no ha sido reconocido, los miembros de otros sitios (con certificados válidos) recibirán mensajes de aviso en sus propios sitios web."
 
-#: ../../Zotlabs/Module/Setup.php:667
+#: ../../Zotlabs/Module/Setup.php:663
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Por razones de compatibilidad (sobre el conjunto de la red, no solo sobre su propio sitio), debemos insistir en estos requisitos."
 
-#: ../../Zotlabs/Module/Setup.php:668
+#: ../../Zotlabs/Module/Setup.php:664
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Existen varias Autoridades de Certificación que le pueden proporcionar certificados válidos."
 
-#: ../../Zotlabs/Module/Setup.php:670
+#: ../../Zotlabs/Module/Setup.php:665
 msgid ""
 "If you are confident that the certificate is valid and signed by a trusted "
 "authority, check to see if you have failed to install an intermediate cert. "
@@ -2303,37 +2336,37 @@ msgid ""
 "server communications."
 msgstr "Si se tiene la certeza de que el certificado es válido y está firmado por una autoridad de confianza, comprobar para ver si hubo un error al instalar un certificado intermedio. Estos no son normalmente requeridos por los navegadores, pero son necesarios para las comunicaciones de servidor a servidor."
 
-#: ../../Zotlabs/Module/Setup.php:672
+#: ../../Zotlabs/Module/Setup.php:667
 msgid "SSL certificate validation"
 msgstr "validación del certificado SSL"
 
-#: ../../Zotlabs/Module/Setup.php:678
+#: ../../Zotlabs/Module/Setup.php:673
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "No se pueden reescribir las direcciones web en .htaccess. Compruebe la configuración de su servidor:"
 
-#: ../../Zotlabs/Module/Setup.php:681
+#: ../../Zotlabs/Module/Setup.php:676
 msgid "Url rewrite is working"
 msgstr "La reescritura de las direcciones funciona correctamente"
 
-#: ../../Zotlabs/Module/Setup.php:695
+#: ../../Zotlabs/Module/Setup.php:689
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "El fichero de configuración de la base de datos .htconfig.php no se ha podido modificar. Por favor, copie el texto generado en un fichero con ese nombre en el directorio raíz de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:719
+#: ../../Zotlabs/Module/Setup.php:718
 #: ../../addon/rendezvous/rendezvous.php:401
 msgid "Errors encountered creating database tables."
 msgstr "Se han encontrado errores al crear las tablas de la base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:759
+#: ../../Zotlabs/Module/Setup.php:764
 msgid "<h1>What next?</h1>"
 msgstr "<h1>¿Qué sigue?</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:760
+#: ../../Zotlabs/Module/Setup.php:765
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -2442,42 +2475,66 @@ msgid "Manage Additional Features"
 msgstr "Gestionar las funcionalidades"
 
 #: ../../Zotlabs/Module/Admin/Dbsync.php:19
+#: ../../Zotlabs/Module/Admin/Dbsync.php:59
 msgid "Update has been marked successful"
 msgstr "La actualización ha sido marcada como exitosa"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:31
+#: ../../Zotlabs/Module/Admin/Dbsync.php:32
 #, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr "La ejecución de %s ha fallado. Mirar en los informes del sistema."
+msgid "Verification of update %s failed. Check system logs."
+msgstr "Error en la verificación de la actualización %s. Compruebe los registros del sistema."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:34
+#: ../../Zotlabs/Module/Admin/Dbsync.php:35
+#: ../../Zotlabs/Module/Admin/Dbsync.php:74
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "La actualización de %s se ha realizado exitosamente."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:38
+#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#, php-format
+msgid "Verifying update %s did not return a status. Unknown if it succeeded."
+msgstr "La verificación de la actualización %s no devuelve un estado. Desconocido si tuvo éxito."
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:42
 #, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "La actualización de %s no ha devuelto ningún estado. No se sabe si ha tenido éxito."
+msgid "Update %s does not contain a verification function."
+msgstr "La actualización %s no contiene una función de verificación."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:41
+#: ../../Zotlabs/Module/Admin/Dbsync.php:46
+#: ../../Zotlabs/Module/Admin/Dbsync.php:81
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "No se encuentra la función de actualización de %s."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+#: ../../Zotlabs/Module/Admin/Dbsync.php:71
+#, php-format
+msgid "Executing update procedure %s failed. Check system logs."
+msgstr "Error al ejecutar el procedimiento de actualización %s. Compruebe los registros del sistema."
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:78
+#, php-format
+msgid ""
+"Update %s did not return a status. It cannot be determined if it was "
+"successful."
+msgstr "La actualización %s no devuelve un estado. No se puede determinar si tuvo éxito."
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:99
 msgid "Failed Updates"
 msgstr "Han fallado las actualizaciones"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:61
+#: ../../Zotlabs/Module/Admin/Dbsync.php:101
 msgid "Mark success (if update was manually applied)"
 msgstr "Marcar como exitosa (si la actualización se ha hecho manualmente)"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:62
+#: ../../Zotlabs/Module/Admin/Dbsync.php:102
+msgid "Attempt to verify this update if a verification procedure exists"
+msgstr "Intentar verificar esta actualización si existe un procedimiento de verificación."
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:103
 msgid "Attempt to execute this update step automatically"
 msgstr "Intentar ejecutar este paso de actualización automáticamente"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:67
+#: ../../Zotlabs/Module/Admin/Dbsync.php:108
 msgid "No failed updates."
 msgstr "No ha fallado ninguna actualización."
 
@@ -2499,7 +2556,7 @@ msgstr[1] "%s cuentas eliminadas"
 msgid "Account not found"
 msgstr "Cuenta no encontrada"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2562
+#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2632
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "La cuenta '%s' ha sido eliminada"
@@ -2551,7 +2608,7 @@ msgid "No registrations."
 msgstr "Sin registros."
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:173
-#: ../../Zotlabs/Module/Connections.php:306 ../../include/conversation.php:735
+#: ../../Zotlabs/Module/Connections.php:320 ../../include/conversation.php:735
 msgid "Approve"
 msgstr "Aprobar"
 
@@ -2708,7 +2765,7 @@ msgstr "Permitir código"
 msgid "Disallow Code"
 msgstr "No permitir código"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:421
+#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:423
 msgid "Channel"
 msgstr "Canal"
 
@@ -2739,9 +2796,9 @@ msgstr "No se han encontrado temas."
 #: ../../Zotlabs/Module/Admin/Themes.php:72
 #: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94
 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45
-#: ../../Zotlabs/Module/Display.php:450
-#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62
-#: ../../include/items.php:3693
+#: ../../Zotlabs/Module/Display.php:455
+#: ../../Zotlabs/Module/Filestorage.php:26 ../../Zotlabs/Module/Admin.php:62
+#: ../../include/items.php:3713
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
@@ -2770,9 +2827,9 @@ msgid "Toggle"
 msgstr "Cambiar"
 
 #: ../../Zotlabs/Module/Admin/Themes.php:125
-#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:336
+#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:338
 #: ../../Zotlabs/Widget/Newmember.php:53
-#: ../../Zotlabs/Widget/Settings_menu.php:61 ../../include/nav.php:97
+#: ../../Zotlabs/Widget/Settings_menu.php:61 ../../include/nav.php:101
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -2800,7 +2857,7 @@ msgstr "Ajustes del sitio actualizados."
 
 #: ../../Zotlabs/Module/Admin/Site.php:187
 #: ../../view/theme/redbasic_c/php/config.php:15
-#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3210
+#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3218
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -2856,7 +2913,7 @@ msgid "Site"
 msgstr "Sitio"
 
 #: ../../Zotlabs/Module/Admin/Site.php:290
-#: ../../Zotlabs/Module/Register.php:273
+#: ../../Zotlabs/Module/Register.php:277
 msgid "Registration"
 msgstr "Registro"
 
@@ -3310,7 +3367,7 @@ msgstr "Descargar el repositorio"
 msgid "Install new repo"
 msgstr "Instalar un nuevo repositorio"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:425 ../../Zotlabs/Lib/Apps.php:535
+#: ../../Zotlabs/Module/Admin/Addons.php:425 ../../Zotlabs/Lib/Apps.php:536
 msgid "Install"
 msgstr "Instalar"
 
@@ -3331,7 +3388,9 @@ msgid "Switch branch"
 msgstr "Cambiar la rama"
 
 #: ../../Zotlabs/Module/Admin/Addons.php:458
-#: ../../Zotlabs/Module/Photos.php:1035 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Zotlabs/Module/Photos.php:993
+#: ../../Zotlabs/Module/Profile_photo.php:499
+#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Tagrm.php:137
 #: ../../addon/superblock/Mod_Superblock.php:91
 msgid "Remove"
 msgstr "Eliminar"
@@ -3379,8 +3438,8 @@ msgstr "Información adicional (opcional)"
 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32
 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
 #: ../../Zotlabs/Widget/Notes.php:23
-#: ../../addon/queueworker/Mod_Queueworker.php:102 ../../include/text.php:1085
-#: ../../include/text.php:1097
+#: ../../addon/queueworker/Mod_Queueworker.php:102 ../../include/text.php:1104
+#: ../../include/text.php:1116
 msgid "Save"
 msgstr "Guardar"
 
@@ -3693,7 +3752,7 @@ msgid "Basic Settings"
 msgstr "Configuración básica"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:499
-#: ../../include/channel.php:1577
+#: ../../include/channel.php:1643
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
@@ -4027,8 +4086,8 @@ msgid "Events Settings"
 msgstr "Gestión de eventos"
 
 #: ../../Zotlabs/Module/Settings/Calendar.php:39
-msgid "CalDAV Settings"
-msgstr "Ajustes de CalDav"
+msgid "Calendar Settings"
+msgstr "Ajustes del calendario"
 
 #: ../../Zotlabs/Module/Settings/Conversation.php:22
 msgid "Settings saved."
@@ -4253,24 +4312,24 @@ msgstr "Mostrar el menú de enlaces rápidos para nuevos miembros"
 msgid "Stream Settings"
 msgstr "Ajustes del stream"
 
-#: ../../Zotlabs/Module/Embedphotos.php:148
-#: ../../Zotlabs/Module/Photos.php:826 ../../Zotlabs/Module/Photos.php:1374
+#: ../../Zotlabs/Module/Embedphotos.php:168
+#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1332
 #: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78
 msgid "View Photo"
 msgstr "Ver foto"
 
-#: ../../Zotlabs/Module/Embedphotos.php:164
-#: ../../Zotlabs/Module/Photos.php:857 ../../Zotlabs/Widget/Portfolio.php:108
+#: ../../Zotlabs/Module/Embedphotos.php:184
+#: ../../Zotlabs/Module/Photos.php:815 ../../Zotlabs/Widget/Portfolio.php:108
 #: ../../Zotlabs/Widget/Album.php:95
 msgid "Edit Album"
 msgstr "Editar álbum"
 
-#: ../../Zotlabs/Module/Embedphotos.php:166
-#: ../../Zotlabs/Module/Photos.php:727
-#: ../../Zotlabs/Module/Profile_photo.php:459
-#: ../../Zotlabs/Module/Cover_photo.php:395
-#: ../../Zotlabs/Storage/Browser.php:392 ../../Zotlabs/Widget/Cdav.php:133
-#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110
+#: ../../Zotlabs/Module/Embedphotos.php:186
+#: ../../Zotlabs/Module/Photos.php:685
+#: ../../Zotlabs/Module/Profile_photo.php:498
+#: ../../Zotlabs/Module/Cover_photo.php:429
+#: ../../Zotlabs/Storage/Browser.php:398 ../../Zotlabs/Widget/Cdav.php:146
+#: ../../Zotlabs/Widget/Cdav.php:182 ../../Zotlabs/Widget/Portfolio.php:110
 #: ../../Zotlabs/Widget/Album.php:97
 msgid "Upload"
 msgstr "Subir"
@@ -4388,9 +4447,9 @@ msgid "URL for photo of thing (optional)"
 msgstr "Dirección para la foto o elemento (opcional)"
 
 #: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372
-#: ../../Zotlabs/Module/Photos.php:717 ../../Zotlabs/Module/Photos.php:1086
+#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1044
 #: ../../Zotlabs/Module/Connedit.php:690 ../../Zotlabs/Module/Chat.php:243
-#: ../../Zotlabs/Module/Filestorage.php:170
+#: ../../Zotlabs/Module/Filestorage.php:190
 #: ../../include/acl_selectors.php:123
 msgid "Permissions"
 msgstr "Permisos"
@@ -4413,56 +4472,56 @@ msgstr "Notificaciones del sistema"
 msgid "Connection added."
 msgstr "Se ha incorporado una conexión."
 
-#: ../../Zotlabs/Module/Import.php:155
+#: ../../Zotlabs/Module/Import.php:157
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "Su paquete de servicios solo permite %d canales."
 
-#: ../../Zotlabs/Module/Import.php:182
+#: ../../Zotlabs/Module/Import.php:184
 msgid "No channel. Import failed."
 msgstr "No hay canal. La importación ha fallado"
 
-#: ../../Zotlabs/Module/Import.php:522
+#: ../../Zotlabs/Module/Import.php:594
 #: ../../addon/diaspora/import_diaspora.php:141
 msgid "Import completed."
 msgstr "Importación completada."
 
-#: ../../Zotlabs/Module/Import.php:550
+#: ../../Zotlabs/Module/Import.php:622
 msgid "You must be logged in to use this feature."
 msgstr "Debe estar registrado para poder usar esta funcionalidad."
 
-#: ../../Zotlabs/Module/Import.php:555
+#: ../../Zotlabs/Module/Import.php:627
 msgid "Import Channel"
 msgstr "Importar canal"
 
-#: ../../Zotlabs/Module/Import.php:556
+#: ../../Zotlabs/Module/Import.php:628
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación."
 
-#: ../../Zotlabs/Module/Import.php:558
+#: ../../Zotlabs/Module/Import.php:630
 msgid "Or provide the old server/hub details"
 msgstr "O proporcione los detalles de su antiguo servidor/hub"
 
-#: ../../Zotlabs/Module/Import.php:560
+#: ../../Zotlabs/Module/Import.php:632
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Su identidad en el antiguo servidor  (canal@ejemplo.com)"
 
-#: ../../Zotlabs/Module/Import.php:561
+#: ../../Zotlabs/Module/Import.php:633
 msgid "Your old login email address"
 msgstr "Su antigua dirección de correo electrónico"
 
-#: ../../Zotlabs/Module/Import.php:562
+#: ../../Zotlabs/Module/Import.php:634
 msgid "Your old login password"
 msgstr "Su antigua contraseña"
 
-#: ../../Zotlabs/Module/Import.php:563
+#: ../../Zotlabs/Module/Import.php:635
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr "Importar unos meses de mensajes si es posible (limitado por la memoria disponible"
 
-#: ../../Zotlabs/Module/Import.php:565
+#: ../../Zotlabs/Module/Import.php:637
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -4470,26 +4529,26 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos."
 
-#: ../../Zotlabs/Module/Import.php:567
+#: ../../Zotlabs/Module/Import.php:639
 msgid "Make this hub my primary location"
 msgstr "Convertir este servidor en mi ubicación primaria"
 
-#: ../../Zotlabs/Module/Import.php:568
+#: ../../Zotlabs/Module/Import.php:640
 msgid "Move this channel (disable all previous locations)"
 msgstr "Mover este canal (desactivar todas las ubicaciones anteriores)"
 
-#: ../../Zotlabs/Module/Import.php:569
+#: ../../Zotlabs/Module/Import.php:641
 msgid "Use this channel nickname instead of the one provided"
 msgstr "Usa este alias de canal en lugar del que se proporciona"
 
-#: ../../Zotlabs/Module/Import.php:569
+#: ../../Zotlabs/Module/Import.php:641
 msgid ""
 "Leave blank to keep your existing channel nickname. You will be randomly "
 "assigned a similar nickname if either name is already allocated on this "
 "site."
 msgstr "Dejar en blanco para mantener su alias de canal . Se le asignará aleatoriamente uno similar si cualquiera de los dos nombres ya está asignado en este sitio."
 
-#: ../../Zotlabs/Module/Import.php:571
+#: ../../Zotlabs/Module/Import.php:643
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -4499,16 +4558,16 @@ msgstr "Este proceso puede tardar varios minutos en completarse. Por favor enví
 msgid "Authentication failed."
 msgstr "Falló la autenticación."
 
-#: ../../Zotlabs/Module/Rmagic.php:93 ../../boot.php:1630
-#: ../../include/channel.php:2405
+#: ../../Zotlabs/Module/Rmagic.php:93 ../../boot.php:1631
+#: ../../include/channel.php:2475
 msgid "Remote Authentication"
 msgstr "Acceso desde su servidor"
 
-#: ../../Zotlabs/Module/Rmagic.php:94 ../../include/channel.php:2406
+#: ../../Zotlabs/Module/Rmagic.php:94 ../../include/channel.php:2476
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)"
 
-#: ../../Zotlabs/Module/Rmagic.php:95 ../../include/channel.php:2407
+#: ../../Zotlabs/Module/Rmagic.php:95 ../../include/channel.php:2477
 msgid "Authenticate"
 msgstr "Acceder"
 
@@ -4602,7 +4661,7 @@ msgstr "Eliminar autorización"
 msgid "Permissions denied."
 msgstr "Permisos denegados."
 
-#: ../../Zotlabs/Module/Cal.php:343 ../../include/text.php:2558
+#: ../../Zotlabs/Module/Cal.php:343 ../../include/text.php:2573
 msgid "Import"
 msgstr "Importar"
 
@@ -4674,36 +4733,36 @@ msgstr "App Estados de ánimo"
 msgid "Set your current mood and tell your friends"
 msgstr "Describir su estado de ánimo para comunicárselo a sus amigos"
 
-#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:347
+#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:349
 msgid "Mood"
 msgstr "Estado de ánimo"
 
 #: ../../Zotlabs/Module/Connections.php:58
 #: ../../Zotlabs/Module/Connections.php:115
-#: ../../Zotlabs/Module/Connections.php:259
+#: ../../Zotlabs/Module/Connections.php:273
 msgid "Active"
 msgstr "Activo/a"
 
 #: ../../Zotlabs/Module/Connections.php:63
-#: ../../Zotlabs/Module/Connections.php:167
-#: ../../Zotlabs/Module/Connections.php:264
+#: ../../Zotlabs/Module/Connections.php:181
+#: ../../Zotlabs/Module/Connections.php:278
 msgid "Blocked"
 msgstr "Bloqueadas"
 
 #: ../../Zotlabs/Module/Connections.php:68
-#: ../../Zotlabs/Module/Connections.php:174
-#: ../../Zotlabs/Module/Connections.php:263
+#: ../../Zotlabs/Module/Connections.php:188
+#: ../../Zotlabs/Module/Connections.php:277
 msgid "Ignored"
 msgstr "Ignoradas"
 
 #: ../../Zotlabs/Module/Connections.php:73
-#: ../../Zotlabs/Module/Connections.php:188
-#: ../../Zotlabs/Module/Connections.php:262
+#: ../../Zotlabs/Module/Connections.php:202
+#: ../../Zotlabs/Module/Connections.php:276
 msgid "Hidden"
 msgstr "Ocultas"
 
 #: ../../Zotlabs/Module/Connections.php:78
-#: ../../Zotlabs/Module/Connections.php:181
+#: ../../Zotlabs/Module/Connections.php:195
 msgid "Archived/Unreachable"
 msgstr "Archivadas o inaccesibles"
 
@@ -4719,121 +4778,121 @@ msgstr "Nuevas"
 msgid "All"
 msgstr "Todos/as"
 
-#: ../../Zotlabs/Module/Connections.php:143
+#: ../../Zotlabs/Module/Connections.php:157
 msgid "Active Connections"
 msgstr "Conexiones activas"
 
-#: ../../Zotlabs/Module/Connections.php:146
+#: ../../Zotlabs/Module/Connections.php:160
 msgid "Show active connections"
 msgstr "Mostrar las conexiones activas"
 
-#: ../../Zotlabs/Module/Connections.php:150
+#: ../../Zotlabs/Module/Connections.php:164
 #: ../../Zotlabs/Widget/Notifications.php:84
 msgid "New Connections"
 msgstr "Nuevas conexiones"
 
-#: ../../Zotlabs/Module/Connections.php:153
+#: ../../Zotlabs/Module/Connections.php:167
 msgid "Show pending (new) connections"
 msgstr "Mostrar conexiones (nuevas) pendientes"
 
-#: ../../Zotlabs/Module/Connections.php:170
+#: ../../Zotlabs/Module/Connections.php:184
 msgid "Only show blocked connections"
 msgstr "Mostrar solo las conexiones bloqueadas"
 
-#: ../../Zotlabs/Module/Connections.php:177
+#: ../../Zotlabs/Module/Connections.php:191
 msgid "Only show ignored connections"
 msgstr "Mostrar solo conexiones ignoradas"
 
-#: ../../Zotlabs/Module/Connections.php:184
+#: ../../Zotlabs/Module/Connections.php:198
 msgid "Only show archived/unreachable connections"
 msgstr "Mostrar solo las conexiones archivadas o no localizables"
 
-#: ../../Zotlabs/Module/Connections.php:191
+#: ../../Zotlabs/Module/Connections.php:205
 msgid "Only show hidden connections"
 msgstr "Mostrar solo las conexiones ocultas"
 
-#: ../../Zotlabs/Module/Connections.php:206
+#: ../../Zotlabs/Module/Connections.php:220
 msgid "Show all connections"
 msgstr "Mostrar todas las conexiones"
 
-#: ../../Zotlabs/Module/Connections.php:260
+#: ../../Zotlabs/Module/Connections.php:274
 msgid "Pending approval"
 msgstr "Pendiente de aprobación"
 
-#: ../../Zotlabs/Module/Connections.php:261
+#: ../../Zotlabs/Module/Connections.php:275
 msgid "Archived"
 msgstr "Archivadas"
 
-#: ../../Zotlabs/Module/Connections.php:265
+#: ../../Zotlabs/Module/Connections.php:279
 msgid "Not connected at this location"
 msgstr "No está conectado/a en esta ubicación"
 
-#: ../../Zotlabs/Module/Connections.php:282
+#: ../../Zotlabs/Module/Connections.php:296
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../Zotlabs/Module/Connections.php:283
+#: ../../Zotlabs/Module/Connections.php:297
 msgid "Edit connection"
 msgstr "Editar conexión"
 
-#: ../../Zotlabs/Module/Connections.php:285
+#: ../../Zotlabs/Module/Connections.php:299
 msgid "Delete connection"
 msgstr "Eliminar conexión"
 
-#: ../../Zotlabs/Module/Connections.php:294
+#: ../../Zotlabs/Module/Connections.php:308
 msgid "Channel address"
 msgstr "Dirección del canal"
 
-#: ../../Zotlabs/Module/Connections.php:296 ../../include/features.php:313
+#: ../../Zotlabs/Module/Connections.php:310 ../../include/features.php:321
 msgid "Network"
 msgstr "Red"
 
-#: ../../Zotlabs/Module/Connections.php:299
+#: ../../Zotlabs/Module/Connections.php:313
 msgid "Call"
 msgstr "Llamar"
 
-#: ../../Zotlabs/Module/Connections.php:301
+#: ../../Zotlabs/Module/Connections.php:315
 msgid "Status"
 msgstr "Estado"
 
-#: ../../Zotlabs/Module/Connections.php:303
+#: ../../Zotlabs/Module/Connections.php:317
 msgid "Connected"
 msgstr "Conectado/a"
 
-#: ../../Zotlabs/Module/Connections.php:305
+#: ../../Zotlabs/Module/Connections.php:319
 msgid "Approve connection"
 msgstr "Aprobar esta conexión"
 
-#: ../../Zotlabs/Module/Connections.php:307
+#: ../../Zotlabs/Module/Connections.php:321
 msgid "Ignore connection"
 msgstr "Ignorar esta conexión"
 
-#: ../../Zotlabs/Module/Connections.php:308
+#: ../../Zotlabs/Module/Connections.php:322
 #: ../../Zotlabs/Module/Connedit.php:644
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../../Zotlabs/Module/Connections.php:309
+#: ../../Zotlabs/Module/Connections.php:323
 msgid "Recent activity"
 msgstr "Actividad reciente"
 
-#: ../../Zotlabs/Module/Connections.php:334 ../../Zotlabs/Lib/Apps.php:330
-#: ../../include/text.php:991 ../../include/features.php:125
+#: ../../Zotlabs/Module/Connections.php:348 ../../Zotlabs/Lib/Apps.php:332
+#: ../../include/text.php:1010 ../../include/features.php:125
 msgid "Connections"
 msgstr "Conexiones"
 
-#: ../../Zotlabs/Module/Connections.php:339
+#: ../../Zotlabs/Module/Connections.php:353
 msgid "Search your connections"
 msgstr "Buscar sus conexiones"
 
-#: ../../Zotlabs/Module/Connections.php:340
+#: ../../Zotlabs/Module/Connections.php:354
 msgid "Connections search"
 msgstr "Buscar conexiones"
 
-#: ../../Zotlabs/Module/Connections.php:341
-#: ../../Zotlabs/Module/Directory.php:405
-#: ../../Zotlabs/Module/Directory.php:410 ../../include/contact_widgets.php:23
+#: ../../Zotlabs/Module/Connections.php:355
+#: ../../Zotlabs/Module/Directory.php:416
+#: ../../Zotlabs/Module/Directory.php:421 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr "Encontrar"
 
@@ -4901,198 +4960,198 @@ msgstr "Álbum no encontrado."
 msgid "Delete Album"
 msgstr "Borrar álbum"
 
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1098
+#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1056
 msgid "Delete Photo"
 msgstr "Borrar foto"
 
-#: ../../Zotlabs/Module/Photos.php:569
+#: ../../Zotlabs/Module/Photos.php:527
 msgid "No photos selected"
 msgstr "No hay fotos seleccionadas"
 
-#: ../../Zotlabs/Module/Photos.php:618
+#: ../../Zotlabs/Module/Photos.php:576
 msgid "Access to this item is restricted."
 msgstr "El acceso a este elemento está restringido."
 
-#: ../../Zotlabs/Module/Photos.php:661
+#: ../../Zotlabs/Module/Photos.php:619
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../Zotlabs/Module/Photos.php:664
+#: ../../Zotlabs/Module/Photos.php:622
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../Zotlabs/Module/Photos.php:706
+#: ../../Zotlabs/Module/Photos.php:664
 msgid "Upload Photos"
 msgstr "Subir fotos"
 
-#: ../../Zotlabs/Module/Photos.php:710
+#: ../../Zotlabs/Module/Photos.php:668
 msgid "Enter an album name"
 msgstr "Introducir un nombre de álbum"
 
-#: ../../Zotlabs/Module/Photos.php:711
+#: ../../Zotlabs/Module/Photos.php:669
 msgid "or select an existing album (doubleclick)"
 msgstr "o seleccionar un álbum (con un doble click)"
 
-#: ../../Zotlabs/Module/Photos.php:712
+#: ../../Zotlabs/Module/Photos.php:670
 msgid "Create a status post for this upload"
 msgstr "Crear un mensaje de estado para esta subida"
 
-#: ../../Zotlabs/Module/Photos.php:714
+#: ../../Zotlabs/Module/Photos.php:672
 msgid "Description (optional)"
 msgstr "Descripción (opcional)"
 
-#: ../../Zotlabs/Module/Photos.php:800
+#: ../../Zotlabs/Module/Photos.php:758
 msgid "Show Newest First"
 msgstr "Mostrar lo más reciente primero"
 
-#: ../../Zotlabs/Module/Photos.php:802
+#: ../../Zotlabs/Module/Photos.php:760
 msgid "Show Oldest First"
 msgstr "Mostrar lo más antiguo primero"
 
-#: ../../Zotlabs/Module/Photos.php:859 ../../Zotlabs/Module/Photos.php:1405
+#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1363
 msgid "Add Photos"
 msgstr "Añadir fotos"
 
-#: ../../Zotlabs/Module/Photos.php:907
+#: ../../Zotlabs/Module/Photos.php:865
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
 
-#: ../../Zotlabs/Module/Photos.php:909
+#: ../../Zotlabs/Module/Photos.php:867
 msgid "Photo not available"
 msgstr "Foto no disponible"
 
-#: ../../Zotlabs/Module/Photos.php:967
+#: ../../Zotlabs/Module/Photos.php:925
 msgid "Use as profile photo"
 msgstr "Usar como foto del perfil"
 
-#: ../../Zotlabs/Module/Photos.php:968
+#: ../../Zotlabs/Module/Photos.php:926
 msgid "Use as cover photo"
 msgstr "Usar como imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Photos.php:975
+#: ../../Zotlabs/Module/Photos.php:933
 msgid "Private Photo"
 msgstr "Foto privada"
 
-#: ../../Zotlabs/Module/Photos.php:990
+#: ../../Zotlabs/Module/Photos.php:948
 msgid "View Full Size"
 msgstr "Ver tamaño completo"
 
-#: ../../Zotlabs/Module/Photos.php:1072
+#: ../../Zotlabs/Module/Photos.php:1030
 msgid "Edit photo"
 msgstr "Editar foto"
 
-#: ../../Zotlabs/Module/Photos.php:1074
+#: ../../Zotlabs/Module/Photos.php:1032
 msgid "Rotate CW (right)"
 msgstr "Girar CW (a la derecha)"
 
-#: ../../Zotlabs/Module/Photos.php:1075
+#: ../../Zotlabs/Module/Photos.php:1033
 msgid "Rotate CCW (left)"
 msgstr "Girar CCW (a la izquierda)"
 
-#: ../../Zotlabs/Module/Photos.php:1078
+#: ../../Zotlabs/Module/Photos.php:1036
 msgid "Move photo to album"
 msgstr "Mover la foto a un álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1079
+#: ../../Zotlabs/Module/Photos.php:1037
 msgid "Enter a new album name"
 msgstr "Introducir un nuevo nombre de álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1080
+#: ../../Zotlabs/Module/Photos.php:1038
 msgid "or select an existing one (doubleclick)"
 msgstr "o seleccionar un álbum (con un doble click)"
 
-#: ../../Zotlabs/Module/Photos.php:1085
+#: ../../Zotlabs/Module/Photos.php:1043
 msgid "Add a Tag"
 msgstr "Añadir una etiqueta"
 
-#: ../../Zotlabs/Module/Photos.php:1093
+#: ../../Zotlabs/Module/Photos.php:1051
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"
 
-#: ../../Zotlabs/Module/Photos.php:1096
+#: ../../Zotlabs/Module/Photos.php:1054
 msgid "Flag as adult in album view"
 msgstr "Marcar como \"solo para adultos\" en el álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../Zotlabs/Lib/ThreadItem.php:306
+#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:307
 msgid "I like this (toggle)"
 msgstr "Me gusta (cambiar)"
 
-#: ../../Zotlabs/Module/Photos.php:1116 ../../Zotlabs/Lib/ThreadItem.php:307
+#: ../../Zotlabs/Module/Photos.php:1074 ../../Zotlabs/Lib/ThreadItem.php:308
 msgid "I don't like this (toggle)"
 msgstr "No me gusta esto (cambiar)"
 
-#: ../../Zotlabs/Module/Photos.php:1118 ../../Zotlabs/Lib/ThreadItem.php:469
+#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:469
 #: ../../include/conversation.php:787
 msgid "Please wait"
 msgstr "Espere por favor"
 
-#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Module/Photos.php:1254
-#: ../../Zotlabs/Lib/ThreadItem.php:792
+#: ../../Zotlabs/Module/Photos.php:1093 ../../Zotlabs/Module/Photos.php:1212
+#: ../../Zotlabs/Lib/ThreadItem.php:793
 msgid "This is you"
 msgstr "Este es usted"
 
-#: ../../Zotlabs/Module/Photos.php:1137 ../../Zotlabs/Module/Photos.php:1256
-#: ../../Zotlabs/Lib/ThreadItem.php:794 ../../include/js_strings.php:6
+#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1214
+#: ../../Zotlabs/Lib/ThreadItem.php:795 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Comentar"
 
-#: ../../Zotlabs/Module/Photos.php:1154 ../../include/conversation.php:619
+#: ../../Zotlabs/Module/Photos.php:1112 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1154 ../../include/conversation.php:619
+#: ../../Zotlabs/Module/Photos.php:1112 ../../include/conversation.php:619
 msgctxt "title"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1155 ../../include/conversation.php:620
+#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Agree"
 msgstr "De acuerdo"
 
-#: ../../Zotlabs/Module/Photos.php:1155 ../../include/conversation.php:620
+#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Disagree"
 msgstr "En desacuerdo"
 
-#: ../../Zotlabs/Module/Photos.php:1155 ../../include/conversation.php:620
+#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:620
 msgctxt "title"
 msgid "Abstain"
 msgstr "Abstención"
 
-#: ../../Zotlabs/Module/Photos.php:1156 ../../include/conversation.php:621
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:621
 msgctxt "title"
 msgid "Attending"
 msgstr "Participaré"
 
-#: ../../Zotlabs/Module/Photos.php:1156 ../../include/conversation.php:621
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:621
 msgctxt "title"
 msgid "Not attending"
 msgstr "No participaré"
 
-#: ../../Zotlabs/Module/Photos.php:1156 ../../include/conversation.php:621
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:621
 msgctxt "title"
 msgid "Might attend"
 msgstr "Quizá participe"
 
-#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Photos.php:1185
-#: ../../Zotlabs/Lib/ThreadItem.php:231 ../../Zotlabs/Lib/ThreadItem.php:243
+#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Module/Photos.php:1143
+#: ../../Zotlabs/Lib/ThreadItem.php:232 ../../Zotlabs/Lib/ThreadItem.php:244
 msgid "View all"
 msgstr "Ver todo"
 
-#: ../../Zotlabs/Module/Photos.php:1177 ../../Zotlabs/Lib/ThreadItem.php:235
-#: ../../include/conversation.php:1702 ../../include/channel.php:1595
-#: ../../include/taxonomy.php:661
+#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:236
+#: ../../include/conversation.php:1702 ../../include/channel.php:1661
+#: ../../include/taxonomy.php:659
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Me gusta"
 msgstr[1] "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1182 ../../Zotlabs/Lib/ThreadItem.php:240
+#: ../../Zotlabs/Module/Photos.php:1140 ../../Zotlabs/Lib/ThreadItem.php:241
 #: ../../include/conversation.php:1705
 msgctxt "noun"
 msgid "Dislike"
@@ -5100,35 +5159,36 @@ msgid_plural "Dislikes"
 msgstr[0] "No me gusta"
 msgstr[1] "No me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1288
+#: ../../Zotlabs/Module/Photos.php:1246
 msgid "Photo Tools"
 msgstr "Gestión de las fotos"
 
-#: ../../Zotlabs/Module/Photos.php:1297
+#: ../../Zotlabs/Module/Photos.php:1255
 msgid "In This Photo:"
 msgstr "En esta foto:"
 
-#: ../../Zotlabs/Module/Photos.php:1302
+#: ../../Zotlabs/Module/Photos.php:1260
 msgid "Map"
 msgstr "Mapa"
 
-#: ../../Zotlabs/Module/Photos.php:1310 ../../Zotlabs/Lib/ThreadItem.php:457
+#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:457
 msgctxt "noun"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1311 ../../Zotlabs/Lib/ThreadItem.php:458
+#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:458
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1316 ../../Zotlabs/Lib/ThreadItem.php:463
+#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:463
+#: ../../addon/channelreputation/channelreputation.php:230
 #: ../../include/acl_selectors.php:125
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../../Zotlabs/Module/Photos.php:1389 ../../Zotlabs/Module/Photos.php:1402
-#: ../../Zotlabs/Module/Photos.php:1403 ../../include/photos.php:670
+#: ../../Zotlabs/Module/Photos.php:1347 ../../Zotlabs/Module/Photos.php:1360
+#: ../../Zotlabs/Module/Photos.php:1361 ../../include/photos.php:667
 msgid "Recent Photos"
 msgstr "Fotos recientes"
 
@@ -5165,7 +5225,7 @@ msgid "Error downloading wiki: "
 msgstr "Error al descargar el wiki: "
 
 #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Widget/Wiki_list.php:15
-#: ../../include/nav.php:536
+#: ../../include/nav.php:538
 msgid "Wikis"
 msgstr "Wikis"
 
@@ -5189,22 +5249,22 @@ msgstr "Tipo de contenido"
 #: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371
 #: ../../Zotlabs/Widget/Wiki_pages.php:38
 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../addon/mdpost/mdpost.php:41
-#: ../../include/text.php:1955
+#: ../../include/text.php:1979
 msgid "Markdown"
 msgstr "Markdown"
 
 #: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371
 #: ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1953
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1977
 msgid "BBcode"
 msgstr "BBcode"
 
 #: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1956
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1980
 msgid "Text"
 msgstr "Texto"
 
-#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Storage/Browser.php:286
+#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Storage/Browser.php:292
 msgid "Type"
 msgstr "Tipo"
 
@@ -5271,50 +5331,50 @@ msgid "Embed an image from your albums"
 msgstr "Incluir una imagen de sus álbumes"
 
 #: ../../Zotlabs/Module/Wiki.php:402
-#: ../../Zotlabs/Module/Profile_photo.php:466
-#: ../../Zotlabs/Module/Cover_photo.php:400 ../../addon/hsse/hsse.php:210
+#: ../../Zotlabs/Module/Profile_photo.php:506
+#: ../../Zotlabs/Module/Cover_photo.php:435 ../../addon/hsse/hsse.php:210
 #: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1416
 #: ../../include/conversation.php:1463
 msgid "OK"
 msgstr "OK"
 
 #: ../../Zotlabs/Module/Wiki.php:403
-#: ../../Zotlabs/Module/Profile_photo.php:467
-#: ../../Zotlabs/Module/Cover_photo.php:401 ../../addon/hsse/hsse.php:139
+#: ../../Zotlabs/Module/Profile_photo.php:507
+#: ../../Zotlabs/Module/Cover_photo.php:436 ../../addon/hsse/hsse.php:139
 #: ../../include/conversation.php:1342
 msgid "Choose images to embed"
 msgstr "Elegir imágenes para incluir"
 
 #: ../../Zotlabs/Module/Wiki.php:404
-#: ../../Zotlabs/Module/Profile_photo.php:468
-#: ../../Zotlabs/Module/Cover_photo.php:402 ../../addon/hsse/hsse.php:140
+#: ../../Zotlabs/Module/Profile_photo.php:508
+#: ../../Zotlabs/Module/Cover_photo.php:437 ../../addon/hsse/hsse.php:140
 #: ../../include/conversation.php:1343
 msgid "Choose an album"
 msgstr "Elegir un álbum"
 
 #: ../../Zotlabs/Module/Wiki.php:405
-#: ../../Zotlabs/Module/Profile_photo.php:469
-#: ../../Zotlabs/Module/Cover_photo.php:403
+#: ../../Zotlabs/Module/Profile_photo.php:509
+#: ../../Zotlabs/Module/Cover_photo.php:438
 msgid "Choose a different album"
 msgstr "Elegir un álbum diferente..."
 
 #: ../../Zotlabs/Module/Wiki.php:406
-#: ../../Zotlabs/Module/Profile_photo.php:470
-#: ../../Zotlabs/Module/Cover_photo.php:404 ../../addon/hsse/hsse.php:142
+#: ../../Zotlabs/Module/Profile_photo.php:510
+#: ../../Zotlabs/Module/Cover_photo.php:439 ../../addon/hsse/hsse.php:142
 #: ../../include/conversation.php:1345
 msgid "Error getting album list"
 msgstr "Error al obtener la lista de álbumes"
 
 #: ../../Zotlabs/Module/Wiki.php:407
-#: ../../Zotlabs/Module/Profile_photo.php:471
-#: ../../Zotlabs/Module/Cover_photo.php:405 ../../addon/hsse/hsse.php:143
+#: ../../Zotlabs/Module/Profile_photo.php:511
+#: ../../Zotlabs/Module/Cover_photo.php:440 ../../addon/hsse/hsse.php:143
 #: ../../include/conversation.php:1346
 msgid "Error getting photo link"
 msgstr "Error al obtener el enlace de la foto"
 
 #: ../../Zotlabs/Module/Wiki.php:408
-#: ../../Zotlabs/Module/Profile_photo.php:472
-#: ../../Zotlabs/Module/Cover_photo.php:406 ../../addon/hsse/hsse.php:144
+#: ../../Zotlabs/Module/Profile_photo.php:512
+#: ../../Zotlabs/Module/Cover_photo.php:441 ../../addon/hsse/hsse.php:144
 #: ../../include/conversation.php:1347
 msgid "Error getting album"
 msgstr "Error al obtener el álbum"
@@ -5375,7 +5435,7 @@ msgstr "Revisión seleccionada"
 msgid "You must be authenticated."
 msgstr "Debe estar autenticado."
 
-#: ../../Zotlabs/Module/Share.php:103 ../../Zotlabs/Lib/Activity.php:1473
+#: ../../Zotlabs/Module/Share.php:103 ../../Zotlabs/Lib/Activity.php:1529
 #, php-format
 msgid "&#x1f501; Repeated %1$s's %2$s"
 msgstr "&#x1f501; Repetidos %2$sde %1$s"
@@ -5440,7 +5500,7 @@ msgstr "App Toques"
 msgid "Poke somebody in your addressbook"
 msgstr "Dar un toque a alguien en su libreta de direcciones"
 
-#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:348
+#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:350
 #: ../../include/conversation.php:1098
 msgid "Poke"
 msgstr "Toques y otras cosas"
@@ -5469,109 +5529,109 @@ msgstr "Elegir qué desea enviar al destinatario"
 msgid "Make this post private"
 msgstr "Convertir en privado este envío"
 
-#: ../../Zotlabs/Module/Profile_photo.php:66
-#: ../../Zotlabs/Module/Cover_photo.php:57
+#: ../../Zotlabs/Module/Profile_photo.php:91
+#: ../../Zotlabs/Module/Cover_photo.php:83
 msgid "Image uploaded but image cropping failed."
 msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. "
 
-#: ../../Zotlabs/Module/Profile_photo.php:120
-#: ../../Zotlabs/Module/Profile_photo.php:248
+#: ../../Zotlabs/Module/Profile_photo.php:145
+#: ../../Zotlabs/Module/Profile_photo.php:282
 #: ../../include/photo/photo_driver.php:367
 msgid "Profile Photos"
 msgstr "Fotos del perfil"
 
-#: ../../Zotlabs/Module/Profile_photo.php:142
-#: ../../Zotlabs/Module/Cover_photo.php:191
+#: ../../Zotlabs/Module/Profile_photo.php:164
+#: ../../Zotlabs/Module/Cover_photo.php:210
 msgid "Image resize failed."
 msgstr "El ajuste del tamaño de la imagen ha fallado."
 
-#: ../../Zotlabs/Module/Profile_photo.php:218
+#: ../../Zotlabs/Module/Profile_photo.php:252
 #: ../../addon/openclipatar/openclipatar.php:298
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente."
 
-#: ../../Zotlabs/Module/Profile_photo.php:225
-#: ../../Zotlabs/Module/Cover_photo.php:205 ../../include/photos.php:196
+#: ../../Zotlabs/Module/Profile_photo.php:259
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/photos.php:196
 msgid "Unable to process image"
 msgstr "No ha sido posible procesar la imagen"
 
-#: ../../Zotlabs/Module/Profile_photo.php:260
-#: ../../Zotlabs/Module/Cover_photo.php:229
+#: ../../Zotlabs/Module/Profile_photo.php:294
+#: ../../Zotlabs/Module/Cover_photo.php:263
 msgid "Image upload failed."
 msgstr "La carga de la imagen ha fallado."
 
-#: ../../Zotlabs/Module/Profile_photo.php:279
-#: ../../Zotlabs/Module/Cover_photo.php:246
+#: ../../Zotlabs/Module/Profile_photo.php:313
+#: ../../Zotlabs/Module/Cover_photo.php:280
 msgid "Unable to process image."
 msgstr "No ha sido posible procesar la imagen."
 
-#: ../../Zotlabs/Module/Profile_photo.php:343
-#: ../../Zotlabs/Module/Profile_photo.php:390
-#: ../../Zotlabs/Module/Cover_photo.php:339
-#: ../../Zotlabs/Module/Cover_photo.php:354
+#: ../../Zotlabs/Module/Profile_photo.php:377
+#: ../../Zotlabs/Module/Profile_photo.php:429
+#: ../../Zotlabs/Module/Cover_photo.php:373
+#: ../../Zotlabs/Module/Cover_photo.php:388
 msgid "Photo not available."
 msgstr "Foto no disponible."
 
-#: ../../Zotlabs/Module/Profile_photo.php:454
+#: ../../Zotlabs/Module/Profile_photo.php:493
 msgid ""
 "Your default profile photo is visible to anybody on the internet. Profile "
 "photos for alternate profiles will inherit the permissions of the profile"
 msgstr "Su foto de perfil predeterminada es visible para cualquiera en Internet. Las fotos de perfil para perfiles alternativos heredarán los permisos del predeterminado."
 
-#: ../../Zotlabs/Module/Profile_photo.php:454
+#: ../../Zotlabs/Module/Profile_photo.php:493
 msgid ""
 "Your profile photo is visible to anybody on the internet and may be "
 "distributed to other websites."
 msgstr "La foto de su perfil es visible para cualquiera en Internet y puede ser distribuida en otros sitios web."
 
-#: ../../Zotlabs/Module/Profile_photo.php:456
-#: ../../Zotlabs/Module/Cover_photo.php:392
+#: ../../Zotlabs/Module/Profile_photo.php:495
+#: ../../Zotlabs/Module/Cover_photo.php:426
 msgid "Upload File:"
 msgstr "Subir fichero:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:457
-#: ../../Zotlabs/Module/Cover_photo.php:393
+#: ../../Zotlabs/Module/Profile_photo.php:496
+#: ../../Zotlabs/Module/Cover_photo.php:427
 msgid "Select a profile:"
 msgstr "Seleccionar un perfil:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:458
+#: ../../Zotlabs/Module/Profile_photo.php:497
 msgid "Use Photo for Profile"
 msgstr "Usar la fotografía para el perfil"
 
-#: ../../Zotlabs/Module/Profile_photo.php:458
+#: ../../Zotlabs/Module/Profile_photo.php:497
 msgid "Change Profile Photo"
 msgstr "Cambiar la foto del perfil"
 
-#: ../../Zotlabs/Module/Profile_photo.php:459
+#: ../../Zotlabs/Module/Profile_photo.php:498
 msgid "Use"
 msgstr "Usar"
 
-#: ../../Zotlabs/Module/Profile_photo.php:463
-#: ../../Zotlabs/Module/Profile_photo.php:464
-#: ../../Zotlabs/Module/Cover_photo.php:397
-#: ../../Zotlabs/Module/Cover_photo.php:398
+#: ../../Zotlabs/Module/Profile_photo.php:503
+#: ../../Zotlabs/Module/Profile_photo.php:504
+#: ../../Zotlabs/Module/Cover_photo.php:432
+#: ../../Zotlabs/Module/Cover_photo.php:433
 msgid "Use a photo from your albums"
 msgstr "Usar una foto de sus álbumes"
 
-#: ../../Zotlabs/Module/Profile_photo.php:474
-#: ../../Zotlabs/Module/Cover_photo.php:409
+#: ../../Zotlabs/Module/Profile_photo.php:514
+#: ../../Zotlabs/Module/Cover_photo.php:444
 msgid "Select existing photo"
 msgstr "Seleccionar una foto"
 
-#: ../../Zotlabs/Module/Profile_photo.php:493
-#: ../../Zotlabs/Module/Cover_photo.php:426
+#: ../../Zotlabs/Module/Profile_photo.php:533
+#: ../../Zotlabs/Module/Cover_photo.php:461
 msgid "Crop Image"
 msgstr "Recortar imagen"
 
-#: ../../Zotlabs/Module/Profile_photo.php:494
-#: ../../Zotlabs/Module/Cover_photo.php:427
+#: ../../Zotlabs/Module/Profile_photo.php:534
+#: ../../Zotlabs/Module/Cover_photo.php:462
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Por favor ajuste el recorte de la imagen para una visión óptima."
 
-#: ../../Zotlabs/Module/Profile_photo.php:496
-#: ../../Zotlabs/Module/Cover_photo.php:429
+#: ../../Zotlabs/Module/Profile_photo.php:536
+#: ../../Zotlabs/Module/Cover_photo.php:464
 msgid "Done Editing"
 msgstr "Edición completada"
 
@@ -5583,36 +5643,36 @@ msgstr "Ausente"
 msgid "Online"
 msgstr "Conectado/a"
 
-#: ../../Zotlabs/Module/Item.php:341
+#: ../../Zotlabs/Module/Item.php:362
 msgid "Unable to locate original post."
 msgstr "No ha sido posible encontrar la entrada original."
 
-#: ../../Zotlabs/Module/Item.php:628
+#: ../../Zotlabs/Module/Item.php:649
 msgid "Empty post discarded."
 msgstr "La entrada vacía ha sido desechada."
 
-#: ../../Zotlabs/Module/Item.php:1037
+#: ../../Zotlabs/Module/Item.php:1058
 msgid "Duplicate post suppressed."
 msgstr "Se ha suprimido la entrada duplicada."
 
-#: ../../Zotlabs/Module/Item.php:1182
+#: ../../Zotlabs/Module/Item.php:1203
 msgid "System error. Post not saved."
 msgstr "Error del sistema. La entrada no se ha podido salvar."
 
-#: ../../Zotlabs/Module/Item.php:1218
+#: ../../Zotlabs/Module/Item.php:1239
 msgid "Your comment is awaiting approval."
 msgstr "Su comentario está pendiente de aprobación."
 
-#: ../../Zotlabs/Module/Item.php:1335
+#: ../../Zotlabs/Module/Item.php:1356
 msgid "Unable to obtain post information from database."
 msgstr "No ha sido posible obtener información de la entrada en la base de datos."
 
-#: ../../Zotlabs/Module/Item.php:1342
+#: ../../Zotlabs/Module/Item.php:1363
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
 
-#: ../../Zotlabs/Module/Item.php:1349
+#: ../../Zotlabs/Module/Item.php:1370
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Ha alcanzado su límite de %1$.0f páginas web."
@@ -5659,7 +5719,7 @@ msgstr "Elemento no válido."
 
 #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77
 #: ../../Zotlabs/Module/Display.php:140 ../../Zotlabs/Module/Display.php:157
-#: ../../Zotlabs/Module/Display.php:174
+#: ../../Zotlabs/Module/Display.php:174 ../../Zotlabs/Module/Display.php:180
 #: ../../Zotlabs/Lib/NativeWikiPage.php:521 ../../Zotlabs/Web/Router.php:185
 #: ../../addon/chess/Mod_Chess.php:447 ../../include/help.php:132
 msgid "Page not found."
@@ -5713,9 +5773,9 @@ msgstr "No ha sido posible establecer los parámetros de la libreta de direccion
 msgid "Connection has been removed."
 msgstr "La conexión ha sido eliminada."
 
-#: ../../Zotlabs/Module/Connedit.php:608 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Module/Connedit.php:608 ../../Zotlabs/Lib/Apps.php:343
 #: ../../addon/openclipatar/openclipatar.php:57
-#: ../../include/conversation.php:1038 ../../include/nav.php:106
+#: ../../include/conversation.php:1038 ../../include/nav.php:110
 msgid "View Profile"
 msgstr "Ver el perfil"
 
@@ -5887,7 +5947,7 @@ msgstr "Esta conexión no es accesible desde este sitio. La independencia de ubi
 msgid "Connection Default Permissions"
 msgstr "Permisos predeterminados de conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:4308
+#: ../../Zotlabs/Module/Connedit.php:867 ../../include/items.php:4328
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
@@ -6025,7 +6085,7 @@ msgid "Please enter a link URL:"
 msgstr "Por favor, introduzca la dirección del enlace:"
 
 #: ../../Zotlabs/Module/Chat.php:221 ../../Zotlabs/Module/Mail.php:294
-#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:809
+#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:810
 #: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1461
 msgid "Encrypt text"
 msgstr "Cifrar texto"
@@ -6059,13 +6119,13 @@ msgstr "Caducidad"
 msgid "min"
 msgstr "min"
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:342
-#: ../../include/features.php:383 ../../include/nav.php:444
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:344
+#: ../../include/features.php:383 ../../include/nav.php:446
 msgid "Photos"
 msgstr "Fotos"
 
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:337
-#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:452
+#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:339
+#: ../../Zotlabs/Storage/Browser.php:278 ../../include/nav.php:454
 msgid "Files"
 msgstr "Ficheros"
 
@@ -6105,7 +6165,7 @@ msgstr "El menú se puede usar para guardar marcadores"
 msgid "Submit and proceed"
 msgstr "Enviar y proceder"
 
-#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2535
+#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2559
 msgid "Menus"
 msgstr "Menús"
 
@@ -6157,12 +6217,12 @@ msgstr "El título del menú tal como será visto por los demás"
 msgid "Allow bookmarks"
 msgstr "Permitir marcadores"
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2536
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2560
 msgid "Layouts"
 msgstr "Plantillas"
 
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:345
-#: ../../include/nav.php:168 ../../include/nav.php:319
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:347
+#: ../../include/nav.php:172 ../../include/nav.php:322
 #: ../../include/help.php:117 ../../include/help.php:125
 msgid "Help"
 msgstr "Ayuda"
@@ -6229,12 +6289,12 @@ msgid "Post not found."
 msgstr "Mensaje no encontrado."
 
 #: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:200
-#: ../../include/bbcode.php:343
+#: ../../include/bbcode.php:362
 msgid "post"
 msgstr "la entrada"
 
 #: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146
-#: ../../include/text.php:2099
+#: ../../include/text.php:2123
 msgid "comment"
 msgstr "el comentario"
 
@@ -6354,7 +6414,7 @@ msgid "Could not create privacy group."
 msgstr "No se puede crear el grupo de canales"
 
 #: ../../Zotlabs/Module/Group.php:61 ../../Zotlabs/Module/Group.php:213
-#: ../../include/items.php:4275
+#: ../../include/items.php:4295
 msgid "Privacy group not found."
 msgstr "Grupo de canales no encontrado."
 
@@ -6371,8 +6431,8 @@ msgid "Management of privacy groups"
 msgstr "Gestión de grupos de canales"
 
 #: ../../Zotlabs/Module/Group.php:141 ../../Zotlabs/Module/Group.php:153
-#: ../../Zotlabs/Lib/Apps.php:361 ../../Zotlabs/Lib/Group.php:324
-#: ../../Zotlabs/Widget/Activity_filter.php:41 ../../include/nav.php:95
+#: ../../Zotlabs/Lib/Apps.php:363 ../../Zotlabs/Lib/Group.php:324
+#: ../../Zotlabs/Widget/Activity_filter.php:41 ../../include/nav.php:99
 #: ../../include/group.php:320
 msgid "Privacy Groups"
 msgstr "Grupos de canales"
@@ -6517,7 +6577,7 @@ msgid "View this profile"
 msgstr "Ver este perfil"
 
 #: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824
-#: ../../include/channel.php:1375
+#: ../../include/channel.php:1441
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
@@ -6529,7 +6589,7 @@ msgstr "Gestión del perfil"
 msgid "Change cover photo"
 msgstr "Cambiar la imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1345
+#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1411
 msgid "Change profile photo"
 msgstr "Cambiar la foto del perfil"
 
@@ -6695,12 +6755,12 @@ msgstr "Mis otros canales"
 msgid "Communications"
 msgstr "Comunicaciones"
 
-#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1371
+#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1437
 msgid "Profile Image"
 msgstr "Imagen del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1352
-#: ../../include/nav.php:109
+#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1418
+#: ../../include/nav.php:113
 msgid "Edit Profiles"
 msgstr "Editar perfiles"
 
@@ -6779,8 +6839,8 @@ msgstr "Editar la página web"
 msgid "Create a new channel"
 msgstr "Crear un nuevo canal"
 
-#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:334
-#: ../../include/nav.php:92
+#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:336
+#: ../../include/nav.php:96
 msgid "Channel Manager"
 msgstr "Administración de canales"
 
@@ -6827,7 +6887,7 @@ msgid "Add Card"
 msgstr "Añadir una ficha"
 
 #: ../../Zotlabs/Module/Cards.php:207 ../../Zotlabs/Lib/Apps.php:325
-#: ../../include/nav.php:501
+#: ../../include/nav.php:503
 msgid "Cards"
 msgstr "Fichas"
 
@@ -6847,7 +6907,7 @@ msgstr "Nombre del sitio"
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:236
+#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:239
 msgid "Terms of Service"
 msgstr "Términos del servicio"
 
@@ -6926,8 +6986,8 @@ msgstr "Exportar elementos de una página web"
 msgid "Export selected"
 msgstr "Exportar los elementos seleccionados"
 
-#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:338
-#: ../../include/nav.php:524
+#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:340
+#: ../../include/nav.php:526
 msgid "Webpages"
 msgstr "Páginas web"
 
@@ -7000,73 +7060,73 @@ msgstr "Renombrar el canal"
 msgid "Item is not editable"
 msgstr "El elemento no es editable"
 
-#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144
+#: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Rpost.php:144
 msgid "Edit post"
 msgstr "Editar la entrada"
 
-#: ../../Zotlabs/Module/Dreport.php:56
+#: ../../Zotlabs/Module/Dreport.php:59
 msgid "Invalid message"
 msgstr "Mensaje no válido"
 
-#: ../../Zotlabs/Module/Dreport.php:90
+#: ../../Zotlabs/Module/Dreport.php:93
 msgid "no results"
 msgstr "sin resultados"
 
-#: ../../Zotlabs/Module/Dreport.php:104
+#: ../../Zotlabs/Module/Dreport.php:107
 msgid "channel sync processed"
 msgstr "se ha realizado la sincronización del canal"
 
-#: ../../Zotlabs/Module/Dreport.php:108
+#: ../../Zotlabs/Module/Dreport.php:111
 msgid "queued"
 msgstr "encolado"
 
-#: ../../Zotlabs/Module/Dreport.php:112
+#: ../../Zotlabs/Module/Dreport.php:115
 msgid "posted"
 msgstr "enviado"
 
-#: ../../Zotlabs/Module/Dreport.php:116
+#: ../../Zotlabs/Module/Dreport.php:119
 msgid "accepted for delivery"
 msgstr "aceptado para el envío"
 
-#: ../../Zotlabs/Module/Dreport.php:120
+#: ../../Zotlabs/Module/Dreport.php:123
 msgid "updated"
 msgstr "actualizado"
 
-#: ../../Zotlabs/Module/Dreport.php:123
+#: ../../Zotlabs/Module/Dreport.php:126
 msgid "update ignored"
 msgstr "actualización ignorada"
 
-#: ../../Zotlabs/Module/Dreport.php:126
+#: ../../Zotlabs/Module/Dreport.php:129
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: ../../Zotlabs/Module/Dreport.php:130
+#: ../../Zotlabs/Module/Dreport.php:133
 msgid "recipient not found"
 msgstr "destinatario no encontrado"
 
-#: ../../Zotlabs/Module/Dreport.php:133
+#: ../../Zotlabs/Module/Dreport.php:136
 msgid "mail recalled"
 msgstr "mensaje de correo revocado"
 
-#: ../../Zotlabs/Module/Dreport.php:136
+#: ../../Zotlabs/Module/Dreport.php:139
 msgid "duplicate mail received"
 msgstr "se ha recibido mensaje duplicado"
 
-#: ../../Zotlabs/Module/Dreport.php:139
+#: ../../Zotlabs/Module/Dreport.php:142
 msgid "mail delivered"
 msgstr "correo enviado"
 
-#: ../../Zotlabs/Module/Dreport.php:159
+#: ../../Zotlabs/Module/Dreport.php:162
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Informe de entrega para %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:162 ../../Zotlabs/Widget/Wiki_pages.php:41
+#: ../../Zotlabs/Module/Dreport.php:166 ../../Zotlabs/Widget/Wiki_pages.php:41
 #: ../../Zotlabs/Widget/Wiki_pages.php:98
 msgid "Options"
 msgstr "Opciones"
 
-#: ../../Zotlabs/Module/Dreport.php:163
+#: ../../Zotlabs/Module/Dreport.php:167
 msgid "Redeliver"
 msgstr "Volver a enviar"
 
@@ -7094,7 +7154,7 @@ msgstr "Importar automáticamente contenido de otros canales o \"feeds\""
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:366
+#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:367
 msgid "Channel Sources"
 msgstr "Orígenes de los contenidos del canal"
 
@@ -7198,15 +7258,15 @@ msgstr "Canal no disponible."
 msgid "Previous action reversed."
 msgstr "Acción anterior revocada."
 
-#: ../../Zotlabs/Module/Like.php:447 ../../Zotlabs/Lib/Activity.php:1994
-#: ../../addon/diaspora/Receiver.php:1491 ../../addon/pubcrawl/as.php:1540
+#: ../../Zotlabs/Module/Like.php:447 ../../Zotlabs/Lib/Activity.php:2054
+#: ../../addon/diaspora/Receiver.php:1505 ../../addon/pubcrawl/as.php:1594
 #: ../../include/conversation.php:160
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "A %1$s le gusta %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:449 ../../Zotlabs/Lib/Activity.php:1996
-#: ../../addon/pubcrawl/as.php:1542 ../../include/conversation.php:163
+#: ../../Zotlabs/Module/Like.php:449 ../../Zotlabs/Lib/Activity.php:2056
+#: ../../addon/pubcrawl/as.php:1596 ../../include/conversation.php:163
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "A %1$s no le gusta %3$s de %2$s"
@@ -7226,17 +7286,17 @@ msgstr "%3$s de %2$s: %1$s no está de acuerdo"
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s se abstiene"
 
-#: ../../Zotlabs/Module/Like.php:457 ../../addon/diaspora/Receiver.php:2137
+#: ../../Zotlabs/Module/Like.php:457 ../../addon/diaspora/Receiver.php:2151
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s participa"
 
-#: ../../Zotlabs/Module/Like.php:459 ../../addon/diaspora/Receiver.php:2139
+#: ../../Zotlabs/Module/Like.php:459 ../../addon/diaspora/Receiver.php:2153
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s no participa"
 
-#: ../../Zotlabs/Module/Like.php:461 ../../addon/diaspora/Receiver.php:2141
+#: ../../Zotlabs/Module/Like.php:461 ../../addon/diaspora/Receiver.php:2155
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s quizá participe"
@@ -7249,119 +7309,119 @@ msgstr "Acción completada."
 msgid "Thank you."
 msgstr "Gracias."
 
-#: ../../Zotlabs/Module/Directory.php:110
+#: ../../Zotlabs/Module/Directory.php:116
 msgid "No default suggestions were found."
 msgstr "No se encontraron sugerencias por defecto."
 
-#: ../../Zotlabs/Module/Directory.php:259
+#: ../../Zotlabs/Module/Directory.php:270
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] "%d valoración"
 msgstr[1] "%d valoraciones"
 
-#: ../../Zotlabs/Module/Directory.php:270
+#: ../../Zotlabs/Module/Directory.php:281
 msgid "Gender: "
 msgstr "Género:"
 
-#: ../../Zotlabs/Module/Directory.php:272
+#: ../../Zotlabs/Module/Directory.php:283
 msgid "Status: "
 msgstr "Estado:"
 
-#: ../../Zotlabs/Module/Directory.php:274
+#: ../../Zotlabs/Module/Directory.php:285
 msgid "Homepage: "
 msgstr "Página personal:"
 
-#: ../../Zotlabs/Module/Directory.php:323 ../../include/channel.php:1620
+#: ../../Zotlabs/Module/Directory.php:334 ../../include/channel.php:1686
 msgid "Age:"
 msgstr "Edad:"
 
-#: ../../Zotlabs/Module/Directory.php:328 ../../include/channel.php:1447
-#: ../../include/event.php:58 ../../include/event.php:90
+#: ../../Zotlabs/Module/Directory.php:339 ../../include/channel.php:1513
+#: ../../include/event.php:61 ../../include/event.php:93
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: ../../Zotlabs/Module/Directory.php:334
+#: ../../Zotlabs/Module/Directory.php:345
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../../Zotlabs/Module/Directory.php:339 ../../include/channel.php:1649
+#: ../../Zotlabs/Module/Directory.php:350 ../../include/channel.php:1715
 msgid "Hometown:"
 msgstr "Lugar de nacimiento:"
 
-#: ../../Zotlabs/Module/Directory.php:341 ../../include/channel.php:1655
+#: ../../Zotlabs/Module/Directory.php:352 ../../include/channel.php:1721
 msgid "About:"
 msgstr "Sobre mí:"
 
-#: ../../Zotlabs/Module/Directory.php:342 ../../Zotlabs/Module/Suggest.php:71
-#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
-#: ../../include/conversation.php:1058 ../../include/channel.php:1432
+#: ../../Zotlabs/Module/Directory.php:353 ../../Zotlabs/Module/Suggest.php:71
+#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:46
+#: ../../include/conversation.php:1058 ../../include/channel.php:1498
 #: ../../include/connections.php:110
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../../Zotlabs/Module/Directory.php:343
+#: ../../Zotlabs/Module/Directory.php:354
 msgid "Public Forum:"
 msgstr "Foro público:"
 
-#: ../../Zotlabs/Module/Directory.php:346
+#: ../../Zotlabs/Module/Directory.php:357
 msgid "Keywords: "
 msgstr "Palabras clave:"
 
-#: ../../Zotlabs/Module/Directory.php:349
+#: ../../Zotlabs/Module/Directory.php:360
 msgid "Don't suggest"
 msgstr "No sugerir:"
 
-#: ../../Zotlabs/Module/Directory.php:351
+#: ../../Zotlabs/Module/Directory.php:362
 msgid "Common connections (estimated):"
 msgstr "Conexiones comunes (estimadas): "
 
-#: ../../Zotlabs/Module/Directory.php:400
+#: ../../Zotlabs/Module/Directory.php:411
 msgid "Global Directory"
 msgstr "Directorio global:"
 
-#: ../../Zotlabs/Module/Directory.php:400
+#: ../../Zotlabs/Module/Directory.php:411
 msgid "Local Directory"
 msgstr "Directorio local:"
 
-#: ../../Zotlabs/Module/Directory.php:406
+#: ../../Zotlabs/Module/Directory.php:417
 msgid "Finding:"
 msgstr "Encontrar:"
 
-#: ../../Zotlabs/Module/Directory.php:409 ../../Zotlabs/Module/Suggest.php:79
+#: ../../Zotlabs/Module/Directory.php:420 ../../Zotlabs/Module/Suggest.php:79
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr "Sugerencias de canales"
 
-#: ../../Zotlabs/Module/Directory.php:411
+#: ../../Zotlabs/Module/Directory.php:422
 msgid "next page"
 msgstr "siguiente página"
 
-#: ../../Zotlabs/Module/Directory.php:411
+#: ../../Zotlabs/Module/Directory.php:422
 msgid "previous page"
 msgstr "página anterior"
 
-#: ../../Zotlabs/Module/Directory.php:412
+#: ../../Zotlabs/Module/Directory.php:423
 msgid "Sort options"
 msgstr "Ordenar opciones"
 
-#: ../../Zotlabs/Module/Directory.php:413
+#: ../../Zotlabs/Module/Directory.php:424
 msgid "Alphabetic"
 msgstr "Alfabético"
 
-#: ../../Zotlabs/Module/Directory.php:414
+#: ../../Zotlabs/Module/Directory.php:425
 msgid "Reverse Alphabetic"
 msgstr "Alfabético inverso"
 
-#: ../../Zotlabs/Module/Directory.php:415
+#: ../../Zotlabs/Module/Directory.php:426
 msgid "Newest to Oldest"
 msgstr "De más nuevo a más antiguo"
 
-#: ../../Zotlabs/Module/Directory.php:416
+#: ../../Zotlabs/Module/Directory.php:427
 msgid "Oldest to Newest"
 msgstr "De más antiguo a más nuevo"
 
-#: ../../Zotlabs/Module/Directory.php:433
+#: ../../Zotlabs/Module/Directory.php:444
 msgid "No entries (some entries may be hidden)."
 msgstr "Sin entradas (algunas entradas pueden estar ocultas)."
 
@@ -7389,7 +7449,7 @@ msgid ""
 "hours."
 msgstr "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo."
 
-#: ../../Zotlabs/Module/Suggest.php:73 ../../Zotlabs/Widget/Suggestions.php:46
+#: ../../Zotlabs/Module/Suggest.php:73 ../../Zotlabs/Widget/Suggestions.php:48
 msgid "Ignore/Hide"
 msgstr "Ignorar/Ocultar"
 
@@ -7538,19 +7598,19 @@ msgstr "Software"
 msgid "Rate"
 msgstr "Valorar"
 
-#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:269
+#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:288
 msgid "webpage"
 msgstr "página web"
 
-#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:275
+#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:294
 msgid "block"
 msgstr "bloque"
 
-#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:272
+#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:291
 msgid "layout"
 msgstr "plantilla"
 
-#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:278
+#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:297
 msgid "menu"
 msgstr "menú"
 
@@ -7588,7 +7648,7 @@ msgstr "Escriba un nombre de carpeta"
 msgid "or select an existing folder (doubleclick)"
 msgstr "o seleccione una (con un doble click)"
 
-#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:181
+#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:182
 msgid "Save to Folder"
 msgstr "Guardar en carpeta"
 
@@ -7600,162 +7660,162 @@ msgstr "App Diagnósticos remotos"
 msgid "Perform diagnostics on remote channels"
 msgstr "Realizar diagnósticos en canales remotos"
 
-#: ../../Zotlabs/Module/Register.php:49
+#: ../../Zotlabs/Module/Register.php:52
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana."
 
-#: ../../Zotlabs/Module/Register.php:55
+#: ../../Zotlabs/Module/Register.php:58
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado."
 
-#: ../../Zotlabs/Module/Register.php:89
+#: ../../Zotlabs/Module/Register.php:92
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: ../../Zotlabs/Module/Register.php:132
+#: ../../Zotlabs/Module/Register.php:135
 msgid "Registration successful. Continue to create your first channel..."
 msgstr "Registro exitoso. Continúe creando tu primer canal..."
 
-#: ../../Zotlabs/Module/Register.php:135
+#: ../../Zotlabs/Module/Register.php:138
 msgid ""
 "Registration successful. Please check your email for validation "
 "instructions."
 msgstr "Registro realizado con éxito. Por favor, compruebe su correo electrónico para ver las instrucciones para validarlo."
 
-#: ../../Zotlabs/Module/Register.php:142
+#: ../../Zotlabs/Module/Register.php:145
 msgid "Your registration is pending approval by the site owner."
 msgstr "Su registro está pendiente de aprobación por el propietario del sitio."
 
-#: ../../Zotlabs/Module/Register.php:145
+#: ../../Zotlabs/Module/Register.php:148
 msgid "Your registration can not be processed."
 msgstr "Su registro no puede ser procesado."
 
-#: ../../Zotlabs/Module/Register.php:192
+#: ../../Zotlabs/Module/Register.php:195
 msgid "Registration on this hub is disabled."
 msgstr "El registro está deshabilitado en este sitio."
 
-#: ../../Zotlabs/Module/Register.php:201
+#: ../../Zotlabs/Module/Register.php:204
 msgid "Registration on this hub is by approval only."
 msgstr "El registro en este hub está sometido a aprobación previa."
 
-#: ../../Zotlabs/Module/Register.php:202 ../../Zotlabs/Module/Register.php:211
+#: ../../Zotlabs/Module/Register.php:205 ../../Zotlabs/Module/Register.php:214
 msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>"
 msgstr "<a href=\"pubsites\">Registrarse en otro hub afiliado.</a>"
 
-#: ../../Zotlabs/Module/Register.php:210
+#: ../../Zotlabs/Module/Register.php:213
 msgid "Registration on this hub is by invitation only."
 msgstr "La inscripción en este hub es sólo posible por invitación."
 
-#: ../../Zotlabs/Module/Register.php:221
+#: ../../Zotlabs/Module/Register.php:224
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Este sitio ha excedido el límite de inscripción diaria de cuentas. Por favor, inténtelo de nuevo mañana."
 
-#: ../../Zotlabs/Module/Register.php:242
+#: ../../Zotlabs/Module/Register.php:245
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Acepto los %s de este sitio"
 
-#: ../../Zotlabs/Module/Register.php:249
+#: ../../Zotlabs/Module/Register.php:252
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr "Tengo más de %s años de edad y acepto los %s de este sitio web"
 
-#: ../../Zotlabs/Module/Register.php:254
+#: ../../Zotlabs/Module/Register.php:257
 msgid "Your email address"
 msgstr "Su dirección de correo electrónico"
 
-#: ../../Zotlabs/Module/Register.php:255
+#: ../../Zotlabs/Module/Register.php:258
 msgid "Choose a password"
 msgstr "Elija una contraseña"
 
-#: ../../Zotlabs/Module/Register.php:256
+#: ../../Zotlabs/Module/Register.php:259
 msgid "Please re-enter your password"
 msgstr "Por favor, vuelva a escribir su contraseña"
 
-#: ../../Zotlabs/Module/Register.php:257
+#: ../../Zotlabs/Module/Register.php:260
 msgid "Please enter your invitation code"
 msgstr "Por favor, introduzca el código de su invitación"
 
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Zotlabs/Module/Register.php:261
 msgid "Your Name"
 msgstr "Su nombre"
 
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Zotlabs/Module/Register.php:261
 msgid "Real names are preferred."
 msgstr "Se prefieren los nombres reales"
 
-#: ../../Zotlabs/Module/Register.php:260
+#: ../../Zotlabs/Module/Register.php:263
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address "
 "e.g. nickname%s"
 msgstr "Su alias se usará para crear una dirección de canal fácil de recordar, p. ej.: alias%s"
 
-#: ../../Zotlabs/Module/Register.php:261
+#: ../../Zotlabs/Module/Register.php:264
 msgid ""
 "Select a channel permission role for your usage needs and privacy "
 "requirements."
 msgstr "Seleccione unos permisos de rol del canal compatibles con sus necesidades de uso y requisitos de privacidad."
 
-#: ../../Zotlabs/Module/Register.php:262
+#: ../../Zotlabs/Module/Register.php:265
 msgid "no"
 msgstr "no"
 
-#: ../../Zotlabs/Module/Register.php:262
+#: ../../Zotlabs/Module/Register.php:265
 msgid "yes"
 msgstr "sí"
 
-#: ../../Zotlabs/Module/Register.php:289 ../../boot.php:1609
-#: ../../include/nav.php:156
+#: ../../Zotlabs/Module/Register.php:293 ../../boot.php:1610
+#: ../../include/nav.php:160
 msgid "Register"
 msgstr "Registrarse"
 
-#: ../../Zotlabs/Module/Register.php:290
+#: ../../Zotlabs/Module/Register.php:294
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
 msgstr "Este sitio requiere verificación por correo electrónico. Después de completar este formulario, por favor revise su correo electrónico para más instrucciones."
 
-#: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Cover_photo.php:218
+#: ../../Zotlabs/Module/Cover_photo.php:194
+#: ../../Zotlabs/Module/Cover_photo.php:252
 msgid "Cover Photos"
 msgstr "Imágenes de portada del perfil"
 
-#: ../../Zotlabs/Module/Cover_photo.php:269 ../../include/items.php:4652
+#: ../../Zotlabs/Module/Cover_photo.php:303 ../../include/items.php:4672
 msgid "female"
 msgstr "mujer"
 
-#: ../../Zotlabs/Module/Cover_photo.php:270 ../../include/items.php:4653
+#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/items.php:4673
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:271 ../../include/items.php:4654
+#: ../../Zotlabs/Module/Cover_photo.php:305 ../../include/items.php:4674
 msgid "male"
 msgstr "hombre"
 
-#: ../../Zotlabs/Module/Cover_photo.php:272 ../../include/items.php:4655
+#: ../../Zotlabs/Module/Cover_photo.php:306 ../../include/items.php:4675
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:274 ../../include/items.php:4657
+#: ../../Zotlabs/Module/Cover_photo.php:308 ../../include/items.php:4677
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:276 ../../include/channel.php:2137
+#: ../../Zotlabs/Module/Cover_photo.php:310 ../../include/channel.php:2207
 msgid "cover photo"
 msgstr "Imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Cover_photo.php:390
+#: ../../Zotlabs/Module/Cover_photo.php:424
 msgid "Your cover photo may be visible to anybody on the internet"
 msgstr "La foto de la portada puede ser visible para cualquiera en Internet"
 
-#: ../../Zotlabs/Module/Cover_photo.php:394
+#: ../../Zotlabs/Module/Cover_photo.php:428
 msgid "Change Cover Photo"
 msgstr "Cambiar la foto de portada del perfil"
 
@@ -7763,7 +7823,7 @@ msgstr "Cambiar la foto de portada del perfil"
 msgid "Documentation Search"
 msgstr "Búsqueda de Documentación"
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:434
+#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:436
 msgid "About"
 msgstr "Mi perfil"
 
@@ -7787,11 +7847,11 @@ msgstr "Documentación de $Projectname"
 msgid "Contents"
 msgstr "Contenidos"
 
-#: ../../Zotlabs/Module/Display.php:391
+#: ../../Zotlabs/Module/Display.php:396
 msgid "Article"
 msgstr "Artículo"
 
-#: ../../Zotlabs/Module/Display.php:443
+#: ../../Zotlabs/Module/Display.php:448
 msgid "Item has been removed."
 msgstr "Se ha eliminado el elemento."
 
@@ -7841,48 +7901,48 @@ msgstr "$Projectname"
 msgid "Welcome to %s"
 msgstr "Bienvenido a %s"
 
-#: ../../Zotlabs/Module/Filestorage.php:79
-msgid "Permission Denied."
-msgstr "Permiso denegado"
-
-#: ../../Zotlabs/Module/Filestorage.php:112
+#: ../../Zotlabs/Module/Filestorage.php:103
 msgid "File not found."
 msgstr "Fichero no encontrado."
 
-#: ../../Zotlabs/Module/Filestorage.php:165
+#: ../../Zotlabs/Module/Filestorage.php:152
+msgid "Permission Denied."
+msgstr "Permiso denegado"
+
+#: ../../Zotlabs/Module/Filestorage.php:185
 msgid "Edit file permissions"
 msgstr "Modificar los permisos del fichero"
 
-#: ../../Zotlabs/Module/Filestorage.php:177
+#: ../../Zotlabs/Module/Filestorage.php:197
 msgid "Set/edit permissions"
 msgstr "Establecer/editar los permisos"
 
-#: ../../Zotlabs/Module/Filestorage.php:178
+#: ../../Zotlabs/Module/Filestorage.php:198
 msgid "Include all files and sub folders"
 msgstr "Incluir todos los ficheros y subcarpetas"
 
-#: ../../Zotlabs/Module/Filestorage.php:179
+#: ../../Zotlabs/Module/Filestorage.php:199
 msgid "Return to file list"
 msgstr "Volver a la lista de ficheros"
 
-#: ../../Zotlabs/Module/Filestorage.php:181
+#: ../../Zotlabs/Module/Filestorage.php:201
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Copiar/pegar este código para adjuntar el fichero al envío"
 
-#: ../../Zotlabs/Module/Filestorage.php:182
+#: ../../Zotlabs/Module/Filestorage.php:202
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Copiar/pegar esta dirección para enlazar el fichero desde una página web"
 
-#: ../../Zotlabs/Module/Filestorage.php:184
+#: ../../Zotlabs/Module/Filestorage.php:204
 msgid "Share this file"
 msgstr "Compartir este fichero"
 
-#: ../../Zotlabs/Module/Filestorage.php:185
+#: ../../Zotlabs/Module/Filestorage.php:205
 msgid "Show URL to this file"
 msgstr "Mostrar la dirección de este fichero"
 
-#: ../../Zotlabs/Module/Filestorage.php:186
-#: ../../Zotlabs/Storage/Browser.php:405
+#: ../../Zotlabs/Module/Filestorage.php:206
+#: ../../Zotlabs/Storage/Browser.php:411
 msgid "Show in your contacts shared folder"
 msgstr "Mostrar en la carpeta compartida con sus contactos"
 
@@ -8020,7 +8080,7 @@ msgid ""
 "Password reset failed."
 msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1638
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1639
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
@@ -8103,35 +8163,35 @@ msgstr "Apps OAuth conectadas"
 msgid "Mark all seen"
 msgstr "Marcar todo como visto"
 
-#: ../../Zotlabs/Lib/Activity.php:1458
+#: ../../Zotlabs/Lib/Activity.php:1514
 #, php-format
 msgid "Likes %1$s's %2$s"
 msgstr "Gusta de %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:1461
+#: ../../Zotlabs/Lib/Activity.php:1517
 #, php-format
 msgid "Doesn't like %1$s's %2$s"
 msgstr "No le gusta %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:1464
+#: ../../Zotlabs/Lib/Activity.php:1520
 #, php-format
 msgid "Will attend %1$s's %2$s"
 msgstr "Asistirá %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:1467
+#: ../../Zotlabs/Lib/Activity.php:1523
 #, php-format
 msgid "Will not attend %1$s's %2$s"
 msgstr "No asistirá %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:1470
+#: ../../Zotlabs/Lib/Activity.php:1526
 #, php-format
 msgid "May attend %1$s's %2$s"
 msgstr "Puede asistir %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:1806 ../../Zotlabs/Lib/Activity.php:2003
-#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1214
-#: ../../addon/pubcrawl/as.php:1369 ../../addon/pubcrawl/as.php:1549
-#: ../../include/network.php:1720
+#: ../../Zotlabs/Lib/Activity.php:1865 ../../Zotlabs/Lib/Activity.php:2063
+#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1268
+#: ../../addon/pubcrawl/as.php:1423 ../../addon/pubcrawl/as.php:1603
+#: ../../include/network.php:1730
 msgid "ActivityPub"
 msgstr "ActivityPub"
 
@@ -8179,163 +8239,170 @@ msgstr "Administrador del sitio"
 msgid "Report Bug"
 msgstr "Informe de errores"
 
-#: ../../Zotlabs/Lib/Apps.php:328 ../../include/nav.php:490
+#: ../../Zotlabs/Lib/Apps.php:328 ../../include/nav.php:492
 msgid "Bookmarks"
 msgstr "Marcadores"
 
 #: ../../Zotlabs/Lib/Apps.php:329 ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/nav.php:477 ../../include/nav.php:480
+#: ../../include/nav.php:479 ../../include/nav.php:482
 msgid "Chatrooms"
 msgstr "Salas de chat"
 
+#: ../../Zotlabs/Lib/Apps.php:330
+msgid "Content Filter"
+msgstr "Filtro de contenido"
+
 #: ../../Zotlabs/Lib/Apps.php:331
+#: ../../addon/content_import/Mod_content_import.php:135
+msgid "Content Import"
+msgstr "Importación de contenidos"
+
+#: ../../Zotlabs/Lib/Apps.php:333
 msgid "Remote Diagnostics"
 msgstr "Diagnóstico remoto"
 
-#: ../../Zotlabs/Lib/Apps.php:332 ../../include/features.php:365
+#: ../../Zotlabs/Lib/Apps.php:334
 msgid "Suggest Channels"
 msgstr "Sugerir canales"
 
-#: ../../Zotlabs/Lib/Apps.php:333 ../../boot.php:1629
-#: ../../include/nav.php:118 ../../include/nav.php:122
+#: ../../Zotlabs/Lib/Apps.php:335 ../../boot.php:1630
+#: ../../include/nav.php:122 ../../include/nav.php:126
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: ../../Zotlabs/Lib/Apps.php:335
+#: ../../Zotlabs/Lib/Apps.php:337
 msgid "Stream"
 msgstr "Stream"
 
-#: ../../Zotlabs/Lib/Apps.php:339 ../../include/nav.php:539
+#: ../../Zotlabs/Lib/Apps.php:341 ../../include/nav.php:541
 msgid "Wiki"
 msgstr "Wiki"
 
-#: ../../Zotlabs/Lib/Apps.php:340 ../../include/features.php:96
+#: ../../Zotlabs/Lib/Apps.php:342 ../../include/features.php:96
 msgid "Channel Home"
 msgstr "Mi canal"
 
-#: ../../Zotlabs/Lib/Apps.php:343 ../../include/features.php:269
-msgid "Events"
-msgstr "Eventos"
+#: ../../Zotlabs/Lib/Apps.php:345 ../../Zotlabs/Storage/Browser.php:140
+#: ../../include/features.php:82 ../../include/nav.php:465
+#: ../../include/nav.php:468
+msgid "Calendar"
+msgstr "Calendario"
 
-#: ../../Zotlabs/Lib/Apps.php:344 ../../include/features.php:176
+#: ../../Zotlabs/Lib/Apps.php:346 ../../include/features.php:184
 msgid "Directory"
 msgstr "Directorio"
 
-#: ../../Zotlabs/Lib/Apps.php:346
+#: ../../Zotlabs/Lib/Apps.php:348
 msgid "Mail"
 msgstr "Correo"
 
-#: ../../Zotlabs/Lib/Apps.php:349
+#: ../../Zotlabs/Lib/Apps.php:351
 msgid "Chat"
 msgstr "Chat"
 
-#: ../../Zotlabs/Lib/Apps.php:351
+#: ../../Zotlabs/Lib/Apps.php:353
 msgid "Probe"
 msgstr "Probar"
 
-#: ../../Zotlabs/Lib/Apps.php:352
+#: ../../Zotlabs/Lib/Apps.php:354
 msgid "Suggest"
 msgstr "Sugerir"
 
-#: ../../Zotlabs/Lib/Apps.php:353
+#: ../../Zotlabs/Lib/Apps.php:355
 msgid "Random Channel"
 msgstr "Canal aleatorio"
 
-#: ../../Zotlabs/Lib/Apps.php:354
+#: ../../Zotlabs/Lib/Apps.php:356
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../../Zotlabs/Lib/Apps.php:355 ../../Zotlabs/Widget/Admin.php:26
+#: ../../Zotlabs/Lib/Apps.php:357 ../../Zotlabs/Widget/Admin.php:26
 msgid "Features"
 msgstr "Funcionalidades"
 
-#: ../../Zotlabs/Lib/Apps.php:356 ../../addon/openid/MysqlProvider.php:69
+#: ../../Zotlabs/Lib/Apps.php:358 ../../addon/openid/MysqlProvider.php:69
 msgid "Language"
 msgstr "Idioma"
 
-#: ../../Zotlabs/Lib/Apps.php:357
+#: ../../Zotlabs/Lib/Apps.php:359
 msgid "Post"
 msgstr "Publicación"
 
-#: ../../Zotlabs/Lib/Apps.php:358 ../../addon/openid/MysqlProvider.php:58
+#: ../../Zotlabs/Lib/Apps.php:360 ../../addon/openid/MysqlProvider.php:58
 #: ../../addon/openid/MysqlProvider.php:59
 #: ../../addon/openid/MysqlProvider.php:60
 msgid "Profile Photo"
 msgstr "Foto del perfil"
 
-#: ../../Zotlabs/Lib/Apps.php:360 ../../include/features.php:397
+#: ../../Zotlabs/Lib/Apps.php:362 ../../include/features.php:397
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: ../../Zotlabs/Lib/Apps.php:362
+#: ../../Zotlabs/Lib/Apps.php:364
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../../Zotlabs/Lib/Apps.php:363
+#: ../../Zotlabs/Lib/Apps.php:365
 msgid "Order Apps"
 msgstr "Ordenar las apps"
 
-#: ../../Zotlabs/Lib/Apps.php:364 ../../include/features.php:82
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../../Zotlabs/Lib/Apps.php:365
+#: ../../Zotlabs/Lib/Apps.php:366
 msgid "CardDAV"
 msgstr "CardDAV"
 
-#: ../../Zotlabs/Lib/Apps.php:367
+#: ../../Zotlabs/Lib/Apps.php:368
 msgid "Guest Access"
 msgstr "Acceso para invitados"
 
-#: ../../Zotlabs/Lib/Apps.php:368 ../../Zotlabs/Widget/Notes.php:21
+#: ../../Zotlabs/Lib/Apps.php:369 ../../Zotlabs/Widget/Notes.php:21
 msgid "Notes"
 msgstr "Notas"
 
-#: ../../Zotlabs/Lib/Apps.php:369
+#: ../../Zotlabs/Lib/Apps.php:370
 msgid "OAuth Apps Manager"
 msgstr "Administrador de apps OAuth"
 
-#: ../../Zotlabs/Lib/Apps.php:370
+#: ../../Zotlabs/Lib/Apps.php:371
 msgid "OAuth2 Apps Manager"
 msgstr "Administrador de apps OAuth2"
 
-#: ../../Zotlabs/Lib/Apps.php:371
+#: ../../Zotlabs/Lib/Apps.php:372
 msgid "PDL Editor"
 msgstr "Editor PDL"
 
-#: ../../Zotlabs/Lib/Apps.php:373
+#: ../../Zotlabs/Lib/Apps.php:374
 msgid "Premium Channel"
 msgstr "Canal premium"
 
-#: ../../Zotlabs/Lib/Apps.php:375
+#: ../../Zotlabs/Lib/Apps.php:376
 msgid "My Chatrooms"
 msgstr "Mis salas de chat"
 
-#: ../../Zotlabs/Lib/Apps.php:376
+#: ../../Zotlabs/Lib/Apps.php:377
 msgid "Channel Export"
 msgstr "Exportar canal"
 
-#: ../../Zotlabs/Lib/Apps.php:553
+#: ../../Zotlabs/Lib/Apps.php:554
 msgid "Purchase"
 msgstr "Comprar"
 
-#: ../../Zotlabs/Lib/Apps.php:558
+#: ../../Zotlabs/Lib/Apps.php:559
 msgid "Undelete"
 msgstr "Recuperar"
 
-#: ../../Zotlabs/Lib/Apps.php:567
+#: ../../Zotlabs/Lib/Apps.php:568
 msgid "Add to app-tray"
 msgstr "Añadir a la bandeja de aplicaciones"
 
-#: ../../Zotlabs/Lib/Apps.php:568
+#: ../../Zotlabs/Lib/Apps.php:569
 msgid "Remove from app-tray"
 msgstr "Quitar de la bandeja de aplicaciones"
 
-#: ../../Zotlabs/Lib/Apps.php:569
+#: ../../Zotlabs/Lib/Apps.php:570
 msgid "Pin to navbar"
 msgstr "Fijar en la barra de navegación"
 
-#: ../../Zotlabs/Lib/Apps.php:570
+#: ../../Zotlabs/Lib/Apps.php:571
 msgid "Unpin from navbar"
 msgstr "Quitar de la barra de navegación"
 
@@ -8432,8 +8499,8 @@ msgstr "Fecha"
 msgid "Compare"
 msgstr "Comparar"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:603 ../../include/bbcode.php:735
-#: ../../include/bbcode.php:905
+#: ../../Zotlabs/Lib/NativeWikiPage.php:603 ../../include/bbcode.php:754
+#: ../../include/bbcode.php:924
 msgid "Different viewers will see this text differently"
 msgstr "Visitantes diferentes verán este texto de forma distinta"
 
@@ -8568,7 +8635,7 @@ msgstr "Sala no encontrada."
 msgid "Room is full"
 msgstr "La sala está llena."
 
-#: ../../Zotlabs/Lib/Libsync.php:733 ../../include/zot.php:2591
+#: ../../Zotlabs/Lib/Libsync.php:733 ../../include/zot.php:2611
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "No ha sido posible de verificar la firma del sitio para %s"
@@ -8577,8 +8644,8 @@ msgstr "No ha sido posible de verificar la firma del sitio para %s"
 msgid "$Projectname Notification"
 msgstr "Notificación de $Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:313
-#: ../../addon/diaspora/util.php:326 ../../addon/diaspora/p.php:48
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:336
+#: ../../addon/diaspora/util.php:349 ../../addon/diaspora/p.php:48
 msgid "$projectname"
 msgstr "$projectname"
 
@@ -8849,161 +8916,181 @@ msgstr "El wiki se ha actualizado con éxito"
 msgid "Wiki files deleted successfully"
 msgstr "Se han borrado con éxito los ficheros del wiki"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:83
+#: ../../Zotlabs/Lib/DB_Upgrade.php:67
+msgid "Source code of failed update: "
+msgstr "Código fuente de la actualización fallida: "
+
+#: ../../Zotlabs/Lib/DB_Upgrade.php:88
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error de actualización en %s"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:89
+#: ../../Zotlabs/Lib/DB_Upgrade.php:94
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La actualización %s ha fallado. Mire el informe de errores."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:102 ../../include/conversation.php:700
+#: ../../Zotlabs/Lib/ThreadItem.php:103 ../../include/conversation.php:700
 msgid "Private Message"
 msgstr "Mensaje Privado"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:129
+#: ../../Zotlabs/Lib/ThreadItem.php:130
 msgid "Privacy conflict. Discretion advised."
 msgstr "Conflicto de privacidad. Se aconseja discreción."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:171 ../../Zotlabs/Storage/Browser.php:280
+#: ../../Zotlabs/Lib/ThreadItem.php:172 ../../Zotlabs/Storage/Browser.php:286
 msgid "Admin Delete"
 msgstr "Eliminar admin"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:177 ../../include/conversation.php:690
+#: ../../Zotlabs/Lib/ThreadItem.php:178 ../../include/conversation.php:690
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:202
+#: ../../Zotlabs/Lib/ThreadItem.php:203
 msgid "I will attend"
 msgstr "Participaré"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:202
+#: ../../Zotlabs/Lib/ThreadItem.php:203
 msgid "I will not attend"
 msgstr "No participaré"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:202
+#: ../../Zotlabs/Lib/ThreadItem.php:203
 msgid "I might attend"
 msgstr "Quizá participe"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:212
+#: ../../Zotlabs/Lib/ThreadItem.php:213
 msgid "I agree"
 msgstr "Estoy de acuerdo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:212
+#: ../../Zotlabs/Lib/ThreadItem.php:213
 msgid "I disagree"
 msgstr "No estoy de acuerdo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:212
+#: ../../Zotlabs/Lib/ThreadItem.php:213
 msgid "I abstain"
 msgstr "Me abstengo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:266 ../../include/conversation.php:695
+#: ../../Zotlabs/Lib/ThreadItem.php:267 ../../include/conversation.php:695
 msgid "Toggle Star Status"
 msgstr "Activar o desactivar el estado de entrada preferida"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:277 ../../include/conversation.php:707
+#: ../../Zotlabs/Lib/ThreadItem.php:278 ../../include/conversation.php:707
 msgid "Message signature validated"
 msgstr "Firma de mensaje validada"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:278 ../../include/conversation.php:708
+#: ../../Zotlabs/Lib/ThreadItem.php:279 ../../include/conversation.php:708
 msgid "Message signature incorrect"
 msgstr "Firma de mensaje incorrecta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:286
+#: ../../Zotlabs/Lib/ThreadItem.php:287
 msgid "Add Tag"
 msgstr "Añadir etiqueta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:290 ../../include/conversation.php:891
+#: ../../Zotlabs/Lib/ThreadItem.php:291 ../../include/conversation.php:891
 msgid "Conversation Tools"
 msgstr "Herramientas de conversación"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:306 ../../include/taxonomy.php:575
+#: ../../Zotlabs/Lib/ThreadItem.php:307 ../../include/taxonomy.php:573
 msgid "like"
 msgstr "me gusta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:307 ../../include/taxonomy.php:576
+#: ../../Zotlabs/Lib/ThreadItem.php:308 ../../include/taxonomy.php:574
 msgid "dislike"
 msgstr "no me gusta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:317
+#: ../../Zotlabs/Lib/ThreadItem.php:309
+msgid "Reply on this comment"
+msgstr "Responder a este comentario"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:309
+msgid "reply"
+msgstr "responder"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:309
+msgid "Reply to"
+msgstr "Responder a "
+
+#: ../../Zotlabs/Lib/ThreadItem.php:319
 msgid "Share This"
 msgstr "Compartir esto"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:317
+#: ../../Zotlabs/Lib/ThreadItem.php:319
 msgid "share"
 msgstr "compartir"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:327
+#: ../../Zotlabs/Lib/ThreadItem.php:329
 msgid "Delivery Report"
 msgstr "Informe de transmisión"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:347
+#: ../../Zotlabs/Lib/ThreadItem.php:348
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d comentario"
 msgstr[1] "%d comentarios"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:381 ../../Zotlabs/Lib/ThreadItem.php:382
+#: ../../Zotlabs/Lib/ThreadItem.php:380 ../../Zotlabs/Lib/ThreadItem.php:381
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Ver el perfil de %s - %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:385
+#: ../../Zotlabs/Lib/ThreadItem.php:384
 msgid "to"
 msgstr "a"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:386
+#: ../../Zotlabs/Lib/ThreadItem.php:385
 msgid "via"
 msgstr "mediante"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:387
+#: ../../Zotlabs/Lib/ThreadItem.php:386
 msgid "Wall-to-Wall"
 msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:388
+#: ../../Zotlabs/Lib/ThreadItem.php:387
 msgid "via Wall-To-Wall:"
 msgstr "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:402 ../../include/conversation.php:766
+#: ../../Zotlabs/Lib/ThreadItem.php:401 ../../include/conversation.php:766
 #, php-format
 msgid "from %s"
 msgstr "desde %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:405 ../../include/conversation.php:769
+#: ../../Zotlabs/Lib/ThreadItem.php:404 ../../include/conversation.php:769
 #, php-format
 msgid "last edited: %s"
 msgstr "último cambio: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:406 ../../include/conversation.php:770
+#: ../../Zotlabs/Lib/ThreadItem.php:405 ../../include/conversation.php:770
 #, php-format
 msgid "Expires: %s"
 msgstr "Caduca: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:414
+#: ../../Zotlabs/Lib/ThreadItem.php:413
 msgid "Attend"
 msgstr "Participar o asistir"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:415
+#: ../../Zotlabs/Lib/ThreadItem.php:414
 msgid "Attendance Options"
 msgstr "Opciones de participación o asistencia"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:416
+#: ../../Zotlabs/Lib/ThreadItem.php:415
 msgid "Vote"
 msgstr "Votar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:417
+#: ../../Zotlabs/Lib/ThreadItem.php:416
 msgid "Voting Options"
 msgstr "Opciones de votación"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:439
+#: ../../Zotlabs/Lib/ThreadItem.php:431
+msgid "Go to previous comment"
+msgstr "Ir al comentario anterior"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:440
 #: ../../addon/bookmarker/bookmarker.php:38
 msgid "Save Bookmarks"
 msgstr "Guardar en Marcadores"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:440
+#: ../../Zotlabs/Lib/ThreadItem.php:441
 msgid "Add to Calendar"
 msgstr "Añadir al calendario"
 
@@ -9011,62 +9098,62 @@ msgstr "Añadir al calendario"
 msgid "This is an unsaved preview"
 msgstr "Esta es una previsualización sin guardar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:501 ../../include/js_strings.php:7
+#: ../../Zotlabs/Lib/ThreadItem.php:502 ../../include/js_strings.php:7
 #, php-format
 msgid "%s show all"
 msgstr "%s mostrar todo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:796 ../../addon/hsse/hsse.php:200
+#: ../../Zotlabs/Lib/ThreadItem.php:797 ../../addon/hsse/hsse.php:200
 #: ../../include/conversation.php:1406
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:797 ../../addon/hsse/hsse.php:201
+#: ../../Zotlabs/Lib/ThreadItem.php:798 ../../addon/hsse/hsse.php:201
 #: ../../include/conversation.php:1407
 msgid "Italic"
 msgstr "Itálico "
 
-#: ../../Zotlabs/Lib/ThreadItem.php:798 ../../addon/hsse/hsse.php:202
+#: ../../Zotlabs/Lib/ThreadItem.php:799 ../../addon/hsse/hsse.php:202
 #: ../../include/conversation.php:1408
 msgid "Underline"
 msgstr "Subrayar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:799 ../../addon/hsse/hsse.php:203
+#: ../../Zotlabs/Lib/ThreadItem.php:800 ../../addon/hsse/hsse.php:203
 #: ../../include/conversation.php:1409
 msgid "Quote"
 msgstr "Citar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:800 ../../addon/hsse/hsse.php:204
+#: ../../Zotlabs/Lib/ThreadItem.php:801 ../../addon/hsse/hsse.php:204
 #: ../../include/conversation.php:1410
 msgid "Code"
 msgstr "Código"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:801
+#: ../../Zotlabs/Lib/ThreadItem.php:802
 msgid "Image"
 msgstr "Imagen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:802 ../../addon/hsse/hsse.php:205
+#: ../../Zotlabs/Lib/ThreadItem.php:803 ../../addon/hsse/hsse.php:205
 #: ../../include/conversation.php:1411
 msgid "Attach/Upload file"
 msgstr "Adjuntar/cargar fichero"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:803
+#: ../../Zotlabs/Lib/ThreadItem.php:804
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:804
+#: ../../Zotlabs/Lib/ThreadItem.php:805
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:814
+#: ../../Zotlabs/Lib/ThreadItem.php:815
 msgid "Your full name (required)"
 msgstr "Su nombre completo (requerido)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:815
+#: ../../Zotlabs/Lib/ThreadItem.php:816
 msgid "Your email address (required)"
 msgstr "Su dirección de correo electrónico (requerido)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:816
+#: ../../Zotlabs/Lib/ThreadItem.php:817
 msgid "Your website URL (optional)"
 msgstr "La URL de su sitio web (opcional)"
 
@@ -9082,11 +9169,11 @@ msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
 
-#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:289
+#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:295
 msgid "parent"
 msgstr "padre"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2941
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2950
 msgid "Collection"
 msgstr "Colección"
 
@@ -9098,11 +9185,6 @@ msgstr "Principal"
 msgid "Addressbook"
 msgstr "Libreta de direcciones"
 
-#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:463
-#: ../../include/nav.php:466
-msgid "Calendar"
-msgstr "Calendario"
-
 #: ../../Zotlabs/Storage/Browser.php:143
 msgid "Schedule Inbox"
 msgstr "Programar bandeja de entrada"
@@ -9111,41 +9193,41 @@ msgstr "Programar bandeja de entrada"
 msgid "Schedule Outbox"
 msgstr "Programar bandeja de salida"
 
-#: ../../Zotlabs/Storage/Browser.php:273
+#: ../../Zotlabs/Storage/Browser.php:279
 msgid "Total"
 msgstr "Total"
 
-#: ../../Zotlabs/Storage/Browser.php:275
+#: ../../Zotlabs/Storage/Browser.php:281
 msgid "Shared"
 msgstr "Compartido"
 
-#: ../../Zotlabs/Storage/Browser.php:277
+#: ../../Zotlabs/Storage/Browser.php:283
 msgid "Add Files"
 msgstr "Añadir ficheros"
 
-#: ../../Zotlabs/Storage/Browser.php:361
+#: ../../Zotlabs/Storage/Browser.php:367
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr "Está usando %1$s de su espacio disponible para ficheros."
 
-#: ../../Zotlabs/Storage/Browser.php:366
+#: ../../Zotlabs/Storage/Browser.php:372
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
 msgstr "Está usando %1$s de %2$s que tiene a su disposición para ficheros. (%3$s&#37;)"
 
-#: ../../Zotlabs/Storage/Browser.php:377
+#: ../../Zotlabs/Storage/Browser.php:383
 msgid "WARNING:"
 msgstr "ATENCIÓN: "
 
-#: ../../Zotlabs/Storage/Browser.php:389
+#: ../../Zotlabs/Storage/Browser.php:395
 msgid "Create new folder"
 msgstr "Crear nueva carpeta"
 
-#: ../../Zotlabs/Storage/Browser.php:391
+#: ../../Zotlabs/Storage/Browser.php:397
 msgid "Upload file"
 msgstr "Subir fichero"
 
-#: ../../Zotlabs/Storage/Browser.php:404
+#: ../../Zotlabs/Storage/Browser.php:410
 msgid "Drop files here to immediately upload"
 msgstr "Arrastre los ficheros aquí para subirlos de forma inmediata"
 
@@ -9168,78 +9250,70 @@ msgstr "Lectura y escritura"
 msgid "Read-only"
 msgstr "Sólo lectura"
 
-#: ../../Zotlabs/Widget/Cdav.php:117
-msgid "My Calendars"
-msgstr "Mis calendarios"
+#: ../../Zotlabs/Widget/Cdav.php:127
+msgid "Channel Calendar"
+msgstr "Calendario del canal"
 
-#: ../../Zotlabs/Widget/Cdav.php:119
-msgid "Shared Calendars"
-msgstr "Calendarios compartidos"
+#: ../../Zotlabs/Widget/Cdav.php:131
+msgid "Shared CalDAV Calendars"
+msgstr "Calendarios CalDAV compartidos"
 
-#: ../../Zotlabs/Widget/Cdav.php:123
+#: ../../Zotlabs/Widget/Cdav.php:135
 msgid "Share this calendar"
 msgstr "Compartir este calendario"
 
-#: ../../Zotlabs/Widget/Cdav.php:125
+#: ../../Zotlabs/Widget/Cdav.php:137
 msgid "Calendar name and color"
 msgstr "Nombre y color del calendario"
 
-#: ../../Zotlabs/Widget/Cdav.php:127
-msgid "Create new calendar"
-msgstr "Crear un nuevo calendario"
+#: ../../Zotlabs/Widget/Cdav.php:139
+msgid "Create new CalDAV calendar"
+msgstr "Crear un nuevo calendario CalDAV"
 
-#: ../../Zotlabs/Widget/Cdav.php:129
+#: ../../Zotlabs/Widget/Cdav.php:141
 msgid "Calendar Name"
 msgstr "Nombre del calendario"
 
-#: ../../Zotlabs/Widget/Cdav.php:130
+#: ../../Zotlabs/Widget/Cdav.php:142
 msgid "Calendar Tools"
 msgstr "Gestión de calendarios"
 
-#: ../../Zotlabs/Widget/Cdav.php:131
+#: ../../Zotlabs/Widget/Cdav.php:144
 msgid "Import calendar"
 msgstr "Importar un calendario"
 
-#: ../../Zotlabs/Widget/Cdav.php:132
+#: ../../Zotlabs/Widget/Cdav.php:145
 msgid "Select a calendar to import to"
 msgstr "Seleccionar un calendario para importarlo"
 
-#: ../../Zotlabs/Widget/Cdav.php:159
+#: ../../Zotlabs/Widget/Cdav.php:172
 msgid "Addressbooks"
 msgstr "Agenda de direcciones"
 
-#: ../../Zotlabs/Widget/Cdav.php:161
+#: ../../Zotlabs/Widget/Cdav.php:174
 msgid "Addressbook name"
 msgstr "Nombre de la agenda"
 
-#: ../../Zotlabs/Widget/Cdav.php:163
+#: ../../Zotlabs/Widget/Cdav.php:176
 msgid "Create new addressbook"
 msgstr "Crear una nueva agenda de direcciones"
 
-#: ../../Zotlabs/Widget/Cdav.php:164
+#: ../../Zotlabs/Widget/Cdav.php:177
 msgid "Addressbook Name"
 msgstr "Nombre de la agenda"
 
-#: ../../Zotlabs/Widget/Cdav.php:166
+#: ../../Zotlabs/Widget/Cdav.php:179
 msgid "Addressbook Tools"
 msgstr "Gestión de agendas de direcciones"
 
-#: ../../Zotlabs/Widget/Cdav.php:167
+#: ../../Zotlabs/Widget/Cdav.php:180
 msgid "Import addressbook"
 msgstr "Importar una agenda de direcciones"
 
-#: ../../Zotlabs/Widget/Cdav.php:168
+#: ../../Zotlabs/Widget/Cdav.php:181
 msgid "Select an addressbook to import to"
 msgstr "Seleccionar una agenda para importarla"
 
-#: ../../Zotlabs/Widget/Appcategories.php:43
-#: ../../include/contact_widgets.php:96 ../../include/contact_widgets.php:139
-#: ../../include/contact_widgets.php:184 ../../include/taxonomy.php:409
-#: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511
-#: ../../include/taxonomy.php:532
-msgid "Categories"
-msgstr "Temas"
-
 #: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31
 #: ../../widget/Netselect/Netselect.php:26
 #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:99
@@ -9352,7 +9426,7 @@ msgstr "Mostrar las entradas que he enviado a %s"
 
 #: ../../Zotlabs/Widget/Activity_filter.php:137
 #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
-#: ../../include/features.php:325
+#: ../../include/features.php:333
 msgid "Saved Folders"
 msgstr "Carpetas guardadas"
 
@@ -9429,7 +9503,7 @@ msgstr "foto/imagen"
 msgid "Remove term"
 msgstr "Eliminar término"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:317
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:325
 msgid "Saved Searches"
 msgstr "Búsquedas guardadas"
 
@@ -9454,11 +9528,11 @@ msgstr "Recargar"
 msgid "Tasks"
 msgstr "Tareas"
 
-#: ../../Zotlabs/Widget/Suggestions.php:51
+#: ../../Zotlabs/Widget/Suggestions.php:53
 msgid "Suggestions"
 msgstr "Sugerencias"
 
-#: ../../Zotlabs/Widget/Suggestions.php:52
+#: ../../Zotlabs/Widget/Suggestions.php:54
 msgid "See more..."
 msgstr "Ver más..."
 
@@ -9519,7 +9593,7 @@ msgstr "Cargar la foto del perfil"
 msgid "Upload cover photo"
 msgstr "Cargar la foto de portada del perfil"
 
-#: ../../Zotlabs/Widget/Newmember.php:35 ../../include/nav.php:111
+#: ../../Zotlabs/Widget/Newmember.php:35 ../../include/nav.php:115
 msgid "Edit your profile"
 msgstr "Editar su perfil"
 
@@ -9579,7 +9653,7 @@ msgstr "Examinar la cola"
 msgid "DB updates"
 msgstr "Actualizaciones de la base de datos"
 
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:189
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:192
 msgid "Admin"
 msgstr "Administrador"
 
@@ -9742,67 +9816,67 @@ msgstr "No se ha encontrado el canal de origen."
 msgid "Network/Protocol"
 msgstr "Red / Protocolo"
 
-#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1724
+#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1734
 msgid "Zot"
 msgstr "Zot"
 
-#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1722
+#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1732
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1715
-#: ../../include/network.php:1716
+#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1725
+#: ../../include/network.php:1726
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1717
+#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1727
 msgid "OStatus"
 msgstr "OStatus"
 
-#: ../../boot.php:1608
+#: ../../boot.php:1609
 msgid "Create an account to access services and applications"
 msgstr "Crear una cuenta para acceder a los servicios y aplicaciones"
 
-#: ../../boot.php:1628 ../../include/nav.php:103 ../../include/nav.php:132
-#: ../../include/nav.php:151
+#: ../../boot.php:1629 ../../include/nav.php:107 ../../include/nav.php:136
+#: ../../include/nav.php:155
 msgid "Logout"
 msgstr "Finalizar sesión"
 
-#: ../../boot.php:1632
+#: ../../boot.php:1633
 msgid "Login/Email"
 msgstr "Inicio de sesión / Correo electrónico"
 
-#: ../../boot.php:1633
+#: ../../boot.php:1634
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1634
+#: ../../boot.php:1635
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1637
+#: ../../boot.php:1638
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2433
+#: ../../boot.php:2434
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr "[$Projectname] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2438
+#: ../../boot.php:2439
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
 
-#: ../../boot.php:2554
+#: ../../boot.php:2555
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr "[$Projectname] Las tareas de Cron no están funcionando en %s"
 
-#: ../../boot.php:2559
+#: ../../boot.php:2560
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2560 ../../include/datetime.php:238
+#: ../../boot.php:2561 ../../include/datetime.php:238
 msgid "never"
 msgstr "nunca"
 
@@ -10150,8 +10224,8 @@ msgstr "Regresar después"
 msgid "Page to load after image selection."
 msgstr "Página para cargar después de la selección de imágenes."
 
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1356
-#: ../../include/nav.php:111
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1422
+#: ../../include/nav.php:115
 msgid "Edit Profile"
 msgstr "Editar el perfil"
 
@@ -10647,7 +10721,7 @@ msgstr "Se han guardado los ajustes de IRC."
 msgid "IRC Chatroom"
 msgstr "Sala de chat IRC"
 
-#: ../../addon/gallery/gallery.php:38 ../../addon/gallery/Mod_Gallery.php:135
+#: ../../addon/gallery/gallery.php:38 ../../addon/gallery/Mod_Gallery.php:136
 msgid "Gallery"
 msgstr "Galería"
 
@@ -10771,12 +10845,12 @@ msgid "Login failed."
 msgstr "El acceso ha fallado."
 
 #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60
-#: ../../include/selectors.php:77 ../../include/channel.php:1536
+#: ../../include/selectors.php:77 ../../include/channel.php:1602
 msgid "Male"
 msgstr "Hombre"
 
 #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60
-#: ../../include/selectors.php:77 ../../include/channel.php:1534
+#: ../../include/selectors.php:77 ../../include/channel.php:1600
 msgid "Female"
 msgstr "Mujer"
 
@@ -10971,23 +11045,23 @@ msgstr "una declaración de amor eterno"
 msgid "declared undying love for"
 msgstr "ha declarado amor eterno a"
 
-#: ../../addon/diaspora/Receiver.php:1495
+#: ../../addon/diaspora/Receiver.php:1509
 #, php-format
 msgid "%1$s dislikes %2$s's %3$s"
 msgstr "a %1$s no le gusta el %3$s de %2$s"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:40
+#: ../../addon/diaspora/Mod_Diaspora.php:42
 msgid "Diaspora Protocol Settings updated."
 msgstr "Los ajustes del protocolo de Diaspora se han actualizado."
 
-#: ../../addon/diaspora/Mod_Diaspora.php:49
+#: ../../addon/diaspora/Mod_Diaspora.php:51
 msgid ""
 "The diaspora protocol does not support location independence. Connections "
 "you make within that network may be unreachable from alternate channel "
 "locations."
 msgstr "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos."
 
-#: ../../addon/diaspora/Mod_Diaspora.php:55
+#: ../../addon/diaspora/Mod_Diaspora.php:57
 msgid "Diaspora Protocol App"
 msgstr "App Protocolo Diaspora"
 
@@ -11144,23 +11218,25 @@ msgstr "Seleccione la valoración adecuada del avatar para su sitio. Ver README"
 msgid "Gravatar settings updated."
 msgstr "Se han actualizado los ajustes de Gravatar."
 
-#: ../../addon/hzfiles/hzfiles.php:79
+#: ../../addon/hzfiles/hzfiles.php:81
 msgid "Hubzilla File Storage Import"
 msgstr "Importar del depósito de ficheros de Hubzilla"
 
-#: ../../addon/hzfiles/hzfiles.php:80
+#: ../../addon/hzfiles/hzfiles.php:82
 msgid "This will import all your cloud files from another server."
 msgstr "Esto importará todos sus ficheros en la nube desde otro servidor."
 
-#: ../../addon/hzfiles/hzfiles.php:81
+#: ../../addon/hzfiles/hzfiles.php:83
 msgid "Hubzilla Server base URL"
 msgstr "URL base del servidor Hubzilla"
 
-#: ../../addon/hzfiles/hzfiles.php:82
+#: ../../addon/hzfiles/hzfiles.php:84
+#: ../../addon/content_import/Mod_content_import.php:140
 msgid "Since modified date yyyy-mm-dd"
 msgstr "Modificado desde la fecha yyyy-mm-dd"
 
-#: ../../addon/hzfiles/hzfiles.php:83
+#: ../../addon/hzfiles/hzfiles.php:85
+#: ../../addon/content_import/Mod_content_import.php:141
 msgid "Until modified date yyyy-mm-dd"
 msgstr "Modificado hasta la fecha yyyy-mm-dd"
 
@@ -11332,7 +11408,7 @@ msgid "Provides a Facebook-like chat using Jappix Mini"
 msgstr "Proporciona un chat similar al de Facebook utilizando Jappix Mini"
 
 #: ../../addon/jappixmini/Mod_Jappixmini.php:157
-#: ../../include/channel.php:1452 ../../include/channel.php:1623
+#: ../../include/channel.php:1518 ../../include/channel.php:1689
 msgid "Status:"
 msgstr "Estado:"
 
@@ -11382,107 +11458,116 @@ msgstr "Ayuda para los ajustes"
 msgid "Jappixmini Settings"
 msgstr "Ajustes de Jappixmini"
 
-#: ../../addon/upgrade_info/upgrade_info.php:43
-msgid "Your channel has been upgraded to the latest $Projectname version."
-msgstr "Su canal ha sido actualizado a la última versión de $Projectname."
+#: ../../addon/upgrade_info/upgrade_info.php:48
+msgid "Your channel has been upgraded to $Projectname version"
+msgstr "Su canal ha sido actualizado a la versión $Projectname"
 
-#: ../../addon/upgrade_info/upgrade_info.php:44
-msgid ""
-"To improve usability, we have converted some features into installable "
-"stand-alone apps."
-msgstr "Para mejorar la usabilidad, hemos convertido algunas características en aplicaciones independientes instalables."
+#: ../../addon/upgrade_info/upgrade_info.php:50
+msgid "Please have a look at the"
+msgstr "Por favor, eche un vistazo a la "
 
-#: ../../addon/upgrade_info/upgrade_info.php:45
-msgid "Please visit the $Projectname"
-msgstr "Por favor visite el sitio web de $Projectname"
+#: ../../addon/upgrade_info/upgrade_info.php:52
+msgid "git history"
+msgstr "historial del git"
 
-#: ../../addon/upgrade_info/upgrade_info.php:46
-msgid "app store"
-msgstr "aplicaciones disponibles"
+#: ../../addon/upgrade_info/upgrade_info.php:54
+msgid "change log"
+msgstr "lista de cambios"
 
-#: ../../addon/upgrade_info/upgrade_info.php:47
-msgid "and install possibly missing apps."
-msgstr "e instale las aplicaciones que posiblemente falten."
+#: ../../addon/upgrade_info/upgrade_info.php:55
+msgid "for further infos."
+msgstr "para más información."
 
-#: ../../addon/upgrade_info/upgrade_info.php:52
+#: ../../addon/upgrade_info/upgrade_info.php:60
 msgid "Upgrade Info"
 msgstr "Información de actualización"
 
-#: ../../addon/upgrade_info/upgrade_info.php:56
+#: ../../addon/upgrade_info/upgrade_info.php:64
 msgid "Do not show this again"
 msgstr "No mostrar esto de nuevo"
 
-#: ../../addon/channelreputation/channelreputation.php:98
-#: ../../addon/channelreputation/channelreputation.php:99
+#: ../../addon/channelreputation/channelreputation.php:100
+#: ../../addon/channelreputation/channelreputation.php:101
 #: ../../addon/cart/myshop.php:141 ../../addon/cart/myshop.php:177
 #: ../../addon/cart/myshop.php:211 ../../addon/cart/myshop.php:259
 #: ../../addon/cart/myshop.php:294 ../../addon/cart/myshop.php:317
 msgid "Access Denied"
 msgstr "Acceso denegado"
 
-#: ../../addon/channelreputation/channelreputation.php:106
+#: ../../addon/channelreputation/channelreputation.php:108
 msgid "Enable Community Moderation"
 msgstr "Habilitar la moderación de la comunidad"
 
-#: ../../addon/channelreputation/channelreputation.php:114
+#: ../../addon/channelreputation/channelreputation.php:116
 msgid "Reputation automatically given to new members"
 msgstr "La reputación se otorga automáticamente a los nuevos miembros"
 
-#: ../../addon/channelreputation/channelreputation.php:115
+#: ../../addon/channelreputation/channelreputation.php:117
 msgid "Reputation will never fall below this value"
 msgstr "La reputación nunca caerá por debajo de este valor"
 
-#: ../../addon/channelreputation/channelreputation.php:116
+#: ../../addon/channelreputation/channelreputation.php:118
 msgid "Minimum reputation before posting is allowed"
 msgstr "Reputación mínima antes de que se permita el envío de entradas"
 
-#: ../../addon/channelreputation/channelreputation.php:117
+#: ../../addon/channelreputation/channelreputation.php:119
 msgid "Minimum reputation before commenting is allowed"
 msgstr "Mínima reputación antes de que se permitan los comentarios"
 
-#: ../../addon/channelreputation/channelreputation.php:118
+#: ../../addon/channelreputation/channelreputation.php:120
 msgid "Minimum reputation before a member is able to moderate other posts"
 msgstr "Reputación mínima antes de que un miembro sea capaz de moderar otros mensajes"
 
-#: ../../addon/channelreputation/channelreputation.php:119
+#: ../../addon/channelreputation/channelreputation.php:121
 msgid ""
 "Max ratio of moderator's reputation that can be added to/deducted from "
 "reputation of person being moderated"
 msgstr "Proporción máxima de la reputación del moderador que puede ser añadida/descontada de la reputación de la persona que está siendo moderada."
 
-#: ../../addon/channelreputation/channelreputation.php:120
+#: ../../addon/channelreputation/channelreputation.php:122
 msgid "Reputation \"cost\" to post"
 msgstr "\"Coste\" de la reputación a contabilizar"
 
-#: ../../addon/channelreputation/channelreputation.php:121
+#: ../../addon/channelreputation/channelreputation.php:123
 msgid "Reputation \"cost\" to comment"
 msgstr "\"Coste\" de la reputación para comentar"
 
-#: ../../addon/channelreputation/channelreputation.php:122
+#: ../../addon/channelreputation/channelreputation.php:124
 msgid ""
 "Reputation automatically recovers at this rate per hour until it reaches "
 "minimum_to_post"
 msgstr "La reputación se recupera automáticamente a esta tasa por hora hasta que alcanza el mínimo_a_post"
 
-#: ../../addon/channelreputation/channelreputation.php:123
+#: ../../addon/channelreputation/channelreputation.php:125
 msgid ""
 "When minimum_to_moderate > reputation > minimum_to_post reputation recovers "
 "at this rate per hour"
 msgstr "Cuando el mínimo_a_moderar > reputación > mínimo_a_publicar la reputación se recupera a esta tasa por hora "
 
-#: ../../addon/channelreputation/channelreputation.php:137
+#: ../../addon/channelreputation/channelreputation.php:139
 msgid "Community Moderation Settings"
 msgstr "Configuración de la moderación de la comunidad"
 
-#: ../../addon/channelreputation/channelreputation.php:365
-msgid "Can moderate reputation on my channel."
-msgstr "Se puede moderar la reputación en mi canal."
-
-#: ../../addon/channelreputation/channelreputation.php:549
-#: ../../addon/channelreputation/channelreputation.php:552
+#: ../../addon/channelreputation/channelreputation.php:229
 msgid "Channel Reputation"
 msgstr "Reputación del canal"
 
+#: ../../addon/channelreputation/channelreputation.php:233
+msgid "An Error has occurred."
+msgstr "Se ha producido un error."
+
+#: ../../addon/channelreputation/channelreputation.php:251
+msgid "Upvote"
+msgstr "Votar a favor"
+
+#: ../../addon/channelreputation/channelreputation.php:252
+msgid "Downvote"
+msgstr "Votar en contra"
+
+#: ../../addon/channelreputation/channelreputation.php:374
+msgid "Can moderate reputation on my channel."
+msgstr "Se puede moderar la reputación en mi canal."
+
 #: ../../addon/superblock/superblock.php:337
 msgid "Block Completely"
 msgstr "Bloquear completamente"
@@ -11590,6 +11675,53 @@ msgstr "Tamaño del fichero de informe en bytes antes de rotarlo"
 msgid "Number of logfiles to retain"
 msgstr "Número de ficheros de informe que se deben retener"
 
+#: ../../addon/content_import/Mod_content_import.php:27
+msgid "No server specified"
+msgstr "No se ha especificado ningún servidor"
+
+#: ../../addon/content_import/Mod_content_import.php:73
+msgid "Posts imported"
+msgstr "Entradas importadas"
+
+#: ../../addon/content_import/Mod_content_import.php:113
+msgid "Files imported"
+msgstr "Ficheros importados"
+
+#: ../../addon/content_import/Mod_content_import.php:122
+msgid ""
+"This addon app copies existing content and file storage to a cloned/copied "
+"channel. Once the app is installed, visit the newly installed app. This will"
+" allow you to set the location of your original channel and an optional date"
+" range of files/conversations to copy."
+msgstr "Este complemento copia el contenido existente y el almacenamiento de ficheros en un canal clonado/copiado. Una vez instalada la aplicación, visite la aplicación recién instalada. Esto le permitirá establecer la ubicación de su canal original y un rango de fechas opcional de ficheros/conversaciones para copiar."
+
+#: ../../addon/content_import/Mod_content_import.php:136
+msgid ""
+"This will import all your conversations and cloud files from a cloned "
+"channel on another server. This may take a while if you have lots of posts "
+"and or files."
+msgstr "Esto importará todas sus conversaciones y archivos de nube de un canal clonado en otro servidor. El proceso puede tardar un poco si tiene muchos mensajes y/o ficheros."
+
+#: ../../addon/content_import/Mod_content_import.php:137
+msgid "Include posts"
+msgstr "Incluir entradas"
+
+#: ../../addon/content_import/Mod_content_import.php:137
+msgid "Conversations, Articles, Cards, and other posted content"
+msgstr "Conversaciones, artículos, fichas y otros contenidos publicados"
+
+#: ../../addon/content_import/Mod_content_import.php:138
+msgid "Include files"
+msgstr "Incluir ficheros"
+
+#: ../../addon/content_import/Mod_content_import.php:138
+msgid "Files, Photos and other cloud storage"
+msgstr "Archivos, fotos y otro tipo de almacenamiento en la nube"
+
+#: ../../addon/content_import/Mod_content_import.php:139
+msgid "Original Server base URL"
+msgstr "URL base del servidor original"
+
 #: ../../addon/frphotos/frphotos.php:92
 msgid "Friendica Photo Album Import"
 msgstr "Importar un álbum de fotos de Friendica"
@@ -11701,25 +11833,25 @@ msgstr "El protocolo ActivityPub no soporta la independencia de ubicación. Las
 msgid "Activitypub Protocol App"
 msgstr "App Protocolo Activitypub"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:48
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50
 msgid "Deliver to ActivityPub recipients in privacy groups"
 msgstr "Entregar a los destinatarios de ActivityPub en grupos de canales"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:48
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50
 msgid ""
 "May result in a large number of mentions and expose all the members of your "
 "privacy group"
 msgstr "Puede resultar en un gran número de menciones y exponer a todos los miembros de su grupo de canales"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:52
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:54
 msgid "Send multi-media HTML articles"
 msgstr "Enviar artículos multimedia en HTML"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:52
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:54
 msgid "Not supported by some microblog services such as Mastodon"
 msgstr "No soportado por algunos servicios de microblog como Mastodon"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:60
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:62
 msgid "Activitypub Protocol"
 msgstr "Protocolo Activitypub"
 
@@ -12110,7 +12242,7 @@ msgstr "Elegido un color aleatorio."
 msgid "Error creating new game."
 msgstr "Error al crear un nuevo juego."
 
-#: ../../addon/chess/Mod_Chess.php:306 ../../include/channel.php:1207
+#: ../../addon/chess/Mod_Chess.php:306 ../../include/channel.php:1273
 msgid "Requested channel is not available."
 msgstr "El canal solicitado no está disponible."
 
@@ -12122,7 +12254,7 @@ msgstr "Chess no está instalado."
 msgid "You must select a local channel /chess/channelname"
 msgstr "Debe seleccionar un canal local /chess/nombredelcanal"
 
-#: ../../addon/chess/chess.php:642
+#: ../../addon/chess/chess.php:645
 msgid "Enable notifications"
 msgstr "Habilitar notificaciones"
 
@@ -13070,11 +13202,11 @@ msgstr "Transexual"
 msgid "Hermaphrodite"
 msgstr "Hermafrodita"
 
-#: ../../include/selectors.php:60 ../../include/channel.php:1540
+#: ../../include/selectors.php:60 ../../include/channel.php:1606
 msgid "Neuter"
 msgstr "Neutral"
 
-#: ../../include/selectors.php:60 ../../include/channel.php:1542
+#: ../../include/selectors.php:60 ../../include/channel.php:1608
 msgid "Non-specific"
 msgstr "No especificado"
 
@@ -13274,8 +13406,8 @@ msgstr "%1$s ahora está conectado/a con %2$s"
 msgid "%1$s poked %2$s"
 msgstr "%1$s ha dado un toque a %2$s"
 
-#: ../../include/conversation.php:251 ../../include/text.php:1176
-#: ../../include/text.php:1180
+#: ../../include/conversation.php:251 ../../include/text.php:1195
+#: ../../include/text.php:1199
 msgid "poked"
 msgstr "ha dado un toque a"
 
@@ -13429,373 +13561,373 @@ msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado."
 
-#: ../../include/import.php:117
+#: ../../include/import.php:118
 msgid "Cloned channel not found. Import failed."
 msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
 
-#: ../../include/text.php:501
+#: ../../include/text.php:520
 msgid "prev"
 msgstr "anterior"
 
-#: ../../include/text.php:503
+#: ../../include/text.php:522
 msgid "first"
 msgstr "primera"
 
-#: ../../include/text.php:532
+#: ../../include/text.php:551
 msgid "last"
 msgstr "última"
 
-#: ../../include/text.php:535
+#: ../../include/text.php:554
 msgid "next"
 msgstr "próxima"
 
-#: ../../include/text.php:553
+#: ../../include/text.php:572
 msgid "older"
 msgstr "más antiguas"
 
-#: ../../include/text.php:555
+#: ../../include/text.php:574
 msgid "newer"
 msgstr "más recientes"
 
-#: ../../include/text.php:979
+#: ../../include/text.php:998
 msgid "No connections"
 msgstr "Sin conexiones"
 
-#: ../../include/text.php:1011
+#: ../../include/text.php:1030
 #, php-format
 msgid "View all %s connections"
 msgstr "Ver todas las %s conexiones"
 
-#: ../../include/text.php:1073
+#: ../../include/text.php:1092
 #, php-format
 msgid "Network: %s"
 msgstr "Red %s"
 
-#: ../../include/text.php:1176 ../../include/text.php:1180
+#: ../../include/text.php:1195 ../../include/text.php:1199
 msgid "poke"
 msgstr "un toque"
 
-#: ../../include/text.php:1181
+#: ../../include/text.php:1200
 msgid "ping"
 msgstr "un \"ping\""
 
-#: ../../include/text.php:1181
+#: ../../include/text.php:1200
 msgid "pinged"
 msgstr "ha enviado un \"ping\" a"
 
-#: ../../include/text.php:1182
+#: ../../include/text.php:1201
 msgid "prod"
 msgstr "una incitación "
 
-#: ../../include/text.php:1182
+#: ../../include/text.php:1201
 msgid "prodded"
 msgstr "ha incitado a "
 
-#: ../../include/text.php:1183
+#: ../../include/text.php:1202
 msgid "slap"
 msgstr "una bofetada "
 
-#: ../../include/text.php:1183
+#: ../../include/text.php:1202
 msgid "slapped"
 msgstr "ha abofeteado a "
 
-#: ../../include/text.php:1184
+#: ../../include/text.php:1203
 msgid "finger"
 msgstr "un \"finger\" "
 
-#: ../../include/text.php:1184
+#: ../../include/text.php:1203
 msgid "fingered"
 msgstr "envió un \"finger\" a"
 
-#: ../../include/text.php:1185
+#: ../../include/text.php:1204
 msgid "rebuff"
 msgstr "un reproche"
 
-#: ../../include/text.php:1185
+#: ../../include/text.php:1204
 msgid "rebuffed"
 msgstr "ha hecho un reproche a "
 
-#: ../../include/text.php:1208
+#: ../../include/text.php:1227
 msgid "happy"
 msgstr "feliz "
 
-#: ../../include/text.php:1209
+#: ../../include/text.php:1228
 msgid "sad"
 msgstr "triste "
 
-#: ../../include/text.php:1210
+#: ../../include/text.php:1229
 msgid "mellow"
 msgstr "tranquilo/a"
 
-#: ../../include/text.php:1211
+#: ../../include/text.php:1230
 msgid "tired"
 msgstr "cansado/a "
 
-#: ../../include/text.php:1212
+#: ../../include/text.php:1231
 msgid "perky"
 msgstr "vivaz"
 
-#: ../../include/text.php:1213
+#: ../../include/text.php:1232
 msgid "angry"
 msgstr "enfadado/a"
 
-#: ../../include/text.php:1214
+#: ../../include/text.php:1233
 msgid "stupefied"
 msgstr "asombrado/a"
 
-#: ../../include/text.php:1215
+#: ../../include/text.php:1234
 msgid "puzzled"
 msgstr "perplejo/a"
 
-#: ../../include/text.php:1216
+#: ../../include/text.php:1235
 msgid "interested"
 msgstr "interesado/a"
 
-#: ../../include/text.php:1217
+#: ../../include/text.php:1236
 msgid "bitter"
 msgstr "amargado/a"
 
-#: ../../include/text.php:1218
+#: ../../include/text.php:1237
 msgid "cheerful"
 msgstr "alegre"
 
-#: ../../include/text.php:1219
+#: ../../include/text.php:1238
 msgid "alive"
 msgstr "animado/a"
 
-#: ../../include/text.php:1220
+#: ../../include/text.php:1239
 msgid "annoyed"
 msgstr "molesto/a"
 
-#: ../../include/text.php:1221
+#: ../../include/text.php:1240
 msgid "anxious"
 msgstr "ansioso/a"
 
-#: ../../include/text.php:1222
+#: ../../include/text.php:1241
 msgid "cranky"
 msgstr "de mal humor"
 
-#: ../../include/text.php:1223
+#: ../../include/text.php:1242
 msgid "disturbed"
 msgstr "perturbado/a"
 
-#: ../../include/text.php:1224
+#: ../../include/text.php:1243
 msgid "frustrated"
 msgstr "frustrado/a"
 
-#: ../../include/text.php:1225
+#: ../../include/text.php:1244
 msgid "depressed"
 msgstr "deprimido/a"
 
-#: ../../include/text.php:1226
+#: ../../include/text.php:1245
 msgid "motivated"
 msgstr "motivado/a"
 
-#: ../../include/text.php:1227
+#: ../../include/text.php:1246
 msgid "relaxed"
 msgstr "relajado/a"
 
-#: ../../include/text.php:1228
+#: ../../include/text.php:1247
 msgid "surprised"
 msgstr "sorprendido/a"
 
-#: ../../include/text.php:1416 ../../include/js_strings.php:95
+#: ../../include/text.php:1435 ../../include/js_strings.php:96
 msgid "Monday"
 msgstr "lunes"
 
-#: ../../include/text.php:1416 ../../include/js_strings.php:96
+#: ../../include/text.php:1435 ../../include/js_strings.php:97
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../../include/text.php:1416 ../../include/js_strings.php:97
+#: ../../include/text.php:1435 ../../include/js_strings.php:98
 msgid "Wednesday"
 msgstr "miércoles"
 
-#: ../../include/text.php:1416 ../../include/js_strings.php:98
+#: ../../include/text.php:1435 ../../include/js_strings.php:99
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../../include/text.php:1416 ../../include/js_strings.php:99
+#: ../../include/text.php:1435 ../../include/js_strings.php:100
 msgid "Friday"
 msgstr "viernes"
 
-#: ../../include/text.php:1416 ../../include/js_strings.php:100
+#: ../../include/text.php:1435 ../../include/js_strings.php:101
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../../include/text.php:1416 ../../include/js_strings.php:94
+#: ../../include/text.php:1435 ../../include/js_strings.php:95
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../../include/text.php:1420 ../../include/js_strings.php:70
+#: ../../include/text.php:1439 ../../include/js_strings.php:71
 msgid "January"
 msgstr "enero"
 
-#: ../../include/text.php:1420 ../../include/js_strings.php:71
+#: ../../include/text.php:1439 ../../include/js_strings.php:72
 msgid "February"
 msgstr "febrero"
 
-#: ../../include/text.php:1420 ../../include/js_strings.php:72
+#: ../../include/text.php:1439 ../../include/js_strings.php:73
 msgid "March"
 msgstr "marzo"
 
-#: ../../include/text.php:1420 ../../include/js_strings.php:73
+#: ../../include/text.php:1439 ../../include/js_strings.php:74
 msgid "April"
 msgstr "abril"
 
-#: ../../include/text.php:1420
+#: ../../include/text.php:1439
 msgid "May"
 msgstr "mayo"
 
-#: ../../include/text.php:1420 ../../include/js_strings.php:75
+#: ../../include/text.php:1439 ../../include/js_strings.php:76
 msgid "June"
 msgstr "junio"
 
-#: ../../include/text.php:1420 ../../include/js_strings.php:76
+#: ../../include/text.php:1439 ../../include/js_strings.php:77
 msgid "July"
 msgstr "julio"
 
-#: ../../include/text.php:1420 ../../include/js_strings.php:77
+#: ../../include/text.php:1439 ../../include/js_strings.php:78
 msgid "August"
 msgstr "agosto"
 
-#: ../../include/text.php:1420 ../../include/js_strings.php:78
+#: ../../include/text.php:1439 ../../include/js_strings.php:79
 msgid "September"
 msgstr "septiembre"
 
-#: ../../include/text.php:1420 ../../include/js_strings.php:79
+#: ../../include/text.php:1439 ../../include/js_strings.php:80
 msgid "October"
 msgstr "octubre"
 
-#: ../../include/text.php:1420 ../../include/js_strings.php:80
+#: ../../include/text.php:1439 ../../include/js_strings.php:81
 msgid "November"
 msgstr "noviembre"
 
-#: ../../include/text.php:1420 ../../include/js_strings.php:81
+#: ../../include/text.php:1439 ../../include/js_strings.php:82
 msgid "December"
 msgstr "diciembre"
 
-#: ../../include/text.php:1494
+#: ../../include/text.php:1513
 msgid "Unknown Attachment"
 msgstr "Adjunto no reconocido"
 
-#: ../../include/text.php:1496 ../../include/feedutils.php:858
+#: ../../include/text.php:1515 ../../include/feedutils.php:858
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../../include/text.php:1532
+#: ../../include/text.php:1551
 msgid "remove category"
 msgstr "eliminar el tema"
 
-#: ../../include/text.php:1606
+#: ../../include/text.php:1625
 msgid "remove from file"
 msgstr "eliminar del fichero"
 
-#: ../../include/text.php:1765 ../../include/message.php:13
+#: ../../include/text.php:1789 ../../include/message.php:13
 msgid "Download binary/encrypted content"
 msgstr "Descargar contenido binario o cifrado"
 
-#: ../../include/text.php:1935 ../../include/language.php:423
+#: ../../include/text.php:1959 ../../include/language.php:423
 msgid "default"
 msgstr "por defecto"
 
-#: ../../include/text.php:1943
+#: ../../include/text.php:1967
 msgid "Page layout"
 msgstr "Plantilla de la página"
 
-#: ../../include/text.php:1943
+#: ../../include/text.php:1967
 msgid "You can create your own with the layouts tool"
 msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas"
 
-#: ../../include/text.php:1954
+#: ../../include/text.php:1978
 msgid "HTML"
 msgstr "HTML"
 
-#: ../../include/text.php:1957
+#: ../../include/text.php:1981
 msgid "Comanche Layout"
 msgstr "Plantilla de Comanche"
 
-#: ../../include/text.php:1962
+#: ../../include/text.php:1986
 msgid "PHP"
 msgstr "PHP"
 
-#: ../../include/text.php:1971
+#: ../../include/text.php:1995
 msgid "Page content type"
 msgstr "Tipo de contenido de la página"
 
-#: ../../include/text.php:2104
+#: ../../include/text.php:2128
 msgid "activity"
 msgstr "la/su actividad"
 
-#: ../../include/text.php:2205
+#: ../../include/text.php:2229
 msgid "a-z, 0-9, -, and _ only"
 msgstr "a-z, 0-9, -, and _ only"
 
-#: ../../include/text.php:2531
+#: ../../include/text.php:2555
 msgid "Design Tools"
 msgstr "Herramientas de diseño web"
 
-#: ../../include/text.php:2537
+#: ../../include/text.php:2561
 msgid "Pages"
 msgstr "Páginas"
 
-#: ../../include/text.php:2559
+#: ../../include/text.php:2574
 msgid "Import website..."
 msgstr "Importar un sitio web..."
 
-#: ../../include/text.php:2560
+#: ../../include/text.php:2575
 msgid "Select folder to import"
 msgstr "Seleccionar la carpeta que se va a importar"
 
-#: ../../include/text.php:2561
+#: ../../include/text.php:2576
 msgid "Import from a zipped folder:"
 msgstr "Importar desde una carpeta comprimida: "
 
-#: ../../include/text.php:2562
+#: ../../include/text.php:2577
 msgid "Import from cloud files:"
 msgstr "Importar desde los ficheros en la nube: "
 
-#: ../../include/text.php:2563
+#: ../../include/text.php:2578
 msgid "/cloud/channel/path/to/folder"
 msgstr "/cloud/canal/ruta/a la/carpeta"
 
-#: ../../include/text.php:2564
+#: ../../include/text.php:2579
 msgid "Enter path to website files"
 msgstr "Ruta a los ficheros del sitio web"
 
-#: ../../include/text.php:2565
+#: ../../include/text.php:2580
 msgid "Select folder"
 msgstr "Seleccionar la carpeta"
 
-#: ../../include/text.php:2566
+#: ../../include/text.php:2581
 msgid "Export website..."
 msgstr "Exportar un sitio web..."
 
-#: ../../include/text.php:2567
+#: ../../include/text.php:2582
 msgid "Export to a zip file"
 msgstr "Exportar a un fichero comprimido .zip"
 
-#: ../../include/text.php:2568
+#: ../../include/text.php:2583
 msgid "website.zip"
 msgstr "sitio_web.zip"
 
-#: ../../include/text.php:2569
+#: ../../include/text.php:2584
 msgid "Enter a name for the zip file."
 msgstr "Escriba un nombre para el fichero zip."
 
-#: ../../include/text.php:2570
+#: ../../include/text.php:2585
 msgid "Export to cloud files"
 msgstr "Exportar a la nube de ficheros"
 
-#: ../../include/text.php:2571
+#: ../../include/text.php:2586
 msgid "/path/to/export/folder"
 msgstr "/ruta/para/exportar/carpeta"
 
-#: ../../include/text.php:2572
+#: ../../include/text.php:2587
 msgid "Enter a path to a cloud files destination."
 msgstr "Escriba una ruta de destino a la nube de ficheros."
 
-#: ../../include/text.php:2573
+#: ../../include/text.php:2588
 msgid "Specify folder"
 msgstr "Especificar una carpeta"
 
@@ -13843,7 +13975,7 @@ msgstr "Conexiones comunes"
 msgid "View all %d common connections"
 msgstr "Ver todas las %d conexiones comunes"
 
-#: ../../include/markdown.php:198 ../../include/bbcode.php:347
+#: ../../include/markdown.php:198 ../../include/bbcode.php:366
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr "%1$s escribió %2$s siguiente %3$s"
@@ -13868,19 +14000,19 @@ msgstr "Canal Premium - por favor visite:"
 msgid "Channel was deleted and no longer exists."
 msgstr "El canal ha sido eliminado y ya no existe."
 
-#: ../../include/follow.php:165
+#: ../../include/follow.php:166
 msgid "Remote channel or protocol unavailable."
 msgstr "Canal remoto o protocolo no disponible."
 
-#: ../../include/follow.php:188
+#: ../../include/follow.php:190
 msgid "Channel discovery failed."
 msgstr "El intento de acceder al canal ha fallado."
 
-#: ../../include/follow.php:200
+#: ../../include/follow.php:202
 msgid "Protocol disabled."
 msgstr "Protocolo deshabilitado."
 
-#: ../../include/follow.php:211
+#: ../../include/follow.php:213
 msgid "Cannot connect to yourself."
 msgstr "No puede conectarse consigo mismo."
 
@@ -13993,192 +14125,196 @@ msgstr "Esto es un "
 msgid " channel name"
 msgstr "nombre de canal"
 
-#: ../../include/js_strings.php:41
+#: ../../include/js_strings.php:36
+msgid "Back to reply"
+msgstr "Volver a la respuesta"
+
+#: ../../include/js_strings.php:42
 #, php-format
 msgid "%d minutes"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutos"
 msgstr[1] "%d minutos"
 
-#: ../../include/js_strings.php:42
+#: ../../include/js_strings.php:43
 #, php-format
 msgid "about %d hours"
 msgid_plural "about %d hours"
 msgstr[0] "alrededor de %d horas"
 msgstr[1] "alrededor de %d horas"
 
-#: ../../include/js_strings.php:43
+#: ../../include/js_strings.php:44
 #, php-format
 msgid "%d days"
 msgid_plural "%d days"
 msgstr[0] "%d días"
 msgstr[1] "%d días"
 
-#: ../../include/js_strings.php:44
+#: ../../include/js_strings.php:45
 #, php-format
 msgid "%d months"
 msgid_plural "%d months"
 msgstr[0] "%d meses"
 msgstr[1] "%d meses"
 
-#: ../../include/js_strings.php:45
+#: ../../include/js_strings.php:46
 #, php-format
 msgid "%d years"
 msgid_plural "%d years"
 msgstr[0] "%d años"
 msgstr[1] "%d años"
 
-#: ../../include/js_strings.php:50
+#: ../../include/js_strings.php:51
 msgid "timeago.prefixAgo"
 msgstr "hace "
 
-#: ../../include/js_strings.php:51
+#: ../../include/js_strings.php:52
 msgid "timeago.prefixFromNow"
 msgstr "en "
 
-#: ../../include/js_strings.php:52
+#: ../../include/js_strings.php:53
 msgid "timeago.suffixAgo"
 msgstr "NONE"
 
-#: ../../include/js_strings.php:53
+#: ../../include/js_strings.php:54
 msgid "timeago.suffixFromNow"
 msgstr "NONE"
 
-#: ../../include/js_strings.php:56
+#: ../../include/js_strings.php:57
 msgid "less than a minute"
 msgstr "menos de un minuto"
 
-#: ../../include/js_strings.php:57
+#: ../../include/js_strings.php:58
 msgid "about a minute"
 msgstr "alrededor de un minuto"
 
-#: ../../include/js_strings.php:59
+#: ../../include/js_strings.php:60
 msgid "about an hour"
 msgstr "alrededor de una hora"
 
-#: ../../include/js_strings.php:61
+#: ../../include/js_strings.php:62
 msgid "a day"
 msgstr "un día"
 
-#: ../../include/js_strings.php:63
+#: ../../include/js_strings.php:64
 msgid "about a month"
 msgstr "alrededor de un mes"
 
-#: ../../include/js_strings.php:65
+#: ../../include/js_strings.php:66
 msgid "about a year"
 msgstr "alrededor de un año"
 
-#: ../../include/js_strings.php:67
+#: ../../include/js_strings.php:68
 msgid " "
 msgstr " "
 
-#: ../../include/js_strings.php:68
+#: ../../include/js_strings.php:69
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
-#: ../../include/js_strings.php:74
+#: ../../include/js_strings.php:75
 msgctxt "long"
 msgid "May"
 msgstr "mayo"
 
-#: ../../include/js_strings.php:82
+#: ../../include/js_strings.php:83
 msgid "Jan"
 msgstr "ene"
 
-#: ../../include/js_strings.php:83
+#: ../../include/js_strings.php:84
 msgid "Feb"
 msgstr "feb"
 
-#: ../../include/js_strings.php:84
+#: ../../include/js_strings.php:85
 msgid "Mar"
 msgstr "mar"
 
-#: ../../include/js_strings.php:85
+#: ../../include/js_strings.php:86
 msgid "Apr"
 msgstr "abr"
 
-#: ../../include/js_strings.php:86
+#: ../../include/js_strings.php:87
 msgctxt "short"
 msgid "May"
 msgstr "may"
 
-#: ../../include/js_strings.php:87
+#: ../../include/js_strings.php:88
 msgid "Jun"
 msgstr "jun"
 
-#: ../../include/js_strings.php:88
+#: ../../include/js_strings.php:89
 msgid "Jul"
 msgstr "jul"
 
-#: ../../include/js_strings.php:89
+#: ../../include/js_strings.php:90
 msgid "Aug"
 msgstr "ago"
 
-#: ../../include/js_strings.php:90
+#: ../../include/js_strings.php:91
 msgid "Sep"
 msgstr "sep"
 
-#: ../../include/js_strings.php:91
+#: ../../include/js_strings.php:92
 msgid "Oct"
 msgstr "oct"
 
-#: ../../include/js_strings.php:92
+#: ../../include/js_strings.php:93
 msgid "Nov"
 msgstr "nov"
 
-#: ../../include/js_strings.php:93
+#: ../../include/js_strings.php:94
 msgid "Dec"
 msgstr "dic"
 
-#: ../../include/js_strings.php:101
+#: ../../include/js_strings.php:102
 msgid "Sun"
 msgstr "dom"
 
-#: ../../include/js_strings.php:102
+#: ../../include/js_strings.php:103
 msgid "Mon"
 msgstr "lun"
 
-#: ../../include/js_strings.php:103
+#: ../../include/js_strings.php:104
 msgid "Tue"
 msgstr "mar"
 
-#: ../../include/js_strings.php:104
+#: ../../include/js_strings.php:105
 msgid "Wed"
 msgstr "mié"
 
-#: ../../include/js_strings.php:105
+#: ../../include/js_strings.php:106
 msgid "Thu"
 msgstr "jue"
 
-#: ../../include/js_strings.php:106
+#: ../../include/js_strings.php:107
 msgid "Fri"
 msgstr "vie"
 
-#: ../../include/js_strings.php:107
+#: ../../include/js_strings.php:108
 msgid "Sat"
 msgstr "sáb"
 
-#: ../../include/js_strings.php:108
+#: ../../include/js_strings.php:109
 msgctxt "calendar"
 msgid "today"
 msgstr "hoy"
 
-#: ../../include/js_strings.php:109
+#: ../../include/js_strings.php:110
 msgctxt "calendar"
 msgid "month"
 msgstr "mes"
 
-#: ../../include/js_strings.php:110
+#: ../../include/js_strings.php:111
 msgctxt "calendar"
 msgid "week"
 msgstr "semana"
 
-#: ../../include/js_strings.php:111
+#: ../../include/js_strings.php:112
 msgctxt "calendar"
 msgid "day"
 msgstr "día"
 
-#: ../../include/js_strings.php:112
+#: ../../include/js_strings.php:113
 msgctxt "calendar"
 msgid "All day"
 msgstr "Todos los días"
@@ -14222,7 +14358,7 @@ msgstr "Visitar %2$s de %1$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s ha actualizado %2$s, cambiando %3$s."
 
-#: ../../include/attach.php:267 ../../include/attach.php:376
+#: ../../include/attach.php:267 ../../include/attach.php:375
 msgid "Item was not found."
 msgstr "Elemento no encontrado."
 
@@ -14230,135 +14366,135 @@ msgstr "Elemento no encontrado."
 msgid "Unknown error."
 msgstr "Error desconocido"
 
-#: ../../include/attach.php:569
+#: ../../include/attach.php:568
 msgid "No source file."
 msgstr "Ningún fichero de origen"
 
-#: ../../include/attach.php:591
+#: ../../include/attach.php:590
 msgid "Cannot locate file to replace"
 msgstr "No se puede localizar el fichero que va a ser sustituido."
 
-#: ../../include/attach.php:610
+#: ../../include/attach.php:609
 msgid "Cannot locate file to revise/update"
 msgstr "No se puede localizar el fichero para revisar/actualizar"
 
-#: ../../include/attach.php:752
+#: ../../include/attach.php:751
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "El fichero supera el limite de tamaño de %d"
 
-#: ../../include/attach.php:773
+#: ../../include/attach.php:772
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
 
-#: ../../include/attach.php:955
+#: ../../include/attach.php:954
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado."
 
-#: ../../include/attach.php:984
+#: ../../include/attach.php:983
 msgid "Stored file could not be verified. Upload failed."
 msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
 
-#: ../../include/attach.php:1058 ../../include/attach.php:1074
+#: ../../include/attach.php:1057 ../../include/attach.php:1073
 msgid "Path not available."
 msgstr "Ruta no disponible."
 
-#: ../../include/attach.php:1123 ../../include/attach.php:1288
+#: ../../include/attach.php:1122 ../../include/attach.php:1285
 msgid "Empty pathname"
 msgstr "Ruta vacía"
 
-#: ../../include/attach.php:1149
+#: ../../include/attach.php:1148
 msgid "duplicate filename or path"
 msgstr "Nombre duplicado de ruta o fichero"
 
-#: ../../include/attach.php:1174
+#: ../../include/attach.php:1173
 msgid "Path not found."
 msgstr "Ruta no encontrada"
 
-#: ../../include/attach.php:1242
+#: ../../include/attach.php:1241
 msgid "mkdir failed."
 msgstr "mkdir ha fallado."
 
-#: ../../include/attach.php:1246
+#: ../../include/attach.php:1245
 msgid "database storage failed."
 msgstr "el almacenamiento en la base de datos ha fallado."
 
-#: ../../include/attach.php:1294
+#: ../../include/attach.php:1291
 msgid "Empty path"
 msgstr "Ruta vacía"
 
-#: ../../include/security.php:541
+#: ../../include/security.php:607
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado"
 
-#: ../../include/items.php:955 ../../include/items.php:1015
+#: ../../include/items.php:965 ../../include/items.php:1025
 msgid "(Unknown)"
 msgstr "(Desconocido)"
 
-#: ../../include/items.php:1203
+#: ../../include/items.php:1213
 msgid "Visible to anybody on the internet."
 msgstr "Visible para cualquiera en internet."
 
-#: ../../include/items.php:1205
+#: ../../include/items.php:1215
 msgid "Visible to you only."
 msgstr "Visible sólo para usted."
 
-#: ../../include/items.php:1207
+#: ../../include/items.php:1217
 msgid "Visible to anybody in this network."
 msgstr "Visible para cualquiera en esta red."
 
-#: ../../include/items.php:1209
+#: ../../include/items.php:1219
 msgid "Visible to anybody authenticated."
 msgstr "Visible para cualquiera que esté autenticado."
 
-#: ../../include/items.php:1211
+#: ../../include/items.php:1221
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Visible para cualquiera en %s."
 
-#: ../../include/items.php:1213
+#: ../../include/items.php:1223
 msgid "Visible to all connections."
 msgstr "Visible para todas las conexiones."
 
-#: ../../include/items.php:1215
+#: ../../include/items.php:1225
 msgid "Visible to approved connections."
 msgstr "Visible para las conexiones permitidas."
 
-#: ../../include/items.php:1217
+#: ../../include/items.php:1227
 msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
-#: ../../include/items.php:4291
+#: ../../include/items.php:4311
 msgid "Privacy group is empty."
 msgstr "El grupo de canales está vacío."
 
-#: ../../include/items.php:4298
+#: ../../include/items.php:4318
 #, php-format
 msgid "Privacy group: %s"
 msgstr "Grupo de canales: %s"
 
-#: ../../include/items.php:4310
+#: ../../include/items.php:4330
 msgid "Connection not found."
 msgstr "Conexión no encontrada"
 
-#: ../../include/items.php:4659
+#: ../../include/items.php:4679
 msgid "profile photo"
 msgstr "foto del perfil"
 
-#: ../../include/items.php:4851
+#: ../../include/items.php:4871
 #, php-format
 msgid "[Edited %s]"
 msgstr "[se ha editado %s]"
 
-#: ../../include/items.php:4851
+#: ../../include/items.php:4871
 msgctxt "edit_activity"
 msgid "Post"
 msgstr "Publicar"
 
-#: ../../include/items.php:4851
+#: ../../include/items.php:4871
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr "Comentar"
@@ -14395,196 +14531,196 @@ msgstr "Perfil principal"
 msgid "Unable to retrieve modified identity"
 msgstr "No se puede recuperar la identidad modficada"
 
-#: ../../include/channel.php:1353
+#: ../../include/channel.php:1419
 msgid "Create New Profile"
 msgstr "Crear un nuevo perfil"
 
-#: ../../include/channel.php:1374
+#: ../../include/channel.php:1440
 msgid "Visible to everybody"
 msgstr "Visible para todos"
 
-#: ../../include/channel.php:1451 ../../include/channel.php:1579
+#: ../../include/channel.php:1517 ../../include/channel.php:1645
 msgid "Gender:"
 msgstr "Género:"
 
-#: ../../include/channel.php:1453 ../../include/channel.php:1647
+#: ../../include/channel.php:1519 ../../include/channel.php:1713
 msgid "Homepage:"
 msgstr "Página personal:"
 
-#: ../../include/channel.php:1454
+#: ../../include/channel.php:1520
 msgid "Online Now"
 msgstr "Ahora en línea"
 
-#: ../../include/channel.php:1507
+#: ../../include/channel.php:1573
 msgid "Change your profile photo"
 msgstr "Cambiar su foto del perfil"
 
-#: ../../include/channel.php:1538
+#: ../../include/channel.php:1604
 msgid "Trans"
 msgstr "Trans"
 
-#: ../../include/channel.php:1584
+#: ../../include/channel.php:1650
 msgid "Like this channel"
 msgstr "Me gusta este canal"
 
-#: ../../include/channel.php:1608
+#: ../../include/channel.php:1674
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/channel.php:1609
+#: ../../include/channel.php:1675
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/channel.php:1616
+#: ../../include/channel.php:1682
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../../include/channel.php:1629
+#: ../../include/channel.php:1695
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "por %1$d %2$s"
 
-#: ../../include/channel.php:1641
+#: ../../include/channel.php:1707
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../../include/channel.php:1645
+#: ../../include/channel.php:1711
 msgid "Sexual Preference:"
 msgstr "Orientación sexual:"
 
-#: ../../include/channel.php:1651
+#: ../../include/channel.php:1717
 msgid "Political Views:"
 msgstr "Posición política:"
 
-#: ../../include/channel.php:1653
+#: ../../include/channel.php:1719
 msgid "Religion:"
 msgstr "Religión:"
 
-#: ../../include/channel.php:1657
+#: ../../include/channel.php:1723
 msgid "Hobbies/Interests:"
 msgstr "Aficciones o intereses:"
 
-#: ../../include/channel.php:1659
+#: ../../include/channel.php:1725
 msgid "Likes:"
 msgstr "Me gusta:"
 
-#: ../../include/channel.php:1661
+#: ../../include/channel.php:1727
 msgid "Dislikes:"
 msgstr "No me gusta:"
 
-#: ../../include/channel.php:1663
+#: ../../include/channel.php:1729
 msgid "Contact information and Social Networks:"
 msgstr "Información de contacto y redes sociales:"
 
-#: ../../include/channel.php:1665
+#: ../../include/channel.php:1731
 msgid "My other channels:"
 msgstr "Mis otros canales:"
 
-#: ../../include/channel.php:1667
+#: ../../include/channel.php:1733
 msgid "Musical interests:"
 msgstr "Preferencias musicales:"
 
-#: ../../include/channel.php:1669
+#: ../../include/channel.php:1735
 msgid "Books, literature:"
 msgstr "Libros, literatura:"
 
-#: ../../include/channel.php:1671
+#: ../../include/channel.php:1737
 msgid "Television:"
 msgstr "Televisión:"
 
-#: ../../include/channel.php:1673
+#: ../../include/channel.php:1739
 msgid "Film/dance/culture/entertainment:"
 msgstr "Cine, danza, cultura, entretenimiento:"
 
-#: ../../include/channel.php:1675
+#: ../../include/channel.php:1741
 msgid "Love/Romance:"
 msgstr "Vida sentimental o amorosa:"
 
-#: ../../include/channel.php:1677
+#: ../../include/channel.php:1743
 msgid "Work/employment:"
 msgstr "Trabajo:"
 
-#: ../../include/channel.php:1679
+#: ../../include/channel.php:1745
 msgid "School/education:"
 msgstr "Estudios:"
 
-#: ../../include/channel.php:1702
+#: ../../include/channel.php:1768
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
-#: ../../include/event.php:28 ../../include/event.php:75
+#: ../../include/event.php:31 ../../include/event.php:78
 msgid "l F d, Y \\@ g:i A"
 msgstr "l d de F, Y \\@ G:i"
 
-#: ../../include/event.php:36 ../../include/event.php:79
+#: ../../include/event.php:39 ../../include/event.php:82
 msgid "Starts:"
 msgstr "Comienza:"
 
-#: ../../include/event.php:46 ../../include/event.php:83
+#: ../../include/event.php:49 ../../include/event.php:86
 msgid "Finishes:"
 msgstr "Finaliza:"
 
-#: ../../include/event.php:1020
+#: ../../include/event.php:1023
 msgid "This event has been added to your calendar."
 msgstr "Este evento ha sido añadido a su calendario."
 
-#: ../../include/event.php:1239
+#: ../../include/event.php:1244
 msgid "Not specified"
 msgstr "Sin especificar"
 
-#: ../../include/event.php:1240
+#: ../../include/event.php:1245
 msgid "Needs Action"
 msgstr "Necesita de una intervención"
 
-#: ../../include/event.php:1241
+#: ../../include/event.php:1246
 msgid "Completed"
 msgstr "Completado/a"
 
-#: ../../include/event.php:1242
+#: ../../include/event.php:1247
 msgid "In Process"
 msgstr "En proceso"
 
-#: ../../include/event.php:1243
+#: ../../include/event.php:1248
 msgid "Cancelled"
 msgstr "Cancelado/a"
 
-#: ../../include/event.php:1322 ../../include/connections.php:698
+#: ../../include/event.php:1331 ../../include/connections.php:725
 msgid "Home, Voice"
 msgstr "Llamadas particulares"
 
-#: ../../include/event.php:1323 ../../include/connections.php:699
+#: ../../include/event.php:1332 ../../include/connections.php:726
 msgid "Home, Fax"
 msgstr "Fax particular"
 
-#: ../../include/event.php:1325 ../../include/connections.php:701
+#: ../../include/event.php:1334 ../../include/connections.php:728
 msgid "Work, Voice"
 msgstr "Llamadas de trabajo"
 
-#: ../../include/event.php:1326 ../../include/connections.php:702
+#: ../../include/event.php:1335 ../../include/connections.php:729
 msgid "Work, Fax"
 msgstr "Fax de trabajo"
 
-#: ../../include/network.php:1718
+#: ../../include/network.php:1728
 msgid "GNU-Social"
 msgstr "GNU Social"
 
-#: ../../include/network.php:1719
+#: ../../include/network.php:1729
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/network.php:1723
+#: ../../include/network.php:1733
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../../include/network.php:1725
+#: ../../include/network.php:1735
 msgid "LinkedIn"
 msgstr "LinkedIn"
 
-#: ../../include/network.php:1726
+#: ../../include/network.php:1736
 msgid "XMPP/IM"
 msgstr "XMPP/IM"
 
-#: ../../include/network.php:1727
+#: ../../include/network.php:1737
 msgid "MySpace"
 msgstr "MySpace"
 
@@ -14621,90 +14757,90 @@ msgid ""
 " permissions set who is allowed to view the post."
 msgstr "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje."
 
-#: ../../include/bbcode.php:200 ../../include/bbcode.php:1190
-#: ../../include/bbcode.php:1193 ../../include/bbcode.php:1198
-#: ../../include/bbcode.php:1201 ../../include/bbcode.php:1204
-#: ../../include/bbcode.php:1207 ../../include/bbcode.php:1212
-#: ../../include/bbcode.php:1215 ../../include/bbcode.php:1220
-#: ../../include/bbcode.php:1223 ../../include/bbcode.php:1226
-#: ../../include/bbcode.php:1229
+#: ../../include/bbcode.php:219 ../../include/bbcode.php:1211
+#: ../../include/bbcode.php:1214 ../../include/bbcode.php:1219
+#: ../../include/bbcode.php:1222 ../../include/bbcode.php:1225
+#: ../../include/bbcode.php:1228 ../../include/bbcode.php:1233
+#: ../../include/bbcode.php:1236 ../../include/bbcode.php:1241
+#: ../../include/bbcode.php:1244 ../../include/bbcode.php:1247
+#: ../../include/bbcode.php:1250
 msgid "Image/photo"
 msgstr "Imagen/foto"
 
-#: ../../include/bbcode.php:239 ../../include/bbcode.php:1240
+#: ../../include/bbcode.php:258 ../../include/bbcode.php:1261
 msgid "Encrypted content"
 msgstr "Contenido cifrado"
 
-#: ../../include/bbcode.php:255
+#: ../../include/bbcode.php:274
 #, php-format
 msgid "Install %1$s element %2$s"
 msgstr "Instalar el elemento de%1$s%2$s"
 
-#: ../../include/bbcode.php:259
+#: ../../include/bbcode.php:278
 #, php-format
 msgid ""
 "This post contains an installable %s element, however you lack permissions "
 "to install it on this site."
 msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."
 
-#: ../../include/bbcode.php:339
+#: ../../include/bbcode.php:358
 msgid "card"
 msgstr "ficha"
 
-#: ../../include/bbcode.php:341
+#: ../../include/bbcode.php:360
 msgid "article"
 msgstr "el artículo"
 
-#: ../../include/bbcode.php:424 ../../include/bbcode.php:432
+#: ../../include/bbcode.php:443 ../../include/bbcode.php:451
 msgid "Click to open/close"
 msgstr "Pulsar para abrir/cerrar"
 
-#: ../../include/bbcode.php:432
+#: ../../include/bbcode.php:451
 msgid "spoiler"
 msgstr "spoiler"
 
-#: ../../include/bbcode.php:445
+#: ../../include/bbcode.php:464
 msgid "View article"
 msgstr "Ver el artículo"
 
-#: ../../include/bbcode.php:445
+#: ../../include/bbcode.php:464
 msgid "View summary"
 msgstr "Ver sumario"
 
-#: ../../include/bbcode.php:1178
+#: ../../include/bbcode.php:1199
 msgid "$1 wrote:"
 msgstr "$1 escribió:"
 
-#: ../../include/oembed.php:226
+#: ../../include/oembed.php:153
 msgid "View PDF"
 msgstr "Ver PDF"
 
-#: ../../include/oembed.php:356
+#: ../../include/oembed.php:357
 msgid " by "
 msgstr "por"
 
-#: ../../include/oembed.php:357
+#: ../../include/oembed.php:358
 msgid " on "
 msgstr "en"
 
-#: ../../include/oembed.php:386
+#: ../../include/oembed.php:387
 msgid "Embedded content"
 msgstr "Contenido incorporado"
 
-#: ../../include/oembed.php:395
+#: ../../include/oembed.php:396
 msgid "Embedding disabled"
 msgstr "Incrustación deshabilitada"
 
-#: ../../include/zid.php:351
+#: ../../include/zid.php:363
 #, php-format
 msgid "OpenWebAuth: %1$s welcomes %2$s"
 msgstr "OpenWebAuth:  %1$s da la bienvenida a %2$s"
 
-#: ../../include/features.php:86 ../../include/features.php:273
+#: ../../include/features.php:86 ../../include/features.php:281
 msgid "Start calendar week on Monday"
 msgstr "Comenzar el calendario semanal por el lunes"
 
-#: ../../include/features.php:87 ../../include/features.php:274
+#: ../../include/features.php:87 ../../include/features.php:282
 msgid "Default is Sunday"
 msgstr "Por defecto es domingo"
 
@@ -14776,173 +14912,181 @@ msgstr "Entradas destacadas"
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella"
 
-#: ../../include/features.php:180
+#: ../../include/features.php:174
+msgid "Reply on comment"
+msgstr "Responder a los comentarios"
+
+#: ../../include/features.php:175
+msgid "Ability to reply on selected comment"
+msgstr "Posibilidad de responder a los comentarios seleccionados"
+
+#: ../../include/features.php:188
 msgid "Advanced Directory Search"
 msgstr "Búsqueda avanzada en el directorio"
 
-#: ../../include/features.php:181
+#: ../../include/features.php:189
 msgid "Allows creation of complex directory search queries"
 msgstr "Permitir la creación de consultas complejas en las búsquedas en el directorio"
 
-#: ../../include/features.php:190
+#: ../../include/features.php:198
 msgid "Editor"
 msgstr "Editor"
 
-#: ../../include/features.php:194
+#: ../../include/features.php:202
 msgid "Post Categories"
 msgstr "Temas de las entradas"
 
-#: ../../include/features.php:195
+#: ../../include/features.php:203
 msgid "Add categories to your posts"
 msgstr "Añadir temas a sus publicaciones"
 
-#: ../../include/features.php:203
+#: ../../include/features.php:211
 msgid "Large Photos"
 msgstr "Fotos de gran tamaño"
 
-#: ../../include/features.php:204
+#: ../../include/features.php:212
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)"
 
-#: ../../include/features.php:211
+#: ../../include/features.php:219
 msgid "Even More Encryption"
 msgstr "Más cifrado todavía"
 
-#: ../../include/features.php:212
+#: ../../include/features.php:220
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida."
 
-#: ../../include/features.php:219
+#: ../../include/features.php:227
 msgid "Enable Voting Tools"
 msgstr "Permitir entradas con votación"
 
-#: ../../include/features.php:220
+#: ../../include/features.php:228
 msgid "Provide a class of post which others can vote on"
 msgstr "Proveer una clase de publicación en la que otros puedan votar"
 
-#: ../../include/features.php:227
+#: ../../include/features.php:235
 msgid "Disable Comments"
 msgstr "Deshabilitar comentarios"
 
-#: ../../include/features.php:228
+#: ../../include/features.php:236
 msgid "Provide the option to disable comments for a post"
 msgstr "Proporcionar la opción de desactivar los comentarios para una entrada"
 
-#: ../../include/features.php:235
+#: ../../include/features.php:243
 msgid "Delayed Posting"
 msgstr "Publicación aplazada"
 
-#: ../../include/features.php:236
+#: ../../include/features.php:244
 msgid "Allow posts to be published at a later date"
 msgstr "Permitir mensajes que se publicarán en una fecha posterior"
 
-#: ../../include/features.php:243
+#: ../../include/features.php:251
 msgid "Content Expiration"
 msgstr "Caducidad del contenido"
 
-#: ../../include/features.php:244
+#: ../../include/features.php:252
 msgid "Remove posts/comments and/or private messages at a future time"
 msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante"
 
-#: ../../include/features.php:251
+#: ../../include/features.php:259
 msgid "Suppress Duplicate Posts/Comments"
 msgstr "Prevenir entradas o comentarios duplicados"
 
-#: ../../include/features.php:252
+#: ../../include/features.php:260
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo."
 
-#: ../../include/features.php:259
+#: ../../include/features.php:267
 msgid "Auto-save drafts of posts and comments"
 msgstr "Guardar automáticamente borradores de entradas y comentarios"
 
-#: ../../include/features.php:260
+#: ../../include/features.php:268
 msgid ""
 "Automatically saves post and comment drafts in local browser storage to help"
 " prevent accidental loss of compositions"
 msgstr "Guarda automáticamente los borradores de comentarios y publicaciones en el almacenamiento del navegador local para ayudar a evitar la pérdida accidental de composiciones."
 
-#: ../../include/features.php:281
+#: ../../include/features.php:277
+msgid "Events"
+msgstr "Eventos"
+
+#: ../../include/features.php:289
 msgid "Smart Birthdays"
 msgstr "Cumpleaños inteligentes"
 
-#: ../../include/features.php:282
+#: ../../include/features.php:290
 msgid ""
 "Make birthday events timezone aware in case your friends are scattered "
 "across the planet."
 msgstr "Enlazar los eventos de cumpleaños con el huso horario en el caso de que sus amigos estén dispersos por el mundo."
 
-#: ../../include/features.php:289
+#: ../../include/features.php:297
 msgid "Event Timezone Selection"
 msgstr "Selección del huso horario del evento"
 
-#: ../../include/features.php:290
+#: ../../include/features.php:298
 msgid "Allow event creation in timezones other than your own."
 msgstr "Permitir la creación de eventos en husos horarios distintos del suyo."
 
-#: ../../include/features.php:299
+#: ../../include/features.php:307
 msgid "Manage"
 msgstr "Gestionar"
 
-#: ../../include/features.php:303
+#: ../../include/features.php:311
 msgid "Navigation Channel Select"
 msgstr "Navegación por el selector de canales"
 
-#: ../../include/features.php:304
+#: ../../include/features.php:312
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Cambiar de canales directamente desde el menú de navegación desplegable"
 
-#: ../../include/features.php:318
+#: ../../include/features.php:326
 msgid "Save search terms for re-use"
 msgstr "Guardar términos de búsqueda para su reutilización"
 
-#: ../../include/features.php:326
+#: ../../include/features.php:334
 msgid "Ability to file posts under folders"
 msgstr "Capacidad de archivar entradas en carpetas"
 
-#: ../../include/features.php:333
+#: ../../include/features.php:341
 msgid "Alternate Stream Order"
 msgstr "Orden de stream alternativo"
 
-#: ../../include/features.php:334
+#: ../../include/features.php:342
 msgid ""
 "Ability to order the stream by last post date, last comment date or "
 "unthreaded activities"
 msgstr "Posibilidad de ordenar el stream por última fecha de publicación, última fecha de comentario o actividades sin hilo"
 
-#: ../../include/features.php:341
+#: ../../include/features.php:349
 msgid "Contact Filter"
 msgstr "Filtro de contactos"
 
-#: ../../include/features.php:342
+#: ../../include/features.php:350
 msgid "Ability to display only posts of a selected contact"
 msgstr "Posibilidad de mostrar sólo los mensajes de un contacto seleccionado"
 
-#: ../../include/features.php:349
+#: ../../include/features.php:357
 msgid "Forum Filter"
 msgstr "Filtro de foro"
 
-#: ../../include/features.php:350
+#: ../../include/features.php:358
 msgid "Ability to display only posts of a specific forum"
 msgstr "Posibilidad de mostrar sólo los mensajes de un foro específico"
 
-#: ../../include/features.php:357
+#: ../../include/features.php:365
 msgid "Personal Posts Filter"
 msgstr "Filtro de entradas personales"
 
-#: ../../include/features.php:358
+#: ../../include/features.php:366
 msgid "Ability to display only posts that you've interacted on"
 msgstr "Posibilidad de mostrar sólo los mensajes en los que usted haya interactuado"
 
-#: ../../include/features.php:366
-msgid "Show friend and connection suggestions"
-msgstr "Mostrar sugerencias de amigos y conexiones"
-
 #: ../../include/features.php:387
 msgid "Photo Location"
 msgstr "Ubicación de las fotos"
@@ -14979,31 +15123,31 @@ msgstr "Capacidad de crear múltiples perfiles"
 msgid "Trending"
 msgstr "Etiquetas populares"
 
-#: ../../include/taxonomy.php:552
+#: ../../include/taxonomy.php:550
 msgid "Keywords"
 msgstr "Palabras clave"
 
-#: ../../include/taxonomy.php:573
+#: ../../include/taxonomy.php:571
 msgid "have"
 msgstr "tener"
 
-#: ../../include/taxonomy.php:573
+#: ../../include/taxonomy.php:571
 msgid "has"
 msgstr "tiene"
 
-#: ../../include/taxonomy.php:574
+#: ../../include/taxonomy.php:572
 msgid "want"
 msgstr "quiero"
 
-#: ../../include/taxonomy.php:574
+#: ../../include/taxonomy.php:572
 msgid "wants"
 msgstr "quiere"
 
-#: ../../include/taxonomy.php:575
+#: ../../include/taxonomy.php:573
 msgid "likes"
 msgstr "gusta de"
 
-#: ../../include/taxonomy.php:576
+#: ../../include/taxonomy.php:574
 msgid "dislikes"
 msgstr "no gusta de"
 
@@ -15027,51 +15171,51 @@ msgstr "Es obligatorio que le inviten."
 msgid "Invitation could not be verified."
 msgstr "No se ha podido verificar su invitación."
 
-#: ../../include/account.php:158
+#: ../../include/account.php:156
 msgid "Please enter the required information."
 msgstr "Por favor introduzca la información requerida."
 
-#: ../../include/account.php:225
+#: ../../include/account.php:223
 msgid "Failed to store account information."
 msgstr "La información de la cuenta no se ha podido guardar."
 
-#: ../../include/account.php:314
+#: ../../include/account.php:311
 #, php-format
 msgid "Registration confirmation for %s"
 msgstr "Confirmación de registro para %s"
 
-#: ../../include/account.php:385
+#: ../../include/account.php:380
 #, php-format
 msgid "Registration request at %s"
 msgstr "Solicitud de registro en %s"
 
-#: ../../include/account.php:407
+#: ../../include/account.php:402
 msgid "your registration password"
 msgstr "su contraseña de registro"
 
-#: ../../include/account.php:413 ../../include/account.php:475
+#: ../../include/account.php:408 ../../include/account.php:471
 #, php-format
 msgid "Registration details for %s"
 msgstr "Detalles del registro de %s"
 
-#: ../../include/account.php:486
+#: ../../include/account.php:482
 msgid "Account approved."
 msgstr "Cuenta aprobada."
 
-#: ../../include/account.php:526
+#: ../../include/account.php:522
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registro revocado para %s"
 
-#: ../../include/account.php:805 ../../include/account.php:807
+#: ../../include/account.php:803 ../../include/account.php:805
 msgid "Click here to upgrade."
 msgstr "Pulse aquí para actualizar"
 
-#: ../../include/account.php:813
+#: ../../include/account.php:811
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Esta acción supera los límites establecidos por su plan de suscripción "
 
-#: ../../include/account.php:818
+#: ../../include/account.php:816
 msgid "This action is not available under your subscription plan."
 msgstr "Esta acción no está disponible en su plan de suscripción."
 
@@ -15156,115 +15300,115 @@ msgstr "Cumpleaños de %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "Feliz cumpleaños %1$s"
 
-#: ../../include/nav.php:86
+#: ../../include/nav.php:90
 msgid "Remote authentication"
 msgstr "Acceder desde su servidor"
 
-#: ../../include/nav.php:86
+#: ../../include/nav.php:90
 msgid "Click to authenticate to your home hub"
 msgstr "Pulsar para identificarse en su servidor de inicio"
 
-#: ../../include/nav.php:92
+#: ../../include/nav.php:96
 msgid "Manage your channels"
 msgstr "Gestionar sus canales"
 
-#: ../../include/nav.php:95
+#: ../../include/nav.php:99
 msgid "Manage your privacy groups"
 msgstr "Gestionar sus grupos de canales"
 
-#: ../../include/nav.php:97
+#: ../../include/nav.php:101
 msgid "Account/Channel Settings"
 msgstr "Ajustes de cuenta/canales"
 
-#: ../../include/nav.php:103 ../../include/nav.php:132
+#: ../../include/nav.php:107 ../../include/nav.php:136
 msgid "End this session"
 msgstr "Finalizar esta sesión"
 
-#: ../../include/nav.php:106
+#: ../../include/nav.php:110
 msgid "Your profile page"
 msgstr "Su página del perfil"
 
-#: ../../include/nav.php:109
+#: ../../include/nav.php:113
 msgid "Manage/Edit profiles"
 msgstr "Administrar/editar perfiles"
 
-#: ../../include/nav.php:118 ../../include/nav.php:122
+#: ../../include/nav.php:122 ../../include/nav.php:126
 msgid "Sign in"
 msgstr "Acceder"
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:153
 msgid "Take me home"
 msgstr "Volver a la página principal"
 
-#: ../../include/nav.php:151
+#: ../../include/nav.php:155
 msgid "Log me out of this site"
 msgstr "Salir de este sitio"
 
-#: ../../include/nav.php:156
+#: ../../include/nav.php:160
 msgid "Create an account"
 msgstr "Crear una cuenta"
 
-#: ../../include/nav.php:168
+#: ../../include/nav.php:172
 msgid "Help and documentation"
 msgstr "Ayuda y documentación"
 
-#: ../../include/nav.php:183
+#: ../../include/nav.php:186
 msgid "Search site @name, !forum, #tag, ?docs, content"
 msgstr "Buscar en el sitio @nombre, !foro, #tag, ?docs, contenido"
 
-#: ../../include/nav.php:189
+#: ../../include/nav.php:192
 msgid "Site Setup and Configuration"
 msgstr "Ajustes y configuración del sitio"
 
-#: ../../include/nav.php:329
+#: ../../include/nav.php:332
 msgid "@name, !forum, #tag, ?doc, content"
 msgstr "@nombre, !foro, #tag, ?docs, contenido"
 
-#: ../../include/nav.php:330
+#: ../../include/nav.php:333
 msgid "Please wait..."
 msgstr "Espere por favor…"
 
-#: ../../include/nav.php:336
+#: ../../include/nav.php:339
 msgid "Add Apps"
 msgstr "Añadir aplicaciones"
 
-#: ../../include/nav.php:337
+#: ../../include/nav.php:340
 msgid "Arrange Apps"
 msgstr "Organizar aplicaciones"
 
-#: ../../include/nav.php:338
+#: ../../include/nav.php:341
 msgid "Toggle System Apps"
 msgstr "Alternar aplicaciones de sistema"
 
-#: ../../include/nav.php:424
+#: ../../include/nav.php:426
 msgid "Status Messages and Posts"
 msgstr "Mensajes de estado y publicaciones"
 
-#: ../../include/nav.php:437
+#: ../../include/nav.php:439
 msgid "Profile Details"
 msgstr "Detalles del perfil"
 
-#: ../../include/nav.php:447 ../../include/photos.php:669
+#: ../../include/nav.php:449 ../../include/photos.php:666
 msgid "Photo Albums"
 msgstr "Álbumes de fotos"
 
-#: ../../include/nav.php:455
+#: ../../include/nav.php:457
 msgid "Files and Storage"
 msgstr "Ficheros y repositorio"
 
-#: ../../include/nav.php:493
+#: ../../include/nav.php:495
 msgid "Saved Bookmarks"
 msgstr "Marcadores guardados"
 
-#: ../../include/nav.php:504
+#: ../../include/nav.php:506
 msgid "View Cards"
 msgstr "Ver las fichas"
 
-#: ../../include/nav.php:515
+#: ../../include/nav.php:517
 msgid "View Articles"
 msgstr "Ver los artículos"
 
-#: ../../include/nav.php:527
+#: ../../include/nav.php:529
 msgid "View Webpages"
 msgstr "Ver páginas web"
 
@@ -15277,21 +15421,21 @@ msgstr "La imagen excede el límite de %lu bytes del sitio"
 msgid "Image file is empty."
 msgstr "El fichero de imagen está vacío. "
 
-#: ../../include/photos.php:327
+#: ../../include/photos.php:324
 msgid "Photo storage failed."
 msgstr "La foto no ha podido ser guardada."
 
-#: ../../include/photos.php:376
+#: ../../include/photos.php:373
 msgid "a new photo"
 msgstr "una nueva foto"
 
-#: ../../include/photos.php:380
+#: ../../include/photos.php:377
 #, php-format
 msgctxt "photo_upload"
 msgid "%1$s posted %2$s to %3$s"
 msgstr "%1$s ha publicado %2$s en %3$s"
 
-#: ../../include/photos.php:674
+#: ../../include/photos.php:671
 msgid "Upload New Photos"
 msgstr "Subir nuevas fotos"
 
@@ -15299,7 +15443,7 @@ msgstr "Subir nuevas fotos"
 msgid "Invalid data packet"
 msgstr "Paquete de datos no válido"
 
-#: ../../include/zot.php:4288
+#: ../../include/zot.php:4308
 msgid "invalid target signature"
 msgstr "La firma recibida no es válida"
 
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index bb4c3728f..52aae3ccc 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -92,6 +92,8 @@ App::$strings["Profile"] = "Perfil";
 App::$strings["Click on a contact to add or remove."] = "Pulsar en un contacto para añadirlo o eliminarlo.";
 App::$strings["Visible To"] = "Visible para";
 App::$strings["All Connections"] = "Todas las conexiones";
+App::$strings["Calendar entries imported."] = "Entradas de calendario importadas.";
+App::$strings["No calendar entries found."] = "No se han encontrado entradas de calendario.";
 App::$strings["INVALID EVENT DISMISSED!"] = "¡EVENTO NO VÁLIDO RECHAZADO!";
 App::$strings["Summary: "] = "Resumen: ";
 App::$strings["Unknown"] = "Desconocido";
@@ -99,13 +101,11 @@ App::$strings["Date: "] = "Fecha: ";
 App::$strings["Reason: "] = "Razón: ";
 App::$strings["INVALID CARD DISMISSED!"] = "¡TARJETA NO VÁLIDA RECHAZADA!";
 App::$strings["Name: "] = "Nombre: ";
-App::$strings["CalDAV App"] = "App CalDav";
-App::$strings["CalDAV capable calendar"] = "Calendario compatible con CalDAV";
 App::$strings["CardDAV App"] = "App CarDav";
 App::$strings["CalDAV capable addressbook"] = "Libreta de direcciones compatible con CalDav";
+App::$strings["Link to source"] = "Enlace a la fuente";
 App::$strings["Event title"] = "Título del evento";
 App::$strings["Start date and time"] = "Fecha y hora de comienzo";
-App::$strings["Example: YYYY-MM-DD HH:mm"] = "Ejemplo: YYYY-MM-DD HH:mm";
 App::$strings["End date and time"] = "Fecha y hora de finalización";
 App::$strings["Description"] = "Descripción";
 App::$strings["Location"] = "Ubicación";
@@ -120,9 +120,13 @@ App::$strings["List week"] = "Lista semanal";
 App::$strings["List day"] = "Lista diaria";
 App::$strings["More"] = "Más";
 App::$strings["Less"] = "Menos";
+App::$strings["Update"] = "Actualizar";
 App::$strings["Select calendar"] = "Seleccionar un calendario";
+App::$strings["Channel Calendars"] = "Calendarios del canal";
+App::$strings["CalDAV Calendars"] = "Calendarios CalDAV";
 App::$strings["Delete all"] = "Eliminar todos";
 App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado.";
+App::$strings["Categories"] = "Temas";
 App::$strings["Name"] = "Nombre";
 App::$strings["Organisation"] = "Organización";
 App::$strings["Title"] = "Título";
@@ -137,7 +141,6 @@ App::$strings["Home"] = "Inicio";
 App::$strings["Work"] = "Trabajo";
 App::$strings["Add Contact"] = "Añadir un contacto";
 App::$strings["Add Field"] = "Añadir un campo";
-App::$strings["Update"] = "Actualizar";
 App::$strings["P.O. Box"] = "Buzón de correos";
 App::$strings["Additional"] = "Adicional";
 App::$strings["Street"] = "Calle";
@@ -237,8 +240,6 @@ App::$strings["Menu item deleted."] = "Este elemento del menú ha sido borrado";
 App::$strings["Menu item could not be deleted."] = "Este elemento del menú no puede ser borrado.";
 App::$strings["Edit Menu Element"] = "Editar elemento del menú";
 App::$strings["Link text"] = "Texto del enlace";
-App::$strings["Calendar entries imported."] = "Entradas de calendario importadas.";
-App::$strings["No calendar entries found."] = "No se han encontrado entradas de calendario.";
 App::$strings["Event can not end before it has started."] = "Un evento no puede terminar antes de que haya comenzado.";
 App::$strings["Unable to generate preview."] = "No se puede crear la vista previa.";
 App::$strings["Event title and start time are required."] = "Se requieren el título del evento y su hora de inicio.";
@@ -359,7 +360,7 @@ App::$strings["Website URL"] = "Dirección del sitio web";
 App::$strings["Please use SSL (https) URL if available."] = "Por favor, use SSL (https) si está disponible.";
 App::$strings["Please select a default timezone for your website"] = "Por favor, selecciones el huso horario por defecto de su sitio web";
 App::$strings["Site settings"] = "Ajustes del sitio";
-App::$strings["PHP version 5.5 or greater is required."] = "Se requiere la versión 5.5, o superior, de PHP.";
+App::$strings["PHP version 7.1 or greater is required."] = "Se requiere la versión 7.1 o superior de PHP.";
 App::$strings["PHP version"] = "Versión de PHP";
 App::$strings["Could not find a command line version of PHP in the web server PATH."] = "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web.";
 App::$strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá realizar envíos en segundo plano mediante cron.";
@@ -446,12 +447,16 @@ App::$strings["On"] = "Activado";
 App::$strings["Lock feature %s"] = "Bloquear la funcionalidad %s";
 App::$strings["Manage Additional Features"] = "Gestionar las funcionalidades";
 App::$strings["Update has been marked successful"] = "La actualización ha sido marcada como exitosa";
-App::$strings["Executing %s failed. Check system logs."] = "La ejecución de %s ha fallado. Mirar en los informes del sistema.";
+App::$strings["Verification of update %s failed. Check system logs."] = "Error en la verificación de la actualización %s. Compruebe los registros del sistema.";
 App::$strings["Update %s was successfully applied."] = "La actualización de %s se ha realizado exitosamente.";
-App::$strings["Update %s did not return a status. Unknown if it succeeded."] = "La actualización de %s no ha devuelto ningún estado. No se sabe si ha tenido éxito.";
+App::$strings["Verifying update %s did not return a status. Unknown if it succeeded."] = "La verificación de la actualización %s no devuelve un estado. Desconocido si tuvo éxito.";
+App::$strings["Update %s does not contain a verification function."] = "La actualización %s no contiene una función de verificación.";
 App::$strings["Update function %s could not be found."] = "No se encuentra la función de actualización de %s.";
+App::$strings["Executing update procedure %s failed. Check system logs."] = "Error al ejecutar el procedimiento de actualización %s. Compruebe los registros del sistema.";
+App::$strings["Update %s did not return a status. It cannot be determined if it was successful."] = "La actualización %s no devuelve un estado. No se puede determinar si tuvo éxito.";
 App::$strings["Failed Updates"] = "Han fallado las actualizaciones";
 App::$strings["Mark success (if update was manually applied)"] = "Marcar como exitosa (si la actualización se ha hecho manualmente)";
+App::$strings["Attempt to verify this update if a verification procedure exists"] = "Intentar verificar esta actualización si existe un procedimiento de verificación.";
 App::$strings["Attempt to execute this update step automatically"] = "Intentar ejecutar este paso de actualización automáticamente";
 App::$strings["No failed updates."] = "No ha fallado ninguna actualización.";
 App::$strings["%s account blocked/unblocked"] = array(
@@ -805,7 +810,7 @@ App::$strings["Default file upload folder"] = "Carpeta por defecto de los ficher
 App::$strings["Remove this channel."] = "Eliminar este canal.";
 App::$strings["Additional Features"] = "Funcionalidades";
 App::$strings["Events Settings"] = "Gestión de eventos";
-App::$strings["CalDAV Settings"] = "Ajustes de CalDav";
+App::$strings["Calendar Settings"] = "Ajustes del calendario";
 App::$strings["Settings saved."] = "Configuración guardada.";
 App::$strings["Settings saved. Reload page please."] = "Ajustes guardados. Recargue la página, por favor.";
 App::$strings["Conversation Settings"] = "Ajustes de conversación";
@@ -1685,8 +1690,8 @@ App::$strings["Invalid channel."] = "El canal no es válido.";
 App::$strings["network"] = "red";
 App::$strings["\$Projectname"] = "\$Projectname";
 App::$strings["Welcome to %s"] = "Bienvenido a %s";
-App::$strings["Permission Denied."] = "Permiso denegado";
 App::$strings["File not found."] = "Fichero no encontrado.";
+App::$strings["Permission Denied."] = "Permiso denegado";
 App::$strings["Edit file permissions"] = "Modificar los permisos del fichero";
 App::$strings["Set/edit permissions"] = "Establecer/editar los permisos";
 App::$strings["Include all files and sub folders"] = "Incluir todos los ficheros y subcarpetas";
@@ -1766,13 +1771,15 @@ App::$strings["Site Admin"] = "Administrador del sitio";
 App::$strings["Report Bug"] = "Informe de errores";
 App::$strings["Bookmarks"] = "Marcadores";
 App::$strings["Chatrooms"] = "Salas de chat";
+App::$strings["Content Filter"] = "Filtro de contenido";
+App::$strings["Content Import"] = "Importación de contenidos";
 App::$strings["Remote Diagnostics"] = "Diagnóstico remoto";
 App::$strings["Suggest Channels"] = "Sugerir canales";
 App::$strings["Login"] = "Iniciar sesión";
 App::$strings["Stream"] = "Stream";
 App::$strings["Wiki"] = "Wiki";
 App::$strings["Channel Home"] = "Mi canal";
-App::$strings["Events"] = "Eventos";
+App::$strings["Calendar"] = "Calendario";
 App::$strings["Directory"] = "Directorio";
 App::$strings["Mail"] = "Correo";
 App::$strings["Chat"] = "Chat";
@@ -1787,7 +1794,6 @@ App::$strings["Profile Photo"] = "Foto del perfil";
 App::$strings["Profiles"] = "Perfiles";
 App::$strings["Notifications"] = "Notificaciones";
 App::$strings["Order Apps"] = "Ordenar las apps";
-App::$strings["CalDAV"] = "CalDAV";
 App::$strings["CardDAV"] = "CardDAV";
 App::$strings["Guest Access"] = "Acceso para invitados";
 App::$strings["Notes"] = "Notas";
@@ -1912,6 +1918,7 @@ App::$strings["edited a post dated %s"] = "ha editado una entrada fechada el %s"
 App::$strings["edited a comment dated %s"] = "ha editado un comentario fechado el %s";
 App::$strings["Wiki updated successfully"] = "El wiki se ha actualizado con éxito";
 App::$strings["Wiki files deleted successfully"] = "Se han borrado con éxito los ficheros del wiki";
+App::$strings["Source code of failed update: "] = "Código fuente de la actualización fallida: ";
 App::$strings["Update Error at %s"] = "Error de actualización en %s";
 App::$strings["Update %s failed. See error logs."] = "La actualización %s ha fallado. Mire el informe de errores.";
 App::$strings["Private Message"] = "Mensaje Privado";
@@ -1931,6 +1938,9 @@ App::$strings["Add Tag"] = "Añadir etiqueta";
 App::$strings["Conversation Tools"] = "Herramientas de conversación";
 App::$strings["like"] = "me gusta";
 App::$strings["dislike"] = "no me gusta";
+App::$strings["Reply on this comment"] = "Responder a este comentario";
+App::$strings["reply"] = "responder";
+App::$strings["Reply to"] = "Responder a ";
 App::$strings["Share This"] = "Compartir esto";
 App::$strings["share"] = "compartir";
 App::$strings["Delivery Report"] = "Informe de transmisión";
@@ -1950,6 +1960,7 @@ App::$strings["Attend"] = "Participar o asistir";
 App::$strings["Attendance Options"] = "Opciones de participación o asistencia";
 App::$strings["Vote"] = "Votar";
 App::$strings["Voting Options"] = "Opciones de votación";
+App::$strings["Go to previous comment"] = "Ir al comentario anterior";
 App::$strings["Save Bookmarks"] = "Guardar en Marcadores";
 App::$strings["Add to Calendar"] = "Añadir al calendario";
 App::$strings["This is an unsaved preview"] = "Esta es una previsualización sin guardar";
@@ -1972,7 +1983,6 @@ App::$strings["parent"] = "padre";
 App::$strings["Collection"] = "Colección";
 App::$strings["Principal"] = "Principal";
 App::$strings["Addressbook"] = "Libreta de direcciones";
-App::$strings["Calendar"] = "Calendario";
 App::$strings["Schedule Inbox"] = "Programar bandeja de entrada";
 App::$strings["Schedule Outbox"] = "Programar bandeja de salida";
 App::$strings["Total"] = "Total";
@@ -1988,11 +1998,11 @@ App::$strings["Forums"] = "Foros";
 App::$strings["Select Channel"] = "Seleccionar un canal";
 App::$strings["Read-write"] = "Lectura y escritura";
 App::$strings["Read-only"] = "Sólo lectura";
-App::$strings["My Calendars"] = "Mis calendarios";
-App::$strings["Shared Calendars"] = "Calendarios compartidos";
+App::$strings["Channel Calendar"] = "Calendario del canal";
+App::$strings["Shared CalDAV Calendars"] = "Calendarios CalDAV compartidos";
 App::$strings["Share this calendar"] = "Compartir este calendario";
 App::$strings["Calendar name and color"] = "Nombre y color del calendario";
-App::$strings["Create new calendar"] = "Crear un nuevo calendario";
+App::$strings["Create new CalDAV calendar"] = "Crear un nuevo calendario CalDAV";
 App::$strings["Calendar Name"] = "Nombre del calendario";
 App::$strings["Calendar Tools"] = "Gestión de calendarios";
 App::$strings["Import calendar"] = "Importar un calendario";
@@ -2004,7 +2014,6 @@ App::$strings["Addressbook Name"] = "Nombre de la agenda";
 App::$strings["Addressbook Tools"] = "Gestión de agendas de direcciones";
 App::$strings["Import addressbook"] = "Importar una agenda de direcciones";
 App::$strings["Select an addressbook to import to"] = "Seleccionar una agenda para importarla";
-App::$strings["Categories"] = "Temas";
 App::$strings["Everything"] = "Todo";
 App::$strings["Events Tools"] = "Gestión de eventos";
 App::$strings["Export Calendar"] = "Exportar el calendario";
@@ -2507,11 +2516,11 @@ App::$strings["Approve subscription requests from Hubzilla contacts automaticall
 App::$strings["Purge internal list of jabber addresses of contacts"] = "Purgar la lista interna de las direcciones de contactos de jabber";
 App::$strings["Configuration Help"] = "Ayuda para los ajustes";
 App::$strings["Jappixmini Settings"] = "Ajustes de Jappixmini";
-App::$strings["Your channel has been upgraded to the latest \$Projectname version."] = "Su canal ha sido actualizado a la última versión de \$Projectname.";
-App::$strings["To improve usability, we have converted some features into installable stand-alone apps."] = "Para mejorar la usabilidad, hemos convertido algunas características en aplicaciones independientes instalables.";
-App::$strings["Please visit the \$Projectname"] = "Por favor visite el sitio web de \$Projectname";
-App::$strings["app store"] = "aplicaciones disponibles";
-App::$strings["and install possibly missing apps."] = "e instale las aplicaciones que posiblemente falten.";
+App::$strings["Your channel has been upgraded to \$Projectname version"] = "Su canal ha sido actualizado a la versión \$Projectname";
+App::$strings["Please have a look at the"] = "Por favor, eche un vistazo a la ";
+App::$strings["git history"] = "historial del git";
+App::$strings["change log"] = "lista de cambios";
+App::$strings["for further infos."] = "para más información.";
 App::$strings["Upgrade Info"] = "Información de actualización";
 App::$strings["Do not show this again"] = "No mostrar esto de nuevo";
 App::$strings["Access Denied"] = "Acceso denegado";
@@ -2527,8 +2536,11 @@ App::$strings["Reputation \"cost\" to comment"] = "\"Coste\" de la reputación p
 App::$strings["Reputation automatically recovers at this rate per hour until it reaches minimum_to_post"] = "La reputación se recupera automáticamente a esta tasa por hora hasta que alcanza el mínimo_a_post";
 App::$strings["When minimum_to_moderate > reputation > minimum_to_post reputation recovers at this rate per hour"] = "Cuando el mínimo_a_moderar > reputación > mínimo_a_publicar la reputación se recupera a esta tasa por hora ";
 App::$strings["Community Moderation Settings"] = "Configuración de la moderación de la comunidad";
-App::$strings["Can moderate reputation on my channel."] = "Se puede moderar la reputación en mi canal.";
 App::$strings["Channel Reputation"] = "Reputación del canal";
+App::$strings["An Error has occurred."] = "Se ha producido un error.";
+App::$strings["Upvote"] = "Votar a favor";
+App::$strings["Downvote"] = "Votar en contra";
+App::$strings["Can moderate reputation on my channel."] = "Se puede moderar la reputación en mi canal.";
 App::$strings["Block Completely"] = "Bloquear completamente";
 App::$strings["Superblock App"] = "App Superblock";
 App::$strings["Block channels"] = "Bloquear canales";
@@ -2555,6 +2567,16 @@ App::$strings["Logfile archive directory"] = "Directorio de los ficheros de info
 App::$strings["Directory to store rotated logs"] = "Directorio para almacenar los informes rotados";
 App::$strings["Logfile size in bytes before rotating"] = "Tamaño del fichero de informe en bytes antes de rotarlo";
 App::$strings["Number of logfiles to retain"] = "Número de ficheros de informe que se deben retener";
+App::$strings["No server specified"] = "No se ha especificado ningún servidor";
+App::$strings["Posts imported"] = "Entradas importadas";
+App::$strings["Files imported"] = "Ficheros importados";
+App::$strings["This addon app copies existing content and file storage to a cloned/copied channel. Once the app is installed, visit the newly installed app. This will allow you to set the location of your original channel and an optional date range of files/conversations to copy."] = "Este complemento copia el contenido existente y el almacenamiento de ficheros en un canal clonado/copiado. Una vez instalada la aplicación, visite la aplicación recién instalada. Esto le permitirá establecer la ubicación de su canal original y un rango de fechas opcional de ficheros/conversaciones para copiar.";
+App::$strings["This will import all your conversations and cloud files from a cloned channel on another server. This may take a while if you have lots of posts and or files."] = "Esto importará todas sus conversaciones y archivos de nube de un canal clonado en otro servidor. El proceso puede tardar un poco si tiene muchos mensajes y/o ficheros.";
+App::$strings["Include posts"] = "Incluir entradas";
+App::$strings["Conversations, Articles, Cards, and other posted content"] = "Conversaciones, artículos, fichas y otros contenidos publicados";
+App::$strings["Include files"] = "Incluir ficheros";
+App::$strings["Files, Photos and other cloud storage"] = "Archivos, fotos y otro tipo de almacenamiento en la nube";
+App::$strings["Original Server base URL"] = "URL base del servidor original";
 App::$strings["Friendica Photo Album Import"] = "Importar un álbum de fotos de Friendica";
 App::$strings["This will import all your Friendica photo albums to this Red channel."] = "Esto importará todos sus álbumes de fotos de Friendica a este canal de Hubzilla.";
 App::$strings["Friendica Server base URL"] = "URL base del servidor de Friendica";
@@ -3142,6 +3164,7 @@ App::$strings["Thank you, this nickname is valid."] = "Gracias, este alias es v�
 App::$strings["A channel name is required."] = "Se requiere un nombre de canal";
 App::$strings["This is a "] = "Esto es un ";
 App::$strings[" channel name"] = "nombre de canal";
+App::$strings["Back to reply"] = "Volver a la respuesta";
 App::$strings["%d minutes"] = array(
 	0 => "%d minutos",
 	1 => "%d minutos",
@@ -3340,6 +3363,8 @@ App::$strings["Dislike Posts"] = "Desagrado de publicaciones";
 App::$strings["Ability to dislike posts/comments"] = "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios";
 App::$strings["Star Posts"] = "Entradas destacadas";
 App::$strings["Ability to mark special posts with a star indicator"] = "Capacidad de marcar entradas destacadas con un indicador de estrella";
+App::$strings["Reply on comment"] = "Responder a los comentarios";
+App::$strings["Ability to reply on selected comment"] = "Posibilidad de responder a los comentarios seleccionados";
 App::$strings["Advanced Directory Search"] = "Búsqueda avanzada en el directorio";
 App::$strings["Allows creation of complex directory search queries"] = "Permitir la creación de consultas complejas en las búsquedas en el directorio";
 App::$strings["Editor"] = "Editor";
@@ -3361,6 +3386,7 @@ App::$strings["Suppress Duplicate Posts/Comments"] = "Prevenir entradas o coment
 App::$strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo.";
 App::$strings["Auto-save drafts of posts and comments"] = "Guardar automáticamente borradores de entradas y comentarios";
 App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = "Guarda automáticamente los borradores de comentarios y publicaciones en el almacenamiento del navegador local para ayudar a evitar la pérdida accidental de composiciones.";
+App::$strings["Events"] = "Eventos";
 App::$strings["Smart Birthdays"] = "Cumpleaños inteligentes";
 App::$strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Enlazar los eventos de cumpleaños con el huso horario en el caso de que sus amigos estén dispersos por el mundo.";
 App::$strings["Event Timezone Selection"] = "Selección del huso horario del evento";
@@ -3378,7 +3404,6 @@ App::$strings["Forum Filter"] = "Filtro de foro";
 App::$strings["Ability to display only posts of a specific forum"] = "Posibilidad de mostrar sólo los mensajes de un foro específico";
 App::$strings["Personal Posts Filter"] = "Filtro de entradas personales";
 App::$strings["Ability to display only posts that you've interacted on"] = "Posibilidad de mostrar sólo los mensajes en los que usted haya interactuado";
-App::$strings["Show friend and connection suggestions"] = "Mostrar sugerencias de amigos y conexiones";
 App::$strings["Photo Location"] = "Ubicación de las fotos";
 App::$strings["If location data is available on uploaded photos, link this to a map."] = "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa.";
 App::$strings["Advanced Profiles"] = "Perfiles avanzados";
diff --git a/view/es-es/update_fail_eml.tpl b/view/es-es/update_fail_eml.tpl
index 6ebb521c5..f5b083bf9 100644
--- a/view/es-es/update_fail_eml.tpl
+++ b/view/es-es/update_fail_eml.tpl
@@ -1,13 +1,22 @@
-Hola, 
-Soy el servidor web en {{$sitename}};
+Disculpas, pero esto puede ser urgente.
+
+Este es el servidor web en {{$sitename}};
    
-Los desarrolladores de Hubzilla lanzaron una actualización {{$update}} recientemente, 
-pero cuando se intentaba instalar, alguna cosa ha ido terriblemente mal.  
+Los desarrolladores del proyecto han publicado recientemente una actualización {{$update}},  
+pero durante el intento de instalarlo automáticamente, algo salió terriblemente mal.   
 Esto requiere intervención humana tan pronto como sea posible. 
 Póngase en contacto con un desarrollador de proyectos si no sabe cómo 
-por sí mismo. Mi base se datos puede quedar inservible. 
+arréglelo por su cuenta. La configuración de la base de datos de su servidor web puede no ser válida. 
 
 El mensaje de error ha sido el siguiente: '{{$error}}'.   
 
+Puede intentar volver a aplicar esta actualización visitando 
+
+{{$baseurl}}/admin/dbsync
+
+mientras estaba conectado a la cuenta de administración. 
+
+{{$source}}
+
 Disculpe por cualquier inconveniente causado, 
 	su servidor web en {{$siteurl}}
 \ No newline at end of file
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index 22579227a..083c7cea3 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -17,6 +17,8 @@ var resource = {{$resource}};
 var default_view = resource !== null ? 'timeGridDay' : 'dayGridMonth';
 var default_date = resource !== null ? new Date(resource.dtstart) : new Date();
 
+var allday;
+
 $(document).ready(function() {
 	var calendarEl = document.getElementById('calendar');
 	calendar = new FullCalendar.Calendar(calendarEl, {
@@ -43,7 +45,6 @@ $(document).ready(function() {
 		dayNamesShort: aStr['dayNamesShort'],
 		allDayText: aStr['allday'],
 
-		defaultTimedEventDuration: '01:00:00',
 		snapDuration: '00:15:00',
 		
 		dateClick: function(info) {
@@ -53,8 +54,10 @@ $(document).ready(function() {
 				new_event = {};
 			}
 
+			allday = info.allDay;
+
 			var dtend = new Date(info.date.toUTCString());
-			if(info.view.type == 'dayGridMonth') {
+			if(allday) {
 				dtend.setDate(dtend.getDate() + 1);
 			}
 			else{
@@ -76,12 +79,11 @@ $(document).ready(function() {
 			$('#event_submit').val('create_event').html('{{$create}}');
 			$('#event_delete').hide();
 
-			new_event = { id: new_event_id, title  : 'New event', start: $('#id_dtstart').val(), end: $('#id_dtend').val(), editable: true, color: '#bbb' };
+			new_event = { id: new_event_id, title: 'New event', start: $('#id_dtstart').val(), end: $('#id_dtend').val(), allDay: info.allDay, editable: true, color: '#bbb' };
 			calendar.addEvent(new_event);
 		},
-		
-		eventClick: function(info) {
 
+		eventClick: function(info) {
 			//reset categories
 			$('#id_categories').tagsinput('removeAll');
 
@@ -131,6 +133,8 @@ $(document).ready(function() {
 				event_uri = event.extendedProps.uri;
 				$('#id_title').val(event.title);
 				$('#calendar_select').val(calendar_id).attr('disabled', true).trigger('change');
+				$('#id_timezone_select').val(event.extendedProps.timezone);
+				$('#id_location').val(event.extendedProps.location);
 				$('#id_categories').tagsinput('add', event.extendedProps.categories);
 				$('#id_dtstart').val(dtstart.toUTCString());
 				$('#id_dtend').val(dtend.toUTCString());
@@ -179,11 +183,12 @@ $(document).ready(function() {
 		},
 		
 		eventResize: function(info) {
+			console.log(info);
 
 			var event = info.event._def;
 			var dtstart = new Date(info.event._instance.range.start);
 			var dtend = new Date(info.event._instance.range.end);
-			
+
 			$('#id_title').val(event.title);
 			$('#id_dtstart').val(dtstart.toUTCString());
 			$('#id_dtend').val(dtend.toUTCString());
@@ -199,9 +204,10 @@ $(document).ready(function() {
 					'type': 'event',
 					'preview': 0,
 					'summary': event.title,
+					'timezone_select': event.extendedProps.timezone,
 					'dtstart': dtstart.toUTCString(),
 					'dtend': dtend.toUTCString(),
-					'adjust': event.extendedProps.item.adjust,
+					'adjust': event.allDay ? 0 : 1,
 					'categories': event.extendedProps.categories,
 					'desc': event.extendedProps.description,
 					'location': event.extendedProps.location,
@@ -215,8 +221,10 @@ $(document).ready(function() {
 					'update': 'resize',
 					'id[]': event.extendedProps.calendar_id,
 					'uri': event.extendedProps.uri,
+					'timezone_select': event.extendedProps.timezone,
 					'dtstart': dtstart ? dtstart.toUTCString() : '',
-					'dtend': dtend ? dtend.toUTCString() : ''
+					'dtend': dtend ? dtend.toUTCString() : '',
+					'allday': event.allDay ? 1 : 0
 				})
 				.fail(function() {
 					info.revert();
@@ -245,9 +253,10 @@ $(document).ready(function() {
 					'type': 'event',
 					'preview': 0,
 					'summary': event.title,
+					'timezone_select': event.extendedProps.timezone,
 					'dtstart': dtstart.toUTCString(),
 					'dtend': dtend.toUTCString(),
-					'adjust': event.extendedProps.item.adjust,
+					'adjust': event.allDay ? 0 : 1,
 					'categories': event.extendedProps.categories,
 					'desc': event.extendedProps.description,
 					'location': event.extendedProps.location,
@@ -261,8 +270,10 @@ $(document).ready(function() {
 					'update': 'drop',
 					'id[]': event.extendedProps.calendar_id,
 					'uri': event.extendedProps.uri,
+					'timezone_select': event.extendedProps.timezone,
 					'dtstart': dtstart ? dtstart.toUTCString() : '',
-					'dtend': dtend ? dtend.toUTCString() : ''
+					'dtend': dtend ? dtend.toUTCString() : '',
+					'allday': event.allDay ? 1 : 0
 				})
 				.fail(function() {
 					info.revert();
@@ -334,6 +345,7 @@ $(document).ready(function() {
 		$('#id_categories').tagsinput('add', '{{$categories}}'),
 		$('#id_description').val(resource.description);
 		$('#id_location').val(resource.location);
+		$('#id_timezone_select').val(resource.timezone);
 
 		if(event_xchan !== '{{$channel_hash}}')
 			$('#event_submit').hide();
@@ -414,10 +426,11 @@ function on_submit() {
 			'xchan': event_xchan,
 			'type': 'event',
 			'preview': 0,
+			'timezone_select': $('#id_timezone_select').val(),
 			'summary': $('#id_title').val(),
 			'dtstart': $('#id_dtstart').val(),
 			'dtend': $('#id_dtend').val(),
-			'adjust': 0,
+			'adjust': allday ? 0 : 1,
 			'categories': $('#id_categories').val(),
 			'desc': $('#id_description').val(),
 			'location': $('#id_location').val(),
@@ -439,12 +452,14 @@ function on_submit() {
 		$.post( 'cdav/calendar', {
 			'submit': $('#event_submit').val(),
 			'target': $('#calendar_select').val(),
+			'timezone_select': $('#id_timezone_select').val(),
 			'uri': event_uri,
 			'title': $('#id_title').val(),
 			'dtstart': $('#id_dtstart').val(),
 			'dtend': $('#id_dtend').val(),
 			'description': $('#id_description').val(),
-			'location': $('#id_location').val()
+			'location': $('#id_location').val(),
+			'allday': allday ? 1 : 0
 		})
 		.done(function() {
 			var parts = $('#calendar_select').val().split(':');
@@ -569,6 +584,9 @@ function exportDate() {
 					{{/foreach}}
 					</optgroup>
 				</select>
+				{{if $timezone_select}}
+				{{include file="field_select_grouped.tpl" field=$timezone_select}}
+				{{/if}}
 				<div id="more_block" style="display: none;">
 					{{if $catsenabled}}
 					<div id="id_categories_wrapper" class="form-group">
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 0e6f7523c..9d56b7fe4 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -52,6 +52,7 @@
 			header: false,
 			eventTextColor: 'white',
 			lang: '{{$lang}}',
+			timeZone: '{{$timezone}}',
 			firstDay: {{$first_day}},
 
 			eventLimit: 3,
diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl
index 6247aaf6f..ed46c304f 100755
--- a/view/tpl/event_item_header.tpl
+++ b/view/tpl/event_item_header.tpl
@@ -1,6 +1,11 @@
 <div class="event-item-title">
 	<h3><i class="fa fa-calendar"></i>&nbsp;{{$title}}</h3>
 </div>
+{{if $oneday && $allday}}
+<span class="dtstart">{{$dtstart_dt}}</span>
+{{else if $allday}}
+<span class="dtstart">{{$dtstart_dt}}</span> &mdash; <span class="dtend">{{$dtend_dt}}</span>
+{{else}}
 <div class="event-item-start">
 	<span class="event-item-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
 </div>
@@ -9,3 +14,4 @@
 	<span class="event-item-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
 </div>
 {{/if}}
+{{/if}}
author	zotlabs <mike@macgirvin.com>	2019-05-28 16:16:29 -0700
committer	zotlabs <mike@macgirvin.com>	2019-05-28 16:16:29 -0700
commit	932b4140637e22e9fb4ff3a91a9c8f186915646b (patch)
tree	c6e6b8c19079d34fda0fa11d3af26ddef69ae2b6
parent	7c2aafd4ee123f9db1ea2733119e0711f53414cc (diff)
parent	ca8d252ad75306e6d3cd066d5c593e94de1dfbdd (diff)
download	volse-hubzilla-932b4140637e22e9fb4ff3a91a9c8f186915646b.tar.gz volse-hubzilla-932b4140637e22e9fb4ff3a91a9c8f186915646b.tar.bz2 volse-hubzilla-932b4140637e22e9fb4ff3a91a9c8f186915646b.zip