Merge branch '3.2RC'

Add rounded corners to mimic categories input field and main text area.

.homeinstall/README.md

@@ -120,7 +120,7 @@ There are two ways to get a domain...
 
 The cost are around 10,- € once and 1,50 € per month (2017).
 
-### Method 2 Register a (free) Subdomain
+The cost are around 10,- € once and 1,50 € per month (2017).
 
 ...for example register at freedns.afraid.org
 

CHANGELOG

@@ -1,3 +1,129 @@
+Hubzilla 3.2 (2018-03-09)
+	- Improve rendering of Readme files in plugin settings
+	- Add pdl file for mod moderate
+	- Update redbasic theme screenshot
+	- Restrict mail messages to max_import_size
+	- Add pdl file for mod thing
+	- Add federation property to webfinger
+	- Provide new member widget which sits beneath the notifications for the first 60 days after an account creation
+	- Rename Addon/Feature settings to Addon Settings
+	- Move privacy groups to the newly created Access Control and Permissions tab
+	- Move oauth_client management and guest access tokens to features rather than auto-enabling at various feature levels
+	- Change undo_post_tagging() to emit quoted tags rather than using underscore replacement if they contain spaces
+	- Require directory servers to be using some modern form of encryption
+	- Change icon set from font-awesome to fork-awesome
+	- Provide opt-out link and text with notification emails
+	- Alter image selection widget to accept/submit on choose (github issue #979)
+	- If hide_in_statistics is set, only include the total channels count and no other statistical info in siteinfo.json
+	- Mark connections where we do not have post_comments permissions with an no entry sign
+	- Click your own profile photo to change it if loged in
+	- Remove street address info from the default basic profile fields
+	- Handle error logging in on cloud page (post method not implemented)
+	- Cloud 'view-as-tiles' toggle wasn't available for guests and they are the most likely to prefer that view
+	- Provide DB compatibility for poll and voting implementations across several platforms
+	- Remove the unused ZotDriver and ProtoDriver classes
+	- Move dreport from zot to lib
+	- Move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the zot6 re-org
+	- Add event resource_id to iconfig so Diaspora can search on it without looking inside JSON objects
+	- Trim non-existent/deprecated plugins from siteinfo plugin list
+	- Add 'Validate' button to new_channel page
+	- Do not show summary if it is equal to body
+	- Update code tag styling so bbcode [code] blocks and wiki markdown inline code render nicely
+	- Crypto improvements (use pkcs1_oaep_padding instead of the older pkcs1_padding)
+	- Refactor OAuth2Server a bit
+	- Refactor of the DB update system
+	- Extend the oauth2 storage driver so that we can use our own channel table
+	- Provide option to block the public stream unless authenticated
+	- Refactor shares and urn shares into activities
+	- Show likes and dislikes in notices if always_show_in_notices is set
+	- Add hidden config to disallow anonymous comments (github issue #972)
+	- Add flexibility to prefix/suffix string translations for jquery.timeago
+	- Make post titles searchable (github issue #975)
+	- Implement zot6 delivery
+	- Remove mobile_detect library
+	- Separate the parsing of author information from the parsing of item/activity information in feedutils
+	- Provide summaries in feeds under very limited cases
+	- Redirect to the email_validation page if login was attempted after account creation but prior to successful verification
+	- Iprove workflow for form based email validation when auto_channel_create is in effect
+	- Provide a default video image if nothing else is available
+	- Surface the ability to change the landing page after channel creation
+	- Create the 'go' module to present several possible things to do after channel creation
+	- Add unit test for dba_pdo driver class
+	- Add unit test for \DBA factory
+	- Usability improvements to registration/verification workflow
+	- Don't do any bbcode translation within code blocks (except baseurl, observer, and linefeeds)
+	- Improve browser language detection
+	- Remove unused prototype importer template and obsolete reflection cms importer
+	- Update to bootstrap 4 stable
+	- Implement caching of notifications in browser session storage
+	- Code cleanup and simplification in mod_like
+	- Implement new cropper library
+	- Better notifications for edit post/comments which may have been originally posted long ago
+	- Ensure filter words are not empty in include/items.php
+	- Change query in mod search to be compatible with postgres
+	- Provide channel list function in the zot api
+	- Remove deprecated 'qcomment' feature
+	- Simplify webserver logic flow
+	- Simplify interactions with the get_features hook
+	- Provide a local pubstream option (content from this site only)
+	- Simplify dir_tagadelic dramatically
+	- Surface the article feature
+	- Add summary bbcode tag
+	- Move markdown-in-posts/comments feature to plugin
+	- Support tables in markdown posts/comments
+
+
+	Bugfixes
+	- Fix javascript error if there are no notifications
+	- Fix some issues with friend suggestions on standalone sites with no 'suggestme' volunteers
+	- Fix unable to reset profile fields to defaults in admin/profs by emptying the textarea
+	⁻ Fix issues with accordions related to bootstrap upgrade
+	- Fix empty dob is set to the date of the first profile save
+	- Fix several email validation issues
+	- Fix issue if logged in locally and mod_display returns nothing owned by your uid; retry with known public uids rather than issue 'permission denied'
+	- Fix public stream app permission check to match the recent fixes to the Module
+	- Fix issues with delivery of edited posts to forums
+	- Fix autoname test
+	- Fix issue where self and pending connections were visible in connections when not loged in
+	- Fix bad query in mod defperms
+	- Fix issue where gnusocial likes were not recognised as like activity
+	- Fix manual queue invocation
+	- Fix unable to delete accounts using tickboxes on admin/accounts
+	- Fix a PHP7.2 warning when a channel has no cards
+	- Fix unable to delete permission groups with space in name (github issue #920)
+
+	Addons
+	Statistic: fix reporting of incorrect register policy in nodeinfo
+	Diaspora: diaspora_init_relay: calls diaspora_import_author with too many arguments
+	Pubcrawl: provide a system 'allowed' for to match the system setting for other protocols
+	Diaspora: fix issue with sending diaspora profile change messages over diaspora_v2
+	Diaspora: provide limited but hopefully adequate support for new Diaspora html5 audio/video
+	Pubcrawl: send zot context with follow requests
+	Pubcrawl: add video to the set of message types we process
+	Pubcrawl: support for activitypub media
+	Openclipatar: remove extra details for each image
+	Diaspora: initial work on event participation
+	Statistic: remove the friendica protocol from nodeinfo until it is fully implemented
+	Statistic: re-arrange the order of the .host-meta/nodeinfo links
+	Pubcrawl: add share verb to activitystreams translator
+	Pubcrawl: post public posts to syschannel
+	Statistics: fix legacy statistics.json interface
+	Gnusocial: improve error checking when processing a salmon message
+	Dirstats: fix sql syntax error
+	Pubcrawl: possibly reduce constraint violations for xchan_store_lowlevel (duplicate entry)
+	Diaspora: ensure we process Friendica-over-Diaspora yearless birthdays correctly
+	Chess: added simple history browsing controls to spectator view
+	Diaspora: support post/comment edits
+	Diaspora: don't redirect fetch requests for non-Diaspora wall-to-wall and forum posts unless they can be redirected to a Diaspora protocol site
+	Chess: added support for publicly visible games
+	Phpmailer: add quickstart notes
+	Chess: choose random color if no color is chosen
+	New Plugin: mdpost - markdown in posts/comments, migrated from core to addon
+	Diaspora: provide a configuration option to import the diaspora firehose, otherwise only import content matching subscribed tags
+	NSFW: load images only after click on the button
+	Twitter: provide configurable tweet length until such time as 280 becomes universal
+
+
 Hubzilla 3.0 (2018-01-09)
 	- Updated homeinstall script
 	- Sort cloud directory by 1. is_dir and 2. name

Zotlabs/Module/Admin/Profs.php

@@ -9,17 +9,37 @@ class Profs {
 	
 		if(array_key_exists('basic',$_REQUEST)) {
 			$arr = explode(',',$_REQUEST['basic']);
-			for($x = 0; $x < count($arr); $x ++) 
-				if(trim($arr[$x]))
-					$arr[$x] = trim($arr[$x]);
-			set_config('system','profile_fields_basic',$arr);
-	
+			array_walk($arr,'array_trim');
+			$narr = [];
+			if(count($arr)) {
+				foreach($arr as $a) {
+					if(strlen($a)) {
+						$narr[] = $a;
+					}
+				}
+			}
+			if(! $narr)
+				del_config('system','profile_fields_basic');
+			else
+				set_config('system','profile_fields_basic',$narr);
+
+
 			if(array_key_exists('advanced',$_REQUEST)) {
 				$arr = explode(',',$_REQUEST['advanced']);
-				for($x = 0; $x < count($arr); $x ++)
-					if(trim($arr[$x]))
-						$arr[$x] = trim($arr[$x]);
-				set_config('system','profile_fields_advanced',$arr);
+				array_walk($arr,'array_trim');
+				$narr = [];
+				if(count($arr)) {
+					foreach($arr as $a) {
+						if(strlen($a)) {
+							$narr[] = $a;
+						}
+					}
+				}
+				if(! $narr)
+					del_config('system','profile_fields_advanced');
+				else
+					set_config('system','profile_fields_advanced',$narr);
+
 			}
 			goaway(z_root() . '/admin/profs');
 		}
@@ -98,6 +118,7 @@ class Profs {
 		$basic = '';
 		$barr = array();
 		$fields = get_profile_fields_basic();
+
 		if(! $fields)
 			$fields = get_profile_fields_basic(1);
 		if($fields) {

Zotlabs/Module/Admin/Site.php

@@ -24,7 +24,7 @@ class Site {
 		$siteinfo			=	((x($_POST,'siteinfo'))		    ? trim($_POST['siteinfo'])				: '');
 		$language			=	((x($_POST,'language'))			? notags(trim($_POST['language']))			: '');
 		$theme				=	((x($_POST,'theme'))			? notags(trim($_POST['theme']))				: '');
-		$theme_mobile			=	((x($_POST,'theme_mobile'))		? notags(trim($_POST['theme_mobile']))			: '');
+//		$theme_mobile			=	((x($_POST,'theme_mobile'))		? notags(trim($_POST['theme_mobile']))			: '');
 //		$site_channel			=	((x($_POST,'site_channel'))	? notags(trim($_POST['site_channel']))				: '');
 		$maximagesize		=	((x($_POST,'maximagesize'))		? intval(trim($_POST['maximagesize']))				:  0);
 
@@ -122,11 +122,11 @@ class Site {
 		set_config('system','siteinfo',$siteinfo);
 		set_config('system', 'language', $language);
 		set_config('system', 'theme', $theme);
-		if ( $theme_mobile === '---' ) {
-			del_config('system', 'mobile_theme');
-		} else {
-			set_config('system', 'mobile_theme', $theme_mobile);
-		}
+//		if ( $theme_mobile === '---' ) {
+//			del_config('system', 'mobile_theme');
+//		} else {
+//			set_config('system', 'mobile_theme', $theme_mobile);
+//		}
 	//	set_config('system','site_channel', $site_channel);
 		set_config('system','maximagesize', $maximagesize);
 
@@ -305,7 +305,7 @@ class Site {
 			'$siteinfo'		=> array('siteinfo', t('Site Information'), get_config('system','siteinfo'), t("Publicly visible description of this site.  Displayed on siteinfo page.  BBCode can be used here")),
 			'$language' 		=> array('language', t("System language"), get_config('system','language'), "", $lang_choices),
 			'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
-			'$theme_mobile' 	=> array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile),
+//			'$theme_mobile' 	=> array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile),
 //			'$site_channel' 	=> array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")),
 			'$feed_contacts'    => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')),
 			'$maximagesize'		=> array('maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),

Zotlabs/Module/Cover_photo.php

@@ -207,7 +207,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 			}
 		}
 	
-		$imagedata = (($os_storage) ? @file_get_contents($imagedata) : $imagedata);
+		$imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata));
 		$ph = photo_factory($imagedata, $filetype);
 	
 		if(! $ph->is_valid()) {
@@ -364,6 +364,12 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 				'$embedPhotosModalTitle' => t('Use a photo from your albums'),
 				'$embedPhotosModalCancel' => t('Cancel'),
 				'$embedPhotosModalOK' => t('OK'),
+				'$modalchooseimages' => t('Choose images to embed'),
+				'$modalchoosealbum' => t('Choose an album'),
+				'$modaldiffalbum' => t('Choose a different album'),
+				'$modalerrorlist' => t('Error getting album list'),
+				'$modalerrorlink' => t('Error getting photo link'),
+				'$modalerroralbum' => t('Error getting album'),
 				'$form_security_token' => get_form_security_token("cover_photo"),
 					/// @FIXME - yuk  
 				'$select' => t('Select existing photo'),

Zotlabs/Module/Directory.php

@@ -17,7 +17,7 @@ class Directory extends \Zotlabs\Web\Controller {
 				intval(local_channel()),
 				dbesc($_GET['ignore'])
 			);
-			goaway(z_root() . '/directory?suggest=1');
+			goaway(z_root() . '/directory?f=&suggest=1');
 		}
 	
 		$observer = get_observer_hash();
@@ -101,6 +101,11 @@ class Directory extends \Zotlabs\Web\Controller {
 		if($suggest) {
 	
 			$r = suggestion_query(local_channel(),get_observer_hash());
+
+			if(! $r) {
+				notice( t('No default suggestions were found.') . EOL);
+				return;
+			}
 	
 			// Remember in which order the suggestions were
 			$addresses = array();

Zotlabs/Module/Profile_photo.php

@@ -463,6 +463,12 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				'$embedPhotosModalTitle' => t('Use a photo from your albums'),
 				'$embedPhotosModalCancel' => t('Cancel'),
 				'$embedPhotosModalOK' => t('OK'),
+				'$modalchooseimages' => t('Choose images to embed'),
+				'$modalchoosealbum' => t('Choose an album'),
+				'$modaldiffalbum' => t('Choose a different album'),
+				'$modalerrorlist' => t('Error getting album list'),
+				'$modalerrorlink' => t('Error getting photo link'),
+				'$modalerroralbum' => t('Error getting album'),
 				'$form_security_token' => get_form_security_token("profile_photo"),
 				'$select' => t('Select existing photo'),
 			));

Zotlabs/Module/Sitelist.php

@@ -32,7 +32,7 @@ class Sitelist extends \Zotlabs\Web\Controller {
 	
 		$result = array('success' => false);
 	
-		$r = q("select count(site_url) as total from site where site_type = %d $sql_extra ",
+		$r = q("select count(site_url) as total from site where site_type = %d and site_dead = 0 $sql_extra ",
 			intval(SITE_TYPE_ZOT)
 		);
 		
@@ -42,7 +42,7 @@ class Sitelist extends \Zotlabs\Web\Controller {
 		$result['start'] = $start;
 		$result['limit'] = $limit;	
 	
-		$r = q("select * from site where site_type = %d $sql_extra $sql_order $sql_limit",
+		$r = q("select * from site where site_type = %d and site_dead = 0 $sql_extra $sql_order $sql_limit",
 			intval(SITE_TYPE_ZOT)
 		);
 	

Zotlabs/Module/Thing.php

@@ -20,6 +20,11 @@ class Thing extends \Zotlabs\Web\Controller {
 
 		$channel    = \App::get_channel();
 
+		if($_SERVER['REQUEST_METHOD'] === 'GET' && argc() < 2) {
+			profile_load($channel['channel_address']);
+		}
+
+
 		$term_hash = (($_REQUEST['term_hash']) ? $_REQUEST['term_hash'] : '');
 
 		$name = escape_tags($_REQUEST['term']);

Zotlabs/Module/Wfinger.php

@@ -123,7 +123,8 @@ class Wfinger extends \Zotlabs\Web\Controller {
 			$result['properties'] = [
 					'http://webfinger.net/ns/name'   => $r[0]['channel_name'],
 					'http://xmlns.com/foaf/0.1/name' => $r[0]['channel_name'],
-					'https://w3id.org/security/v1#publicKeyPem' => $r[0]['xchan_pubkey']
+					'https://w3id.org/security/v1#publicKeyPem' => $r[0]['xchan_pubkey'],
+					'http://purl.org/zot/federation' => 'zot'
 			];
 	
 			foreach($aliases as $alias) 

Zotlabs/Update/_1204.php

@@ -8,11 +8,11 @@ class _1204 {
 
 		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
 			$r1 = q("ALTER TABLE poll ADD poll_guid text NOT NULL");
-			$r2 = q("create index \"poll_guid_idx\" on poll \"poll_guid\"");
+			$r2 = q("create index \"poll_guid_idx\" on poll (\"poll_guid\")");
 			$r3 = q("ALTER TABLE poll_elm ADD pelm_guid text NOT NULL");
-			$r4 = q("create index \"pelm_guid_idx\" on poll_elm \"pelm_guid\"");
+			$r4 = q("create index \"pelm_guid_idx\" on poll_elm (\"pelm_guid\")");
 			$r5 = q("ALTER TABLE vote ADD vote_guid text NOT NULL");
-			$r6 = q("create index \"vote_guid_idx\" on vote \"vote_guid\"");
+			$r6 = q("create index \"vote_guid_idx\" on vote (\"vote_guid\")");
 
 			$r = ($r1 && $r2 && $r3 && $r4 && $r5 && $r6);
 		}

Zotlabs/Update/_1205.php

@@ -7,6 +7,17 @@ class _1205 {
 	function run() {
 
 		if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+
+			q("ALTER TABLE item DROP INDEX title");
+			q("ALTER TABLE item DROP INDEX body");
+			q("ALTER TABLE item DROP INDEX allow_cid");
+			q("ALTER TABLE item DROP INDEX allow_gid");
+			q("ALTER TABLE item DROP INDEX deny_cid");
+			q("ALTER TABLE item DROP INDEX deny_gid");
+			q("ALTER TABLE item DROP INDEX item_flags");
+			q("ALTER TABLE item DROP INDEX item_restrict");
+			q("ALTER TABLE item DROP INDEX aid");
+
 			$r = q("ALTER TABLE item 
 				DROP INDEX item_private,
 				ADD INDEX uid_item_private (uid, item_private),

Zotlabs/Update/_1207.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1207 {
+
+	function run() {
+
+		if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+			$r = q("ALTER TABLE item 
+				DROP INDEX resource_type
+			");
+
+			if($r)
+				return UPDATE_SUCCESS;
+			return UPDATE_FAILED;
+		}
+		else {
+			return UPDATE_SUCCESS;
+		}
+
+	}
+
+}

Zotlabs/Widget/Newmember.php

@@ -39,9 +39,9 @@ class Newmember {
 
 			t('Find and Connect with others'),
 			[
-				'directory'     => t('View the channel directory'),
-				'suggest'       => t('View friend suggestions'),
-				'connections'   => t('Manage your connections'),
+				'directory'              => t('View the directory'),
+				'directory?f=&suggest=1' => t('View friend suggestions'),
+				'connections'            => t('Manage your connections'),
 			],
 
 			t('Communicate'),
@@ -64,7 +64,7 @@ class Newmember {
 		// hack to put this in the correct spot of the array
 
 		if($site_firehose || $net_firehose) {
-			$options[5]['pubstream'] = t('View public stream. Warning: not moderated');
+			$options[5]['pubstream'] = t('View public stream');
 		}
 
 		$o = replace_macros(get_markup_template('new_member.tpl'), [

Zotlabs/Widget/Wiki_pages.php

@@ -59,6 +59,8 @@ class Wiki_pages {
 
 		$wikiname = '';
 
+		$wikiname = '';
+
 		$pages = array();
 
 		$p = \Zotlabs\Lib\NativeWikiPage::page_list($arr['channel_id'],get_observer_hash(),$arr['resource_id']);

boot.php

@@ -50,10 +50,9 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.3' );
+define ( 'STD_VERSION',             '3.2' );
 define ( 'ZOT_REVISION',            '1.3' );
-
-define ( 'DB_UPDATE_VERSION',       1206 );
+define ( 'DB_UPDATE_VERSION',       1207 );
 
 define ( 'PROJECT_BASE',   __DIR__ );
 

include/channel.php

@@ -1126,8 +1126,7 @@ function channel_export_items($channel_id, $start, $finish) {
 /**
  * @brief Loads a profile into the App structure.
  *
- * The function requires a writeable copy of the main App structure, and the
- * nickname of a valid channel.
+ * The function requires the nickname of a valid channel.
  *
  * Permissions of the current observer are checked. If a restricted profile is available
  * to the current observer, that will be loaded instead of the channel default profile.
@@ -1897,6 +1896,7 @@ function is_public_profile() {
 function get_profile_fields_basic($filter = 0) {
 
 	$profile_fields_basic = (($filter == 0) ? get_config('system','profile_fields_basic') : null);
+
 	if(! $profile_fields_basic)
 		$profile_fields_basic = array('fullname','pdesc','chandesc','comms','gender','dob','dob_tz','region','country_name','marital','sexual','homepage','hometown','keywords','about','contact');
 

include/conversation.php

@@ -1005,7 +1005,7 @@ function thread_author_menu($item, $mode = '') {
 		$contact = App::$contacts[$item['author_xchan']];
 	else
 		if($local_channel && $item['author']['xchan_addr'])
-			$follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']);
+			$follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']) . '&interactive=0';
 
 	
 	if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) {
@@ -1051,8 +1051,8 @@ function thread_author_menu($item, $mode = '') {
 			'menu' => 'follow',
 			'title' => t('Connect'),
 			'icon' => 'fw',
-			'action' => '',
-			'href' => $follow_url
+			'action' => 'doFollowAuthor(\'' . $follow_url . '\'); return false;',
+			'href' => '#',
 		];
 	}
 

include/import.php

@@ -157,6 +157,7 @@ function import_profiles($channel, $profiles) {
 			unset($profile['id']);
 			$profile['aid'] = get_account_id();
 			$profile['uid'] = $channel['channel_id'];
+			unset($profile['profile_vcard']);
 
 			convert_oldfields($profile,'name','fullname');
 			convert_oldfields($profile,'with','partner');

include/items.php

@@ -1412,6 +1412,13 @@ function get_mail_elements($x) {
 	}
 	else {
 		$arr['body']         = (($x['body']) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8',false) : '');
+
+		$maxlen = get_max_import_size();
+
+		if($maxlen && mb_strlen($arr['body']) > $maxlen) {
+			$arr['body'] = mb_substr($arr['body'],0,$maxlen,'UTF-8');
+			logger('message length exceeds max_import_size: truncated');
+		}
 	}
 
 	$arr['title']        = (($x['title'])? htmlspecialchars($x['title'],ENT_COMPAT,'UTF-8',false) : '');

include/socgraph.php

@@ -52,7 +52,7 @@ function poco_load($xchan = '', $url = null) {
 		elseif($s['return_code'] == 404)
 			logger('poco_load: nothing found');
 		else
-			logger('poco_load: returns ' . print_r($s,true));
+			logger('poco_load: returns ' . print_r($s,true), LOGGER_DATA);
 		return;
 	}
 
@@ -288,11 +288,14 @@ function suggestion_query($uid, $myxchan, $start = 0, $limit = 80) {
 
 function update_suggestions() {
 
-	$dirmode = get_config('system', 'directory_mode');
-	if($dirmode === false)
-		$dirmode = DIRECTORY_MODE_NORMAL;
+	$dirmode = get_config('system', 'directory_mode', DIRECTORY_MODE_NORMAL);
 
-	if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
+	if($dirmode == DIRECTORY_MODE_STANDALONE) {
+		poco_load('', z_root() . '/poco');
+		return;
+	}
+
+	if($dirmode == DIRECTORY_MODE_PRIMARY) {
 		$url = z_root() . '/sitelist';
 	}
 	else {

include/zot.php

@@ -587,13 +587,16 @@ function zot_refresh($them, $channel = null, $force = false) {
 
 
 						// If there is a default group for this channel, add this connection to it
+						// for pending connections this will happens at acceptance time.
 
-						$default_group = $channel['channel_default_group'];
-						if($default_group) {
-							require_once('include/group.php');
-							$g = group_rec_byhash($channel['channel_id'],$default_group);
-							if($g)
-								group_add_member($channel['channel_id'],'',$x['hash'],$g['id']);
+						if(! intval($new_connection[0]['abook_pending'])) {
+							$default_group = $channel['channel_default_group'];
+							if($default_group) {
+								require_once('include/group.php');
+								$g = group_rec_byhash($channel['channel_id'],$default_group);
+								if($g)
+									group_add_member($channel['channel_id'],'',$x['hash'],$g['id']);
+							}
 						}
 
 						unset($new_connection[0]['abook_id']);
@@ -4272,7 +4275,7 @@ function zotinfo($arr) {
 	if($role === 'forum' || $role === 'repository') {
 		$public_forum = true;
 	}
-	else {
+	elseif($ztarget_hash) {
 		// check if it has characteristics of a public forum based on custom permissions.
 		$m = \Zotlabs\Access\Permissions::FilledAutoperms($e['channel_id']);
 		if($m) {

install/schema_postgres.sql

@@ -1,6 +1,6 @@
 CREATE TABLE "abconfig" (
   "id" serial  NOT NULL,
-  "chan" bigint NOT NULL DEFAULT '0',
+  "chan" bigint NOT NULL DEFAULT 0,
   "xchan" text NOT NULL,
   "cat" text NOT NULL,
   "k" text NOT NULL,
@@ -73,13 +73,13 @@ CREATE TABLE "account" (
   "account_language" varchar(16) NOT NULL DEFAULT 'en',
   "account_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "account_lastlog" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "account_flags" bigint  NOT NULL DEFAULT '0',
-  "account_roles" bigint  NOT NULL DEFAULT '0',
+  "account_flags" bigint  NOT NULL DEFAULT 0 ,
+  "account_roles" bigint  NOT NULL DEFAULT 0 ,
   "account_reset" text NOT NULL DEFAULT '',
   "account_expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "account_expire_notified" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "account_service_class" varchar(32) NOT NULL DEFAULT '',
-  "account_level" bigint  NOT NULL DEFAULT '0',
+  "account_level" bigint  NOT NULL DEFAULT 0 ,
   "account_password_changed" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY ("account_id")
 );
@@ -97,11 +97,11 @@ create index "account_password_changed"  on account ("account_password_changed")
 CREATE TABLE "addon" (
   "id" serial NOT NULL,
   "aname" text NOT NULL,
-  "version" text NOT NULL DEFAULT '0',
-  "installed" numeric(1) NOT NULL DEFAULT '0',
-  "hidden" numeric(1) NOT NULL DEFAULT '0',
-  "tstamp" numeric(20) NOT NULL DEFAULT '0',
-  "plugin_admin" numeric(1) NOT NULL DEFAULT '0',
+  "version" text NOT NULL DEFAULT 0 ,
+  "installed" numeric(1) NOT NULL DEFAULT 0 ,
+  "hidden" numeric(1) NOT NULL DEFAULT 0 ,
+  "tstamp" numeric(20) NOT NULL DEFAULT 0 ,
+  "plugin_admin" numeric(1) NOT NULL DEFAULT 0 ,
   PRIMARY KEY ("id")
 );
 create index "addon_hidden_idx" on addon ("hidden");
@@ -117,13 +117,13 @@ CREATE TABLE "app" (
   "app_url" text NOT NULL DEFAULT '',
   "app_photo" text NOT NULL DEFAULT '',
   "app_version" text NOT NULL DEFAULT '',
-  "app_channel" bigint NOT NULL DEFAULT '0',
+  "app_channel" bigint NOT NULL DEFAULT 0 ,
   "app_addr" text NOT NULL DEFAULT '',
   "app_price" text NOT NULL DEFAULT '',
   "app_page" text NOT NULL DEFAULT '',
   "app_requires" text NOT NULL DEFAULT '',
-  "app_deleted" smallint NOT NULL DEFAULT '0',
-  "app_system" smallint NOT NULL DEFAULT '0',
+  "app_deleted" smallint NOT NULL DEFAULT 0 ,
+  "app_system" smallint NOT NULL DEFAULT 0 ,
   "app_plugin" text NOT NULL DEFAULT '',
   "app_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "app_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -158,19 +158,19 @@ create index atoken_expires on atoken (atoken_expires);
 
 CREATE TABLE "attach" (
   "id" serial  NOT NULL,
-  "aid" bigint  NOT NULL DEFAULT '0',
-  "uid" bigint  NOT NULL DEFAULT '0',
+  "aid" bigint  NOT NULL DEFAULT 0 ,
+  "uid" bigint  NOT NULL DEFAULT 0 ,
   "hash" varchar(64) NOT NULL DEFAULT '',
   "creator" varchar(128) NOT NULL DEFAULT '',
   "filename" text NOT NULL DEFAULT '',
   "filetype" varchar(64) NOT NULL DEFAULT '',
-  "filesize" bigint  NOT NULL DEFAULT '0',
-  "revision" bigint  NOT NULL DEFAULT '0',
+  "filesize" bigint  NOT NULL DEFAULT 0 ,
+  "revision" bigint  NOT NULL DEFAULT 0 ,
   "folder" varchar(64) NOT NULL DEFAULT '',
-  "flags" bigint  NOT NULL DEFAULT '0',
-  "is_dir" smallint NOT NULL DEFAULT '0',
-  "is_photo" smallint NOT NULL DEFAULT '0',
-  "os_storage" smallint NOT NULL DEFAULT '0',
+  "flags" bigint  NOT NULL DEFAULT 0 ,
+  "is_dir" smallint NOT NULL DEFAULT 0 ,
+  "is_photo" smallint NOT NULL DEFAULT 0 ,
+  "os_storage" smallint NOT NULL DEFAULT 0 ,
   "os_path" text NOT NULL,
   "display_path" text NOT NULL,
   "content" bytea NOT NULL,
@@ -214,8 +214,8 @@ CREATE TABLE "cache" (
 );
 CREATE TABLE "cal" (
   "cal_id" serial  NOT NULL,
-  "cal_aid" bigint NOT NULL DEFAULT '0',
-  "cal_uid" bigint NOT NULL DEFAULT '0',
+  "cal_aid" bigint NOT NULL DEFAULT 0 ,
+  "cal_uid" bigint NOT NULL DEFAULT 0 ,
   "cal_hash" text NOT NULL,
   "cal_name" text NOT NULL,
   "uri" text NOT NULL,
@@ -223,7 +223,7 @@ CREATE TABLE "cal" (
   "pass" text NOT NULL,
   "ctag" text NOT NULL,
   "synctoken" text NOT NULL,
-  "cal_types" text NOT NULL DEFAULT '0',
+  "cal_types" text NOT NULL DEFAULT 0 ,
   PRIMARY KEY ("cal_id")
 );
 create index "cal_hash_idx" on cal ("cal_hash");
@@ -234,8 +234,8 @@ create index "cal_uid_idx" on cal ("cal_uid");
 
 CREATE TABLE "channel" (
   "channel_id" serial  NOT NULL,
-  "channel_account_id" bigint  NOT NULL DEFAULT '0',
-  "channel_primary" numeric(1)  NOT NULL DEFAULT '0',
+  "channel_account_id" bigint  NOT NULL DEFAULT 0 ,
+  "channel_primary" numeric(1)  NOT NULL DEFAULT 0 ,
   "channel_name" text NOT NULL DEFAULT '',
   "channel_address" text NOT NULL DEFAULT '',
   "channel_guid" text NOT NULL DEFAULT '',
@@ -247,14 +247,14 @@ CREATE TABLE "channel" (
   "channel_startpage" text NOT NULL DEFAULT '',
   "channel_pubkey" text NOT NULL,
   "channel_prvkey" text NOT NULL,
-  "channel_notifyflags" bigint  NOT NULL DEFAULT '65535',
-  "channel_pageflags" bigint  NOT NULL DEFAULT '0',
+  "channel_notifyflags" bigint  NOT NULL DEFAULT 65535,
+  "channel_pageflags" bigint  NOT NULL DEFAULT 0 ,
   "channel_dirdate" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "channel_lastpost" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "channel_deleted" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "channel_max_anon_mail" bigint  NOT NULL DEFAULT '10',
-  "channel_max_friend_req" bigint  NOT NULL DEFAULT '10',
-  "channel_expire_days" bigint NOT NULL DEFAULT '0',
+  "channel_max_anon_mail" bigint  NOT NULL DEFAULT 10,
+  "channel_max_friend_req" bigint  NOT NULL DEFAULT 10,
+  "channel_expire_days" bigint NOT NULL DEFAULT 0 ,
   "channel_passwd_reset" text NOT NULL DEFAULT '',
   "channel_default_group" text NOT NULL DEFAULT '',
   "channel_allow_cid" text ,
@@ -291,7 +291,7 @@ create index "channel_system" on channel ("channel_system");
 create index "channel_moved" on channel ("channel_moved");
 CREATE TABLE "chat" (
   "chat_id" serial  NOT NULL,
-  "chat_room" bigint  NOT NULL DEFAULT '0',
+  "chat_room" bigint  NOT NULL DEFAULT 0 ,
   "chat_xchan" text NOT NULL DEFAULT '',
   "chat_text" text NOT NULL,
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -302,7 +302,7 @@ create index "chat_xchan_idx" on chat ("chat_xchan");
 create index "chat_created_idx" on chat ("created");
 CREATE TABLE "chatpresence" (
   "cp_id" serial  NOT NULL,
-  "cp_room" bigint  NOT NULL DEFAULT '0',
+  "cp_room" bigint  NOT NULL DEFAULT 0 ,
   "cp_xchan" text NOT NULL DEFAULT '',
   "cp_last" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "cp_status" text NOT NULL,
@@ -316,12 +316,12 @@ create index "cp_status" on chatpresence ("cp_status");
 
 CREATE TABLE "chatroom" (
   "cr_id" serial  NOT NULL,
-  "cr_aid" bigint  NOT NULL DEFAULT '0',
-  "cr_uid" bigint  NOT NULL DEFAULT '0',
+  "cr_aid" bigint  NOT NULL DEFAULT 0 ,
+  "cr_uid" bigint  NOT NULL DEFAULT 0 ,
   "cr_name" text NOT NULL DEFAULT '',
   "cr_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "cr_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "cr_expire" bigint  NOT NULL DEFAULT '0',
+  "cr_expire" bigint  NOT NULL DEFAULT 0 ,
   "allow_cid" text NOT NULL,
   "allow_gid" text NOT NULL,
   "deny_cid" text NOT NULL,
@@ -340,7 +340,7 @@ CREATE TABLE "clients" (
   "redirect_uri" varchar(200) NOT NULL,
   "clname" text,
   "icon" text,
-  "uid" bigint NOT NULL DEFAULT '0',
+  "uid" bigint NOT NULL DEFAULT 0 ,
   PRIMARY KEY ("client_id")
 );
 CREATE TABLE "config" (
@@ -387,9 +387,9 @@ create index "dreport_channel" on dreport ("dreport_channel");
 
 CREATE TABLE "event" (
   "id" serial NOT NULL,
-  "aid" bigint  NOT NULL DEFAULT '0',
+  "aid" bigint  NOT NULL DEFAULT 0 ,
   "uid" bigint NOT NULL,
-  "cal_id" bigint NOT NULL DEFAULT '0',
+  "cal_id" bigint NOT NULL DEFAULT 0 ,
   "event_xchan" text NOT NULL DEFAULT '',
   "event_hash" text NOT NULL DEFAULT '',
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -400,19 +400,19 @@ CREATE TABLE "event" (
   "description" text NOT NULL,
   "location" text NOT NULL,
   "etype" text NOT NULL,
-  "nofinish" numeric(1) NOT NULL DEFAULT '0',
-  "adjust" numeric(1) NOT NULL DEFAULT '1',
-  "dismissed" numeric(1) NOT NULL DEFAULT '0',
+  "nofinish" numeric(1) NOT NULL DEFAULT 0 ,
+  "adjust" numeric(1) NOT NULL DEFAULT 1,
+  "dismissed" numeric(1) NOT NULL DEFAULT 0 ,
   "allow_cid" text NOT NULL,
   "allow_gid" text NOT NULL,
   "deny_cid" text NOT NULL,
   "deny_gid" text NOT NULL,
   "event_status" varchar(255) NOT NULL DEFAULT '',
   "event_status_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "event_percent" smallint NOT NULL DEFAULT '0',
+  "event_percent" smallint NOT NULL DEFAULT 0 ,
   "event_repeat" text NOT NULL,
-  "event_sequence" smallint NOT NULL DEFAULT '0',
-  "event_priority" smallint NOT NULL DEFAULT '0',
+  "event_sequence" smallint NOT NULL DEFAULT 0 ,
+  "event_priority" smallint NOT NULL DEFAULT 0 ,
   "event_vdata" text NOT NULL,
   PRIMARY KEY ("id")
 );
@@ -446,8 +446,8 @@ CREATE TABLE "groups" (
   "id" serial  NOT NULL,
   "hash" text NOT NULL DEFAULT '',
   "uid" bigint  NOT NULL,
-  "visible" numeric(1) NOT NULL DEFAULT '0',
-  "deleted" numeric(1) NOT NULL DEFAULT '0',
+  "visible" numeric(1) NOT NULL DEFAULT 0 ,
+  "deleted" numeric(1) NOT NULL DEFAULT 0 ,
   "gname" text NOT NULL,
   PRIMARY KEY ("id")
 
@@ -462,8 +462,8 @@ CREATE TABLE "hook" (
   "hook" text NOT NULL,
   "file" text NOT NULL,
   "fn" text NOT NULL,
-  "priority" smallint  NOT NULL DEFAULT '0',
-  "hook_version" smallint NOT NULL DEFAULT '0',
+  "priority" smallint  NOT NULL DEFAULT 0 ,
+  "hook_version" smallint NOT NULL DEFAULT 0 ,
   PRIMARY KEY ("id")
 
 );
@@ -478,8 +478,8 @@ CREATE TABLE "hubloc" (
   "hubloc_hash" text NOT NULL,
   "hubloc_addr" text NOT NULL DEFAULT '',
   "hubloc_network" text NOT NULL DEFAULT '',
-  "hubloc_flags" bigint  NOT NULL DEFAULT '0',
-  "hubloc_status" bigint  NOT NULL DEFAULT '0',
+  "hubloc_flags" bigint  NOT NULL DEFAULT 0 ,
+  "hubloc_status" bigint  NOT NULL DEFAULT 0 ,
   "hubloc_url" text NOT NULL DEFAULT '',
   "hubloc_url_sig" text NOT NULL DEFAULT '',
   "hubloc_host" text NOT NULL DEFAULT '',
@@ -488,10 +488,10 @@ CREATE TABLE "hubloc" (
   "hubloc_sitekey" text NOT NULL DEFAULT '',
   "hubloc_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "hubloc_connected" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "hubloc_primary" smallint NOT NULL DEFAULT '0',
-  "hubloc_orphancheck" smallint NOT NULL DEFAULT '0',
-  "hubloc_error" smallint NOT NULL DEFAULT '0',
-  "hubloc_deleted" smallint NOT NULL DEFAULT '0',
+  "hubloc_primary" smallint NOT NULL DEFAULT 0 ,
+  "hubloc_orphancheck" smallint NOT NULL DEFAULT 0 ,
+  "hubloc_error" smallint NOT NULL DEFAULT 0 ,
+  "hubloc_deleted" smallint NOT NULL DEFAULT 0 ,
   PRIMARY KEY ("hubloc_id")
 );
 create index "hubloc_url" on hubloc ("hubloc_url");
@@ -510,11 +510,11 @@ create index "hubloc_error" on hubloc ("hubloc_error");
 create index "hubloc_deleted" on hubloc ("hubloc_deleted");
 CREATE TABLE "iconfig" (
   "id" serial NOT NULL,
-  "iid" bigint NOT NULL DEFAULT '0',
+  "iid" bigint NOT NULL DEFAULT 0 ,
   "cat" text NOT NULL DEFAULT '',
   "k" text NOT NULL DEFAULT '',
   "v" text NOT NULL DEFAULT '',
-  "sharing" int NOT NULL DEFAULT '0',
+  "sharing" int NOT NULL DEFAULT 0 ,
   PRIMARY KEY("id")
 );
 create index "iconfig_iid" on iconfig ("iid");
@@ -541,9 +541,9 @@ create index "issue_component" on issue ("issue_component");
 CREATE TABLE "item" (
   "id" serial  NOT NULL,
   "mid" text  NOT NULL DEFAULT '',
-  "aid" bigint  NOT NULL DEFAULT '0',
-  "uid" bigint  NOT NULL DEFAULT '0',
-  "parent" bigint  NOT NULL DEFAULT '0',
+  "aid" bigint  NOT NULL DEFAULT 0 ,
+  "uid" bigint  NOT NULL DEFAULT 0 ,
+  "parent" bigint  NOT NULL DEFAULT 0 ,
   "parent_mid" text  NOT NULL DEFAULT '',
   "thr_parent" text NOT NULL DEFAULT '',
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -562,7 +562,7 @@ CREATE TABLE "item" (
   "html" text NOT NULL,
   "app" text NOT NULL DEFAULT '',
   "lang" varchar(64) NOT NULL DEFAULT '',
-  "revision" bigint  NOT NULL DEFAULT '0',
+  "revision" bigint  NOT NULL DEFAULT 0 ,
   "verb" text NOT NULL DEFAULT '',
   "obj_type" text NOT NULL DEFAULT '',
   "obj" text NOT NULL,
@@ -585,32 +585,32 @@ CREATE TABLE "item" (
   "allow_gid" text NOT NULL,
   "deny_cid" text NOT NULL,
   "deny_gid" text NOT NULL,
-  "item_restrict" bigint NOT NULL DEFAULT '0',
-  "item_flags" bigint NOT NULL DEFAULT '0',
-  "item_private" numeric(4) NOT NULL DEFAULT '0',
-  "item_unseen" smallint NOT NULL DEFAULT '0',
-  "item_wall" smallint NOT NULL DEFAULT '0',
-  "item_origin" smallint NOT NULL DEFAULT '0',
-  "item_starred" smallint NOT NULL DEFAULT '0',
-  "item_uplink" smallint NOT NULL DEFAULT '0',
-  "item_consensus" smallint NOT NULL DEFAULT '0',
-  "item_thread_top" smallint NOT NULL DEFAULT '0',
-  "item_notshown" smallint NOT NULL DEFAULT '0',
-  "item_nsfw" smallint NOT NULL DEFAULT '0',
-  "item_relay" smallint NOT NULL DEFAULT '0',
-  "item_mentionsme" smallint NOT NULL DEFAULT '0',
-  "item_nocomment" smallint NOT NULL DEFAULT '0',
-  "item_obscured" smallint NOT NULL DEFAULT '0',
-  "item_verified" smallint NOT NULL DEFAULT '0',
-  "item_retained" smallint NOT NULL DEFAULT '0',
-  "item_rss" smallint NOT NULL DEFAULT '0',
-  "item_deleted" smallint NOT NULL DEFAULT '0',
-  "item_type" int NOT NULL DEFAULT '0',
-  "item_hidden" smallint NOT NULL DEFAULT '0',
-  "item_unpublished" smallint NOT NULL DEFAULT '0',
-  "item_delayed" smallint NOT NULL DEFAULT '0',
-  "item_pending_remove" smallint NOT NULL DEFAULT '0',
-  "item_blocked" smallint NOT NULL DEFAULT '0',
+  "item_restrict" bigint NOT NULL DEFAULT 0 ,
+  "item_flags" bigint NOT NULL DEFAULT 0 ,
+  "item_private" numeric(4) NOT NULL DEFAULT 0 ,
+  "item_unseen" smallint NOT NULL DEFAULT 0 ,
+  "item_wall" smallint NOT NULL DEFAULT 0 ,
+  "item_origin" smallint NOT NULL DEFAULT 0 ,
+  "item_starred" smallint NOT NULL DEFAULT 0 ,
+  "item_uplink" smallint NOT NULL DEFAULT 0 ,
+  "item_consensus" smallint NOT NULL DEFAULT 0 ,
+  "item_thread_top" smallint NOT NULL DEFAULT 0 ,
+  "item_notshown" smallint NOT NULL DEFAULT 0 ,
+  "item_nsfw" smallint NOT NULL DEFAULT 0 ,
+  "item_relay" smallint NOT NULL DEFAULT 0 ,
+  "item_mentionsme" smallint NOT NULL DEFAULT 0 ,
+  "item_nocomment" smallint NOT NULL DEFAULT 0 ,
+  "item_obscured" smallint NOT NULL DEFAULT 0 ,
+  "item_verified" smallint NOT NULL DEFAULT 0 ,
+  "item_retained" smallint NOT NULL DEFAULT 0 ,
+  "item_rss" smallint NOT NULL DEFAULT 0 ,
+  "item_deleted" smallint NOT NULL DEFAULT 0 ,
+  "item_type" int NOT NULL DEFAULT 0 ,
+  "item_hidden" smallint NOT NULL DEFAULT 0 ,
+  "item_unpublished" smallint NOT NULL DEFAULT 0 ,
+  "item_delayed" smallint NOT NULL DEFAULT 0 ,
+  "item_pending_remove" smallint NOT NULL DEFAULT 0 ,
+  "item_blocked" smallint NOT NULL DEFAULT 0 ,
   "item_search_vector" tsvector,
   PRIMARY KEY ("id")
 );
@@ -712,9 +712,9 @@ create index "likes_target_type" on likes ("target_type");
 create index "likes_target_id" on likes ("target_id");
 CREATE TABLE "mail" (
   "id" serial  NOT NULL,
-  "convid" bigint  NOT NULL DEFAULT '0',
+  "convid" bigint  NOT NULL DEFAULT 0 ,
   "conv_guid" text NOT NULL,
-  "mail_flags" bigint  NOT NULL DEFAULT '0',
+  "mail_flags" bigint  NOT NULL DEFAULT 0 ,
   "from_xchan" text NOT NULL DEFAULT '',
   "to_xchan" text NOT NULL DEFAULT '',
   "account_id" bigint  NOT NULL DEFAULT '0',
@@ -726,13 +726,13 @@ CREATE TABLE "mail" (
   "attach" text NOT NULL DEFAULT '',
   "mid" text NOT NULL,
   "parent_mid" text NOT NULL,
-  "mail_deleted" smallint NOT NULL DEFAULT '0',
-  "mail_replied" smallint NOT NULL DEFAULT '0',
-  "mail_isreply" smallint NOT NULL DEFAULT '0',
-  "mail_seen" smallint NOT NULL DEFAULT '0',
-  "mail_recalled" smallint NOT NULL DEFAULT '0',
-  "mail_obscured" smallint NOT NULL DEFAULT '0',
-  "mail_raw" smallint NOT NULL DEFAULT '0',
+  "mail_deleted" smallint NOT NULL DEFAULT 0 ,
+  "mail_replied" smallint NOT NULL DEFAULT 0 ,
+  "mail_isreply" smallint NOT NULL DEFAULT 0 ,
+  "mail_seen" smallint NOT NULL DEFAULT 0 ,
+  "mail_recalled" smallint NOT NULL DEFAULT 0 ,
+  "mail_obscured" smallint NOT NULL DEFAULT 0 ,
+  "mail_raw" smallint NOT NULL DEFAULT 0 ,
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY ("id")
@@ -756,10 +756,10 @@ create index "mail_recalled" on mail ("mail_recalled");
 create index "mail_obscured" on mail ("mail_obscured");
 CREATE TABLE "menu" (
   "menu_id" serial  NOT NULL,
-  "menu_channel_id" bigint  NOT NULL DEFAULT '0',
+  "menu_channel_id" bigint  NOT NULL DEFAULT 0 ,
   "menu_name" text NOT NULL DEFAULT '',
   "menu_desc" text NOT NULL DEFAULT '',
-  "menu_flags" bigint NOT NULL DEFAULT '0',
+  "menu_flags" bigint NOT NULL DEFAULT 0 ,
   "menu_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "menu_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY ("menu_id")
@@ -773,14 +773,14 @@ CREATE TABLE "menu_item" (
   "mitem_id" serial  NOT NULL,
   "mitem_link" text NOT NULL DEFAULT '',
   "mitem_desc" text NOT NULL DEFAULT '',
-  "mitem_flags" bigint NOT NULL DEFAULT '0',
+  "mitem_flags" bigint NOT NULL DEFAULT 0 ,
   "allow_cid" text NOT NULL,
   "allow_gid" text NOT NULL,
   "deny_cid" text NOT NULL,
   "deny_gid" text NOT NULL,
   "mitem_channel_id" bigint  NOT NULL,
-  "mitem_menu_id" bigint  NOT NULL DEFAULT '0',
-  "mitem_order" bigint NOT NULL DEFAULT '0',
+  "mitem_menu_id" bigint  NOT NULL DEFAULT 0 ,
+  "mitem_order" bigint NOT NULL DEFAULT 0 ,
   PRIMARY KEY ("mitem_id")
 
 );
@@ -799,7 +799,7 @@ CREATE TABLE "notify" (
   "uid" bigint NOT NULL,
   "link" text NOT NULL,
   "parent" text NOT NULL DEFAULT '',
-  "seen" numeric(1) NOT NULL DEFAULT '0',
+  "seen" numeric(1) NOT NULL DEFAULT 0 ,
   "ntype" bigint NOT NULL,
   "verb" text NOT NULL,
   "otype" varchar(16) NOT NULL,
@@ -848,18 +848,18 @@ create index "obj_quantity" on obj ("obj_quantity");
 
 CREATE TABLE "outq" (
   "outq_hash" text NOT NULL,
-  "outq_account" bigint  NOT NULL DEFAULT '0',
-  "outq_channel" bigint  NOT NULL DEFAULT '0',
+  "outq_account" bigint  NOT NULL DEFAULT 0 ,
+  "outq_channel" bigint  NOT NULL DEFAULT 0 ,
   "outq_driver" varchar(32) NOT NULL DEFAULT '',
   "outq_posturl" text NOT NULL DEFAULT '',
-  "outq_async" numeric(1) NOT NULL DEFAULT '0',
-  "outq_delivered" numeric(1) NOT NULL DEFAULT '0',
+  "outq_async" numeric(1) NOT NULL DEFAULT 0 ,
+  "outq_delivered" numeric(1) NOT NULL DEFAULT 0 ,
   "outq_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "outq_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "outq_scheduled" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "outq_notify" text NOT NULL,
   "outq_msg" text NOT NULL,
-  "outq_priority" smallint NOT NULL DEFAULT '0',
+  "outq_priority" smallint NOT NULL DEFAULT 0 ,
   PRIMARY KEY ("outq_hash")
 );
 create index "outq_account" on outq ("outq_account");
@@ -887,7 +887,7 @@ create index "pchan_hash" on pchan ("pchan_hash");
 
 CREATE TABLE "pconfig" (
   "id" serial NOT NULL,
-  "uid" bigint NOT NULL DEFAULT '0',
+  "uid" bigint NOT NULL DEFAULT 0 ,
   "cat" text  NOT NULL,
   "k" text  NOT NULL,
   "v" text NOT NULL,
@@ -897,7 +897,7 @@ CREATE TABLE "pconfig" (
 
 CREATE TABLE "photo" (
   "id" serial  NOT NULL,
-  "aid" bigint  NOT NULL DEFAULT '0',
+  "aid" bigint  NOT NULL DEFAULT 0 ,
   "uid" bigint  NOT NULL,
   "xchan" text NOT NULL DEFAULT '',
   "resource_id" text NOT NULL,
@@ -910,16 +910,16 @@ CREATE TABLE "photo" (
   "mimetype" varchar(128) NOT NULL DEFAULT 'image/jpeg',
   "height" numeric(6) NOT NULL,
   "width" numeric(6) NOT NULL,
-  "filesize" bigint  NOT NULL DEFAULT '0',
+  "filesize" bigint  NOT NULL DEFAULT 0 ,
   "content" bytea NOT NULL,
-  "imgscale" numeric(3) NOT NULL DEFAULT '0',
-  "profile" numeric(1) NOT NULL DEFAULT '0',
-  "photo_usage" smallint NOT NULL DEFAULT '0',
-  "is_nsfw" smallint NOT NULL DEFAULT '0',
-  "os_storage" smallint NOT NULL DEFAULT '0',
+  "imgscale" numeric(3) NOT NULL DEFAULT 0 ,
+  "profile" numeric(1) NOT NULL DEFAULT 0 ,
+  "photo_usage" smallint NOT NULL DEFAULT 0 ,
+  "is_nsfw" smallint NOT NULL DEFAULT 0 ,
+  "os_storage" smallint NOT NULL DEFAULT 0 ,
   "os_path" text NOT NULL,
   "display_path" text NOT NULL,
-  "photo_flags" bigint  NOT NULL DEFAULT '0',
+  "photo_flags" bigint  NOT NULL DEFAULT 0 ,
   "allow_cid" text NOT NULL,
   "allow_gid" text NOT NULL,
   "deny_cid" text NOT NULL,
@@ -945,8 +945,8 @@ CREATE TABLE "poll" (
   "poll_guid" text NOT NULL,
   "poll_channel" bigint  NOT NULL DEFAULT '0',
   "poll_desc" text NOT NULL,
-  "poll_flags" bigint NOT NULL DEFAULT '0',
-  "poll_votes" bigint NOT NULL DEFAULT '0',
+  "poll_flags" bigint NOT NULL DEFAULT 0 ,
+  "poll_votes" bigint NOT NULL DEFAULT 0 ,
   PRIMARY KEY ("poll_id")
 
 );
@@ -959,8 +959,8 @@ CREATE TABLE "poll_elm" (
   "pelm_guid" text NOT NULL,
   "pelm_poll" bigint  NOT NULL DEFAULT '0',
   "pelm_desc" text NOT NULL,
-  "pelm_flags" bigint NOT NULL DEFAULT '0',
-  "pelm_result" float NOT NULL DEFAULT '0',
+  "pelm_flags" bigint NOT NULL DEFAULT 0 ,
+  "pelm_result" float NOT NULL DEFAULT 0 ,
   PRIMARY KEY ("pelm_id")
 );
 create index "pelm_guid" on poll_elm ("pelm_guid");
@@ -979,7 +979,7 @@ CREATE TABLE "profdef" (
 create index "profdef_field_name" on profdef ("field_name");
 CREATE TABLE "profext" (
   "id" serial  NOT NULL,
-  "channel_id" bigint  NOT NULL DEFAULT '0',
+  "channel_id" bigint  NOT NULL DEFAULT 0 ,
   "hash" text NOT NULL DEFAULT '',
   "k" text NOT NULL DEFAULT '',
   "v" text NOT NULL,
@@ -995,8 +995,8 @@ CREATE TABLE "profile" (
   "aid" bigint  NOT NULL DEFAULT '0',
   "uid" bigint NOT NULL,
   "profile_name" text NOT NULL,
-  "is_default" numeric(1) NOT NULL DEFAULT '0',
-  "hide_friends" numeric(1) NOT NULL DEFAULT '0',
+  "is_default" numeric(1) NOT NULL DEFAULT 0 ,
+  "hide_friends" numeric(1) NOT NULL DEFAULT 0 ,
   "fullname" text NOT NULL,
   "pdesc" text NOT NULL DEFAULT '',
   "chandesc" text NOT NULL DEFAULT '',
@@ -1033,7 +1033,7 @@ CREATE TABLE "profile" (
   "homepage" text NOT NULL DEFAULT '',
   "photo" text NOT NULL,
   "thumb" text NOT NULL,
-  "publish" numeric(1) NOT NULL DEFAULT '0',
+  "publish" numeric(1) NOT NULL DEFAULT 0 ,
   "profile_vcard" text NOT NULL DEFAULT '',
   PRIMARY KEY ("id"),
   UNIQUE ("profile_guid","uid")
@@ -1055,7 +1055,7 @@ create index "profile_guid" on profile ("profile_guid");
 CREATE TABLE "profile_check" (
   "id" serial  NOT NULL,
   "uid" bigint  NOT NULL,
-  "cid" bigint  NOT NULL DEFAULT '0',
+  "cid" bigint  NOT NULL DEFAULT 0 ,
   "dfrn_id" text NOT NULL,
   "sec" text NOT NULL,
   "expire" bigint NOT NULL,
@@ -1090,8 +1090,8 @@ create index "session_sid" on session ("sid");
 create index "session_expire" on session ("expire");
 CREATE TABLE "shares" (
   "share_id" serial  NOT NULL,
-  "share_type" bigint NOT NULL DEFAULT '0',
-  "share_target" bigint  NOT NULL DEFAULT '0',
+  "share_type" bigint NOT NULL DEFAULT 0 ,
+  "share_target" bigint  NOT NULL DEFAULT 0 ,
   "share_xchan" text NOT NULL DEFAULT '',
   PRIMARY KEY ("share_id")
 );
@@ -1101,8 +1101,8 @@ create index "share_xchan" on shares ("share_xchan");
 
 CREATE TABLE "sign" (
   "id" serial  NOT NULL,
-  "iid" bigint  NOT NULL DEFAULT '0',
-  "retract_iid" bigint  NOT NULL DEFAULT '0',
+  "iid" bigint  NOT NULL DEFAULT 0 ,
+  "retract_iid" bigint  NOT NULL DEFAULT 0 ,
   "signed_text" text NOT NULL,
   "signature" text NOT NULL,
   "signer" text NOT NULL,
@@ -1113,19 +1113,19 @@ create index "sign_retract_iid" on "sign" ("retract_iid");
 
 CREATE TABLE "site" (
   "site_url" text NOT NULL,
-  "site_access" bigint NOT NULL DEFAULT '0',
-  "site_flags" bigint NOT NULL DEFAULT '0',
+  "site_access" bigint NOT NULL DEFAULT 0 ,
+  "site_flags" bigint NOT NULL DEFAULT 0 ,
   "site_update" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "site_pull" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "site_sync" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "site_directory" text NOT NULL DEFAULT '',
-  "site_register" bigint NOT NULL DEFAULT '0',
+  "site_register" bigint NOT NULL DEFAULT 0 ,
   "site_sellpage" text NOT NULL DEFAULT '',
   "site_location" text NOT NULL DEFAULT '',
   "site_realm" text NOT NULL DEFAULT '',
-  "site_valid" smallint NOT NULL DEFAULT '0',
-  "site_dead" smallint NOT NULL DEFAULT '0',
-  "site_type" smallint NOT NULL DEFAULT '0',
+  "site_valid" smallint NOT NULL DEFAULT 0 ,
+  "site_dead" smallint NOT NULL DEFAULT 0 ,
+  "site_type" smallint NOT NULL DEFAULT 0 ,
   "site_project" text NOT NULL DEFAULT '',
   "site_version" text NOT NULL DEFAULT '',
   "site_crypto" text NOT NULL DEFAULT '',
@@ -1145,7 +1145,7 @@ create index "site_project" on site ("site_project");
 
 CREATE TABLE "source" (
   "src_id" serial  NOT NULL,
-  "src_channel_id" bigint  NOT NULL DEFAULT '0',
+  "src_channel_id" bigint  NOT NULL DEFAULT 0 ,
   "src_channel_xchan" text NOT NULL DEFAULT '',
   "src_xchan" text NOT NULL DEFAULT '',
   "src_patt" text NOT NULL DEFAULT '',
@@ -1165,8 +1165,8 @@ CREATE TABLE "sys_perms" (
 );
 CREATE TABLE "term" (
   "tid" serial  NOT NULL,
-  "aid" bigint  NOT NULL DEFAULT '0',
-  "uid" bigint  NOT NULL DEFAULT '0',
+  "aid" bigint  NOT NULL DEFAULT 0 ,
+  "uid" bigint  NOT NULL DEFAULT 0 ,
   "oid" bigint  NOT NULL,
   "otype" numeric(3)  NOT NULL,
   "ttype" numeric(3)  NOT NULL,
@@ -1205,7 +1205,7 @@ CREATE TABLE "updates" (
   "ud_guid" text NOT NULL DEFAULT '',
   "ud_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "ud_last" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "ud_flags" bigint NOT NULL DEFAULT '0',
+  "ud_flags" bigint NOT NULL DEFAULT 0 ,
   "ud_addr" text NOT NULL DEFAULT '',
   PRIMARY KEY ("ud_id")
 );
@@ -1217,7 +1217,7 @@ create index "ud_addr" on updates ("ud_addr");
 create index "ud_last" on updates ("ud_last");
 CREATE TABLE "verify" (
   "id" serial  NOT NULL,
-  "channel" bigint  NOT NULL DEFAULT '0',
+  "channel" bigint  NOT NULL DEFAULT 0 ,
   "vtype" varchar(32) NOT NULL DEFAULT '',
   "token" text NOT NULL DEFAULT '',
   "meta" text NOT NULL DEFAULT '',
@@ -1259,16 +1259,16 @@ CREATE TABLE "xchan" (
   "xchan_name" text NOT NULL DEFAULT '',
   "xchan_network" text NOT NULL DEFAULT '',
   "xchan_instance_url" text NOT NULL DEFAULT '',
-  "xchan_flags" bigint  NOT NULL DEFAULT '0',
+  "xchan_flags" bigint  NOT NULL DEFAULT 0 ,
   "xchan_photo_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "xchan_name_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "xchan_hidden" smallint NOT NULL DEFAULT '0',
-  "xchan_orphan" smallint NOT NULL DEFAULT '0',
-  "xchan_censored" smallint NOT NULL DEFAULT '0',
-  "xchan_selfcensored" smallint NOT NULL DEFAULT '0',
-  "xchan_system" smallint NOT NULL DEFAULT '0',
-  "xchan_pubforum" smallint NOT NULL DEFAULT '0',
-  "xchan_deleted" smallint NOT NULL DEFAULT '0',
+  "xchan_hidden" smallint NOT NULL DEFAULT 0 ,
+  "xchan_orphan" smallint NOT NULL DEFAULT 0 ,
+  "xchan_censored" smallint NOT NULL DEFAULT 0 ,
+  "xchan_selfcensored" smallint NOT NULL DEFAULT 0 ,
+  "xchan_system" smallint NOT NULL DEFAULT 0 ,
+  "xchan_pubforum" smallint NOT NULL DEFAULT 0 ,
+  "xchan_deleted" smallint NOT NULL DEFAULT 0 ,
   PRIMARY KEY ("xchan_hash")
 );
 create index "xchan_guid" on xchan ("xchan_guid");
@@ -1313,7 +1313,7 @@ create index "xconfig_cat" on xconfig ("cat");
 create index "xconfig_k" on xconfig ("k");
 CREATE TABLE "xign" (
   "id" serial  NOT NULL,
-  "uid" bigint NOT NULL DEFAULT '0',
+  "uid" bigint NOT NULL DEFAULT 0 ,
   "xchan" text NOT NULL DEFAULT '',
   PRIMARY KEY ("id")
 );
@@ -1323,10 +1323,10 @@ CREATE TABLE "xlink" (
   "xlink_id" serial  NOT NULL,
   "xlink_xchan" text NOT NULL DEFAULT '',
   "xlink_link" text NOT NULL DEFAULT '',
-  "xlink_rating" bigint NOT NULL DEFAULT '0',
+  "xlink_rating" bigint NOT NULL DEFAULT 0 ,
   "xlink_rating_text" TEXT NOT NULL DEFAULT '',
   "xlink_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "xlink_static" numeric(1) NOT NULL DEFAULT '0',
+  "xlink_static" numeric(1) NOT NULL DEFAULT 0 ,
   "xlink_sig" text NOT NULL DEFAULT '',
   PRIMARY KEY ("xlink_id")
 );
@@ -1338,7 +1338,7 @@ create index "xlink_static" on xlink ("xlink_static");
 CREATE TABLE "xperm" (
   "xp_id" serial NOT NULL,
   "xp_client" varchar( 20 ) NOT NULL DEFAULT '',
-  "xp_channel" bigint NOT NULL DEFAULT '0',
+  "xp_channel" bigint NOT NULL DEFAULT 0 ,
   "xp_perm" varchar( 64 ) NOT NULL DEFAULT '',
   PRIMARY KEY ("xp_id")
 );
@@ -1347,7 +1347,7 @@ create index "xp_channel" on xperm ("xp_channel");
 create index "xp_perm" on xperm ("xp_perm");
 CREATE TABLE "xprof" (
   "xprof_hash" text NOT NULL,
-  "xprof_age" numeric(3)  NOT NULL DEFAULT '0',
+  "xprof_age" numeric(3)  NOT NULL DEFAULT 0 ,
   "xprof_desc" text NOT NULL DEFAULT '',
   "xprof_dob" varchar(12) NOT NULL DEFAULT '',
   "xprof_gender" text NOT NULL DEFAULT '',
@@ -1378,7 +1378,7 @@ CREATE TABLE "xtag" (
   "xtag_id" serial  NOT NULL,
   "xtag_hash" text NOT NULL,
   "xtag_term" text NOT NULL DEFAULT '',
-  "xtag_flags" bigint NOT NULL DEFAULT '0',
+  "xtag_flags" bigint NOT NULL DEFAULT 0 ,
   PRIMARY KEY ("xtag_id")
 );
 create index "xtag_term" on xtag ("xtag_term");

util/update_autoloader

@@ -0,0 +1,2 @@
+#!/bin/bash -f
+composer install --optimize-autoloader --no-dev

util/zotsh/zotsh.py

@@ -55,7 +55,7 @@ class ZotSH(object):
     @session.setter
     def session(self, session):
         self._session = session
-        self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="cloud", verify_ssl=VERIFY_SSL)
+        self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="dav", verify_ssl=VERIFY_SSL)
         
     @property
     def PS1(self):
@@ -205,7 +205,7 @@ class ZotSH(object):
                 print _fmt('d', 0, "../")
                 
         for f in r:
-            name = f.name.replace("/cloud"+self.davclient.cwd,"")
+            name = f.name.replace("/dav"+self.davclient.cwd,"")
             type = "-"
             if name.endswith("/"):
                 type = "d"

view/css/mod_admin.css

@@ -70,3 +70,21 @@
 	margin-top: 0px !important;
 	margin-left: 0px !important;
 }
+
+pre code {
+	background: #F5F5F5;
+	font-family: Courier, monospace;
+	font-size: 1em;
+	padding: 1em 1.5em;
+	display: block;
+	white-space: pre-wrap;
+}
+
+code {
+	background: #F5F5F5;
+	font-family: Courier, monospace;
+	font-size: 1em;
+	display: inline;
+	padding: 0.2em 0.2em;
+	white-space: pre-wrap;
+}

view/de-de/hstrings.php

@@ -71,9 +71,8 @@ App::$strings["2. Enter my \$Projectname network address into the site searchbar
 App::$strings["or visit"] = "oder besuche";
 App::$strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]";
 App::$strings["Submit"] = "Absenden";
-App::$strings["Cards"] = "Karten";
-App::$strings["Add Article"] = "Artikel hinzufügen";
 App::$strings["Articles"] = "Artikel";
+App::$strings["Add Article"] = "Artikel hinzufügen";
 App::$strings["Item not found"] = "Element nicht gefunden";
 App::$strings["Layout Name"] = "Layout-Name";
 App::$strings["Layout Description (Optional)"] = "Layout-Beschreibung (optional)";
@@ -151,7 +150,8 @@ App::$strings["You may also export your posts and conversations for a particular
 App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1\$s\">%2\$s</a>.";
 App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1\$s\">%2\$s</a>.";
 App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1\$s\">%2\$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst.";
-App::$strings["Welcome to hubzilla!"] = "Willkommen bei Hubzilla!";
+App::$strings["Welcome to Hubzilla!"] = "Willkommen bei Hubzilla!";
+App::$strings["You have got no unseen posts..."] = "Du hast keine ungelesenen Beiträge...";
 App::$strings["Public access denied."] = "Öffentlichen Zugriff verweigert.";
 App::$strings["Search"] = "Suche";
 App::$strings["Items tagged with: %s"] = "Beiträge mit Schlagwort: %s";
@@ -282,6 +282,7 @@ App::$strings["Read more about roles"] = "Mehr Informationen über Rollen";
 App::$strings["Create Channel"] = "Einen neuen Kanal anlegen";
 App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen.";
 App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server.";
+App::$strings["Validate"] = "Überprüfe";
 App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden.";
 App::$strings["Remove This Channel"] = "Diesen Kanal löschen";
 App::$strings["WARNING: "] = "WARNUNG: ";
@@ -319,7 +320,7 @@ App::$strings["Database Login Password"] = "Datenbank-Passwort";
 App::$strings["Database Name"] = "Datenbankname";
 App::$strings["Database Type"] = "Datenbanktyp";
 App::$strings["Site administrator email address"] = "E-Mail Adresse des Seiten-Administrators";
-App::$strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse Deines Accounts muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst.";
+App::$strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse Deines Kontos muss dieser Adresse entsprechen, damit Du Zugriff zur Administrations-Seite erhältst.";
 App::$strings["Website URL"] = "Webseiten-URL";
 App::$strings["Please use SSL (https) URL if available."] = "Nutze wenn möglich eine SSL-URL (https).";
 App::$strings["Please select a default timezone for your website"] = "Standard-Zeitzone für Deinen Server";
@@ -412,10 +413,10 @@ App::$strings["Executing %s failed. Check system logs."] = "Ausführen von %s fe
 App::$strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich ausgeführt.";
 App::$strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt.";
 App::$strings["Update function %s could not be found."] = "Update-Funktion %s konnte nicht gefunden werden.";
-App::$strings["No failed updates."] = "Keine fehlgeschlagenen Aktualisierungen.";
 App::$strings["Failed Updates"] = "Fehlgeschlagene Aktualisierungen";
 App::$strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)";
 App::$strings["Attempt to execute this update step automatically"] = "Versuche, diesen Updateschritt automatisch auszuführen";
+App::$strings["No failed updates."] = "Keine fehlgeschlagenen Aktualisierungen.";
 App::$strings["Item not found."] = "Element nicht gefunden.";
 App::$strings["Plugin %s disabled."] = "Plug-In %s deaktiviert.";
 App::$strings["Plugin %s enabled."] = "Plug-In %s aktiviert.";
@@ -542,6 +543,7 @@ App::$strings["Used to provide a member experience matched to technical comfort
 App::$strings["Lock the technical skill level setting"] = "Sperre die technische Qualifikationsstufe";
 App::$strings["Members can set their own technical comfort level by default"] = "Benutzer können standardmäßig ihre eigene technische Qualifikationsstufe einstellen";
 App::$strings["Banner/Logo"] = "Banner/Logo";
+App::$strings["Unfiltered HTML/CSS/JS is allowed"] = "Ungefiltertes HTML/CSS/JS ist erlaubt";
 App::$strings["Administrator Information"] = "Administrator-Informationen";
 App::$strings["Contact information for site administrators.  Displayed on siteinfo page.  BBCode can be used here"] = "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden.";
 App::$strings["Site Information"] = "Seiteninformationen";
@@ -558,6 +560,8 @@ App::$strings["Maximum size in bytes of uploaded images. Default is 0, which mea
 App::$strings["Does this site allow new member registration?"] = "Erlaubt dieser Server die Registrierung neuer Nutzer?";
 App::$strings["Invitation only"] = "Nur mit Einladung";
 App::$strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Erlaube die Neuregistrierung von Mitglieder nur mit einem Einladungscode. Die Registrierungs-Politik muss oben auf Ja gesetzt werden.";
+App::$strings["Minimum age"] = "Mindestalter";
+App::$strings["Minimum age (in years) for who may register on this site."] = "Mindestalter (in Jahren) für alle, die sich auf dieser Website anmelden möchten.";
 App::$strings["Which best describes the types of account offered by this hub?"] = "Was ist die passendste Beschreibung der Konten auf diesem Hub?";
 App::$strings["Register text"] = "Registrierungstext";
 App::$strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
@@ -575,6 +579,10 @@ App::$strings["Force publish"] = "Veröffentlichung erzwingen";
 App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen.";
 App::$strings["Import Public Streams"] = "Öffentliche Beiträge importieren";
 App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Öffentliche Beiträge von anderen Servern importieren und zur Verfügung stellen. Warnung: Diese Inhalte sind nicht moderiert.";
+App::$strings["Site only Public Streams"] = "Öffentlichen Beitragsstrom auf diesen Server beschränken";
+App::$strings["Allow access to public content originating only from this site if Imported Public Streams are disabled."] = "Erlaubt den Zugriff auf öffentliche Beiträge von ausschließlich dieser Website (diesem Server), wenn \"Öffentliche Beiträge importieren\" ausgeschaltet ist.";
+App::$strings["Allow anybody on the internet to access the Public streams"] = "Allen im Internet Zugriff auf den öffentlichen Beitragsstrom erlauben";
+App::$strings["Disable to require authentication before viewing. Warning: this content is unmoderated."] = "Deaktiviert die erforderliche Authentifizierung vor dem Ansehen. Warnung: Diese Inhalte sind nicht moderiert.";
 App::$strings["Login on Homepage"] = "Log-in auf der Startseite";
 App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = "Zeigt Besuchern der Homepage eine Anmeldemaske, falls keine anderen Inhalte konfiguriert wurden.";
 App::$strings["Enable context help"] = "Kontext-Hilfe aktivieren";
@@ -604,6 +612,12 @@ App::$strings["Maximum Load Average"] = "Maximales Load Average";
 App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50";
 App::$strings["Expiration period in days for imported (grid/network) content"] = "Setze den Zeitraum (in Tagen), ab wann importierte (aus dem Netzwerk) Inhalte ablaufen sollen";
 App::$strings["0 for no expiration of imported content"] = "0 = keine Löschung importierter Inhalte";
+App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Öffentliche Server: Optionale Einstiegsseite (landing page) für neue Mitglieder vor deren Anmeldung";
+App::$strings["Create this page first. Default is %s/register"] = "Erstelle zunächst die entsprechende Seite. Standard ist %s/register";
+App::$strings["Page to display after creating a new channel"] = "Seite, die nach Erstellung eines neuen Kanals angezeigt werden soll";
+App::$strings["Recommend: profiles, go, or settings"] = "Empfohlen: profiles, go oder settings";
+App::$strings["Optional: site location"] = "Optional: Standort der Website";
+App::$strings["Region or country"] = "Region oder Land";
 App::$strings["New Profile Field"] = "Neues Profilfeld";
 App::$strings["Field nickname"] = "Kurzname für das Feld";
 App::$strings["System name of field"] = "Systemname des Feldes";
@@ -754,8 +768,8 @@ App::$strings["If your channel is mirrored to multiple hubs, set this to your pr
 App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen anzeigen";
 App::$strings["Notify me of events this many days in advance"] = "Benachrichtige mich zu Terminen so viele Tage im Voraus";
 App::$strings["Must be greater than 0"] = "Muss größer als 0 sein";
-App::$strings["Advanced Account/Page Type Settings"] = "Erweiterte Account- und Seitenart-Einstellungen";
-App::$strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Accounts unter speziellen Umständen";
+App::$strings["Advanced Account/Page Type Settings"] = "Erweiterte Konten- und Seitenart-Einstellungen";
+App::$strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten dieses Kontos unter speziellen Umständen";
 App::$strings["Miscellaneous Settings"] = "Sonstige Einstellungen";
 App::$strings["Default photo upload folder"] = "Voreingestellter Ordner für hochgeladene Fotos";
 App::$strings["%Y - current year, %m -  current month"] = "%Y - aktuelles Jahr, %m -  aktueller Monat";
@@ -790,16 +804,18 @@ App::$strings["Enter New Password"] = "Gib ein neues Passwort ein";
 App::$strings["Confirm New Password"] = "Bestätige das neue Passwort";
 App::$strings["Leave password fields blank unless changing"] = "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern";
 App::$strings["Your technical skill level"] = "Deine technische Qualifikationsstufe";
-App::$strings["Used to provide a member experience matched to your comfort level"] = "Dies wird verwendet, um Dir eine Benutzererfahrung  passend zu Deiner technischen Qualifikationsstufe zu bieten.";
+App::$strings["Used to provide a member experience and additional features consistent with your comfort level"] = "Dies wird verwendet, um Dir eine Benutzererfahrung sowie zusätzliche Funktionen passend zu Deiner technischen Qualifikationsstufe zu bieten (Bedienkomfort beim Umgang mit Anwendungen).";
 App::$strings["Remove Account"] = "Konto entfernen";
 App::$strings["Remove this account including all its channels"] = "Dieses Konto inklusive all seiner Kanäle löschen";
 App::$strings["Affinity Slider settings updated."] = "Die Beziehungsgrad-Schieberegler-Einstellungen wurden aktualisiert.";
 App::$strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
 App::$strings["Default maximum affinity level"] = "Voreinstellung für maximalen Beziehungsgrad";
+App::$strings["0-99 default 99"] = "0-99 - Standard 99";
 App::$strings["Default minimum affinity level"] = "Voreinstellung für minimalen Beziehungsgrad";
+App::$strings["0-99 - default 0"] = "0-99 - Standard 0";
 App::$strings["Affinity Slider Settings"] = "Beziehungsgrad-Schieberegler-Einstellungen";
-App::$strings["Feature/Addon Settings"] = "Funktions-/Addon-Einstellungen";
-App::$strings["No special theme for mobile devices"] = "Kein spezielles Design für mobile Geräte";
+App::$strings["Addon Settings"] = "Addon-Einstellungen";
+App::$strings["Please save/submit changes to any panel before opening another."] = "Bitte speichere alle Änderungen in diesem Bereich, bevor Du einen anderen öffnest.";
 App::$strings["%s - (Experimental)"] = "%s – (experimentell)";
 App::$strings["Display Settings"] = "Anzeige-Einstellungen";
 App::$strings["Theme Settings"] = "Design-Einstellungen";
@@ -807,7 +823,6 @@ App::$strings["Custom Theme Settings"] = "Benutzerdefinierte Design-Einstellunge
 App::$strings["Content Settings"] = "Inhaltseinstellungen";
 App::$strings["Display Theme:"] = "Anzeige-Design:";
 App::$strings["Select scheme"] = "Schema wählen";
-App::$strings["Mobile Theme:"] = "Design für mobile Geräte:";
 App::$strings["Preload images before rendering the page"] = "Bilder im voraus laden, bevor die Seite angezeigt wird";
 App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "Die empfundene Ladezeit wird sich erhöhen, aber dafür ist das Layout stabil, sobald eine Seite angezeigt wird";
 App::$strings["Enable user zoom on mobile devices"] = "Zoom auf Mobilgeräten aktivieren";
@@ -1082,10 +1097,10 @@ App::$strings["Photo not available."] = "Foto nicht verfügbar.";
 App::$strings["Upload File:"] = "Datei hochladen:";
 App::$strings["Select a profile:"] = "Wähle ein Profil:";
 App::$strings["Use Photo for Profile"] = "Foto für Profil verwenden";
-App::$strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch";
+App::$strings["Change Profile Photo"] = "Profilfoto ändern";
 App::$strings["Use"] = "Verwenden";
-App::$strings["skip this step"] = "diesen Schritt überspringen";
-App::$strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben";
+App::$strings["Use a photo from your albums"] = "Ein Foto aus meinen Alben verwenden";
+App::$strings["Select existing photo"] = "Wähle ein vorhandenes Foto aus";
 App::$strings["Crop Image"] = "Bild zuschneiden";
 App::$strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu.";
 App::$strings["Done Editing"] = "Bearbeitung fertigstellen";
@@ -1164,6 +1179,7 @@ App::$strings["Connection: %s"] = "Verbindung: %s";
 App::$strings["Apply these permissions automatically"] = "Diese Berechtigungen automatisch anwenden";
 App::$strings["Connection requests will be approved without your interaction"] = "Verbindungsanfragen werden sofort bestätigt, ohne dass Deine aktive Zustimmung erforderlich ist.";
 App::$strings["Permission role"] = "Berechtigungsrolle";
+App::$strings["Loading"] = "Lädt...";
 App::$strings["Add permission role"] = "Berechtigungsrolle hinzufügen";
 App::$strings["This connection's primary address is"] = "Die Hauptadresse der Verbindung ist";
 App::$strings["Available locations:"] = "Verfügbare Klone:";
@@ -1227,7 +1243,13 @@ App::$strings["Help"] = "Hilfe";
 App::$strings["Comanche page description language help"] = "Hilfe zur Comanche-Seitenbeschreibungssprache";
 App::$strings["Layout Description"] = "Layout-Beschreibung";
 App::$strings["Download PDL file"] = "PDL-Datei herunterladen";
+App::$strings["Please refresh page"] = "Bitte die Seite neu laden";
 App::$strings["Unknown error"] = "Unbekannter Fehler";
+App::$strings["Token verification failed."] = "Überprüfung des Verifizierungscodes fehlgeschlagen.";
+App::$strings["Email Verification Required"] = "Email-Überprüfung erforderlich";
+App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = "Ein Verifizierungscode wurde an Deine Emailadresse versendet [%s]. Gib diesen Code hier ein, um die Überprüfung abzuschließen. Bedenke, dass die Zustellung der Mail einige Zeit dauern kann, und überprüfe ggf. auch Spam- und andere Filter-Ordner, falls die Nachricht nicht erscheint.";
+App::$strings["Resend Email"] = "Email erneut versenden";
+App::$strings["Validation token"] = "Verifizierungscode";
 App::$strings["Post not found."] = "Beitrag nicht gefunden.";
 App::$strings["post"] = "Beitrag";
 App::$strings["comment"] = "Kommentar";
@@ -1319,6 +1341,21 @@ App::$strings["My other channels"] = "Meine anderen Kanäle";
 App::$strings["Communications"] = "Kommunikation";
 App::$strings["Profile Image"] = "Profilfoto:";
 App::$strings["Edit Profiles"] = "Profile bearbeiten";
+App::$strings["This page is available only to site members"] = "Diese Seite ist nur für Mitglieder verfügbar";
+App::$strings["Welcome"] = "Willkommen";
+App::$strings["What would you like to do?"] = "Was möchtest Du gerne tun?";
+App::$strings["Please bookmark this page if you would like to return to it in the future"] = "Bitte speichere diese Seite in Deinen Lesezeichen, falls Du später zu ihr zurückkehren möchtest.";
+App::$strings["Upload a profile photo"] = "Ein Profilfoto hochladen";
+App::$strings["Upload a cover photo"] = "Ein Titelbild hochladen";
+App::$strings["Edit your default profile"] = "Dein Standardprofil bearbeiten";
+App::$strings["View friend suggestions"] = "Freundschafts- und Verbindungsvorschläge ansehen";
+App::$strings["View the channel directory"] = "Das Kanalverzeichnis ansehen";
+App::$strings["View/edit your channel settings"] = "Deine Kanaleinstellungen ansehen/bearbeiten";
+App::$strings["View the site or project documentation"] = "Die Website-/Projektdokumentation ansehen";
+App::$strings["Visit your channel homepage"] = "Deine Kanal-Startseite aufrufen";
+App::$strings["View your connections and/or add somebody whose address you already know"] = "Deine Verbindungen ansehen und/oder jemanden hinzufügen, dessen Kanal-Adresse Du bereits kennst";
+App::$strings["View your personal stream (this may be empty until you add some connections)"] = "Deinen persönlichen Beitragsstrom ansehen (dieser kann leer sein, bis Du ein paar Verbindungen hinzugefügt hast)";
+App::$strings["View the public stream. Warning: this content is not moderated"] = "Den öffentlichen Beitragsstrom ansehen. Warnung: Diese Inhalte sind nicht moderiert.";
 App::$strings["Page link"] = "Seiten-Link";
 App::$strings["Edit Webpage"] = "Webseite bearbeiten";
 App::$strings["Create a new channel"] = "Neuen Kanal anlegen";
@@ -1504,6 +1541,7 @@ App::$strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen
 App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
 App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
 App::$strings["Passwords do not match."] = "Passwörter stimmen nicht überein.";
+App::$strings["Registration successful. Continue to create your first channel..."] = "Registrierung erfolgreich. Fahre fort, indem Du Deinen ersten Kanal anlegst...";
 App::$strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
 App::$strings["Registration successful. Continue to create your first channel..."] = "Registrierung erfolgreich. Fahre fort, indem Du Deinen ersten Kanal anlegst...";
 App::$strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
@@ -1522,7 +1560,7 @@ App::$strings["no"] = "nein";
 App::$strings["yes"] = "ja";
 App::$strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
 App::$strings["Register"] = "Registrieren";
-App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "Diese Seite verlangt möglicherweise eine Emailbestätigung nach dem Absenden des Formulars. Wenn Du auf eine Login-Seite zurückgeleitet wirst, prüfe bitte Deinen Posteingang auf neue Mails mit entsprechenden Hinweisen.";
+App::$strings["This site requires email verification. After completing this form, please check your email for further instructions."] = "Diese Website erfordert eine Email-Bestätigung. Bitte prüfe Deine Emails nach Ausfüllen und Absenden des Formulars, um weitere Hinweise zu bekommen.";
 App::$strings["Cover Photos"] = "Cover Foto";
 App::$strings["female"] = "weiblich";
 App::$strings["%1\$s updated her %2\$s"] = "%1\$s hat ihr %2\$s aktualisiert";
@@ -1530,7 +1568,7 @@ App::$strings["male"] = "männlich";
 App::$strings["%1\$s updated his %2\$s"] = "%1\$s hat sein %2\$s aktualisiert";
 App::$strings["%1\$s updated their %2\$s"] = "%1\$s hat sein/ihr %2\$s aktualisiert";
 App::$strings["cover photo"] = "Cover Foto";
-App::$strings["Upload Cover Photo"] = "Cover Foto hochladen";
+App::$strings["Change Cover Photo"] = "Titelbild ändern";
 App::$strings["Documentation Search"] = "Suche in der Dokumentation";
 App::$strings["About"] = "Über";
 App::$strings["Administrators"] = "Administratoren";
@@ -1568,6 +1606,8 @@ App::$strings["Show in your contacts shared folder"] = "Im geteilten Ordner Dein
 App::$strings["No channel."] = "Kein Kanal.";
 App::$strings["No connections in common."] = "Keine gemeinsamen Verbindungen.";
 App::$strings["View Common Connections"] = "Zeige gemeinsame Verbindungen";
+App::$strings["Email verification resent"] = "Email zur Verifizierung wurde erneut versendet";
+App::$strings["Unable to resend email verification message."] = "Erneutes Versenden der Email zur Verifizierung nicht möglich.";
 App::$strings["No connections."] = "Keine Verbindungen.";
 App::$strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen";
 App::$strings["View Connections"] = "Verbindungen anzeigen";
@@ -1684,15 +1724,21 @@ App::$strings["\$Projectname Notification"] = "\$Projectname-Benachrichtigung";
 App::$strings["\$projectname"] = "\$projectname";
 App::$strings["Thank You,"] = "Danke.";
 App::$strings["%s Administrator"] = "der Administrator von %s";
+App::$strings["This email was sent by %1\$s at %2\$s."] = "Diese Email wurde von %1\$s auf %2\$s gesendet.";
+App::$strings["To stop receiving these messages, please adjust your Notification Settings at %s"] = "Um diese Nachrichten nicht mehr zu erhalten, passe bitte Deine Benachrichtigungseinstellungen unter folgendem Link an: %s";
+App::$strings["To stop receiving these messages, please adjust your %s."] = "Um diese Nachrichten nicht mehr zu erhalten, passe bitte Deine %s an.";
 App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
 App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Benachrichtigung] Neue Mail empfangen auf %s";
 App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s hat Dir eine private Nachricht auf %3\$s gesendet.";
 App::$strings["%1\$s sent you %2\$s."] = "%1\$s hat Dir %2\$s geschickt.";
 App::$strings["a private message"] = "eine private Nachricht";
 App::$strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten.";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]einen %4\$s[/zrl] kommentiert";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]%4\$ss %5\$s[/zrl] kommentiert";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s hat [zrl=%3\$s]Deinen %4\$s[/zrl] kommentiert";
+App::$strings["commented on"] = "kommentierte";
+App::$strings["liked"] = "gefiel";
+App::$strings["disliked"] = "missfiel";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]a %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]ein %5\$s[/zrl]";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]%5\$s's %6\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]%5\$s's %6\$s[/zrl]";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]your %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]Dein %5\$s[/zrl]";
 App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Moderierter Kommantar in Unterhaltung #%1\$d von %2\$s";
 App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Benachrichtigung] Kommentar in Unterhaltung #%1\$d von %2\$s";
 App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s hat eine Unterhaltung kommentiert, der Du folgst.";
@@ -1727,6 +1773,8 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Bitte b
 App::$strings["[\$Projectname:Notify]"] = "[\$Projectname:Benachrichtigung]";
 App::$strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
 App::$strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
+App::$strings["edited a post dated %s"] = "hat einen Beitrag vom %s bearbeitet";
+App::$strings["edited a comment dated %s"] = "hat einen Kommentar vom %s bearbeitet";
 App::$strings["Wiki updated successfully"] = "Wiki erfolgreich aktualisiert";
 App::$strings["Wiki files deleted successfully"] = "Wiki-Dateien erfolgreich gelöscht";
 App::$strings["Update Error at %s"] = "Aktualisierungsfehler auf %s";
@@ -1865,6 +1913,18 @@ App::$strings["Suggestions"] = "Vorschläge";
 App::$strings["See more..."] = "Mehr anzeigen …";
 App::$strings["Saved Folders"] = "Gespeicherte Ordner";
 App::$strings["Click to show more"] = "Klick, um mehr anzuzeigen";
+App::$strings["Profile Creation"] = "Profilerstellung";
+App::$strings["Upload profile photo"] = "Profilfoto hochladen";
+App::$strings["Upload cover photo"] = "Titelbild hochladen";
+App::$strings["Edit your profile"] = "Profil bearbeiten";
+App::$strings["Find and Connect with others"] = "Finden und Verbinden von/mit Anderen";
+App::$strings["Manage your connections"] = "Deine Verbindungen verwalten";
+App::$strings["Communicate"] = "Kommunizieren";
+App::$strings["View your channel homepage"] = "Deine Kanal-Startseite ansehen";
+App::$strings["View your network stream"] = "Deine Netzwerk-Aktivitäten ansehen";
+App::$strings["Documentation"] = "Dokumentation";
+App::$strings["View public stream. Warning: not moderated"] = "Öffentliche Beitragsaktivitäten ansehen. Warnung: Diese Inhalte sind nicht moderiert.";
+App::$strings["New Member Links"] = "Links für neue Mitglieder";
 App::$strings["Member registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
 App::$strings["Inspect queue"] = "Warteschlange kontrollieren";
 App::$strings["DB updates"] = "DB-Aktualisierungen";
@@ -1873,7 +1933,7 @@ App::$strings["Plugin Features"] = "Plug-In Funktionen";
 App::$strings["Account settings"] = "Konto-Einstellungen";
 App::$strings["Channel settings"] = "Kanal-Einstellungen";
 App::$strings["Additional features"] = "Zusätzliche Funktionen";
-App::$strings["Feature/Addon settings"] = "Plugin-Einstellungen";
+App::$strings["Addon settings"] = "Addon-Einstellungen";
 App::$strings["Display settings"] = "Anzeige-Einstellungen";
 App::$strings["Manage locations"] = "Klon-Adressen verwalten";
 App::$strings["Export channel"] = "Kanal exportieren";
@@ -1886,6 +1946,7 @@ App::$strings["New Network Activity Notifications"] = "Benachrichtigungen für n
 App::$strings["View your network activity"] = "Zeige Deine Netzwerk-Aktivitäten";
 App::$strings["Mark all notifications read"] = "Alle Benachrichtigungen als gesehen markieren";
 App::$strings["Show new posts only"] = "Zeige nur neue Beiträge";
+App::$strings["Filter by name"] = "Nach Namen filtern";
 App::$strings["New Home Activity"] = "Neue Kanal-Aktivitäten";
 App::$strings["New Home Activity Notifications"] = "Benachrichtigungen für neue Kanal-Aktivitäten";
 App::$strings["View your home activity"] = "Zeige Deine Kanal-Aktivitäten";
@@ -1909,7 +1970,7 @@ App::$strings["New Registrations"] = "Neue Registrierungen";
 App::$strings["New Registrations Notifications"] = "Benachrichtigungen für neue Registrierungen";
 App::$strings["Public Stream Notifications"] = "Benachrichtigungen für öffentlichen Beitrags-Stream";
 App::$strings["View the public stream"] = "Zeige öffentlichen Beitrags-Stream";
-App::$strings["Loading"] = "Lädt...";
+App::$strings["Sorry, you have got no notifications at the moment"] = "Du hast momentan keine Benachrichtigungen";
 App::$strings["Source channel not found."] = "Quellkanal nicht gefunden.";
 App::$strings["Create an account to access services and applications"] = "Erstelle ein Konto, um auf Dienste und Anwendungen zugreifen zu können.";
 App::$strings["Logout"] = "Abmelden";
@@ -1917,7 +1978,6 @@ App::$strings["Login/Email"] = "Anmelden/E-Mail";
 App::$strings["Password"] = "Kennwort";
 App::$strings["Remember me"] = "Angaben speichern";
 App::$strings["Forgot your password?"] = "Passwort vergessen?";
-App::$strings["toggle mobile"] = "auf/von mobile Ansicht wechseln";
 App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] Webseiten-SSL-Fehler für %s";
 App::$strings["Website SSL certificate is not valid. Please correct."] = "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben.";
 App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Cron-Jobs laufen nicht auf %s";
@@ -2005,11 +2065,11 @@ App::$strings["Preferred IDs Message"] = "Nachricht für bevorzugte IDs";
 App::$strings["Message to display above preferred results."] = "Nachricht, die über den Ergebnissen mit den bevorzugten IDs angezeigt werden soll.";
 App::$strings["Uploaded by: "] = "Hochgeladen von: ";
 App::$strings["Drawn by: "] = "Gezeichnet von: ";
+App::$strings["Use this image"] = "";
 App::$strings["Or select from a free OpenClipart.org image:"] = "Oder wähle ein freies Bild von OpenClipart.org:";
 App::$strings["Search Term"] = "Suchbegriff";
 App::$strings["Unknown error. Please try again later."] = "Unbekannter Fehler. Bitte versuchen Sie es später erneut.";
 App::$strings["Profile photo updated successfully."] = "Profilfoto erfolgreich aktualisiert.";
-App::$strings["invalid target signature"] = "Ungültige Signatur des Ziels";
 App::$strings["Flag Adult Photos"] = "Nicht jugendfreie Fotos markieren";
 App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Stellt eine Option zum Verstecken von Fotos mit unangemessenen Inhalten in der Standard-Albumansicht bereit";
 App::$strings["Post to WordPress"] = "Auf WordPress posten";
@@ -2046,6 +2106,8 @@ App::$strings["Dreamwidth username"] = "Dreamwidth-Benutzername";
 App::$strings["Dreamwidth password"] = "Dreamwidth-Passwort";
 App::$strings["Post to Dreamwidth by default"] = "Standardmäßig auf auf Dreamwidth posten";
 App::$strings["Dreamwidth Post Settings"] = "Dreamwidth-Beitragseinstellungen";
+App::$strings["New registration"] = "";
+App::$strings["Message sent to %s. New account registration: %s"] = "Nachricht gesendet an %s. Neue Kontoregistrierung: %s";
 App::$strings["Hubzilla Directory Stats"] = "Hubzilla-Verzeichnisstatistiken";
 App::$strings["Total Hubs"] = "Hubs insgesamt";
 App::$strings["Hubzilla Hubs"] = "Hubzilla Hubs";
@@ -2132,8 +2194,8 @@ App::$strings["kiss"] = "küssen";
 App::$strings["kissed"] = "geküsst";
 App::$strings["tempt"] = "verlocken";
 App::$strings["tempted"] = "verlockt";
-App::$strings["raise eyebrows at"] = "";
-App::$strings["raised their eyebrows at"] = "";
+App::$strings["raise eyebrows at"] = "Augenbrauen hochziehen";
+App::$strings["raised their eyebrows at"] = "zog die Augenbrauen hoch";
 App::$strings["insult"] = "beleidigen";
 App::$strings["insulted"] = "beleidigt";
 App::$strings["praise"] = "loben";
@@ -2152,8 +2214,8 @@ App::$strings["fuck"] = "ficken";
 App::$strings["fucked"] = "gefickt";
 App::$strings["bonk"] = "";
 App::$strings["bonked"] = "";
-App::$strings["declare undying love for"] = "";
-App::$strings["declared undying love for"] = "";
+App::$strings["declare undying love for"] = "erkläre unsterbliche Liebe";
+App::$strings["declared undying love for"] = "erklärte unsterbliche Liebe";
 App::$strings["Diaspora Protocol Settings updated."] = "Diaspora Protokoll Einstellungen aktualisiert";
 App::$strings["The Diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Das Diaspora-Protokoll unterstützt keine Server-unabhängigen Identitäten. Verbindungen, die Du mit diesem Netzwerk eingehst, können von anderen Orten (Klonen) dieses Kanals aus unerreichbar sein.";
 App::$strings["Enable the Diaspora protocol for this channel"] = "Das Diaspora Protokoll für diesen Kanal aktivieren";
@@ -2164,8 +2226,8 @@ App::$strings["Followed hashtags (comma separated, do not include the #)"] = "Ve
 App::$strings["Diaspora Protocol Settings"] = "Diaspora Protokoll Einstellungen";
 App::$strings["No username found in import file."] = "Es wurde kein Nutzername in der importierten Datei gefunden.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen.";
-App::$strings["Your account on %s will expire in a few days."] = "Dein Account auf %s wird in ein paar Tagen ablaufen.";
-App::$strings["Your $Productname test account is about to expire."] = "Dein $Productname Test-Account wird bald auslaufen.";
+App::$strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen ablaufen.";
+App::$strings["Your $Productname test account is about to expire."] = "Dein $Productname Test-Konto wird bald auslaufen.";
 App::$strings["Enable Rainbowtag"] = "Rainbowtag aktivieren";
 App::$strings["Rainbowtag Settings"] = "Rainbowtag-Einstellungen";
 App::$strings["Rainbowtag Settings saved."] = "Rainbowtag-Einstellungen gespeichert.";
@@ -2187,9 +2249,9 @@ App::$strings["Select default avatar image if none was found at Gravatar. See RE
 App::$strings["Rating of images"] = "Bewertungen der Bilder";
 App::$strings["Select the appropriate avatar rating for your site. See README"] = "";
 App::$strings["Gravatar settings updated."] = "Gravatar-Einstellungen aktualisiert.";
-App::$strings["Hubzilla File Storage Import"] = "";
-App::$strings["This will import all your cloud files from another server."] = "";
-App::$strings["Hubzilla Server base URL"] = "";
+App::$strings["Hubzilla File Storage Import"] = "Hubzilla-Datenspeicher-Import";
+App::$strings["This will import all your cloud files from another server."] = "Hiermit werden alle Deine Cloud-Dateien von einem anderen Server importiert.";
+App::$strings["Hubzilla Server base URL"] = "Basis-URL des Habzilla-Servers";
 App::$strings["Since modified date yyyy-mm-dd"] = "";
 App::$strings["Until modified date yyyy-mm-dd"] = "";
 App::$strings["Recent Channel/Profile Viewers"] = "Kürzliche Kanal/Profil Besucher";
@@ -2208,6 +2270,7 @@ App::$strings["Mail sent."] = "Mail gesendet.";
 App::$strings["Sending of mail failed."] = "Senden der E-Mail fehlgeschlagen.";
 App::$strings["Mail Test"] = "Mail Test";
 App::$strings["Message subject"] = "Betreff der Nachricht";
+App::$strings["Use markdown for editing posts"] = "Verwende Markdown zum Bearbeiten von Beiträgen";
 App::$strings["View Larger"] = "Größer anzeigen";
 App::$strings["Tile Server URL"] = "Kachelserver-URL";
 App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Kachelserver</a>";
@@ -2258,7 +2321,7 @@ App::$strings["Send public postings to Hubzilla channel by default"] = "";
 App::$strings["Hubzilla API Path"] = "Hubzilla-API-Pfad";
 App::$strings["Hubzilla login name"] = "Hubzilla-Anmeldename";
 App::$strings["Hubzilla channel name"] = "Hubzilla-Kanalname";
-App::$strings["Hubzilla Crosspost Settings"] = "";
+App::$strings["Hubzilla Crosspost Settings"] = "Hubzilla Crosspost Einstellungen";
 App::$strings["Logfile archive directory"] = "Verzeichnis der Logdatei";
 App::$strings["Directory to store rotated logs"] = "Verzeichnis, in dem rotierte Logs gespeichert werden sollen";
 App::$strings["Logfile size in bytes before rotating"] = "zu erreichende Logdateigröße in Bytes, bevor rotiert wird";
@@ -2269,12 +2332,12 @@ App::$strings["Friendica Server base URL"] = "BasisURL des Friendica Servers";
 App::$strings["Friendica Login Username"] = "Friendica-Anmeldebenutzername";
 App::$strings["Friendica Login Password"] = "Friendica-Anmeldepasswort";
 App::$strings["ActivityPub"] = "ActivityPub";
-App::$strings["ActivityPub Protocol Settings updated."] = "";
+App::$strings["ActivityPub Protocol Settings updated."] = "ActivityPub Protokoll Einstellungen aktualisiert";
 App::$strings["The ActivityPub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "";
-App::$strings["Enable the ActivityPub protocol for this channel"] = "";
-App::$strings["Send multi-media HTML articles"] = "";
-App::$strings["Not supported by some microblog services such as Mastodon"] = "";
-App::$strings["ActivityPub Protocol Settings"] = "";
+App::$strings["Enable the ActivityPub protocol for this channel"] = "Aktiviere das ActivityPub Protokoll für diesen Kanal";
+App::$strings["Send multi-media HTML articles"] = "Multimedia HTML Artikel versenden";
+App::$strings["Not supported by some microblog services such as Mastodon"] = "Wird von einigen Microblogging-Plattformen wie Mastodon nicht unterstützt";
+App::$strings["ActivityPub Protocol Settings"] = "ActivityPub Protokoll Einstellungen";
 App::$strings["Project Servers and Resources"] = "Projektserver und -ressourcen";
 App::$strings["Project Creator and Tech Lead"] = "Projektersteller und Technischer Leiter";
 App::$strings["Admin, developer, directorymin, support bloke"] = "Administrator, Entwickler, Verzeichnis Betreibender, Supportleistende";
@@ -2343,9 +2406,9 @@ App::$strings["Cancel GNU social Connection"] = "GNU social Verbindung trennen";
 App::$strings["Currently connected to: "] = "Momentan verbunden mit:";
 App::$strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 App::$strings["Allow posting to GNU social"] = "Erlaube die Veröffentlichung bei GNU social";
-App::$strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen GNU social Account veröffentlicht werden.";
+App::$strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen GNU social Konto veröffentlicht werden.";
 App::$strings["Post to GNU social by default"] = "Standardmäßig bei GNU social veröffentlichen";
-App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Wenn aktiv werden all deine öffentlichen Beiträge standardmäßig bei dem verbundenen GNU social Account veröffentlicht.";
+App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Wenn aktiv werden all deine öffentlichen Beiträge standardmäßig bei dem verbundenen GNU social Konto veröffentlicht.";
 App::$strings["Clear OAuth configuration"] = "OAuth Konfiguration löschen";
 App::$strings["GNU social Post Settings"] = "GNU social Einstellungen";
 App::$strings["API URL"] = "API-URL";
@@ -2357,9 +2420,9 @@ App::$strings["Invalid game."] = "Ungültiges Spiel.";
 App::$strings["You are not a player in this game."] = "Sie sind kein Spieler in diesem Spiel.";
 App::$strings["You must be a local channel to create a game."] = "Um ein Spiel zu eröffnen, musst du ein lokaler Kanal sein";
 App::$strings["You must select one opponent that is not yourself."] = "Du musst einen Gegner wählen, der nicht du selbst ist";
-App::$strings["You must select white or black."] = "Sie müssen weiß oder schwarz auswählen.";
+App::$strings["Random color chosen."] = "";
 App::$strings["Error creating new game."] = "Fehler beim Erstellen eines neuen Spiels.";
-App::$strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
+App::$strings["Requested channel is not available."] = "Angeforderter Kanal nicht verfügbar.";
 App::$strings["You must select a local channel /chess/channelname"] = "Du musst einen lokalen Kanal/Schach(Kanalnamen aufwählen";
 App::$strings["Enable notifications"] = "Benachrichtigungen aktivieren";
 App::$strings["Post to Twitter"] = "Bei Twitter veröffentlichen";
@@ -2370,9 +2433,11 @@ App::$strings["Log in with Twitter"] = "Mit Twitter anmelden";
 App::$strings["Copy the PIN from Twitter here"] = "PIN von Twitter hier her kopieren";
 App::$strings["<strong>Note:</strong> Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis:</strong> Entsprechend Deiner Privatsphären-Einstellungen (<em>Profil-Details vor nicht angemeldeten Besuchern verbergen?</em>) kann ein ggf. zu Twitter geteilter Link Besucher auf eine leere Seite führen, die darüber informiert, dass der Zugriff zu Deinem Profil eingeschränkt ist.";
 App::$strings["Allow posting to Twitter"] = "Erlaube die Veröffentlichung bei Twitter";
-App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden.";
+App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Konto veröffentlicht werden.";
+App::$strings["Twitter post length"] = "";
+App::$strings["Maximum tweet length"] = "";
 App::$strings["Send public postings to Twitter by default"] = "Standardmäßig öffentliche Beiträge bei Twitter veröffentlichen";
-App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Wenn aktiv können deine öffentlichen Beiträge bei dem verbundenen Twitter Account veröffentlicht werden.";
+App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Wenn aktiv werden deine öffentlichen Beiträge bei dem verbundenen Twitter Konto veröffentlicht werden.";
 App::$strings["Twitter Post Settings"] = "Twitter-Beitragseinstellungen";
 App::$strings["Deactivate the feature"] = "Diese Funktion abschalten";
 App::$strings["Hide the button and show the smilies directly."] = "Verstecke die Schaltfläche und zeige die Smilies direkt an.";
@@ -2422,7 +2487,7 @@ App::$strings["If you see this icon you can be sure that the sender is who it sa
 App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "Vorsicht! Es kann sein, dass jemand versucht, eine Nachricht zu fälschen! Diese Nachricht muss nicht unbedingt vom angegebenen Absender stammen!";
 App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.</p><p>You can also advance by pressing the return key"] = "Willkommen zu Hubzilla! Möchtest Du eine Tour der Benutzeroberfläche angezeigt bekommen?</p><p>Du kannst zu jeder Zeit pausieren und fortsetzen, wo Du aufgehört hast, indem Du die Seite neu lädtst, oder zu einer anderen Seite springst.</p><p>Du kannst auc durch das Drücken der Enter-Taste weitergehen.";
 App::$strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten";
-App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Hubzilla-Servern geteilt.";
+App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with \$Projectname sites."] = "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit \$Projectname - Servern geteilt.";
 App::$strings["Three Dimensional Tic-Tac-Toe"] = "Dreidimensionales Tic-Tac-Toe";
 App::$strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
 App::$strings["New game"] = "Neues Spiel";
@@ -2489,7 +2554,7 @@ App::$strings["Mirror all public posts"] = "Öffentliche Beiträge spiegeln";
 App::$strings["Pump.io Post Settings"] = "Pump.io-Beitragseinstellungen";
 App::$strings["PumpIO Settings saved."] = "PumpIO-Einstellungen gespeichert.";
 App::$strings["An account has been created for you."] = "Ein Konto wurde für Sie erstellt.";
-App::$strings["Authentication successful but rejected: account creation is disabled."] = "Authentifizierung war erfolgreich wurde aber abgewiesen! Das Anlegen von Accounts wurde deaktiviert.";
+App::$strings["Authentication successful but rejected: account creation is disabled."] = "Authentifizierung war erfolgreich, wurde aber abgewiesen! Das Anlegen von Konten wurde deaktiviert.";
 App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Suche %1\$s (%2\$s)";
 App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["Search \$Projectname"] = "\$Projectname suchen";
@@ -2561,8 +2626,8 @@ App::$strings["Uncertain"] = "Ungewiss";
 App::$strings["It's complicated"] = "Es ist kompliziert";
 App::$strings["Don't care"] = "Interessiert mich nicht";
 App::$strings["Ask me"] = "Frag mich mal";
-App::$strings["likes %1\$s's %2\$s"] = "";
-App::$strings["doesn't like %1\$s's %2\$s"] = "";
+App::$strings["likes %1\$s's %2\$s"] = "gefällt %1\$ss %2\$s";
+App::$strings["doesn't like %1\$s's %2\$s"] = "missfällt %1\$ss %2\$s";
 App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden";
 App::$strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s an";
 App::$strings["poked"] = "stupste";
@@ -2876,7 +2941,7 @@ App::$strings["__ctx:edit_activity__ Comment"] = "Kommentar";
 App::$strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
 App::$strings["Empty name"] = "Namensfeld leer";
 App::$strings["Name too long"] = "Name ist zu lang";
-App::$strings["No account identifier"] = "Keine Account-Kennung";
+App::$strings["No account identifier"] = "Keine Konten-Kennung";
 App::$strings["Nickname is required."] = "Spitzname ist erforderlich.";
 App::$strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
 App::$strings["Default Profile"] = "Standard-Profil";
@@ -2886,7 +2951,8 @@ App::$strings["Visible to everybody"] = "Für jeden sichtbar";
 App::$strings["Gender:"] = "Geschlecht:";
 App::$strings["Homepage:"] = "Homepage:";
 App::$strings["Online Now"] = "gerade online";
-App::$strings["Trans"] = "";
+App::$strings["Change your profile photo"] = "Dein Profilfoto ändern";
+App::$strings["Trans"] = "Trans";
 App::$strings["Like this channel"] = "Dieser Kanal gefällt mir";
 App::$strings["j F, Y"] = "j. F Y";
 App::$strings["j F"] = "j. F";
@@ -2929,7 +2995,7 @@ App::$strings["GNU-Social"] = "GNU-Social";
 App::$strings["RSS/Atom"] = "RSS/Atom";
 App::$strings["Diaspora"] = "Diaspora";
 App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot!";
+App::$strings["Zot"] = "Zot";
 App::$strings["LinkedIn"] = "LinkedIn";
 App::$strings["XMPP/IM"] = "XMPP/IM";
 App::$strings["MySpace"] = "MySpace";
@@ -2943,12 +3009,14 @@ App::$strings["Post permissions %s cannot be changed %s after a post is shared.<
 App::$strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden";
 App::$strings["Image/photo"] = "Bild/Foto";
 App::$strings["Encrypted content"] = "Verschlüsselter Inhalt";
-App::$strings["Install %1\$s element %2\$s"] = "";
+App::$strings["Install %1\$s element %2\$s"] = "Installiere %1\$s Element %2\$s";
 App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren.";
 App::$strings["card"] = "Karte";
 App::$strings["article"] = "Artikel";
 App::$strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
 App::$strings["spoiler"] = "Spoiler";
+App::$strings["View article"] = "Artikel ansehen";
+App::$strings["View summary"] = "Zusammenfassung ansehen";
 App::$strings["$1 wrote:"] = "$1 schrieb:";
 App::$strings[" by "] = "von";
 App::$strings[" on "] = "am";
@@ -2956,8 +3024,6 @@ App::$strings["Embedded content"] = "Eingebetteter Inhalt";
 App::$strings["Embedding disabled"] = "Einbetten deaktiviert";
 App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s heißt %2\$s willkommen";
 App::$strings["General Features"] = "Allgemeine Funktionen";
-App::$strings["Multiple Profiles"] = "Mehrfachprofile";
-App::$strings["Ability to create multiple profiles"] = "Ermöglicht das Anlegen mehrerer Profile pro Kanal";
 App::$strings["Advanced Profiles"] = "Erweiterte Profile";
 App::$strings["Additional profile sections and selections"] = "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung";
 App::$strings["Profile Import/Export"] = "Profil-Import/Export";
@@ -2968,21 +3034,33 @@ App::$strings["Provide a wiki for your channel"] = "Stelle ein Wiki in Deinem Ka
 App::$strings["Private Notes"] = "Private Notizen";
 App::$strings["Enables a tool to store notes and reminders (note: not encrypted)"] = "Aktiviert ein Werkzeug mit dem Notizen und Erinnerungen gespeichert werden können (Hinweis: nicht verschlüsselt)";
 App::$strings["Create personal planning cards"] = "Erstelle persönliche (Notiz-)Karten zur Planung/Koordination oder ähnlichen Zwecken";
+App::$strings["Create interactive articles"] = "Erstelle interaktive Artikel";
 App::$strings["Navigation Channel Select"] = "Kanal-Auswahl in der Navigationsleiste";
 App::$strings["Change channels directly from within the navigation dropdown menu"] = "Ermöglicht den direkten Wechsel zu anderen Kanälen über das Navigationsmenü";
 App::$strings["Photo Location"] = "Aufnahmeort";
 App::$strings["If location data is available on uploaded photos, link this to a map."] = "Verlinkt den Aufnahmeort von Fotos (falls verfügbar) auf einer Karte";
 App::$strings["Access Controlled Chatrooms"] = "Zugriffskontrollierte Chaträume";
 App::$strings["Provide chatrooms and chat services with access control."] = "Bieten Sie Chaträume und Chatdienste mit Zugriffskontrolle an.";
-App::$strings["Provide alternate connection permission roles."] = "Stelle benutzerdefinierte Berechtigungsrollen für Verbindungen zur Verfügung.";
 App::$strings["Smart Birthdays"] = "Smarte Geburtstage";
 App::$strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Stellt für Geburtstage einen Zeitzonenbezug her, falls deine Freunde über den ganzen Planeten verstreut sind.";
 App::$strings["Event Timezone Selection"] = "Termin-Zeitzonenauswahl";
 App::$strings["Allow event creation in timezones other than your own."] = "Ermögliche das Erstellen von Terminen in anderen Zeitzonen als Deiner eigenen.";
+App::$strings["Premium Channel"] = "Premium-Kanal";
+App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen";
 App::$strings["Advanced Directory Search"] = "Erweiterte Verzeichnissuche";
 App::$strings["Allows creation of complex directory search queries"] = "Ermöglicht die Erstellung komplexer Verzeichnis-Suchabfragen";
 App::$strings["Advanced Theme and Layout Settings"] = "Erweiterte Design- und Layout-Einstellungen";
 App::$strings["Allows fine tuning of themes and page layouts"] = "Erlaubt die Feineinstellung von Designs und Seitenlayouts";
+App::$strings["Access Control and Permissions"] = "Zugriffskontrolle und Berechtigungen";
+App::$strings["Privacy Groups"] = "Gruppen";
+App::$strings["Enable management and selection of privacy groups"] = "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren";
+App::$strings["Multiple Profiles"] = "Mehrfachprofile";
+App::$strings["Ability to create multiple profiles"] = "Ermöglicht das Anlegen mehrerer Profile pro Kanal";
+App::$strings["Provide alternate connection permission roles."] = "Stelle benutzerdefinierte Berechtigungsrollen für Verbindungen zur Verfügung.";
+App::$strings["OAuth Clients"] = "OAuth Clients";
+App::$strings["Manage authenticatication tokens for mobile and remote apps."] = "Verwalte Tokens für den Zugriff von mobilen bzw. externen Anwendungen.";
+App::$strings["Access Tokens"] = "Zugangstokens";
+App::$strings["Create access tokens so that non-members can access private content."] = "Erzeuge Tokens für den Zugriff von Nicht-Mitgliedern auf private Inhalte.";
 App::$strings["Post Composition Features"] = "Nachbearbeitungsfunktionen";
 App::$strings["Large Photos"] = "Große Fotos";
 App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Große Vorschaubilder (1024px) in Beiträgen anzeigen. Falls nicht aktiviert, werden kleine Vorschaubilder (640px) verwendet.";
@@ -3002,8 +3080,6 @@ App::$strings["Prevent posts with identical content to be published with less th
 App::$strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
 App::$strings["Search by Date"] = "Suche nach Datum";
 App::$strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen";
-App::$strings["Privacy Groups"] = "Gruppen";
-App::$strings["Enable management and selection of privacy groups"] = "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren";
 App::$strings["Save search terms for re-use"] = "Ermöglicht das Abspeichern von Suchbegriffen zur Wiederverwendung";
 App::$strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter";
 App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviert einen Reiter in der Grid-Ansicht, der nur Netzwerk-Beiträge anzeigt, mit denen Du interagiert hast";
@@ -3029,8 +3105,6 @@ App::$strings["Star Posts"] = "Beiträge mit Sternchen versehen";
 App::$strings["Ability to mark special posts with a star indicator"] = "Ermöglicht die lokale Markierung spezieller Beiträge mit einem Sternchen-Symbol";
 App::$strings["Tag Cloud"] = "Schlagwort-Wolke";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Aktiviert die Anzeige einer Schlagwort-Wolke (Tag Cloud) auf Deiner Kanal-Seite";
-App::$strings["Premium Channel"] = "Premium-Kanal";
-App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen";
 App::$strings["Tags"] = "Schlagwörter";
 App::$strings["Keywords"] = "Schlüsselwörter";
 App::$strings["have"] = "habe";
@@ -3092,25 +3166,11 @@ App::$strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
 App::$strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
 App::$strings["Remote authentication"] = "Über Konto auf anderem Server einloggen";
 App::$strings["Click to authenticate to your home hub"] = "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren";
-App::$strings["Network Activity"] = "Netzwerk-Aktivitäten";
-App::$strings["Mark all activity notifications seen"] = "Alle Benachrichtigungen als gesehen markieren";
-App::$strings["Channel home"] = "Mein Kanal";
-App::$strings["View your channel home"] = "Zeige Deine Kanalseite an";
-App::$strings["Mark all channel notifications seen"] = "Markiere alle Kanal-Benachrichtigungen als angesehen";
-App::$strings["Registrations"] = "Registrierungen";
-App::$strings["Notifications"] = "Benachrichtigungen";
-App::$strings["View all notifications"] = "Alle Benachrichtigungen ansehen";
-App::$strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gesehen";
-App::$strings["Private mail"] = "Persönliche Mail";
-App::$strings["View your private messages"] = "Zeige Deine persönlichen Nachrichten an";
-App::$strings["Mark all private messages seen"] = "Markiere alle persönlichen Nachrichten als gesehen";
-App::$strings["Event Calendar"] = "Terminkalender";
 App::$strings["Manage Your Channels"] = "Verwalte Deine Kanäle";
 App::$strings["Account/Channel Settings"] = "Konto-/Kanal-Einstellungen";
 App::$strings["End this session"] = "Beende diese Sitzung";
 App::$strings["Your profile page"] = "Deine Profilseite";
 App::$strings["Manage/Edit profiles"] = "Profile verwalten";
-App::$strings["Edit your profile"] = "Profil bearbeiten";
 App::$strings["Sign in"] = "Anmelden";
 App::$strings["Take me home"] = "Bringe mich nach Hause (eigener Kanal)";
 App::$strings["Log me out of this site"] = "Logge mich von dieser Seite aus";
@@ -3132,6 +3192,7 @@ App::$strings["Upload New Photos"] = "Neue Fotos hochladen";
 App::$strings["Invalid data packet"] = "Ungültiges Datenpaket";
 App::$strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
 App::$strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
+App::$strings["invalid target signature"] = "Ungültige Signatur des Ziels";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Es hat früher schon einmal eine Gruppe mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Gruppe den Zugriff erlauben. Wenn das nicht Deine Absicht ist, erstelle bitte eine neue Gruppe mit einem anderen Namen.";
 App::$strings["Add new connections to this privacy group"] = "Neue Verbindung zu dieser Gruppe hinzufügen";
 App::$strings["edit"] = "Bearbeiten";

view/es-es/hstrings.php

@@ -71,9 +71,8 @@ App::$strings["2. Enter my \$Projectname network address into the site searchbar
 App::$strings["or visit"] = "o visitar";
 App::$strings["3. Click [Connect]"] = "3. Pulse [conectar]";
 App::$strings["Submit"] = "Enviar";
-App::$strings["Cards"] = "Fichas";
-App::$strings["Add Article"] = "Añadir un artículo";
 App::$strings["Articles"] = "Artículos";
+App::$strings["Add Article"] = "Añadir un artículo";
 App::$strings["Item not found"] = "Elemento no encontrado";
 App::$strings["Layout Name"] = "Nombre de la plantilla";
 App::$strings["Layout Description (Optional)"] = "Descripción de la plantilla (opcional)";
@@ -151,7 +150,8 @@ App::$strings["You may also export your posts and conversations for a particular
 App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un año determinado, como este año, visite <a href=\"%1\$s\">%2\$s</a>";
 App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite <a href=\"%1\$s\">%2\$s</a>";
 App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1\$s\">%2\$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero).";
-App::$strings["Welcome to hubzilla!"] = "¡Bienvenido o bienvenida a Hubzilla!";
+App::$strings["Welcome to Hubzilla!"] = "¡Bienvenido a Hubzilla!";
+App::$strings["You have got no unseen posts..."] = "No tiene ningún mensaje sin leer...";
 App::$strings["Public access denied."] = "Acceso público denegado.";
 App::$strings["Search"] = "Buscar";
 App::$strings["Items tagged with: %s"] = "elementos etiquetados con: %s";
@@ -282,6 +282,7 @@ App::$strings["Read more about roles"] = "Leer más sobre los roles";
 App::$strings["Create Channel"] = "Crear un canal";
 App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canal es su identidad en esta red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con una gama de permisos extremadamente detallada.";
 App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "O <a href=\"import\">importar un canal existente</a> desde otro lugar.";
+App::$strings["Validate"] = "Validar";
 App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "La eliminación de canales no está permitida hasta pasadas 48 horas desde el último cambio de contraseña.";
 App::$strings["Remove This Channel"] = "Eliminar este canal";
 App::$strings["WARNING: "] = "ATENCIÓN:";
@@ -412,10 +413,10 @@ App::$strings["Executing %s failed. Check system logs."] = "La ejecución de %s
 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["Update function %s could not be found."] = "No se encuentra la función de actualización de %s.";
-App::$strings["No failed updates."] = "No ha fallado ninguna actualización.";
 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 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["Item not found."] = "Elemento no encontrado.";
 App::$strings["Plugin %s disabled."] = "Extensión %s desactivada.";
 App::$strings["Plugin %s enabled."] = "Extensión %s activada.";
@@ -520,7 +521,9 @@ App::$strings["%s - (Incompatible)"] = "%s - (Incompatible)";
 App::$strings["mobile"] = "móvil";
 App::$strings["experimental"] = "experimental";
 App::$strings["unsupported"] = "no soportado";
+App::$strings["No"] = "No";
 App::$strings["Yes - with approval"] = "Sí - con aprobación";
+App::$strings["Yes"] = "Sí";
 App::$strings["My site is not a public server"] = "Mi sitio no es un servidor público";
 App::$strings["My site has paid access only"] = "Mi sitio es un servicio de pago";
 App::$strings["My site has free access only"] = "Mi sitio es un servicio gratuito";
@@ -542,6 +545,7 @@ App::$strings["Used to provide a member experience matched to technical comfort
 App::$strings["Lock the technical skill level setting"] = "Bloquear el ajuste del nivel de habilidad técnica";
 App::$strings["Members can set their own technical comfort level by default"] = "Los miembros pueden configurar su nivel de comodidad técnica por defecto";
 App::$strings["Banner/Logo"] = "Banner/Logo";
+App::$strings["Unfiltered HTML/CSS/JS is allowed"] = "Se permite HTML/CSS/JS sin filtrar";
 App::$strings["Administrator Information"] = "Información del Administrador";
 App::$strings["Contact information for site administrators.  Displayed on siteinfo page.  BBCode can be used here"] = "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode";
 App::$strings["Site Information"] = "Información sobre el sitio";
@@ -558,6 +562,8 @@ App::$strings["Maximum size in bytes of uploaded images. Default is 0, which mea
 App::$strings["Does this site allow new member registration?"] = "¿Debe este sitio permitir el registro de nuevos miembros?";
 App::$strings["Invitation only"] = "Solo con una invitación";
 App::$strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Solo se permiten inscripciones de nuevos miembros con un código de invitación. Además, deben aceptarse los términos del registro marcando \"Sí\".";
+App::$strings["Minimum age"] = "Edad mínima";
+App::$strings["Minimum age (in years) for who may register on this site."] = "Edad mínima (en años) para poder registrarse en este sitio.";
 App::$strings["Which best describes the types of account offered by this hub?"] = "¿Cómo describiría el tipo de servicio ofrecido por este servidor?";
 App::$strings["Register text"] = "Texto del registro";
 App::$strings["Will be displayed prominently on the registration page."] = "Se mostrará de forma destacada en la página de registro.";
@@ -575,6 +581,10 @@ App::$strings["Force publish"] = "Forzar la publicación";
 App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio.";
 App::$strings["Import Public Streams"] = "Importar contenido público";
 App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Importar y permitir acceso al contenido público sacado de otros sitios. Advertencia: este contenido no está moderado, por lo que podría encontrar cosas inapropiadas u ofensivas.";
+App::$strings["Site only Public Streams"] = "Solo contenido público en este sitio";
+App::$strings["Allow access to public content originating only from this site if Imported Public Streams are disabled."] = "Permitir el acceso al contenido público originado sólo desde este sitio si los \"streams\" públicos Importados están deshabilitados.";
+App::$strings["Allow anybody on the internet to access the Public streams"] = "Permitir que cualquiera en Internet pueda acceder a los \"streams\" públicos";
+App::$strings["Disable to require authentication before viewing. Warning: this content is unmoderated."] = "Desactivar para requerir autenticación antes de la visualización. Advertencia: este contenido no está moderado.";
 App::$strings["Login on Homepage"] = "Iniciar sesión en la página personal";
 App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido.";
 App::$strings["Enable context help"] = "Habilitar la ayuda contextual";
@@ -604,6 +614,12 @@ App::$strings["Maximum Load Average"] = "Carga media máxima";
 App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50.";
 App::$strings["Expiration period in days for imported (grid/network) content"] = "Caducidad del contenido importado de otros sitios (en días)";
 App::$strings["0 for no expiration of imported content"] = "0 para que no caduque el contenido importado";
+App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Servidores públicos: Página web de acogida (marketing) opcional para nuevos registros";
+App::$strings["Create this page first. Default is %s/register"] = "Crear esta página primero. Por defecto es %s/register";
+App::$strings["Page to display after creating a new channel"] = "Página a mostrar después de la creación de un nuevo canal";
+App::$strings["Recommend: profiles, go, or settings"] = "Recomendar: perfiles, ir, o ajustes";
+App::$strings["Optional: site location"] = "Opcional: ubicación del sitio";
+App::$strings["Region or country"] = "Región o país";
 App::$strings["New Profile Field"] = "Nuevo campo en el perfil";
 App::$strings["Field nickname"] = "Alias del campo";
 App::$strings["System name of field"] = "Nombre del campo en el sistema";
@@ -790,16 +806,18 @@ App::$strings["Enter New Password"] = "Escribir una nueva contraseña";
 App::$strings["Confirm New Password"] = "Confirmar la nueva contraseña";
 App::$strings["Leave password fields blank unless changing"] = "Dejar en blanco la contraseña a menos que desee cambiarla.";
 App::$strings["Your technical skill level"] = "Su nivel de habilidad técnica";
-App::$strings["Used to provide a member experience matched to your comfort level"] = "Se utiliza para proporcionar la experiencia de los miembros adaptada a su nivel de comodidad";
+App::$strings["Used to provide a member experience and additional features consistent with your comfort level"] = "Utilizado para proporcionar un nivel de experiencia como miembro y características adicionales consistentes con su nivel de comodidad";
 App::$strings["Remove Account"] = "Eliminar cuenta";
 App::$strings["Remove this account including all its channels"] = "Eliminar esta cuenta incluyendo todos sus canales";
 App::$strings["Affinity Slider settings updated."] = "Se han actualizado los ajustes del controlador de afinidad.";
 App::$strings["No feature settings configured"] = "No se ha establecido la configuración de los complementos";
 App::$strings["Default maximum affinity level"] = "Nivel máximo de afinidad por defecto";
+App::$strings["0-99 default 99"] = "0-99 por defecto 99";
 App::$strings["Default minimum affinity level"] = "Nivel mínimo de afinidad por defecto";
+App::$strings["0-99 - default 0"] = "0-99 - por defecto 0";
 App::$strings["Affinity Slider Settings"] = "Ajustes del controlador de afinidad";
-App::$strings["Feature/Addon Settings"] = "Ajustes de los complementos";
-App::$strings["No special theme for mobile devices"] = "Sin tema especial para dispositivos móviles";
+App::$strings["Addon Settings"] = "Ajustes de los complementos";
+App::$strings["Please save/submit changes to any panel before opening another."] = "Guarde o envíe los cambios a cualquier panel antes de abrir otro.";
 App::$strings["%s - (Experimental)"] = "%s - (Experimental)";
 App::$strings["Display Settings"] = "Ajustes de visualización";
 App::$strings["Theme Settings"] = "Ajustes del tema";
@@ -807,7 +825,6 @@ App::$strings["Custom Theme Settings"] = "Ajustes personalizados del tema";
 App::$strings["Content Settings"] = "Ajustes del contenido";
 App::$strings["Display Theme:"] = "Tema gráfico del perfil:";
 App::$strings["Select scheme"] = "Elegir un esquema";
-App::$strings["Mobile Theme:"] = "Tema para el móvil:";
 App::$strings["Preload images before rendering the page"] = "Carga previa de las imágenes antes de generar la página";
 App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "El tiempo subjetivo de carga de la página será más largo, pero la página estará lista cuando se muestre.";
 App::$strings["Enable user zoom on mobile devices"] = "Habilitar zoom de usuario en dispositivos móviles";
@@ -1082,10 +1099,10 @@ App::$strings["Photo not available."] = "Foto no disponible.";
 App::$strings["Upload File:"] = "Subir fichero:";
 App::$strings["Select a profile:"] = "Seleccionar un perfil:";
 App::$strings["Use Photo for Profile"] = "Usar la fotografía para el perfil";
-App::$strings["Upload Profile Photo"] = "Subir foto de perfil";
+App::$strings["Change Profile Photo"] = "Cambiar la foto del perfil";
 App::$strings["Use"] = "Usar";
-App::$strings["skip this step"] = "Omitir este paso";
-App::$strings["select a photo from your photo albums"] = "Seleccione una foto de sus álbumes de fotos";
+App::$strings["Use a photo from your albums"] = "Usar una foto de sus álbumes";
+App::$strings["Select existing photo"] = "Seleccionar una foto existente";
 App::$strings["Crop Image"] = "Recortar imagen";
 App::$strings["Please adjust the image cropping for optimum viewing."] = "Por favor ajuste el recorte de la imagen para una visión óptima.";
 App::$strings["Done Editing"] = "Edición completada";
@@ -1164,6 +1181,7 @@ App::$strings["Connection: %s"] = "Conexión: %s";
 App::$strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente";
 App::$strings["Connection requests will be approved without your interaction"] = "Las solicitudes de conexión serán aprobadas sin su intervención";
 App::$strings["Permission role"] = "Rol de acceso";
+App::$strings["Loading"] = "Cargando";
 App::$strings["Add permission role"] = "Añadir un rol de acceso";
 App::$strings["This connection's primary address is"] = "La dirección primaria de esta conexión es";
 App::$strings["Available locations:"] = "Ubicaciones disponibles:";
@@ -1227,7 +1245,13 @@ App::$strings["Help"] = "Ayuda";
 App::$strings["Comanche page description language help"] = "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche";
 App::$strings["Layout Description"] = "Descripción de la plantilla";
 App::$strings["Download PDL file"] = "Descargar el fichero PDL";
+App::$strings["Please refresh page"] = "Por favor, recargue la página";
 App::$strings["Unknown error"] = "Error desconocido";
+App::$strings["Token verification failed."] = "Ha fallado el token de verificación.";
+App::$strings["Email Verification Required"] = "Verificación obligatoria del correo electrónico";
+App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = "Se ha enviado un token de verificación a su dirección de correo electrónico [%s]. Ingrese ese símbolo aquí para completar el paso de verificación de cuenta. Por favor, espere unos minutos para el envío, y revise su carpeta de spam si no ve el mensaje.";
+App::$strings["Resend Email"] = "Reenvío de correo electrónico";
+App::$strings["Validation token"] = "Token de validación";
 App::$strings["Post not found."] = "Mensaje no encontrado.";
 App::$strings["post"] = "la entrada";
 App::$strings["comment"] = "el comentario";
@@ -1319,6 +1343,21 @@ App::$strings["My other channels"] = "Mis otros canales";
 App::$strings["Communications"] = "Comunicaciones";
 App::$strings["Profile Image"] = "Imagen del perfil";
 App::$strings["Edit Profiles"] = "Editar perfiles";
+App::$strings["This page is available only to site members"] = "Esta página está disponible sólo para los miembros del sitio";
+App::$strings["Welcome"] = "Bienvenido/a";
+App::$strings["What would you like to do?"] = "¿Qué le gustaría hacer?";
+App::$strings["Please bookmark this page if you would like to return to it in the future"] = "Por favor añada esta página a sus marcadores si desea volver a ella en el futuro.";
+App::$strings["Upload a profile photo"] = "Subir una foto de perfil";
+App::$strings["Upload a cover photo"] = "Subir una foto de portada del perfil";
+App::$strings["Edit your default profile"] = "Editar su perfil por defecto";
+App::$strings["View friend suggestions"] = "Ver sugerencias de amistad";
+App::$strings["View the channel directory"] = "Ver el directorio de canales";
+App::$strings["View/edit your channel settings"] = "Ver o modificar los ajustes de su canal";
+App::$strings["View the site or project documentation"] = "Ver el sitio o la documentación del proyecto";
+App::$strings["Visit your channel homepage"] = "Visitar la página principal de su canal";
+App::$strings["View your connections and/or add somebody whose address you already know"] = "Vea sus conexiones y/o agregue a alguien cuya dirección ya conozca";
+App::$strings["View your personal stream (this may be empty until you add some connections)"] = "Ver su \"stream\" personal (puede que esté vacío hasta que agregue algunas conexiones)";
+App::$strings["View the public stream. Warning: this content is not moderated"] = "Ver el \"stream\" público. Advertencia: este contenido no está moderado";
 App::$strings["Page link"] = "Enlace de la página";
 App::$strings["Edit Webpage"] = "Editar la página web";
 App::$strings["Create a new channel"] = "Crear un nuevo canal";
@@ -1504,6 +1543,7 @@ App::$strings["Fetching URL returns error: %1\$s"] = "Al intentar obtener la dir
 App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana.";
 App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado.";
 App::$strings["Passwords do not match."] = "Las contraseñas no coinciden.";
+App::$strings["Registration successful. Continue to create your first channel..."] = "Registro exitoso. Continúe creando tu primer canal...";
 App::$strings["Registration successful. Please check your email for validation instructions."] = "Registro realizado con éxito. Por favor, compruebe su correo electrónico para ver las instrucciones para validarlo.";
 App::$strings["Registration successful. Continue to create your first channel..."] = "Registro exitoso. Continúe creando tu primer canal...";
 App::$strings["Your registration is pending approval by the site owner."] = "Su registro está pendiente de aprobación por el propietario del sitio.";
@@ -1522,7 +1562,7 @@ App::$strings["no"] = "no";
 App::$strings["yes"] = "sí";
 App::$strings["Membership on this site is by invitation only."] = "Para registrarse en este sitio es necesaria una invitación.";
 App::$strings["Register"] = "Registrarse";
-App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "Este sitio puede requerir una verificación de correo electrónico después de enviar este formulario. Si es devuelto a una página de inicio de sesión, compruebe su email para recibir y leer las instrucciones.";
+App::$strings["This site requires email verification. After completing this form, please check your email for further instructions."] = "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.";
 App::$strings["Cover Photos"] = "Imágenes de portada del perfil";
 App::$strings["female"] = "mujer";
 App::$strings["%1\$s updated her %2\$s"] = "%1\$s ha actualizado su %2\$s";
@@ -1530,7 +1570,7 @@ App::$strings["male"] = "hombre";
 App::$strings["%1\$s updated his %2\$s"] = "%1\$s ha actualizado su %2\$s";
 App::$strings["%1\$s updated their %2\$s"] = "%1\$s ha actualizado su %2\$s";
 App::$strings["cover photo"] = "Imagen de portada del perfil";
-App::$strings["Upload Cover Photo"] = "Subir imagen de portada del perfil";
+App::$strings["Change Cover Photo"] = "Cambiar la foto de portada del perfil";
 App::$strings["Documentation Search"] = "Búsqueda de Documentación";
 App::$strings["About"] = "Mi perfil";
 App::$strings["Administrators"] = "Administradores";
@@ -1568,6 +1608,8 @@ App::$strings["Show in your contacts shared folder"] = "Mostrar en la carpeta co
 App::$strings["No channel."] = "Ningún canal.";
 App::$strings["No connections in common."] = "Ninguna  conexión en común.";
 App::$strings["View Common Connections"] = "Ver las conexiones comunes";
+App::$strings["Email verification resent"] = "Reenvío del email de verificación";
+App::$strings["Unable to resend email verification message."] = "No se puede reenviar el mensaje de verificación por correo electrónico.";
 App::$strings["No connections."] = "Sin conexiones.";
 App::$strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]";
 App::$strings["View Connections"] = "Ver conexiones";
@@ -1684,15 +1726,21 @@ App::$strings["\$Projectname Notification"] = "Notificación de \$Projectname";
 App::$strings["\$projectname"] = "\$projectname";
 App::$strings["Thank You,"] = "Gracias,";
 App::$strings["%s Administrator"] = "%s Administrador";
+App::$strings["This email was sent by %1\$s at %2\$s."] = "Este email ha sido enviado por %1\$s a %2\$s.";
+App::$strings["To stop receiving these messages, please adjust your Notification Settings at %s"] = "Para dejar de recibir estos mensajes, por favor ajuste la configuración de notificación en %s";
+App::$strings["To stop receiving these messages, please adjust your %s."] = "Para dejar de recibir estos mensajes, por favor, ajuste su %s";
 App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
 App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Aviso] Nuevo correo recibido en %s";
 App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
 App::$strings["%1\$s sent you %2\$s."] = "%1\$s le ha enviado %2\$s.";
 App::$strings["a private message"] = "un mensaje privado";
 App::$strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%5\$s de %4\$s[/zrl] ";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s creado por usted[/zrl]";
+App::$strings["commented on"] = "ha comentado sobre";
+App::$strings["liked"] = "ha gustado de ";
+App::$strings["disliked"] = "no ha gustado de ";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]a %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s[zrl=%4\$s]un %5\$s[/zrl]";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]%5\$s's %6\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s] %6\$sde %5\$s[/zrl]";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]your %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s  [zrl=%4\$s] ]su %5\$s [/zrl]";
 App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] Comentario moderado en la conversación #%1\$d por %2\$s";
 App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] Nuevo comentario de %2\$s en la conversación #%1\$d";
 App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha comentado un elemento/conversación que ha estado siguiendo.";
@@ -1727,6 +1775,8 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Por fav
 App::$strings["[\$Projectname:Notify]"] = "[\$Projectname:Aviso]";
 App::$strings["created a new post"] = "ha creado una nueva entrada";
 App::$strings["commented on %s's post"] = "ha comentado la entrada de %s";
+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["Update Error at %s"] = "Error de actualización en %s";
@@ -1865,6 +1915,18 @@ App::$strings["Suggestions"] = "Sugerencias";
 App::$strings["See more..."] = "Ver más...";
 App::$strings["Saved Folders"] = "Carpetas guardadas";
 App::$strings["Click to show more"] = "Hacer clic para ver más";
+App::$strings["Profile Creation"] = "Creación de perfiles";
+App::$strings["Upload profile photo"] = "Cargar la foto del perfil";
+App::$strings["Upload cover photo"] = "Cargar la foto de portada del perfil";
+App::$strings["Edit your profile"] = "Editar su perfil";
+App::$strings["Find and Connect with others"] = "Encontrar y conectarse con otros";
+App::$strings["Manage your connections"] = "Gestionar sus conexiones";
+App::$strings["Communicate"] = "Comunicarse";
+App::$strings["View your channel homepage"] = "Ver la página principal de su canal";
+App::$strings["View your network stream"] = "Ver el \"stream\" de su red";
+App::$strings["Documentation"] = "Documentación";
+App::$strings["View public stream. Warning: not moderated"] = "Ver el \"stream\" público. Advertencia: no está moderado";
+App::$strings["New Member Links"] = "Enlaces para nuevos miembros";
 App::$strings["Member registrations waiting for confirmation"] = "Inscripciones de nuevos miembros pendientes de aprobación";
 App::$strings["Inspect queue"] = "Examinar la cola";
 App::$strings["DB updates"] = "Actualizaciones de la base de datos";
@@ -1873,7 +1935,7 @@ App::$strings["Plugin Features"] = "Extensiones";
 App::$strings["Account settings"] = "Configuración de la cuenta";
 App::$strings["Channel settings"] = "Configuración del canal";
 App::$strings["Additional features"] = "Funcionalidades";
-App::$strings["Feature/Addon settings"] = "Complementos";
+App::$strings["Addon settings"] = "Ajustes de los complementos";
 App::$strings["Display settings"] = "Ajustes de visualización";
 App::$strings["Manage locations"] = "Gestión de ubicaciones (clones) del canal";
 App::$strings["Export channel"] = "Exportar canal";
@@ -1886,6 +1948,7 @@ App::$strings["New Network Activity Notifications"] = "Avisos de nueva actividad
 App::$strings["View your network activity"] = "Ver su actividad en la red";
 App::$strings["Mark all notifications read"] = "Marcar todas las notificaciones como leídas";
 App::$strings["Show new posts only"] = "Mostrar solo las entradas nuevas";
+App::$strings["Filter by name"] = "Filtrar por nombre";
 App::$strings["New Home Activity"] = "Nueva actividad en su página principal";
 App::$strings["New Home Activity Notifications"] = "Avisos de nueva actividad en su página principal";
 App::$strings["View your home activity"] = "Ver su actividad en su página principal";
@@ -1909,7 +1972,7 @@ App::$strings["New Registrations"] = "Registros nuevos";
 App::$strings["New Registrations Notifications"] = "Notificaciones de nuevos registros";
 App::$strings["Public Stream Notifications"] = "Avisos del \"stream\" público";
 App::$strings["View the public stream"] = "Ver el \"stream\" público";
-App::$strings["Loading"] = "Cargando";
+App::$strings["Sorry, you have got no notifications at the moment"] = "Lo sentimos, por el momento no ha recibido ninguna notificación";
 App::$strings["Source channel not found."] = "No se ha encontrado el canal de origen.";
 App::$strings["Create an account to access services and applications"] = "Crear una cuenta para acceder a los servicios y aplicaciones";
 App::$strings["Logout"] = "Finalizar sesión";
@@ -1917,7 +1980,6 @@ App::$strings["Login/Email"] = "Inicio de sesión / Correo electrónico";
 App::$strings["Password"] = "Contraseña";
 App::$strings["Remember me"] = "Recordarme";
 App::$strings["Forgot your password?"] = "¿Olvidó su contraseña?";
-App::$strings["toggle mobile"] = "cambiar a modo móvil";
 App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] Error SSL del sitio web en %s";
 App::$strings["Website SSL certificate is not valid. Please correct."] = "El certificado SSL del sitio web no es válido. Por favor, solucione el problema.";
 App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Las tareas de Cron no están funcionando en %s";
@@ -2005,11 +2067,11 @@ App::$strings["Preferred IDs Message"] = "Mensaje de IDs preferido";
 App::$strings["Message to display above preferred results."] = "Mensaje para mostrar sobre los resultados preferidos.";
 App::$strings["Uploaded by: "] = "Subida por: ";
 App::$strings["Drawn by: "] = "Creada por: ";
+App::$strings["Use this image"] = "Usar esta imagen";
 App::$strings["Or select from a free OpenClipart.org image:"] = "O seleccionar una imagen gratuita de OpenClipart.org: ";
 App::$strings["Search Term"] = "Término de búsqueda";
 App::$strings["Unknown error. Please try again later."] = "Error desconocido. Por favor, inténtelo otra vez.";
 App::$strings["Profile photo updated successfully."] = "Se ha actualizado con éxito la foto de perfil.";
-App::$strings["invalid target signature"] = "La firma recibida no es válida";
 App::$strings["Flag Adult Photos"] = "Indicador (\"flag\") de fotos de adultos";
 App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Proporcionar una opción de edición de fotos para ocultar las fotos inapropiadas de la vista de álbum predeterminada";
 App::$strings["Post to WordPress"] = "Publicar en WordPress";
@@ -2046,6 +2108,8 @@ App::$strings["Dreamwidth username"] = "Nombre de usuario en Dreamwidth";
 App::$strings["Dreamwidth password"] = "Contraseña en Dreamwidth";
 App::$strings["Post to Dreamwidth by default"] = "Publicar en Dreamwidth de forma predeterminada";
 App::$strings["Dreamwidth Post Settings"] = "Ajustes de publicación en Dreamwidth";
+App::$strings["New registration"] = "Nuevo registro";
+App::$strings["Message sent to %s. New account registration: %s"] = "Mensaje enviado a %s. Registro de una nueva cuenta: %s";
 App::$strings["Hubzilla Directory Stats"] = "Estadísticas de directorio de Hubzilla";
 App::$strings["Total Hubs"] = "Número total de servidores";
 App::$strings["Hubzilla Hubs"] = "Servidores (hubs) de Hubzilla";
@@ -2208,6 +2272,7 @@ App::$strings["Mail sent."] = "El correo electrónico ha sido enviado.";
 App::$strings["Sending of mail failed."] = "No se pudo enviar el correo.";
 App::$strings["Mail Test"] = "Prueba de correo";
 App::$strings["Message subject"] = "Asunto del mensaje";
+App::$strings["Use markdown for editing posts"] = "Usar markdown para editar las entradas";
 App::$strings["View Larger"] = "Ver más grande";
 App::$strings["Tile Server URL"] = "URL del servidor de mosaicos de imágenes ";
 App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Una lista de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\"  target=\"_blank\">servidores públicos de mosaicos de imágenes</a>";
@@ -2357,7 +2422,7 @@ App::$strings["Invalid game."] = "Juego no válido.";
 App::$strings["You are not a player in this game."] = "Usted no participa en este juego.";
 App::$strings["You must be a local channel to create a game."] = "Debe ser un canal local para crear un juego";
 App::$strings["You must select one opponent that is not yourself."] = "Debe seleccionar un oponente que no sea usted mismo.";
-App::$strings["You must select white or black."] = "Debe elegir blancas o negras.";
+App::$strings["Random color chosen."] = "Elegido un color aleatorio.";
 App::$strings["Error creating new game."] = "Error al crear un nuevo juego.";
 App::$strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
 App::$strings["You must select a local channel /chess/channelname"] = "Debe seleccionar un canal local /chess/nombredelcanal";
@@ -2371,6 +2436,8 @@ App::$strings["Copy the PIN from Twitter here"] = "Copiar aquí el PIN de Twitte
 App::$strings["<strong>Note:</strong> Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Aviso:</strong> Debido a su configuración de privacidad (<em>Ocultar los detalles de su perfil a los visitantes desconocidos?</em>), el enlace potencialmente incluido en las entradas públicas retransmitidas a Twitter llevará al visitante a una página en blanco informándolo de que el acceso a su perfil ha sido restringido.";
 App::$strings["Allow posting to Twitter"] = "Permitir la publicación en Twitter";
 App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Si está activado, sus entradas públicas se pueden publicar en la cuenta de Twitter asociada";
+App::$strings["Twitter post length"] = "Longitud del mensaje en Twitter";
+App::$strings["Maximum tweet length"] = "Longitud máxima del tweet";
 App::$strings["Send public postings to Twitter by default"] = "Enviar mensajes públicos a Twitter de forma predeterminada";
 App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Si está activado, sus entradas públicas se publicarán en la cuenta de Twitter asociada de forma predeterminada.";
 App::$strings["Twitter Post Settings"] = "Ajustes de publicación en Twitter";
@@ -2422,7 +2489,7 @@ App::$strings["If you see this icon you can be sure that the sender is who it sa
 App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "¡Peligro! ¡Parece que alguien intentó falsificar un mensaje! ¡Este mensaje no es necesariamente de quien dice que es!";
 App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.</p><p>You can also advance by pressing the return key"] = "¡Bienvenido/a a Hubzilla! ¿Quiere hacer un recorrido por la interfaz de usuario?</p> <p> Puede detenerlo en cualquier momento y continuar donde lo dejó recargando la página o navegando a otra.</p> <p> También puede avanzar pulsando la tecla de retorno";
 App::$strings["Extended Identity Sharing"] = "Compartir identidad extendida";
-App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Compartir su identidad con todos los sitios web en Internet. Cuando se inhabilita, la identidad sólo se comparte con los sitios de la matriz.";
+App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with \$Projectname sites."] = "Compartir su identidad con todos los sitios web en Internet. Cuando está deshabilitado, la identidad sólo se comparte con sitios de \$Projectname.";
 App::$strings["Three Dimensional Tic-Tac-Toe"] = "Juego en 3D Tic-Tac-Toe";
 App::$strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
 App::$strings["New game"] = "Nuevo juego";
@@ -2792,8 +2859,8 @@ App::$strings["Please enter a link URL"] = "Por favor, introduzca una dirección
 App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Cambios no guardados. ¿Está seguro de que desea abandonar la página?";
 App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo";
 App::$strings["timeago.prefixFromNow"] = "timeago.prefixFromNow";
-App::$strings["ago"] = "antes";
-App::$strings["from now"] = "desde ahora";
+App::$strings["timeago.suffixAgo"] = "timeago.suffixAgo";
+App::$strings["timeago.suffixFromNow"] = "timeago.suffixFromNow";
 App::$strings["less than a minute"] = "menos de un minuto";
 App::$strings["about a minute"] = "alrededor de un minuto";
 App::$strings["%d minutes"] = "%d minutos";
@@ -2886,6 +2953,7 @@ App::$strings["Visible to everybody"] = "Visible para todos";
 App::$strings["Gender:"] = "Género:";
 App::$strings["Homepage:"] = "Página personal:";
 App::$strings["Online Now"] = "Ahora en línea";
+App::$strings["Change your profile photo"] = "Cambiar su foto del perfil";
 App::$strings["Trans"] = "Trans";
 App::$strings["Like this channel"] = "Me gusta este canal";
 App::$strings["j F, Y"] = "j F Y";
@@ -2949,6 +3017,8 @@ App::$strings["card"] = "ficha";
 App::$strings["article"] = "artículo";
 App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar";
 App::$strings["spoiler"] = "spoiler";
+App::$strings["View article"] = "Ver artículo";
+App::$strings["View summary"] = "Ver sumario";
 App::$strings["$1 wrote:"] = "$1 escribió:";
 App::$strings[" by "] = "por";
 App::$strings[" on "] = "en";
@@ -2956,8 +3026,6 @@ App::$strings["Embedded content"] = "Contenido incorporado";
 App::$strings["Embedding disabled"] = "Incrustación deshabilitada";
 App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth:  %1\$s da la bienvenida a %2\$s";
 App::$strings["General Features"] = "Funcionalidades básicas";
-App::$strings["Multiple Profiles"] = "Múltiples perfiles";
-App::$strings["Ability to create multiple profiles"] = "Capacidad de crear múltiples perfiles";
 App::$strings["Advanced Profiles"] = "Perfiles avanzados";
 App::$strings["Additional profile sections and selections"] = "Secciones y selecciones de perfil adicionales";
 App::$strings["Profile Import/Export"] = "Importar/Exportar perfil";
@@ -2968,21 +3036,33 @@ App::$strings["Provide a wiki for your channel"] = "Proporcionar un wiki para su
 App::$strings["Private Notes"] = "Notas privadas";
 App::$strings["Enables a tool to store notes and reminders (note: not encrypted)"] = "Habilita una herramienta para guardar notas y recordatorios (advertencia: las notas no estarán cifradas)";
 App::$strings["Create personal planning cards"] = "Crear fichas de planificación personal";
+App::$strings["Create interactive articles"] = "Crear artículos interactivos";
 App::$strings["Navigation Channel Select"] = "Navegación por el selector de canales";
 App::$strings["Change channels directly from within the navigation dropdown menu"] = "Cambiar de canales directamente desde el menú de navegación desplegable";
 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["Access Controlled Chatrooms"] = "Salas de chat moderadas";
 App::$strings["Provide chatrooms and chat services with access control."] = "Proporcionar salas y servicios de chat moderados.";
-App::$strings["Provide alternate connection permission roles."] = "Proporcionar roles de acceso alternativos para esta conexión.";
 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";
 App::$strings["Allow event creation in timezones other than your own."] = "Permitir la creación de eventos en husos horarios distintos del suyo.";
+App::$strings["Premium Channel"] = "Canal premium";
+App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal";
 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["Advanced Theme and Layout Settings"] = "Ajustes avanzados de temas y esquemas";
 App::$strings["Allows fine tuning of themes and page layouts"] = "Permitir el ajuste fino de temas y esquemas de páginas";
+App::$strings["Access Control and Permissions"] = "Control de acceso y permisos";
+App::$strings["Privacy Groups"] = "Grupos de canales";
+App::$strings["Enable management and selection of privacy groups"] = "Activar la gestión y selección de grupos de canales";
+App::$strings["Multiple Profiles"] = "Múltiples perfiles";
+App::$strings["Ability to create multiple profiles"] = "Capacidad de crear múltiples perfiles";
+App::$strings["Provide alternate connection permission roles."] = "Proporcionar roles de acceso alternativos para esta conexión.";
+App::$strings["OAuth Clients"] = "Clientes OAuth";
+App::$strings["Manage authenticatication tokens for mobile and remote apps."] = "Administrar tokens de autenticación para aplicaciones móviles y remotas.";
+App::$strings["Access Tokens"] = "Tokens de acceso";
+App::$strings["Create access tokens so that non-members can access private content."] = "Crear tokens de acceso para que los no miembros puedan acceder a contenido privado.";
 App::$strings["Post Composition Features"] = "Opciones para la redacción de entradas";
 App::$strings["Large Photos"] = "Fotos de gran tamaño";
 App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)";
@@ -3002,8 +3082,6 @@ App::$strings["Prevent posts with identical content to be published with less th
 App::$strings["Network and Stream Filtering"] = "Filtrado del contenido";
 App::$strings["Search by Date"] = "Buscar por fecha";
 App::$strings["Ability to select posts by date ranges"] = "Capacidad de seleccionar entradas por rango de fechas";
-App::$strings["Privacy Groups"] = "Grupos de canales";
-App::$strings["Enable management and selection of privacy groups"] = "Activar la gestión y selección de grupos de canales";
 App::$strings["Save search terms for re-use"] = "Guardar términos de búsqueda para su reutilización";
 App::$strings["Network Personal Tab"] = "Actividad personal";
 App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado.";
@@ -3029,8 +3107,6 @@ 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["Tag Cloud"] = "Nube de etiquetas";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Proveer nube de etiquetas personal en su página de canal";
-App::$strings["Premium Channel"] = "Canal premium";
-App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal";
 App::$strings["Tags"] = "Etiquetas";
 App::$strings["Keywords"] = "Palabras clave";
 App::$strings["have"] = "tener";
@@ -3092,25 +3168,11 @@ App::$strings["%1\$s's birthday"] = "Cumpleaños de %1\$s";
 App::$strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s";
 App::$strings["Remote authentication"] = "Acceder desde su servidor";
 App::$strings["Click to authenticate to your home hub"] = "Pulsar para identificarse en su servidor de inicio";
-App::$strings["Network Activity"] = "Actividad de la red";
-App::$strings["Mark all activity notifications seen"] = "Marcar como vistas todas las notificaciones de actividad";
-App::$strings["Channel home"] = "Mi canal";
-App::$strings["View your channel home"] = "Ver su página principal del canal";
-App::$strings["Mark all channel notifications seen"] = "Marcar todas las notificaciones del canal como leídas";
-App::$strings["Registrations"] = "Registros";
-App::$strings["Notifications"] = "Notificaciones";
-App::$strings["View all notifications"] = "Ver todas las notificaciones";
-App::$strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas";
-App::$strings["Private mail"] = "Correo privado";
-App::$strings["View your private messages"] = "Ver sus mensajes privados";
-App::$strings["Mark all private messages seen"] = "Marcar todos los mensajes privados como leídos";
-App::$strings["Event Calendar"] = "Calendario de eventos";
 App::$strings["Manage Your Channels"] = "Gestionar sus canales";
 App::$strings["Account/Channel Settings"] = "Ajustes de cuenta/canales";
 App::$strings["End this session"] = "Finalizar esta sesión";
 App::$strings["Your profile page"] = "Su página del perfil";
 App::$strings["Manage/Edit profiles"] = "Administrar/editar perfiles";
-App::$strings["Edit your profile"] = "Editar su perfil";
 App::$strings["Sign in"] = "Acceder";
 App::$strings["Take me home"] = "Volver a la página principal";
 App::$strings["Log me out of this site"] = "Salir de este sitio";
@@ -3132,6 +3194,7 @@ App::$strings["Upload New Photos"] = "Subir nuevas fotos";
 App::$strings["Invalid data packet"] = "Paquete de datos no válido";
 App::$strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
 App::$strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
+App::$strings["invalid target signature"] = "La firma recibida no es válida";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente.";
 App::$strings["Add new connections to this privacy group"] = "Añadir conexiones nuevas a este grupo de canales";
 App::$strings["edit"] = "editar";

view/es-es/register_verify_member.tpl

@@ -10,7 +10,7 @@ Inicie la sesión con la contraseña que eligió durante el registro.
 
 Necesitamos verificar su correo electrónico para poder darle pleno acceso.
 
-Si registró esta cuenta, por favor, siga el enlace:
+Si registró esta cuenta, por favor, siga el enlace: 
 
 {{$siteurl}}/regver/allow/{{$hash}} 
 

view/js/main.js

@@ -304,6 +304,12 @@ function insertCommentURL(comment, id) {
 	return true;
 }
 
+function doFollowAuthor(url) {
+	$.get(url, function(data) { notificationsUpdate(); });
+	return true;
+}
+
+
 function viewsrc(id) {
 	$.colorbox({href: 'viewsrc/' + id, maxWidth: '80%', maxHeight: '80%' });
 }

view/js/mod_cover_photo.js

@@ -1,80 +0,0 @@
-    var initializeEmbedPhotoDialog = function () {
-        $('.embed-photo-selected-photo').each(function (index) {
-            $(this).removeClass('embed-photo-selected-photo');
-        });
-        getPhotoAlbumList();
-        $('#embedPhotoModalBodyAlbumDialog').off('click');
-        $('#embedPhotoModal').modal('show');
-    };
-
-    var choosePhotoFromAlbum = function (album) {
-        $.post("embedphotos/album", {name: album},
-            function(data) {
-                if (data['status']) {
-                    $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
-                    $('#embedPhotoModalBodyAlbumDialog').html('\
-                            <div><div class="nav nav-pills flex-column">\n\
-                                <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
-                                    <i class="fa fa-chevron-left"></i>&nbsp\n\
-                                    {{$modaldiffalbum}}\n\
-                                    </a>\n\
-                                </li>\n\
-                            </div><br></div>')
-                    $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
-                    $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
-                        evt.preventDefault();
-                        var image = document.getElementById(evt.target.id);
-                        if (typeof($(image).parent()[0]) !== 'undefined') {
-                            var imageparent = document.getElementById($(image).parent()[0].id);
-                            $(imageparent).toggleClass('embed-photo-selected-photo');
-							var href = $(imageparent).attr('href');
-                            $.post("embedphotos/photolink", {href: href},
-                                function(ddata) {
-                                    if (ddata['status']) {
-                                        window.location.href = 'cover_photo/use/' + ddata['resource_id'];
-                                    } else {
-                                        window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
-                                    }
-                                    return false;
-								},
-                               'json');
-                            $('#embedPhotoModalBodyAlbumDialog').html('');
-                            $('#embedPhotoModalBodyAlbumDialog').off('click');
-                            $('#embedPhotoModal').modal('hide');
-						}
-                    });
-
-                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-                } else {
-                    window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
-                }
-                return false;
-            },
-        'json');
-    };
-
-    var getPhotoAlbumList = function () {
-        $.post("embedphotos/albumlist", {},
-            function(data) {
-                if (data['status']) {
-                    var albums = data['albumlist']; //JSON.parse(data['albumlist']);
-                    $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
-                    $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
-                    for(var i=0; i<albums.length; i++) {
-                        var albumName = albums[i].text;
-			var jsAlbumName = albums[i].jstext;
-			var albumLink = '<li class="nav-item">';
-			albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
-                        albumLink += '</li>';
-                        $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
-                    }
-                    $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
-                } else {
-                    window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
-                }
-                return false;
-            },
-        'json');
-    };

view/js/mod_profile_photo.js

@@ -1,82 +0,0 @@
-    var initializeEmbedPhotoDialog = function () {
-        $('.embed-photo-selected-photo').each(function (index) {
-            $(this).removeClass('embed-photo-selected-photo');
-        });
-        getPhotoAlbumList();
-        $('#embedPhotoModalBodyAlbumDialog').off('click');
-        $('#embedPhotoModal').modal('show');
-    };
-
-    var choosePhotoFromAlbum = function (album) {
-        $.post("embedphotos/album", {name: album},
-            function(data) {
-                if (data['status']) {
-                    $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
-                    $('#embedPhotoModalBodyAlbumDialog').html('\
-                            <div><div class="nav nav-pills flex-column">\n\
-                                <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
-                                    <i class="fa fa-chevron-left"></i>&nbsp\n\
-                                    {{$modaldiffalbum}}\n\
-                                    </a>\n\
-                                </li>\n\
-                            </div><br></div>')
-                    $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
-                    $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
-                        evt.preventDefault();
-                        var image = document.getElementById(evt.target.id);
-                        if (typeof($(image).parent()[0]) !== 'undefined') {
-                            var imageparent = document.getElementById($(image).parent()[0].id);
-                            $(imageparent).toggleClass('embed-photo-selected-photo');
-							var href = $(imageparent).attr('href');
-                            $.post("embedphotos/photolink", {href: href},
-                                function(ddata) {
-                                    if (ddata['status']) {
-										var pf = $('#profile-photo-profiles').val();
-										var prof = ((typeof pf !== 'undefined') ? '?f=&pf=' + pf : '');
-                                        window.location.href = 'profile_photo/use/' + ddata['resource_id'] + prof;
-                                    } else {
-                                        window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
-                                    }
-                                    return false;
-								},
-                               'json');
-                            $('#embedPhotoModalBodyAlbumDialog').html('');
-                            $('#embedPhotoModalBodyAlbumDialog').off('click');
-                            $('#embedPhotoModal').modal('hide');
-						}
-                    });
-
-                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-                } else {
-                    window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
-                }
-                return false;
-            },
-        'json');
-    };
-
-    var getPhotoAlbumList = function () {
-        $.post("embedphotos/albumlist", {},
-            function(data) {
-                if (data['status']) {
-                    var albums = data['albumlist']; //JSON.parse(data['albumlist']);
-                    $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
-                    $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
-                    for(var i=0; i<albums.length; i++) {
-                        var albumName = albums[i].text;
-			var jsAlbumName = albums[i].jstext;
-			var albumLink = '<li class="nav-item">';
-			albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
-                        albumLink += '</li>';
-                        $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
-                    }
-                    $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
-                    $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
-                } else {
-                    window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
-                }
-                return false;
-            },
-        'json');
-    };

view/pdl/mod_moderate.pdl

@@ -0,0 +1,4 @@
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]

view/pdl/mod_thing.pdl

@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]

view/php/theme_init.php

@@ -15,7 +15,7 @@ head_add_js('jquery.js');
 head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js');
 head_add_js('/library/sprintf.js/dist/sprintf.min.js');
 
-head_add_js('jquery.textinputs.js');
+//head_add_js('jquery.textinputs.js');
 head_add_js('autocomplete.js');
 head_add_js('/library/jquery-textcomplete/jquery.textcomplete.js');
 

view/theme/redbasic/schema/dark.css

@@ -15,13 +15,26 @@ textarea, input, select
 	padding: 10px 0;
 }
 
+#jot-title {
+	border-radius: 3px;
+}
+
 #jot-title-wrap {
 	border-bottom: none;
 	margin-bottom: 5px;
 }
 
+#jot-category-wrap {
+	border-bottom: none;
+	margin-bottom: 5px;
+}
+
+.bootstrap-tagsinput {
+	background: #333;
+}
+
 optgroup {
-	color: #CCC !important; 
+	color: #CCC !important;
 }
 
 option {
@@ -132,7 +145,7 @@ option {
 .abook-self {
 	border: 1px solid #222;
 	color: #555;
-	background-color:#111;	
+	background-color:#111;
 }
 
 .modal-content {
@@ -208,7 +221,7 @@ a.btn, aside a {
 }
 .btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
 	color: #FFF !important;
-    background-color: #C9302C !important;		
+    background-color: #C9302C !important;
     border-color: #AC2925 !important;
 }
 
@@ -278,7 +291,7 @@ nav .dropdown-menu {
 	border-bottom:1px solid #333;
 }
 
-.nav-tabs .nav-link.active { 
+.nav-tabs .nav-link.active {
 	color: #fff;
 	background-color: #111;
 	border-color: #333;
@@ -297,7 +310,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 	background-color: #222;
 }
 
-a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
 	font-weight: bold;
 }
 
@@ -343,6 +356,10 @@ pre {
 	border:1px solid #090909;
 }
 
+#wiki-content-container code {
+	background: #000;
+}
+
 .notif-item a {
 	color: #ccc;
 }
@@ -352,23 +369,23 @@ pre {
 }
 
 .dropdown-menu {
-	background-color: #222; 
+	background-color: #222;
 }
 
 .dropdown-menu >li > a {
-	color: #ccc; 
+	color: #ccc;
 }
 
 .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
-    	color: #ddd; 
-    	background-color: #333; 
+    	color: #ddd;
+    	background-color: #333;
 	background-image: none;
 }
 
 .open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
-    color: #ccc; 
-    background-color: #222; 
-    border-color: #222; 
+    color: #ccc;
+    background-color: #222;
+    border-color: #222;
 }
 
 .pmenu-item:hover a {
@@ -444,7 +461,7 @@ pre {
 
 
 .profile-match-wrapper {
-	width: 150px;	
+	width: 150px;
 	height: 120px;
 	border: none;
 }
@@ -462,5 +479,3 @@ pre {
 .widget-nav-pills-checkbox:hover + a {
 	background-color: #222;
 }
-
-

view/tpl/admin_settings_features.tpl

@@ -9,12 +9,12 @@
 		<div class="panel">
 			<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
 				<h3>
-					<a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
+					<a data-toggle="collapse" data-target="#{{$g}}-settings-content" href="#" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
 						{{$f.0}}
 					</a>
 				</h3>
 			</div>
-			<div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} in{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
+			<div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} show{{/if}}" data-parent="#settings" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
 				<div class="section-content-tools-wrapper">
 					{{foreach $f.1 as $fcat}}
 						{{include file="field_checkbox.tpl" field=$fcat.0}}

view/tpl/admin_site.tpl

@@ -55,7 +55,7 @@
 
 	{{include file="field_select.tpl" field=$language}}
 	{{include file="field_select.tpl" field=$theme}}
-    {{include file="field_select.tpl" field=$theme_mobile}}
+    {{* include file="field_select.tpl" field=$theme_mobile *}}
     {{include file="field_input.tpl" field=$frontpage}}
     {{include file="field_checkbox.tpl" field=$mirror_frontpage}}
     {{include file="field_checkbox.tpl" field=$login_on_homepage}}

view/tpl/cover_photo.tpl

@@ -1,3 +1,86 @@
+<script>
+    var initializeEmbedPhotoDialog = function () {
+        $('.embed-photo-selected-photo').each(function (index) {
+            $(this).removeClass('embed-photo-selected-photo');
+        });
+        getPhotoAlbumList();
+        $('#embedPhotoModalBodyAlbumDialog').off('click');
+        $('#embedPhotoModal').modal('show');
+    };
+
+    var choosePhotoFromAlbum = function (album) {
+        $.post("embedphotos/album", {name: album},
+            function(data) {
+                if (data['status']) {
+                    $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
+                    $('#embedPhotoModalBodyAlbumDialog').html('\
+                            <div><div class="nav nav-pills flex-column">\n\
+                                <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+                                    <i class="fa fa-chevron-left"></i>&nbsp\n\
+                                    {{$modaldiffalbum}}\n\
+                                    </a>\n\
+                                </li>\n\
+                            </div><br></div>')
+                    $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+                    $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+                        evt.preventDefault();
+                        var image = document.getElementById(evt.target.id);
+                        if (typeof($(image).parent()[0]) !== 'undefined') {
+                            var imageparent = document.getElementById($(image).parent()[0].id);
+                            $(imageparent).toggleClass('embed-photo-selected-photo');
+							var href = $(imageparent).attr('href');
+                            $.post("embedphotos/photolink", {href: href},
+                                function(ddata) {
+                                    if (ddata['status']) {
+                                        window.location.href = 'cover_photo/use/' + ddata['resource_id'];
+                                    } else {
+                                        window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
+                                    }
+                                    return false;
+								},
+                               'json');
+                            $('#embedPhotoModalBodyAlbumDialog').html('');
+                            $('#embedPhotoModalBodyAlbumDialog').off('click');
+                            $('#embedPhotoModal').modal('hide');
+						}
+                    });
+
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
+                } else {
+                    window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+
+    var getPhotoAlbumList = function () {
+        $.post("embedphotos/albumlist", {},
+            function(data) {
+                if (data['status']) {
+                    var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+                    $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
+                    $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
+                    for(var i=0; i<albums.length; i++) {
+                        var albumName = albums[i].text;
+			var jsAlbumName = albums[i].jstext;
+			var albumLink = '<li class="nav-item">';
+			albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
+                        albumLink += '</li>';
+                        $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+                    }
+                    $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
+                } else {
+                    window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+</script>
+
 <div id="profile-photo-content" class="generic-content-wrapper">
     <div class="section-title-wrapper">
     <h2>{{$title}}</h2>

view/tpl/generic_addon_settings.tpl

@@ -1,12 +1,12 @@
 <div class="panel">
 	<div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings">
 		<h3>
-			<a title="{{$addon.2}}" data-toggle="collapse" data-parent="#settings" href="#{{$addon.0}}-settings-content" aria-controls="{{$addon.0}}-settings-content">
+			<a title="{{$addon.2}}" data-toggle="collapse" data-target="#{{$addon.0}}-settings-content" href="#" aria-controls="{{$addon.0}}-settings-content">
 				{{$addon.1}}
 			</a>
 		</h3>
 	</div>
-	<div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings">
+	<div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings" data-parent="#settings">
 		<div class="section-content-tools-wrapper">
 			{{$content}}
 			{{if $addon.0}}

view/tpl/navbar_default.tpl

@@ -80,7 +80,7 @@
 		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
 	</button>
 	{{if $localuser || $nav.pubs}}
-	<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 text-white notifications-btn">
+	<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 notifications-btn">
 		<i id="notifications-btn-icon-1" class="fa fa-exclamation-circle notifications-btn-icon"></i>
 	</button>
 	{{/if}}

view/tpl/navbar_tucson.tpl

@@ -80,7 +80,7 @@
 		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
 	</button>
 	{{if $localuser || $nav.pubs}}
-	<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 text-white notifications-btn">
+	<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 notifications-btn">
 		<i id="notifications-btn-icon-1" class="fa fa-exclamation-circle notifications-btn-icon"></i>
 	</button>
 	{{/if}}

view/tpl/notifications_widget.tpl

@@ -1,3 +1,4 @@
+{{if $notifications}}
 <script>
 	var notifications_parent;
 
@@ -121,8 +122,6 @@
 	}
 </script>
 
-
-{{if $notifications}}
 <div id="notifications_wrapper">
 	<div id="no_notifications" class="d-xl-none">
 		{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>

view/tpl/peoplefind.tpl

@@ -10,7 +10,7 @@
 	</form>
 	<ul class="nav nav-pills flex-column">
 		{{if $similar}}<li class="nav-item"><a class="nav-link" href="match" >{{$similar}}</a></li>{{/if}}
-		{{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}}
+		{{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?f=&suggest=1" >{{$suggest}}</a></li>{{/if}}
 		<li class="nav-item"><a class="nav-link" href="randprof" >{{$random}}</a></li>
 		{{if $loggedin}}{{if $inv}}<li class="nav-item"><a class="nav-link" href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
 	</ul>

view/tpl/profile_edit.tpl

@@ -49,12 +49,12 @@
 				<div class="panel">
 					<div class="section-subtitle-wrapper" role="tab" id="personal">
 						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#personal-collapse" aria-expanded="true" aria-controls="personal-collapse">
+							<a data-toggle="collapse" data-target="#personal-collapse" href="#" aria-expanded="true" aria-controls="personal-collapse">
 								{{$personal}}
 							</a>
 						</h3>
 					</div>
-					<div id="personal-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="personal">
+					<div id="personal-collapse" class="panel-collapse collapse show" data-parent="#profile-edit-wrapper" role="tabpanel" aria-labelledby="personal">
 						<div class="section-content-tools-wrapper">
 							{{include file="field_input.tpl" field=$profile_name}}
 
@@ -215,12 +215,12 @@
 				<div class="panel">
 					<div class="section-subtitle-wrapper" role="tab" id="location">
 						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#location-collapse" aria-expanded="true" aria-controls="location-collapse">
+							<a data-toggle="collapse" data-target="#location-collapse" href="#" aria-expanded="true" aria-controls="location-collapse">
 								{{$location}}
 							</a>
 						</h3>
 					</div>
-					<div id="location-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="location">
+					<div id="location-collapse" class="panel-collapse collapse" data-parent="#profile-edit-wrapper" role="tabpanel" aria-labelledby="location">
 						<div class="section-content-tools-wrapper">
 							{{if $fields.address}}
 							{{include file="field_input.tpl" field=$address}}
@@ -260,12 +260,12 @@
 				<div class="panel">
 					<div class="section-subtitle-wrapper" role="tab" id="relation">
 						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#relation-collapse" aria-expanded="true" aria-controls="relation-collapse">
+							<a data-toggle="collapse" data-target="#relation-collapse" href="#" aria-expanded="true" aria-controls="relation-collapse">
 								{{$relation}}
 							</a>
 						</h3>
 					</div>
-					<div id="relation-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relation">
+					<div id="relation-collapse" class="panel-collapse collapse" data-parent="#profile-edit-wrapper" role="tabpanel" aria-labelledby="relation">
 						<div class="section-content-tools-wrapper">
 							{{if $fields.marital }}
 							<div id="profile-edit-marital-wrapper" class="form-group field" >
@@ -307,12 +307,12 @@
 				<div class="panel">
 					<div class="section-subtitle-wrapper" role="tab" id="miscellaneous">
 						<h3>
-							<a data-toggle="collapse" data-parent="#profile-edit-wrapper" href="#miscellaneous-collapse" aria-expanded="true" aria-controls="miscellaneous-collapse">
+							<a data-toggle="collapse" data-target="#miscellaneous-collapse" href="#" aria-expanded="true" aria-controls="miscellaneous-collapse">
 								{{$miscellaneous}}
 							</a>
 						</h3>
 					</div>
-					<div id="miscellaneous-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous">
+					<div id="miscellaneous-collapse" class="panel-collapse collapse" data-parent="#profile-edit-wrapper" role="tabpanel" aria-labelledby="miscellaneous">
 						<div class="section-content-tools-wrapper">
 							{{if $fields.homepage}}
 							{{include file="field_input.tpl" field=$homepage}}

view/tpl/profile_photo.tpl

@@ -1,3 +1,89 @@
+<script>
+    var initializeEmbedPhotoDialog = function () {
+        $('.embed-photo-selected-photo').each(function (index) {
+            $(this).removeClass('embed-photo-selected-photo');
+        });
+        getPhotoAlbumList();
+        $('#embedPhotoModalBodyAlbumDialog').off('click');
+        $('#embedPhotoModal').modal('show');
+    };
+
+    var choosePhotoFromAlbum = function (album) {
+        $.post("embedphotos/album", {name: album},
+            function(data) {
+                if (data['status']) {
+                    $('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
+                    $('#embedPhotoModalBodyAlbumDialog').html('\
+                            <div><div class="nav nav-pills flex-column">\n\
+                                <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+                                    <i class="fa fa-chevron-left"></i>&nbsp\n\
+                                    {{$modaldiffalbum}}\n\
+                                    </a>\n\
+                                </li>\n\
+                            </div><br></div>')
+                    $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+                    $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+                        evt.preventDefault();
+                        var image = document.getElementById(evt.target.id);
+                        if (typeof($(image).parent()[0]) !== 'undefined') {
+                            var imageparent = document.getElementById($(image).parent()[0].id);
+                            $(imageparent).toggleClass('embed-photo-selected-photo');
+							var href = $(imageparent).attr('href');
+                            $.post("embedphotos/photolink", {href: href},
+                                function(ddata) {
+                                    if (ddata['status']) {
+										var pf = $('#profile-photo-profiles').val();
+										var prof = ((typeof pf !== 'undefined') ? '?f=&pf=' + pf : '');
+                                        window.location.href = 'profile_photo/use/' + ddata['resource_id'] + prof;
+                                    } else {
+                                        window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
+                                    }
+                                    return false;
+								},
+                               'json');
+                            $('#embedPhotoModalBodyAlbumDialog').html('');
+                            $('#embedPhotoModalBodyAlbumDialog').off('click');
+                            $('#embedPhotoModal').modal('hide');
+						}
+                    });
+
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
+                } else {
+                    window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+
+    var getPhotoAlbumList = function () {
+        $.post("embedphotos/albumlist", {},
+            function(data) {
+                if (data['status']) {
+                    var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+                    $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
+                    $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
+                    for(var i=0; i<albums.length; i++) {
+                        var albumName = albums[i].text;
+			var jsAlbumName = albums[i].jstext;
+			var albumLink = '<li class="nav-item">';
+			albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
+                        albumLink += '</li>';
+                        $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+                    }
+                    $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
+                    $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
+                } else {
+                    window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+</script>
+
+
 <div id="profile-photo-content" class="generic-content-wrapper">
     <div class="section-title-wrapper">
     <h2>{{$title}}</h2>

view/tpl/settings.tpl

@@ -11,12 +11,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="basic-settings">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse">
+						<a data-toggle="collapse" data-target="#basic-settings-collapse" href="#">
 							{{$h_basic}}
 						</a>
 					</h3>
 				</div>
-				<div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings">
+				<div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings" data-parent="#settings">
 					<div class="section-content-tools-wrapper">
 						{{include file="field_input.tpl" field=$username}}
 						{{include file="field_select_grouped.tpl" field=$timezone}}
@@ -37,12 +37,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse">
+						<a data-toggle="collapse" data-target="#privacy-settings-collapse" href="#">
 							{{$h_prv}}
 						</a>
 					</h3>
 				</div>
-				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings">
+				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings" data-parent="#settings">
 					<div class="section-content-tools-wrapper">
 						{{include file="field_select_grouped.tpl" field=$role}}
 						<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};">
@@ -96,12 +96,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse">
+						<a data-toggle="collapse" data-target="#notification-settings-collapse" href="#">
 							{{$h_not}}
 						</a>
 					</h3>
 				</div>
-				<div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings">
+				<div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings" data-parent="#settings">
 					<div class="section-content-tools-wrapper">
 						<div id="settings-notifications">
 
@@ -160,12 +160,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#miscellaneous-settings-collapse" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
+						<a data-toggle="collapse" data-target="#miscellaneous-settings-collapse" href="#" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
 							{{$lbl_misc}}
 						</a>
 					</h3>
 				</div>
-				<div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
+				<div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings" data-parent="#settings" >
 					<div class="section-content-tools-wrapper">
 						{{if $profselect}}
 						<label for="contact-profile-selector">{{$profseltxt}}</label>

view/tpl/settings_addons.tpl

@@ -1,8 +1,8 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		<div class="descriptive-text pull-right">{{$descrip}}</div>
 		<h2>{{$title}}</h2>
 	</div>
+	<div class="section-content-info-wrapper">{{$descrip}}</div>
 	<form action="settings/featured" method="post" autocomplete="off">
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 		<div class="panel-group" id="settings" role="tablist">

view/tpl/settings_display.tpl

@@ -10,12 +10,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content">
+						<a data-toggle="collapse" data-target="#theme-settings-content" href="#" aria-expanded="true" aria-controls="theme-settings-content">
 							{{$d_tset}}
 						</a>
 					</h3>
 				</div>
-				<div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings">
+				<div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings" data-parent="#settings" >
 					<div class="section-content-tools-wrapper">
 						{{if $theme}}
 							{{include file="field_themeselect.tpl" field=$theme}}
@@ -33,12 +33,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
+						<a data-toggle="collapse" data-target="#custom-settings-content" href="" aria-expanded="true" aria-controls="custom-settings-content">
 							{{$d_ctset}}
 						</a>
 					</h3>
 				</div>
-				<div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
+				<div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings" data-parent="#settings" >
 					<div class="section-content-tools-wrapper">
 						{{if $theme_config}}
 							{{$theme_config}}
@@ -49,12 +49,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content">
+						<a data-toggle="collapse" data-target="#content-settings-content" href="" aria-expanded="true" aria-controls="content-settings-content">
 							{{$d_cset}}
 						</a>
 					</h3>
 				</div>
-				<div id="content-settings-content" class="collapse{{if !$theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
+				<div id="content-settings-content" class="collapse{{if !$theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings" data-parent="#settings">
 					<div class="section-content-wrapper">
 						{{include file="field_input.tpl" field=$ajaxint}}
 						{{include file="field_input.tpl" field=$itemspage}}

view/tpl/settings_features.tpl

@@ -9,12 +9,12 @@
 		<div class="panel">
 			<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
 				<h3>
-					<a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
+					<a data-toggle="collapse" data-target="#{{$g}}-settings-content" href="#" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
 						{{$f.0}}
 					</a>
 				</h3>
 			</div>
-			<div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
+			<div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title" data-parent="#settings">
 				<div class="section-content-tools-wrapper">
 					{{foreach $f.1 as $fcat}}
 						{{include file="field_checkbox.tpl" field=$fcat}}